Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/TntEntityMixin.java
#	src/main/java/carpet/script/value/EntityValue.java

src/main/java/carpet/fakes/TntEntityInterface.java

@@ -0,0 +1,7 @@
+package carpet.fakes;
+
+public interface TntEntityInterface {
+
+    int getMergedTNT();
+
+}