mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 20:42:17 +00:00
Merge branch 'development' into 1.8 (hopefully I didn't miss anything)
Conflicts: src/main/java/mekanism/client/gui/GuiGasTank.java src/main/java/mekanism/client/gui/GuiPortableTeleporter.java src/main/java/mekanism/client/gui/GuiTeleporter.java src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/content/transporter/TransporterStack.java
This commit is contained in:
commit
9bf4baab49
19 files changed
+980
-136
No files matched your search
@@ -69,6 +69,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
dataStream.writeDouble(usage.chemicalCrystallizerUsage);
|
||||
dataStream.writeDouble(usage.seismicVibratorUsage);
|
||||
dataStream.writeDouble(usage.fluidicPlenisherUsage);
|
||||
dataStream.writeDouble(usage.salinationPlantWaterUsage);
|
||||
|
||||
try {
|
||||
for(IModule module : Mekanism.modulesLoaded)
|
||||
@@ -127,6 +128,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
usage.chemicalCrystallizerUsage = dataStream.readDouble();
|
||||
usage.seismicVibratorUsage = dataStream.readDouble();
|
||||
usage.fluidicPlenisherUsage = dataStream.readDouble();
|
||||
usage.salinationPlantWaterUsage = dataStream.readDouble();
|
||||
|
||||
try {
|
||||
for(IModule module : Mekanism.modulesLoaded)
|
||||
|
||||
Reference in new issue
Block a user