Commit b190a35
committed
Merge remote-tracking branch 'origin/MC-1.14.4' into MC-1.15.2
# Conflicts:
# build.gradle
# changelog.md
# gradle.properties
# readme.md
# src/main/kotlin/com/mairwunnx/projectessentials/warps/EntryPoint.kt
# src/main/kotlin/com/mairwunnx/projectessentials/warps/commands/DelWarpCommand.kt
# src/main/kotlin/com/mairwunnx/projectessentials/warps/commands/SetWarpCommand.kt
# src/main/kotlin/com/mairwunnx/projectessentials/warps/commands/WarpCommand.kt
# src/main/resources/META-INF/mods.toml
# src/main/resources/assets/projectessentialswarps/lang/zh_cn.json
# update.json37 files changed
Lines changed: 765 additions & 1069 deletions
File tree
- .github
- ISSUE_TEMPLATE
- documentation
- gradle/wrapper
- src/main
- kotlin/com/mairwunnx/projectessentials/warps
- commands
- configurations
- helpers
- models
- resources
- META-INF
- assets/projectessentialswarps/lang
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
| 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 | | - | |
| 1 | + | |
3 | 2 | | |
4 | | - | |
5 | | - | |
| 3 | + | |
6 | 4 | | |
7 | | - | |
| 5 | + | |
8 | 6 | | |
9 | | - | |
| 7 | + | |
10 | 8 | | |
11 | | - | |
| 9 | + | |
12 | 10 | | |
13 | | - | |
| 11 | + | |
| 12 | + | |
14 | 13 | | |
15 | | - | |
| 14 | + | |
16 | 15 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
150 | 150 | | |
151 | 151 | | |
152 | 152 | | |
153 | | - | |
This file was deleted.
0 commit comments