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

80 files changed, 9717 insertions, 2820 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 091ee734e6..fe0be2f126 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -90,8 +90,8 @@ public class Meta_GT_Proxy {
 
 		GT_Log.out.println("GT++ Mod: Testing BaseMetaTileEntity.");
 		if (tBaseMetaTileEntity == null || tBaseMetaTileEntity2 == null) {
-			GT_Log.out.println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
-			throw new RuntimeException("");
+			GT_Log.err.println("GT++ Mod: Fatal Error ocurred while initializing custom BaseMetaTileEntities, crashing Minecraft.");
+			CORE.crash("GT++ Mod: Fatal Error ocurred while initializing custom BaseMetaTileEntities, crashing Minecraft.");
 		}
 
 		//Gotta set it here so that we don't try call gregtech too early.        
@@ -104,7 +104,7 @@ public class Meta_GT_Proxy {
 			StaticFields59.mGT6StylePipes = false;        	
 		}       
 
-		GT_Log.out.println("GT++ Mod: Registering the BaseMetaTileEntity.");
+		GT_Log.out.println("GT++ Mod: Registering custom BaseMetaTileEntities.");
 		GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity_GTPP");
 		GameRegistry.registerTileEntity(tBaseMetaTileEntity2.getClass(), "BaseMetaTileEntity_GTPP2");
 		CoverManager.generateCustomCovers();
@@ -361,6 +361,7 @@ public class Meta_GT_Proxy {
 				GT_Log.err
 				.println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
 				e.printStackTrace(GT_Log.err);
+				CORE.crash("GT++ Mod: Fatal Error ocurred while initializing custom BaseMetaTileEntities, crashing Minecraft.");
 				throw new RuntimeException(e);
 			}
 		}
@@ -396,6 +397,7 @@ public class Meta_GT_Proxy {
 				GT_Log.err
 				.println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
 				e.printStackTrace(GT_Log.err);
+				CORE.crash("GT++ Mod: Fatal Error ocurred while initializing custom BaseMetaTileEntities, crashing Minecraft.");
 				throw new RuntimeException(e);
 			}
 		}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
index 419b5f3d30..13eb045748 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
@@ -21,7 +21,7 @@ extends GregtechMetaCasingBlocksAbstract {
 	public GregtechMetaCasingBlocks4() {
 		super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.4", GT_Material_Casings.INSTANCE);
 		for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-			if (i == 2 || i == 4 || i == 5 || i == 6 || i == 7 || i == 8 || i == 9 || i == 12 || i == 13 || i == 14 || i == 15) {
+			if (i == 2 || i == 4 || i == 5 || i == 6 || i == 7 || i == 8 || i == 12 || i == 13 || i == 14 || i == 15) {
 				continue;
 			}
 			TAE.registerTexture(3, i, new GT_CopiedBlockTexture(this, 6, i));
@@ -87,7 +87,7 @@ extends GregtechMetaCasingBlocksAbstract {
 				case 8:
 					return Textures.BlockIcons.RENDERING_ERROR.getIcon();
 				case 9:
-					return Textures.BlockIcons.RENDERING_ERROR.getIcon();	
+					return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
 				case 10:					
 					if (aSide <2) {
 						return TexturesGtBlock.TEXTURE_STONE_RED_B.getIcon();					
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
index 3d15e5cf58..fe247e24a4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
@@ -34,7 +34,8 @@ extends GregtechMetaCasingBlocksAbstract {
 		TAE.registerTexture(0, 4, new GT_CopiedBlockTexture(this, 6, 4));
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused
 		TAE.registerTexture(1, 10, new GT_CopiedBlockTexture(this, 6, 5));
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", ""); // Unused
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer Casing
+		TAE.registerTexture(1, 11, new GT_CopiedBlockTexture(this, 6, 6));
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", ""); // Unused
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", ""); // Unused
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", ""); // Unused
@@ -51,6 +52,7 @@ extends GregtechMetaCasingBlocksAbstract {
 		GregtechItemList.Casing_ElementalDuplicator.set(new ItemStack(this, 1, 3));
 		GregtechItemList.Casing_Sparge_Tower_Exterior.set(new ItemStack(this, 1, 4));
 		GregtechItemList.Casing_IndustrialAutoChisel.set(new ItemStack(this, 1, 5));
+		GregtechItemList.Casing_IndustrialForgeHam