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
@@ -67,8 +67,6 @@
|
||||
"EntityTrackerEntry_leashFixMixin",
|
||||
|
||||
"VillagerEntity_aiMixin",
|
||||
"Brain_Mixin",
|
||||
"Memory_scarpetMixin",
|
||||
|
||||
"PlayerEntity_fakePlayersMixin",
|
||||
"ThrownEnderpearlEntity_fakePlayersMixin",
|
||||
@@ -190,7 +188,6 @@
|
||||
"Team_scarpetMixin",
|
||||
"TradeOutputSlot_scarpetEventMixin",
|
||||
|
||||
"BiomeEffects_scarpetMixin",
|
||||
"ChunkTicketManager_scarpetMixin",
|
||||
"PointOfInterest_scarpetMixin",
|
||||
"ServerWorld_scarpetMixin",
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
"depends": {
|
||||
"minecraft": "1.18.x",
|
||||
"fabricloader": ">=0.11.6",
|
||||
"fabricloader": ">=0.12.8",
|
||||
"java": ">=17"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user