mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-19 03:39:14 +00:00
Merge branch 'master' into development
Conflicts: src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/item/ItemAtomicDisassembler.java src/main/java/mekanism/common/network/PacketConfigSync.java src/main/java/mekanism/generators/common/MekanismGenerators.java
This commit is contained in:
commit
b2e532964c
5 files changed
+19
-15
No files matched your search
@@ -27,6 +27,8 @@ public class MekanismConfig
|
||||
public static int maxUpgradeMultiplier = 10;
|
||||
public static int userWorldGenVersion = 0;
|
||||
public static double ENERGY_PER_REDSTONE = 10000;
|
||||
public static int ETHENE_BURN_TIME = 40;
|
||||
public static double DISASSEMBLER_USAGE = 10;
|
||||
public static EnergyType activeType = EnergyType.J;
|
||||
public static TempType tempUnit = TempType.K;
|
||||
public static double TO_IC2;
|
||||
|
||||
Reference in new issue
Block a user