mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 12:32:13 +00:00
Merge branch 'development' into 1.8
Conflicts: src/main/java/mekanism/client/ClientTickHandler.java src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/Mekanism.java
This commit is contained in:
commit
7ddb8e9727
8 files changed
+46
-9
No files matched your search
@@ -316,6 +316,7 @@ public class Mekanism
|
||||
public static boolean cardboardSpawners = true;
|
||||
public static boolean machineEffects = true;
|
||||
public static boolean enableWorldRegeneration = true;
|
||||
public static boolean creativeOverrideElectricChest = true;
|
||||
public static boolean spawnBabySkeletons = true;
|
||||
public static int obsidianTNTBlastRadius = 12;
|
||||
public static int osmiumPerChunk = 12;
|
||||
|
||||
Reference in new issue
Block a user