mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.9.4
* development: Completed Opaque Transmitter implementation. Yay! Fix Reactor Ports, again Bump up Electrolytic Separator gas output Fixed Reactor Port crash compleatly replaced files removed the word "opaque" in all image names added boolean opaque added boolean opaque loaded config before Tier.init() added new opaque images Conflicts: src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java src/main/java/mekanism/common/multipart/PartMechanicalPipe.java src/main/java/mekanism/common/multipart/PartPressurizedTube.java src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java src/main/java/mekanism/common/multipart/PartUniversalCable.java src/main/java/mekanism/common/multipart/TransmitterIcons.java src/main/java/mekanism/common/network/PacketTransmitterUpdate.java src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
This commit is contained in:
commit
51342603d4
86 files changed
+189
-67
No files matched your search
@@ -75,7 +75,6 @@ public class MekanismConfig
|
||||
{
|
||||
public static boolean enablePlayerSounds = true;
|
||||
public static boolean enableMachineSounds = true;
|
||||
public static boolean fancyUniversalCableRender = true;
|
||||
public static boolean holidays = true;
|
||||
public static float baseSoundVolume = 1F;
|
||||
public static boolean machineEffects = true;
|
||||
@@ -84,6 +83,7 @@ public class MekanismConfig
|
||||
public static boolean renderCTM = true;
|
||||
public static boolean enableAmbientLighting;
|
||||
public static int ambientLightingLevel;
|
||||
public static boolean opaqueTransmitters = false;
|
||||
}
|
||||
|
||||
public static class machines
|
||||
|
||||
Reference in new issue
Block a user