Skip to content

Commit 76a467d

Browse files
MairwunNxMairwunNx
committed
Merge branch 'MC-1.14.4' into MC-1.15.2
# Conflicts: # gradle.properties # readme.md # src/main/java/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ExecuteCommand.java # src/main/java/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ForceLoadCommand.java # src/main/java/com/mairwunnx/projectessentials/core/impl/vanilla/commands/LootCommand.java # src/main/java/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TeleportCommand.java # src/main/kotlin/com/mairwunnx/projectessentials/core/EntryPoint.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/InternalConstants.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/configuration/ConfigurationAPI.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/localization/LocalizationAPI.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/module/ModuleAPI.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/ModuleObject.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/commands/ConfigureEssentialsCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/configurations/NativeMappingsConfiguration.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/AdvancementCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/BanCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/BanIpCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/BanListCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/BossBarCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ClearCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/CloneCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/DataPackCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/DeOpCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/DebugCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/DefaultGameModeCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/DifficultyCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/EffectCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/EnchantCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ExperienceCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/FillCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/FunctionCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/GameModeCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/GameRuleCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/GiveCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/HelpCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/KickCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/KillCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ListCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/LocateCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/MeCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/MessageCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/OpCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/PardonCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/PardonIpCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ParticleCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/PlaySoundCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/PublishCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/RecipeCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ReloadCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ReplaceItemCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SaveAllCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SaveOffCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SaveOnCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SayCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ScheduleCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SeedCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SetBlockCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SetIdleTimeoutCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SetWorldSpawnCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SpawnPointCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/StopCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/StopSoundCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SummonCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TagCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TeamMsgCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TellRawCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TimeCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TitleCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TriggerCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/WeatherCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/WhitelistCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/WorldBorderCommand.kt # updatev2.json
2 parents c683b72 + 892cafa commit 76a467d

File tree

82 files changed

+607
-13403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+607
-13403
lines changed

‎src/main/java/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ExecuteCommand.java

-463
This file was deleted.

‎src/main/java/com/mairwunnx/projectessentials/core/impl/vanilla/commands/ForceLoadCommand.java

-197
This file was deleted.

0 commit comments

Comments
 (0)