Merge branch 'development' into 1.8

This commit is contained in:
Aidan Brady 2014-08-17 15:57:03 -04:00
commit 13a88c64bf

View file

@ -59,7 +59,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityElectricBloc
public final double ENERGY_USAGE = usage.chemicalDissolutionChamberUsage;
public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3);
public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4);
public RedstoneControl controlType = RedstoneControl.DISABLED;