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

src/main/resources/carpet.mixins.json

@@ -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",