Merge branch 'master' into 1.17

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/value/ValueConversions.java

src/main/resources/carpet.mixins.json

@@ -176,6 +176,8 @@
     "RecipeManager_scarpetMixin",
     "Ingredient_scarpetMixin",
     "BlockStateArgument_scarpetMixin",
+    "StatePredicate_scarpetMixin",
+    "TagPredicate_scarpetMixin",
     "HorseBaseEntity_scarpetMixin",
     "PillagerEntity_scarpetMixin",