Merge branch 'development' into 1.9.4

* development:
  Fixed Turbines unable to be formed in other dimensions
  Bump version to 9.0.2
  Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes
  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/LaserManager.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/entity/EntityFlame.java
	src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityLaser.java
	src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
	src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
This commit is contained in:
aidancbrady committed 2016-05-28 02:34:55 -04:00
commit eb7c2d1b78
19 files changed
+38 -41

No files matched your search

@@ -260,7 +260,7 @@ public class CommonProxy implements IGuiProvider
general.energyPerHeat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerHeat", 1000D).getDouble();
general.maxEnergyPerSteam = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxEnergyPerSteam", 100D).getDouble();
general.superheatingHeatTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D).getDouble();
general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 1D).getDouble();
general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble();
general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean();
general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean();