Commit 71c5f40
committed
Merge remote-tracking branch 'origin/MC-1.14.4' into MC-1.15.2
# Conflicts:
# assets/curse/ForDescription.xd
# build.gradle
# changelog.md
# 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/ScoreboardCommand.java
# src/main/java/com/mairwunnx/projectessentials/core/impl/vanilla/commands/SpreadPlayersCommand.java
# src/main/java/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TeamCommand.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/EssBase.kt
# src/main/kotlin/com/mairwunnx/projectessentials/core/JavaCompatibility.kt
# src/main/kotlin/com/mairwunnx/projectessentials/core/helpers/JsonHelper.kt
# src/main/kotlin/com/mairwunnx/projectessentials/core/helpers/ModErrorsHelper.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/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/TitleCommand.kt
# src/main/kotlin/com/mairwunnx/projectessentials/core/impl/vanilla/commands/TriggerCommand.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
# src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/GameModeCommand.kt
# src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/TimeCommand.kt
# src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/WeatherCommand.kt
# src/main/resources/META-INF/mods.toml
# src/main/resources/assets/projectessentialscore/lang/en_us.json
# src/main/resources/assets/projectessentialscore/lang/ru_ru.json
# update.jsonFile tree
211 files changed
+5734
-3477
lines changed- .github
- ISSUE_TEMPLATE
- assets
- curse
- documentation
- src/main
- java/com/mairwunnx/projectessentials/core/impl
- events
- vanilla/commands
- kotlin/com/mairwunnx/projectessentials/core
- api/v1
- commands
- arguments
- back
- configuration
- events
- forge
- internal
- extensions
- helpers
- localization
- messaging
- module
- permissions
- strategy
- processor
- providers
- configuration/commands
- enums
- extensions
- helpers
- impl
- commands
- configurations
- vanilla/commands
- vanilla
- commands
- utils
- resources
- META-INF
- assets/projectessentialscore/lang
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
211 files changed
+5734
-3477
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | | - | |
| 10 | + | |
12 | 11 | | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
| 12 | + | |
17 | 13 | | |
18 | 14 | | |
19 | | - | |
20 | 15 | | |
21 | | - | |
22 | | - | |
| 16 | + | |
23 | 17 | | |
24 | 18 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | 19 | | |
30 | | - | |
31 | | - | |
| 20 | + | |
32 | 21 | | |
33 | 22 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments