mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-19 19:49:50 +00:00
Merge branch 'development' into 1.8
Conflicts: src/main/java/mekanism/client/ClientTickHandler.java src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/Mekanism.java
This commit is contained in:
commit
7ddb8e9727
8 files changed
+46
-9
No files matched your search
@@ -30,6 +30,8 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
dataStream.writeBoolean(Mekanism.dynamicTankEasterEgg);
|
||||
dataStream.writeBoolean(Mekanism.voiceServerEnabled);
|
||||
dataStream.writeBoolean(Mekanism.cardboardSpawners);
|
||||
dataStream.writeBoolean(Mekanism.creativeOverrideElectricChest);
|
||||
dataStream.writeBoolean(Mekanism.spawnBabySkeletons);
|
||||
dataStream.writeInt(Mekanism.obsidianTNTDelay);
|
||||
dataStream.writeInt(Mekanism.obsidianTNTBlastRadius);
|
||||
dataStream.writeInt(Mekanism.UPDATE_DELAY);
|
||||
@@ -83,6 +85,8 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
Mekanism.dynamicTankEasterEgg = dataStream.readBoolean();
|
||||
Mekanism.voiceServerEnabled = dataStream.readBoolean();
|
||||
Mekanism.cardboardSpawners = dataStream.readBoolean();
|
||||
Mekanism.creativeOverrideElectricChest = dataStream.readBoolean();
|
||||
Mekanism.spawnBabySkeletons = dataStream.readBoolean();
|
||||
Mekanism.obsidianTNTDelay = dataStream.readInt();
|
||||
Mekanism.obsidianTNTBlastRadius = dataStream.readInt();
|
||||
Mekanism.UPDATE_DELAY = dataStream.readInt();
|
||||
|
||||
Reference in new issue
Block a user