Skip to content

Commit 71c5f40

Browse files
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.json
2 parents 4bc4a3d + 26b75fd commit 71c5f40

File tree

211 files changed

+5734
-3477
lines changed

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

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,16 @@ assignees: ''
77

88
---
99

10-
### Describe the bug
11-
> - A clear and concise description of what the bug is.
10+
### Description of the problem
1211

13-
### Steps to reproduce the behavior
14-
> - 1. Go to '...'
15-
> - 2. Enter command '....'
16-
> - 3. See error
12+
### Steps to reproduce this problem
1713

1814
### Expected behavior
19-
> - A clear and concise description of what you expected to happen.
2015

21-
### Screenshots
22-
> - If applicable, add screenshots to help explain your problem.
16+
### Additional materials
2317

2418
### Environment information
25-
> - Project Essentials Core version: [e.g. v1.0.0.0]
26-
> - Project Essentials version: [e.g. v0.6.0.0]
27-
> - Project Essentials Modules version: [e.g. Spawn - v1.0.0.2; Home - v1.3.0.0]
28-
> - Minecraft / Forge version: [e.g. 1.14.4 / 28.1.0]
2919

30-
### Additional context
31-
> - Add any other context about the problem here.
20+
### Your comment.
3221

3322
### Log files. (latest.log and debug.log file in attachment)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## Description
2+
3+
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
4+
5+
Fixes # (issue)
6+
7+
# How Has This Been Tested?
8+
9+
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
10+
11+
- [ ] Test A
12+
- [ ] Test B
13+
14+
# Checklist:
15+
16+
- [ ] My code follows the style guidelines of this project
17+
- [ ] I have performed a self-review of my own code
18+
- [ ] I have commented my code, particularly in hard-to-understand areas
19+
- [ ] I have made corresponding changes to the documentation
20+
- [ ] My changes generate no new warnings
21+
- [ ] Any dependent changes have been merged and published in downstream modules

LICENSE

Lines changed: 0 additions & 165 deletions
This file was deleted.

assets/core_social_logo.jpg

-528 KB
Binary file not shown.

assets/core_social_logo.xd

-3.88 MB
Binary file not shown.

assets/curse/Any questions.png

-90.5 KB
Binary file not shown.

assets/curse/ApiUsing.png

-56.4 KB
Binary file not shown.

assets/curse/Changelog.png

-53.9 KB
Binary file not shown.

assets/curse/Commands.png

-57.4 KB
Binary file not shown.

assets/curse/Configuration.png

-64.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)