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/java/carpet/fakes/BiomeEffectsInterface.java

@@ -1,12 +0,0 @@
-package carpet.fakes;
-
-import java.util.Optional;
-
-public interface BiomeEffectsInterface
-{
-    int getCMFogColor();
-    Optional<Integer> getCMFoliageColor();
-    int getCMSkyColor();
-    int getCMWaterColor();
-    int getCMWaterFogColor();
-}

src/main/java/carpet/fakes/BrainInterface.java

@@ -1,12 +0,0 @@
-package carpet.fakes;
-
-import net.minecraft.entity.ai.brain.Memory;
-import net.minecraft.entity.ai.brain.MemoryModuleType;
-
-import java.util.Map;
-import java.util.Optional;
-
-public interface BrainInterface
-{
-    Map<MemoryModuleType<?>, Optional<? extends Memory<?>>> getMobMemories();
-}

src/main/java/carpet/fakes/ItemEntityInterface.java

@@ -2,6 +2,5 @@ package carpet.fakes;
 
 public interface ItemEntityInterface
 {
-    int getAgeCM();
     int getPickupDelayCM();
 }

src/main/java/carpet/fakes/MemoryInterface.java

@@ -1,6 +0,0 @@
-package carpet.fakes;
-
-public interface MemoryInterface
-{
-    long getScarpetExpiry();
-}