Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into St00f

# Conflicts:
#	.gitignore
#	dependencies.gradle
#	src/main/java/gtPlusPlus/core/config/ConfigHandler.java
#	src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
#	src/main/resources/assets/miscutils/lang/en_US.lang

2 files changed, 21 insertions, 17 deletions

diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
index b52f4eb67e..fd07fd1bbe 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
@@ -8,6 +8,8 @@ import java.util.Map;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.preloader.Preloader_Logger;
@@ -74,6 +76,7 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin  {
         CORE_Preloader.DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
         CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode;
         Preloader_Logger.INFO("Running on "+gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION+" | Development Environment: "+CORE_Preloader.DEV_ENVIRONMENT);
+        //Preloader_Logger.INFO("Is Client? "+Utils.isClient()+" | Is Server? "+Utils.isServer());
         Locale aDefaultLocale = Locale.getDefault();
         NumberFormat aFormat = NumberFormat.getInstance();
         Locale aDisplayLocale = ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale"));
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java
index e2d34c38e7..25ec9a8338 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java
@@ -383,23 +383,24 @@ public class ClassTransformer_GT_Client {
 	 * GT_Client's onPostLoad
 	 */
 	
-    public static void onPostLoad() {
-    	try {
-    		for (int i = 0; i < GregTech_API.METATILEENTITIES.length; i++) {    			
-    			try {    			
-    			if (GregTech_API.METATILEENTITIES[i] != null) {
-    				GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip((EntityPlayer) null, true);
-    			}    			
-    			}
-    			catch (Throwable t) {
-    				GT_Log.err.println("Error in MetaTileEntity with ID of "+i);
-    	    		t.printStackTrace(GT_Log.err);    				
-    			}
-    		}
-    	} catch (Throwable var2) {
-    		var2.printStackTrace();
-    	}
-    }
+	public static void onPostLoad() {
+		try {
+			for (int i = 0; i < GregTech_API.METATILEENTITIES.length; i++) {
+				try {
+					if (GregTech_API.METATILEENTITIES[i] != null) {
+						GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip((EntityPlayer) null, true);
+					}
+				}
+				catch (Throwable t) {
+					GT_Log.err.println("Error in MetaTileEntity with ID of " + i);
+					t.printStackTrace(GT_Log.err);
+				}
+			}
+		}
+		catch (Throwable var2) {
+			var2.printStackTrace();
+		}
+	}