Merge branch 'master' into 1.17

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

src/main/java/carpet/fakes/BlockPredicateInterface.java

@@ -0,0 +1,17 @@
+package carpet.fakes;
+
+import carpet.script.value.Value;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.tag.Tag;
+
+import java.util.Map;
+
+public interface BlockPredicateInterface
+{
+    BlockState getCMBlockState();
+    Tag<Block> getCMBlockTag();
+    Map<Value, Value> getCMProperties();
+    CompoundTag getCMDataTag();
+}