Merge branch 'master' into 1.16

# Conflicts: # src/main/resources/carpet.mixins.json
2020-05-25 23:51:06 -03:00
commit a4ac4cb01b
@@ -65,6 +65,8 @@
    "StructureFeatureMixin",
    "World_scarpetPlopMixin",
    "Biome_scarpetMixin",
+    "ChunkRegion_scarpetPlopMixin",
+    "StructurePiece_scarpetPlopMixin",

    "ServerPlayNetworkHandler_scarpetEventsMixin",
    "ServerPlayerInteractionManager_scarpetEventsMixin",