Merge remote-tracking branch 'upstream/master' into renewableSponges

This commit is contained in:
DeadlyMC committed 2019-06-06 16:11:06 +05:30
commit 9e5981a3b9
12 files changed
+702 -2

No files matched your search

+10 -2
View File
@@ -73,13 +73,21 @@
"EndCityFeatureMixin",
"InfestedBlockMixin",
"PlayerEntityMixin"
"PlayerEntityMixin",
"PistonBlock_movableTEMixin",
"PistonBlockEntity_movableTEMixin",
"World_movableTEMixin",
"WorldChunk_movableTEMixin"
],
"client": [
"MinecraftClientMixin",
"IntegratedServerMixin",
"InGameHudMixin",
"PlayerListHudMixin"
"PlayerListHudMixin",
"BlockEntityRenderDispatcher_movableTEMixin",
"PistonBlockEntityRenderer_movableTEMixin"
],
"server": [
"MinecraftDedicatedServerMixin"