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/lib | |
| 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/lib')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/lib/CORE.java | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/lib/LoadedMods.java | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index bb0df9d5fb..463a10258a 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -302,6 +302,8 @@ public class CORE { public static int pollutionPerSecondMultiThermalBoiler = 700; public static int pollutionPerSecondMultiMolecularTransformer = 1000; public static int pollutionPerSecondMultiAlgaePond = 0; + public static int pollutionPerSecondMultiIndustrialRockBreaker = 100; + public static int pollutionPerSecondMultiIndustrialChisel = 50; //pollution single blocks public static int basePollutionPerSecondSemiFluidGenerator = 40; public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[]{0,2.0,4.0,8.0}; diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java index 8d20f2ff67..9f5882c5ea 100644 --- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java @@ -62,11 +62,11 @@ public class LoadedMods { public static boolean CropsPlusPlus = false; //Barts Crop Mod public static boolean Reliquary = false; public static boolean SpiceOfLife = false; + public static boolean RemoteIO = false; public static boolean BartWorks = false; public static boolean GoodGenerator = false; private static int totalMods; - @SuppressWarnings("deprecation") public static void checkLoaded(){ Logger.INFO("Looking for optional mod prereqs."); @@ -179,7 +179,7 @@ public class LoadedMods { OpenBlocks = true; Logger.INFO("Components enabled for: OpenBlocks"); totalMods++; - } + } if (isModLoaded("Thaumcraft")){ Thaumcraft = true; Logger.INFO("Components enabled for: Thaumcraft"); @@ -345,6 +345,11 @@ public class LoadedMods { Witchery = true; Logger.INFO("Components enabled for: Witchery"); totalMods++; + } + if (isModLoaded("RIO")){ + RemoteIO = true; + Logger.INFO("Components enabled for: RemoteIO"); + totalMods++; } Logger.INFO("Content found for "+totalMods+" mods"); |