Merge branch 'master' into 1.17

# Conflicts:
#	src/main/resources/carpet.mixins.json
This commit is contained in:
gnembon committed 2021-06-22 01:28:32 -03:00
commit 241537b172
5 files changed
+38 -9

No files matched your search

+1
View File
@@ -210,6 +210,7 @@
"BlockItem_creativeNoClipMixin",
"WallStandingBlockItem_creativeNoClipMixin",
"ShulkerBoxBlockEntity_creativeNoClipMixin",
"EndGatewayBlockEntity_creativeNoClipMixin",
"LivingEntity_creativeFlyMixin",
"VeryBiasedToBottomHeightProvider_cleanLogsMixin",