Merge branch 'master' into 1.15

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

src/main/resources/carpet.mixins.json

@@ -106,6 +106,7 @@
     "ItemEntityMixin",
     "TntBlockMixin",
     "ExplosionMixin",
+    "ExplosionAccessor",
 
     "TntEntityMixin",
     "ProjectileEntityMixin",
@@ -125,6 +126,7 @@
     "PickaxeItem_missingToolsMixin",
     "ShearsItem_missingToolsMixin",
 
+    "ArmorStandEntity_scarpetMarkerMixin",
     "Entity_scarpetEventsMixin",
     "LivingEntity_scarpetEventsMixin",
     "DamageTracker_scarpetEventMixin",