diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2022-01-21 19:17:26 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2022-01-21 19:17:26 +0000 |
| commit | ba8f7141fb7f91c0f7e769afa9bf406071f33759 (patch) | |
| tree | 3b1a7ebd8343e61a8314b023a3e5e253b0dad968 /src/main/java/gtPlusPlus/core/config | |
| parent | 8ef649f21845808a6f58f02a4b50c799529eb258 (diff) | |
| parent | 888f07c5796b860bb7e0fbb507a5728950e941fd (diff) | |
| download | GT5-Unofficial-ba8f7141fb7f91c0f7e769afa9bf406071f33759.tar.gz GT5-Unofficial-ba8f7141fb7f91c0f7e769afa9bf406071f33759.tar.bz2 GT5-Unofficial-ba8f7141fb7f91c0f7e769afa9bf406071f33759.zip | |
Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into New-Multis-3
# Conflicts:
# .gitignore
# build.gradle
# src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
# src/main/java/gtPlusPlus/core/lib/LoadedMods.java
# src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
# src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
# src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
# src/main/resources/assets/miscutils/lang/en_US.lang
Diffstat (limited to 'src/main/java/gtPlusPlus/core/config')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/config/ConfigHandler.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 0e88a20aac..2e1d43bdda 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -226,6 +226,8 @@ public class ConfigHandler { pollutionPerSecondMultiMassFabricator = config.get("pollution", "pollutionPerSecondMultiMassFabricator", pollutionPerSecondMultiMassFabricator,"pollution rate in gibbl/s for the Matter fabrication CPU").getInt(pollutionPerSecondMultiMassFabricator); pollutionPerSecondMultiRefinery = config.get("pollution", "pollutionPerSecondMultiRefinery", pollutionPerSecondMultiRefinery,"pollution rate in gibbl/s for the Reactor fuel processing plant").getInt(pollutionPerSecondMultiRefinery); //pollutionPerSecondMultiGeneratorArray; + pollutionPerSecondMultiIndustrialRockBreaker = config.get("pollution", "pollutionPerSecondMultiIndustrialRockBreaker", pollutionPerSecondMultiIndustrialRockBreaker,"pollution rate in gibbl/s for the Industrial Rock Breaker").getInt(pollutionPerSecondMultiIndustrialRockBreaker); + pollutionPerSecondMultiIndustrialChisel = config.get("pollution", "pollutionPerSecondMultiIndustrialChisel", pollutionPerSecondMultiIndustrialChisel,"pollution rate in gibbl/s for the Industrial Chisel").getInt(pollutionPerSecondMultiIndustrialChisel); pollutionPerSecondMultiTreeFarm = config.get("pollution", "pollutionPerSecondMultiTreeFarm", pollutionPerSecondMultiTreeFarm,"pollution rate in gibbl/s for the Tree growth simulator").getInt(pollutionPerSecondMultiTreeFarm); pollutionPerSecondMultiFrothFlotationCell = config.get("pollution", "pollutionPerSecondMultiFrothFlotationCell", pollutionPerSecondMultiFrothFlotationCell,"pollution rate in gibbl/s for the Flotation cell regulator").getInt(pollutionPerSecondMultiFrothFlotationCell); pollutionPerSecondMultiAutoCrafter = config.get("pollution", "pollutionPerSecondMultiAutoCrafter", pollutionPerSecondMultiAutoCrafter,"pollution rate in gibbl/s for the Large-Scale auto assembler v1.01").getInt(pollutionPerSecondMultiAutoCrafter); |