Merge branch 'master' into future
# Conflicts: # gradle.properties # src/main/java/carpet/script/annotation/AnnotationParser.java # src/main/java/carpet/script/utils/BiomeInfo.java # src/main/resources/fabric.mod.json
This commit is contained in:
commit
529a5b358d
38 files changed
+247
-381
No files matched your search
+1
-1
@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G
|
||||
# or better: https://modmuss50.me/fabric.html
|
||||
minecraft_version=1.18
|
||||
yarn_mappings=1.18+build.1
|
||||
loader_version=0.12.6
|
||||
loader_version=0.12.12
|
||||
fabric_version=0.43.1+1.18
|
||||
|
||||
# Mod Properties
|
||||
|
||||
Reference in new issue
Block a user