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, 53 insertions, 24 deletions

diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 9ae37ff0a2..076616f569 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -277,6 +277,7 @@ public class CORE {
 		public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = 600;
 		public static int pollutionPerSecondMultiIndustrialPlatePress_ModeForming = 240;
 		public static int pollutionPerSecondMultiIndustrialPlatePress_ModeBending = 480;
+		public static int pollutionPerSecondMultiIndustrialForgeHammer = 250;
 		public static int pollutionPerSecondMultiIndustrialSifter = 40;
 		public static int pollutionPerSecondMultiIndustrialThermalCentrifuge = 1000;
 		public static int pollutionPerSecondMultiIndustrialVacuumFreezer = 500;
@@ -300,6 +301,7 @@ public class CORE {
 		public static int pollutionPerSecondMultiFrothFlotationCell = 0;
 		public static int pollutionPerSecondMultiAutoCrafter = 500;
 		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;
@@ -334,28 +336,33 @@ public class CORE {
 	}
 	
 	public static final void crash(String aReason) {
-		Logger.INFO("==========================================================");
-		Logger.INFO("[GT++ CRASH]");
-		Logger.INFO("==========================================================");
-		Logger.INFO("Oooops...");
-		Logger.INFO("This should only happy in a development environment or when something really bad happens.");
-		Logger.INFO("Reason: "+aReason);
-		Logger.INFO("==========================================================");
-		Logger.INFO("Called from: "+ReflectionUtils.getMethodName(1));
-		Logger.INFO(ReflectionUtils.getMethodName(2));
-		Logger.INFO(ReflectionUtils.getMethodName(3));
-		Logger.INFO(ReflectionUtils.getMethodName(4));
-		Logger.INFO(ReflectionUtils.getMethodName(5));
-		Logger.INFO(ReflectionUtils.getMethodName(6));	
-		Logger.INFO(ReflectionUtils.getMethodName(7));	
-		Logger.INFO(ReflectionUtils.getMethodName(8));	
-		Logger.INFO(ReflectionUtils.getMethodName(9));	
-		Logger.INFO(ReflectionUtils.getMethodName(10));	
-		Logger.INFO(ReflectionUtils.getMethodName(11));	
-		Logger.INFO(ReflectionUtils.getMethodName(12));	
-		Logger.INFO(ReflectionUtils.getMethodName(13));	
-		Logger.INFO(ReflectionUtils.getMethodName(14));	
-		Logger.INFO(ReflectionUtils.getMethodName(15));		
+		try {
+			Logger.INFO("==========================================================");
+			Logger.INFO("[GT++ CRASH]");
+			Logger.INFO("==========================================================");
+			Logger.INFO("Oooops...");
+			Logger.INFO("This should only happy in a development environment or when something really bad happens.");
+			Logger.INFO("Reason: "+aReason);
+			Logger.INFO("==========================================================");
+			Logger.INFO("Called from: "+ReflectionUtils.getMethodName(1));
+			Logger.INFO(ReflectionUtils.getMethodName(2));
+			Logger.INFO(ReflectionUtils.getMethodName(3));
+			Logger.INFO(ReflectionUtils.getMethodName(4));
+			Logger.INFO(ReflectionUtils.getMethodName(5));
+			Logger.INFO(ReflectionUtils.getMethodName(6));	
+			Logger.INFO(ReflectionUtils.getMethodName(7));	
+			Logger.INFO(ReflectionUtils.getMethodName(8));	
+			Logger.INFO(ReflectionUtils.getMethodName(9));	
+			Logger.INFO(ReflectionUtils.getMethodName(10));	
+			Logger.INFO(ReflectionUtils.getMethodName(11));	
+			Logger.INFO(ReflectionUtils.getMethodName(12));	
+			Logger.INFO(ReflectionUtils.getMethodName(13));	
+			Logger.INFO(ReflectionUtils.getMethodName(14));	
+			Logger.INFO(ReflectionUtils.getMethodName(15));		
+		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
 		FMLCommonHandler.instance().exitJava(0, true);
 	}
 	
diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
index 4f7a10be78..9f5882c5ea 100644
--- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
@@ -24,6 +24,7 @@ public class LoadedMods {
 	public static boolean Simply_Jetpacks = false;
 	public static boolean RFTools = false;
 	public static boolean Thaumcraft = false;
+	public static boolean ThaumicBases = false;
 	public static boolean Baubles = false;
 	public static boolean Extra_Utils = false;
 	public static boolean PneumaticCraft = false;
@@ -41,6 +42,7 @@ public class LoadedMods {
 	public static boolean MiscUtils = true; //Dummy For MetaData Lookups in MT Wrapper
 	public static boolean ThermalFoundation = false;
 	public static boolean IHL = false;
+	public static boolean AdvancedSolarPanel = false;
 	public static boolean OpenComputers = false; //OpenComputers
 	public static boolean OpenBlocks = false;
 	public static boolean Computronics = false; //computronics
@@ -61,8 +63,8 @@ public class LoadedMods {
 	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")
@@ -118,6 +120,21 @@ public class LoadedMods {
 			Logger.INFO("Components enabled for: Tinkers Construct");
 			totalMods++;
 		}
+		if (isModLoaded("AdvancedSolarPanel")){
+			AdvancedSolarPanel = true;
+			Logger.INFO("Components enabled for: Advanced Solar Panels");
+			totalMods++;
+		}
+		if (isModLoaded("GoodGenerator")) {
+			GoodGenerator = true;
+			Logger.INFO("Components enabled for: GoodGenerator");
+			totalMods++;
+		}
+		if (isModLoaded("bartworks")) {
+			BartWorks = true;
+			Logger.INFO("Components enabled for: BartWorks");
+			totalMods++;
+		}
 		if (isModLoaded("BuildCraft")){
 			BuildCraft = true;
 			Logger.INFO("Components enabled for: BuildCraft");
@@ -168,6 +185,11 @@ public class LoadedMods {
 			Logger.INFO("Components enabled for: Thaumcraft");
 			totalMods++;
 		}
+		if (isModLoaded("thaumicbases")){
+			ThaumicBases = true;
+			Logger.INFO("Components enabled for: Thaumic Bases");
+			totalMods++;
+		}
 		if (isModLoaded("BiomesOPlenty")){
 			BiomesOPlenty = true;
 			Logger.INFO("Components enabled for: BiomesOPlenty");