mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-18 11:19:13 +00:00
Merge branch 'development' into 1.8
Conflicts: src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
This commit is contained in:
commit
69874de9d2
10 files changed
+111
-47
No files matched your search
@@ -71,8 +71,15 @@ public class MekanismConfig
|
||||
public static double advancedSolarGeneration;
|
||||
public static double bioGeneration;
|
||||
public static double heatGeneration;
|
||||
public static double heatGenerationLava;
|
||||
public static double heatGenerationNether;
|
||||
public static double solarGeneration;
|
||||
public static double windGeneration;
|
||||
|
||||
public static double windGenerationMin;
|
||||
public static double windGenerationMax;
|
||||
|
||||
public static int windGenerationMinY;
|
||||
public static int windGenerationMaxY;
|
||||
}
|
||||
|
||||
public static class tools
|
||||
|
||||
Reference in new issue
Block a user