mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 04:22:26 +00:00
Merge branch 'development' into 1.8
Conflicts: src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
This commit is contained in:
commit
69874de9d2
10 files changed
+111
-47
No files matched your search
@@ -148,8 +148,13 @@ public class MekanismGenerators implements IModule
|
||||
dataStream.writeDouble(generators.advancedSolarGeneration);
|
||||
dataStream.writeDouble(generators.bioGeneration);
|
||||
dataStream.writeDouble(generators.heatGeneration);
|
||||
dataStream.writeDouble(generators.heatGenerationLava);
|
||||
dataStream.writeDouble(generators.heatGenerationNether);
|
||||
dataStream.writeDouble(generators.solarGeneration);
|
||||
dataStream.writeDouble(generators.windGeneration);
|
||||
dataStream.writeDouble(generators.windGenerationMin);
|
||||
dataStream.writeDouble(generators.windGenerationMax);
|
||||
dataStream.writeInt(generators.windGenerationMinY);
|
||||
dataStream.writeInt(generators.windGenerationMaxY);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -158,8 +163,13 @@ public class MekanismGenerators implements IModule
|
||||
generators.advancedSolarGeneration = dataStream.readDouble();
|
||||
generators.bioGeneration = dataStream.readDouble();
|
||||
generators.heatGeneration = dataStream.readDouble();
|
||||
generators.heatGenerationLava = dataStream.readDouble();
|
||||
generators.heatGenerationNether = dataStream.readDouble();
|
||||
generators.solarGeneration = dataStream.readDouble();
|
||||
generators.windGeneration = dataStream.readDouble();
|
||||
generators.windGenerationMin = dataStream.readDouble();
|
||||
generators.windGenerationMax = dataStream.readDouble();
|
||||
generators.windGenerationMinY = dataStream.readInt();
|
||||
generators.windGenerationMaxY = dataStream.readInt();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
Reference in new issue
Block a user