upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-13 00:37:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into v8

Browse Source 
Conflicts:
	build.properties
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/recipe/RecipeHandler.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
This commit is contained in:
Aidan C. Brady committed 2015-02-10 18:39:15 -05:00
2 parents d8e12ca8d2 b1ebcd0e5e
commit 50f7df5f98
31 files changed
+143 -150
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
+1
View File
@@ -78,6 +78,7 @@ public class GeneratorsCommonProxy
generators.heatGenerationLava = Mekanism.configuration.get("generation", "HeatGenerationLava", 5D).getDouble(5D);
generators.heatGenerationNether = Mekanism.configuration.get("generation", "HeatGenerationNether", 100D).getDouble(100D);
generators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble(50D);
loadWindConfiguration();
if(Mekanism.configuration.hasChanged())