Merge branch 'master' into future

# Conflicts:
#	src/main/resources/fabric.mod.json
This commit is contained in:
gnembon committed 2021-11-16 20:14:38 +01:00
commit b64427a4ac
1 file changed
+1 -1
+1 -1
View File
@@ -34,6 +34,6 @@
"depends": { "depends": {
"minecraft": "1.18.x", "minecraft": "1.18.x",
"fabricloader": ">=0.11.6", "fabricloader": ">=0.11.6",
"java": ">=16" "java": ">=17"
} }
} }