Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-12-11 00:31:58 -04:00
commit c0d9b6ecb6
4 files changed
+50 -1

No files matched your search

+2
View File
@@ -114,6 +114,8 @@
"PickaxeItem_missingToolsMixin",
"ShearsItem_missingToolsMixin",
"ItemDispenserBehaviour_extremeBehavioursMixin",
"ArmorStandEntity_scarpetMarkerMixin",
"Entity_scarpetEventsMixin",
"LivingEntity_scarpetEventsMixin",