Merge branch 'master' into 1.17

# Conflicts:
#	src/main/resources/carpet.mixins.json
This commit is contained in:
gnembon committed 2021-06-13 11:47:56 -03:00
commit dc38cd272f
7 files changed
+40 -24

No files matched your search

+2 -1
View File
@@ -209,7 +209,8 @@
"PistonBlockEntity_playerHandlingMixin",
"BlockItem_creativeNoClipMixin",
"WallStandingBlockItem_creativeNoClipMixin",
"LivingEntity_creativeFlyMixin",
"ShulkerBoxBlockEntity_creativeNoClipMixin",
"LivingEntity_creativeFlyMixin"
"VeryBiasedToBottomHeightProvider_cleanLogsMixin",
"TrapezoidHeightProvider_cleanLogsMixin"