 altrisi
|
7fb5e47da5
|
Use newer Java features in places where it makes sense and more (#1009)
|
2021-08-03 07:32:40 -03:00 |
|
|
gnembon
|
9a4e15da48
|
mappings
|
2021-06-29 17:28:58 -03:00 |
|
|
gnembon
|
f64cf67e41
|
1.17-pre1
|
2021-05-27 15:01:07 -03:00 |
|
|
gnembon
|
b80b555781
|
Merge branch 'master' into 1.17
# Conflicts:
# src/main/java/carpet/script/utils/SnoopyCommandSource.java
# src/main/java/carpet/utils/WoolTool.java
|
2021-05-18 21:23:15 -03:00 |
|
|
gnembon
|
edc90133b2
|
fix run position, fixes #866
|
2021-05-18 21:18:53 -03:00 |
|
|
gnembon
|
4b85bdcb86
|
merge errors
|
2021-04-19 23:48:55 -03:00 |
|
|
gnembon
|
709d74ea47
|
Merge branch 'master' into 1.17
# Conflicts:
# src/main/java/carpet/network/ServerNetworkHandler.java
# src/main/java/carpet/script/utils/SnoopyCommandSource.java
|
2021-04-19 23:42:38 -03:00 |
|
|
gnembon
|
ba89d0164f
|
handling snooped commands properly
|
2021-04-19 23:40:22 -03:00 |
|
|
gnembon
|
5cceec9486
|
Merge branch 'master' into 1.17
|
2021-04-19 23:35:30 -03:00 |
|
|
gnembon
|
b0dafccc18
|
re-name
|
2021-04-19 23:35:13 -03:00 |
|