Commit c14b6cc
committed
Merge remote-tracking branch 'origin/MC-1.14.X' into MC-1.15.2
# Conflicts:
# build.gradle
# changelog.md
# gradle.properties
# readme.md
# src/main/kotlin/com/mairwunnx/projectessentials/permissions/EntryPoint.kt
# src/main/kotlin/com/mairwunnx/projectessentials/permissions/commands/PermissionsCommand.kt
# src/main/kotlin/com/mairwunnx/projectessentials/permissions/permissions/PermissionBase.kt
# src/main/kotlin/com/mairwunnx/projectessentials/permissions/permissions/PermissionModel.kt
# src/main/resources/META-INF/mods.toml
# src/main/resources/assets/projectessentialspermissions/lang/zh_cn.json
# src/main/resources/pack.mcmeta
# update.jsonFile tree
41 files changed
+2272
-1943
lines changed- .github
- ISSUE_TEMPLATE
- assets
- documentation
- src/main
- java/com/mairwunnx/projectessentials/permissions/impl
- kotlin/com/mairwunnx/projectessentials/permissions
- api/v1
- commands
- impl
- commands
- configurations
- permissions
- resources
- META-INF
- assets/projectessentialspermissions/lang
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
41 files changed
+2272
-1943
lines changed| 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 | | - | |
| 3 | + | |
5 | 4 | | |
6 | | - | |
7 | | - | |
| 5 | + | |
8 | 6 | | |
9 | | - | |
| 7 | + | |
10 | 8 | | |
11 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
53 | 52 | | |
54 | 53 | | |
55 | 54 | | |
| |||
66 | 65 | | |
67 | 66 | | |
68 | 67 | | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | 68 | | |
76 | 69 | | |
77 | 70 | | |
| |||
119 | 112 | | |
120 | 113 | | |
121 | 114 | | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | 115 | | |
126 | 116 | | |
127 | 117 | | |
| |||
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file was deleted.
Binary file not shown.
0 commit comments