Merge branch 'development' into 1.9.4

* development:
  Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction

Conflicts:
	src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
This commit is contained in:
aidancbrady committed 2016-06-09 17:24:47 -04:00
commit 963cdd364d
5 files changed
+25 -12

No files matched your search

@@ -3,6 +3,7 @@ package mekanism.common.tile;
import mekanism.api.EnumColor;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.SideData;
import mekanism.common.Upgrade;
import mekanism.common.Tier.FactoryTier;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.tile.component.TileComponentConfig;
@@ -33,6 +34,8 @@ public class TileEntityAdvancedFactory extends TileEntityFactory
configComponent.setInputConfig(TransmissionType.ENERGY);
upgradeComponent = new TileComponentUpgrade(this, 0);
upgradeComponent.setSupported(Upgrade.MUFFLING);
ejectorComponent = new TileComponentEjector(this);
ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2));
}