mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 20:12:30 +00:00
Merge branch 'development' into v8
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:
commit
50f7df5f98
31 files changed
+143
-150
No files matched your search
@@ -202,10 +202,14 @@ public class ClientProxy extends CommonProxy
|
||||
client.oldTransmitterRender = Mekanism.configuration.get("client", "OldTransmitterRender", false).getBoolean();
|
||||
client.replaceSoundsWhenResuming = Mekanism.configuration.get("client", "ReplaceSoundsWhenResuming", true,
|
||||
"If true, will reduce lagging between player sounds. Setting to false will reduce GC load").getBoolean();
|
||||
client.renderCTM = Mekanism.configuration.get("client", "Use CTM Renderer", true).getBoolean();
|
||||
client.renderCTM = Mekanism.configuration.get("client", "CTMRenderer", true).getBoolean();
|
||||
client.enableAmbientLighting = Mekanism.configuration.get("client", "EnableAmbientLighting", true).getBoolean(true);
|
||||
client.ambientLightingLevel = Mekanism.configuration.get("client", "AmbientLightingLevel", 15).getInt(15);
|
||||
|
||||
if(Mekanism.configuration.hasChanged())
|
||||
{
|
||||
Mekanism.configuration.save();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user