Merge branch 'master' into 1.17

src/main/resources/carpet.mixins.json

@@ -4,6 +4,8 @@
   "package": "carpet.mixins",
   "compatibilityLevel": "JAVA_16",
   "mixins": [
+    "BarrierBlock_updateSuppressionBlockMixin",
+
     "SpawnHelperInnerMixin",
     "CommandManagerMixin",
 
@@ -234,4 +236,4 @@
   "injectors": {
     "defaultRequire": 1
   }
-}
+}