From 6205a2088bbbc31a09d0a2a3d460add1a7622801 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 29 Oct 2018 05:09:01 +0000
Subject: + Added recipe for heating Titanium Ingots, required for Krypton
 processing. + Added custom GT TextureSets. $ Lots of small fixes to Material,
 Material Generation & Recipe Generation. $ Lots of small fixes to Fluids,
 Fluid Generation and Fluid Cell Generation. $ Fixed Creative Tabs. $ Possibly
 fixed issue where tickable items would instantly tick to 0. $ Fixed display
 names of Throwable Potions. $ Fixed NPE in removeCrudeTurbineRotors(). %
 Adjusted lots of textures. % Adjusted handling of Thermal Foundation Fluids.
 % Moved Furnace/EBF and Maceration recipes out of BaseItemDust.java. % Made
 Tooltips of GT++ Material Blocks, Frames and ores more informational. % Made
 Bromine a Fluid Material, this will remove all Bromine solid material items
 from the world. (Ingots, Blocks, etc.) % Increased cost of GT++ Ores in
 processing. - Broke lots of recipes. > EBF/ABS & All Table Crafting. TBA~

---
 src/Java/gtPlusPlus/core/common/CommonProxy.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/common')

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index c9ea0f3e5b..9e75cd4a16 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -45,12 +45,13 @@ public class CommonProxy {
 		//Should Register Gregtech Materials I've Made
 		Utils.registerEvent(this);
 		if (LoadedMods.Gregtech){
-			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
-				Logger.INFO("We're using Gregtech 5.09 Experimental.");
+			if (!CORE.GTNH) {
+				Logger.INFO("We're using Gregtech "+Utils.getGregtechVersionAsString());				
 			}
 			else {
-				Logger.INFO("We're using Gregtech 5.08 or an earlier fork.");
+				Logger.INFO("We're using GTNH's Gregtech "+Utils.getGregtechVersionAsString());				
 			}
+			
 			Logger.INFO("Setting up our own GT_Proxy.");
 			GtProxy = new Meta_GT_Proxy();
 		}
@@ -74,6 +75,8 @@ public class CommonProxy {
 		else {
 			Logger.WARNING("Development mode not set.");
 		}
+
+		AddToCreativeTab.initialiseTabs();
 		
 		//Moved from Init after Debug Loading.
 		//29/01/18 - Alkalus
@@ -83,7 +86,6 @@ public class CommonProxy {
 		ModBlocks.init();
 		CI.preInit();
 		
-		AddToCreativeTab.initialiseTabs();
 		
 		
 		COMPAT_IntermodStaging.preInit();
-- 
cgit