From a4958ae8c96905bf9151b1898b35a3cad024731c Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Wed, 9 Aug 2017 19:39:06 +0200 Subject: [PATCH] Temp-fix quantum entangloporter and fix ThermoConductor losing tier Fixes #4605 Fixes #4606 --- .../common/content/entangloporter/InventoryFrequency.java | 2 +- .../tile/transmitter/TileEntityThermodynamicConductor.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 491d4d9f9..13e08906a 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -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; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java index fbc28cd84..80dacbe73 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java @@ -106,6 +106,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter