From 2cf05c4deaf3a26626853431f725d0ca375ffec3 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Fri, 26 Oct 2018 15:46:55 +0100 Subject: + Added 4 new High-Tier Alloys. Lafium, Cinobite, Pikyonite & Abyssal. + Added missing Germanium Dust. + Added compatibility for Witchery. - Removed portability of Tanks for GTNH, tanks are still portable otherwise. $ Fixed calculations for automatic recipe generation, EBF and ABS recipe requirements for GT++ Alloys are now significantly increased. $ Fixed missing Control Core textures. % Cleaned up some recipe generation. % Improved Material.java. --- src/Java/gtPlusPlus/core/lib/CORE.java | 2 ++ src/Java/gtPlusPlus/core/lib/LoadedMods.java | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'src/Java/gtPlusPlus/core/lib') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 99092aed71..a6ffd96bbf 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -44,6 +44,7 @@ public class CORE { public static boolean DEVENV = false; public static boolean DEBUG = false; + public static boolean NBT_PERSISTENCY_PATCH_APPLIED = false; //Only can be set in Dev, no config or setting elsewhere. public static final boolean LOAD_ALL_CONTENT = false;; @@ -114,6 +115,7 @@ public class CORE { public static IGregtech_RecipeAdder sRecipeAdder; public static IGregtech_RecipeAdder RA; public static GregtechRecipe GT_Recipe = new GregtechRecipe(); + public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000]; /** diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index 5426bb1a6a..2a7ef9bc39 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -52,6 +52,7 @@ public class LoadedMods { public static boolean TecTech = false; //Technus' Mod public static boolean TiCon = false; public static boolean StevesCarts = false; + public static boolean Witchery = false; @@ -279,6 +280,11 @@ public class LoadedMods { TecTech = true; Logger.INFO("Components enabled for: TecTech"); totalMods++; + } + if (Loader.isModLoaded("witchery")){ + Witchery = true; + Logger.INFO("Components enabled for: Witchery"); + totalMods++; } Logger.INFO("Content found for "+totalMods+" mods"); -- cgit