Merge remote-tracking branch 'upstream/1.11' into 1.12

This commit is contained in:
Tom Elfring committed 2017-08-09 19:40:46 +02:00
commit 0f3e5175d4
2 files changed
+3 -1

No files matched your search

@@ -24,7 +24,7 @@ public class InventoryFrequency extends Frequency
{
public static final String ENTANGLOPORTER = "Entangloporter";
public static final double MAX_ENERGY = Tier.EnergyCubeTier.ULTIMATE.output;
public static final double MAX_ENERGY = 1000000;
public static final int FLUID_TANK_SIZE = Tier.FluidTankTier.ULTIMATE.output;
public static final int GAS_TANK_SIZE = Tier.GasTankTier.ULTIMATE.output;
@@ -105,6 +105,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter<IHea
super.readFromNBT(nbtTags);
temperature = nbtTags.getDouble("temperature");
if(nbtTags.hasKey("tier")) tier = Tier.ConductorTier.values()[nbtTags.getInteger("tier")];
}
@Override
@@ -113,6 +114,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter<IHea
super.writeToNBT(nbtTags);
nbtTags.setDouble("temperature", temperature);
nbtTags.setInteger("tier", tier.ordinal());
return nbtTags;
}