Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
gnembon committed 2020-06-14 01:25:58 -03:00
commit 80ca80fe24
22 files changed
+528 -3

No files matched your search

+1
View File
@@ -24,6 +24,7 @@
"mixins": [
"carpet.mixins.json"
],
"accessWidener" : "carpet.accesswidener",
"depends": {
"minecraft": "1.16.x",