Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java
This commit is contained in:
gnembon committed 2020-11-06 00:25:36 -04:00
commit f306da7cc2
6 files changed
+5 -58

No files matched your search

-1
View File
@@ -197,7 +197,6 @@
"InGameHudMixin",
"PlayerListHudMixin",
"PistonBlockEntityRenderer_movableTEMixin",
"ClientPlayNetworkHandler_smoothClientAnimationsMixin",
"ClientPlayerEntity_clientCommandMixin",
"WorldRenderer_fogOffMixin",
"WorldRenderer_creativeNoClipMixin",