mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch '1.7.10' into 1.10
* 1.7.10: Added version-based handling, bump version to 9.1.1 Bump up Dynamic Tank max storage, fixed Factory container issue Add config option to disable block protections Fixed chunk churning issue with frames Restrict Thermal Evaporation Plant output to needed Going back to MIT, thanks to the concerns of @bshelden and @asiekierka Conflicts: build.properties src/main/java/mekanism/api/MekanismConfig.java src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/ThreadGetData.java src/main/java/mekanism/common/block/BlockBounding.java src/main/java/mekanism/common/item/ItemBlockEnergyCube.java src/main/java/mekanism/common/item/ItemBlockGasTank.java src/main/java/mekanism/common/item/ItemBlockMachine.java src/main/java/mekanism/common/network/PacketConfigSync.java src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java src/main/java/mekanism/tools/common/MekanismTools.java
This commit is contained in:
commit
c510ce7d8c
9 files changed
+35
-2
No files matched your search
@@ -77,6 +77,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
dataStream.writeDouble(general.heatPerFuelTick);
|
||||
dataStream.writeBoolean(general.allowTransmitterAlloyUpgrade);
|
||||
dataStream.writeBoolean(general.allowChunkloading);
|
||||
dataStream.writeBoolean(general.allowProtection);
|
||||
|
||||
for(MachineType type : BlockStateMachine.MachineType.getValidMachines())
|
||||
{
|
||||
@@ -169,6 +170,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
general.heatPerFuelTick = dataStream.readDouble();
|
||||
general.allowTransmitterAlloyUpgrade = dataStream.readBoolean();
|
||||
general.allowChunkloading = dataStream.readBoolean();
|
||||
general.allowProtection = dataStream.readBoolean();
|
||||
|
||||
for(MachineType type : BlockStateMachine.MachineType.getValidMachines())
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user