+ Added an Advanced Hazmat Suit.

+ Added a T3 circuit for recipe selections.
$ Disabled TT Thaumic Repairer patch.
$ Fixed a bug in EnumUtils not correctly handling missing entries.

25 files changed, 595 insertions, 53 deletions

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 0aeff5ae16..4dad732e25 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -1,10 +1,6 @@
 package gtPlusPlus.core.common;
 
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
@@ -19,18 +15,8 @@ import gtPlusPlus.core.entity.monster.EntityGiantChickenBase;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
 import gtPlusPlus.core.fluids.FluidFactory;
-import gtPlusPlus.core.handler.BookHandler;
-import gtPlusPlus.core.handler.BurnableFuelHandler;
-import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.handler.StopAnnoyingFuckingAchievements;
-import gtPlusPlus.core.handler.events.BlockEventHandler;
-import gtPlusPlus.core.handler.events.EnderDragonDeathHandler;
-import gtPlusPlus.core.handler.events.EntityDeathHandler;
-import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler;
-import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
-import gtPlusPlus.core.handler.events.ZombieBackupSpawnEventHandler;
+import gtPlusPlus.core.handler.*;
+import gtPlusPlus.core.handler.events.*;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.lib.CORE;
@@ -50,7 +36,6 @@ import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO;
 import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
 import net.minecraft.enchantment.Enchantment;
@@ -89,10 +74,7 @@ public class CommonProxy {
 		}
 
 		AddToCreativeTab.initialiseTabs();
-		
-		if (LoadedMods.Gregtech) {
-			HANDLER_GT.addNewOrePrefixes();
-		}
+		EnumHelperHandler.init();
 
 		// Moved from Init after Debug Loading.
 		// 29/01/18 - Alkalus
diff --git a/src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java b/src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java
new file mode 100644
index 0000000000..d164efa3d7
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java
@@ -0,0 +1,21 @@
+package gtPlusPlus.core.handler;
+
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+import gtPlusPlus.xmod.ic2.CustomInternalName;
+
+public class EnumHelperHandler {
+
+	public static void init() {		
+
+		if (LoadedMods.IndustrialCraft2) {
+			CustomInternalName.init();
+		}
+		
+		if (LoadedMods.Gregtech) {
+			HANDLER_GT.addNewOrePrefixes();
+		}
+		
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 488151a773..fbbc1d24eb 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -1,18 +1,13 @@
 package gtPlusPlus.core.item.chemistry;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.TextureSet;
+import gregtech.api.enums.*;
+import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
+import gtPlusPlus.core.item.circuit.ItemAdvancedChip;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.material.NONMATERIAL;
+import gtPlusPlus.core.material.*;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
@@ -25,10 +20,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.*;
 
 public class GenericChem extends ItemPackage {
 
@@ -106,6 +98,7 @@ public class GenericChem extends ItemPackage {
 	// Phenol Byproducts
 	public Item PhenolicResins; //https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin
 	public static ItemGenericChemBase mGenericChemItem1;
+	public static Item mAdvancedCircuit;
 
 	private ItemStack mCatalystCarrier;
 
@@ -134,7 +127,9 @@ public class GenericChem extends ItemPackage {
 		MaterialGenerator.generate(NYLON, false);
 		MaterialGenerator.generate(TEFLON, false);		
 
-		mGenericChemItem1 = new ItemGenericChemBase();		
+		mGenericChemItem1 = new ItemGenericChemBase();	
+		mAdvancedCircuit = new ItemAdvancedChip();		
+		GregtechItemList.Circuit_T3RecipeSelector.set(mAdvancedCircuit);
 
 		registerItemStacks();
 		registerOreDict();
@@ -292,6 +287,7 @@ public class GenericChem extends ItemPackage {
 	@Override
 	public boolean generateRecipes() {
 
+		recipeAdvancedChip();
 		recipeCatalystRed();
 		recipeCatalystYellow();
 		recipeCatalystBlue();
@@ -1066,6 +1062,60 @@ public class GenericChem extends ItemPackage {
 		return CI.getNumberedBioCircuit(16);
 	}
 
+	private static void recipeAdvancedChip() {
+		GT_ModHandler.addShapelessCraftingRecipe(
+				GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 0L), 0, new Object[]{OrePrefixes.circuit.get(Materials.Advanced)});
+
+		long bits = 0;
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 1L, new Object[0]), bits,
+				new Object[]{"d  ", " P ", "   ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 2L, new Object[0]), bits,
+				new Object[]{" d ", " P ", "   ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 3L, new Object[0]), bits,
+				new Object[]{"  d", " P ", "   ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 4L, new Object[0]), bits,
+				new Object[]{"   ", " Pd", "   ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 5L, new Object[0]), bits,
+				new Object[]{"   ", " P ", "  d", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 6L, new Object[0]), bits,
+				new Object[]{"   ", " P ", " d ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 7L, new Object[0]), bits,
+				new Object[]{"   ", " P ", "d  ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 8L, new Object[0]), bits,
+				new Object[]{"   ", "dP ", "   ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 9L, new Object[0]), bits,
+				new Object[]{"P d", "   ", "   ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 10L, new Object[0]), bits,
+				new Object[]{"P  ", "  d", "   ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 11L, new Object[0]), bits,
+				new Object[]{"P  ", "   ", "  d", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 12L, new Object[0]), bits,
+				new Object[]{"P  ", "   ", " d ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 13L, new Object[0]), bits,
+				new Object[]{"  P", "   ", "  d", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 14L, new Object[0]), bits,
+				new Object[]{"  P", "   ", " d ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 15L, new Object[0]), bits,
+				new Object[]{"  P", "   ", "d  ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 16L, new Object[0]), bits,
+				new Object[]{"  P", "d  ", "   ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 17L, new Object[0]), bits,
+				new Object[]{"   ", "   ", "d P", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 18L, new Object[0]), bits,
+				new Object[]{"   ", "d  ", "  P", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 19L, new Object[0]), bits,
+				new Object[]{"d  ", "   ", "  P", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 20L, new Object[0]), bits,
+				new Object[]{" d ", "   ", "  P", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 21L, new Object[0]), bits,
+				new Object[]{"d  ", "   ", "P  ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 22L, new Object[0]), bits,
+				new Object[]{" d ", "   ", "P  ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 23L, new Object[0]), bits,
+				new Object[]{"  d", "   ", "P  ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+		BioRecipes.addCraftingRecipe(GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 24L, new Object[0]), bits,
+				new Object[]{"   ", "  d", "P  ", 'P', GregtechItemList.Circuit_T3RecipeSelector.getWildcard(1L, new Object[0])});
+	}
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java b/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java
new file mode 100644
index 0000000000..c375c32952
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java
@@ -0,0 +1,138 @@
+package gtPlusPlus.core.item.circuit;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class ItemAdvancedChip extends Item {
+
+	protected IIcon base;
+	
+	public ItemAdvancedChip() {
+		this.setHasSubtypes(true);
+		this.setNoRepair();
+		this.setMaxStackSize(64);
+		this.setMaxDamage(0);
+		this.setUnlocalizedName("T3RecipeSelector");
+		GameRegistry.registerItem(this, this.getUnlocalizedName());
+	}
+	
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public boolean shouldRotateAroundWhenRendering() {
+		return super.shouldRotateAroundWhenRendering();
+	}
+
+	@Override
+	public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+		super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack aStack) {
+		return super.getItemStackDisplayName(aStack);
+	}
+
+	@Override
+	public void addInformation(ItemStack aStack, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
+		try {
+			aList.add("Configuration == "+aStack.getItemDamage());
+		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
+		super.addInformation(aStack, p_77624_2_, aList, p_77624_4_);
+	}
+
+	@Override
+	public EnumRarity getRarity(ItemStack p_77613_1_) {
+		return EnumRarity.common;
+	}
+
+	@Override
+	public void getSubItems(Item aItem, CreativeTabs p_150895_2_, List aList) {
+			aList.add(ItemUtils.simpleMetaStack(aItem, 0, 1));		
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+		return false;
+	}
+
+	@Override
+	public boolean isRepairable() {
+		return false;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return stack.getItemDamage();
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public void registerIcons(final IIconRegister u) {
+		this.base = u.registerIcon(CORE.MODID + ":" + "science/general/AdvancedCircuit");				
+	}
+	
+	@Override
+	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
+		return this.base;		
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int damage) {
+		return this.base;	
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
+		return this.base;
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int pass) {
+		return this.base;	
+	}
+
+	@Override
+    public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName();
+    }
+	
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java b/src/Java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java
new file mode 100644
index 0000000000..1f8009e54a
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java
@@ -0,0 +1,31 @@
+package gtPlusPlus.core.item.wearable.hazmat;
+
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.ic2.CustomInternalName;
+import ic2.core.IC2;
+import ic2.core.init.InternalName;
+import ic2.core.item.armor.ItemArmorHazmat;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+
+public class ItemArmorHazmatEx extends ItemArmorHazmat {
+
+	public static void init() {
+		GregtechItemList.Armour_Hazmat_Advanced_Helmet.set(new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatHelmetEx, 0)));
+		GregtechItemList.Armour_Hazmat_Advanced_Chest.set(new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatChestEx, 1)));
+		GregtechItemList.Armour_Hazmat_Advanced_Legs.set(new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatLegsEx, 2)));
+		GregtechItemList.Armour_Hazmat_Advanced_Boots.set(new ItemStack(new ItemArmorHazmatEx(CustomInternalName.aHazmatBootsEx, 3)));
+	}
+	
+	private ItemArmorHazmatEx(InternalName internalName, int type) {
+		super(internalName, type);
+		this.setMaxDamage(256);
+	}
+
+	@Override
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
+		int suffix = this.armorType == 2 ? 2 : 1;
+		return IC2.textureDomain + ":textures/armor/" + "hazmatEx_" + suffix + ".png";
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index d67a372572..93ede378a8 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -1235,6 +1235,10 @@ public class CI {
 		return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, i, 0);
 	}
 
+	public static ItemStack getNumberedAdvancedCircuit(int i) {
+		return ItemUtils.simpleMetaStack(GenericChem.mAdvancedCircuit, i, 0);
+	}
+
 	public static ItemStack getTieredGTPPMachineCasing(int aTier, int aAmount) {
 		GregtechItemList[] aHulls = new GregtechItemList[] {
 				GregtechItemList.GTPP_Casing_ULV,
diff --git a/src/Java/gtPlusPlus/core/util/data/EnumUtils.java b/src/Java/gtPlusPlus/core/util/data/EnumUtils.java
index 9c96b61876..edcc071b54 100644
--- a/src/Java/gtPlusPlus/core/util/data/EnumUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/EnumUtils.java
@@ -12,10 +12,13 @@ public class EnumUtils {
 	 **/
 	public static <T extends Enum<T>> T getValue(Class<T> enumeration, String name) {
 		Optional<T> j = Enums.getIfPresent(enumeration, name);
-		T VALUE = j.get();
-		if (j.get() == null) {
+		T VALUE;
+		if (j == null || !j.isPresent()) {
 			VALUE = valueOfIgnoreCase(enumeration, name);
 		}
+		else {
+			VALUE = j.get();
+		}
 		return VALUE;
 	}
 	
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index 8b9b5cf94f..e0634dfb14 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -508,6 +508,30 @@ public class ReflectionUtils {
 		Logger.REFLECTION("Invoke failed or did something wrong.");		
 		return false;
 	}
+	
+	public static boolean invokeVoid(Object objectInstance, Method method, Object[] values){		
+		if (method == null || values == null || (!ReflectionUtils.isStaticMethod(method)  && objectInstance == null)){
+			//Logger.REFLECTION("Null value when trying to Dynamically invoke "+methodName+" on an object of type: "+objectInstance.getClass().getName());
+			return false;
+		}		
+		String methodName = method.getName();
+		String classname = objectInstance != null ? objectInstance.getClass().getCanonicalName() : method.getDeclaringClass().getCanonicalName();
+		Logger.REFLECTION("Trying to invoke "+methodName+" on an instance of "+classname+".");		
+		try {
+			Method mInvokingMethod = method;
+			if (mInvokingMethod != null){
+				Logger.REFLECTION(methodName+" was not null.");
+				mInvokingMethod.invoke(objectInstance, values);
+					Logger.REFLECTION("Successfully invoked "+methodName+".");
+					return true;				
+			}
+		}
+		catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			Logger.REFLECTION("Failed to Dynamically invoke "+methodName+" on an object of type: "+classname);
+		}
+		Logger.REFLECTION("Invoke failed or did something wrong.");		
+		return false;
+	}
 
 	public static boolean invokeVoid(Object objectInstance, String methodName, Class[] parameters, Object[] values){
 		if (objectInstance == null || methodName == null || parameters == null || values == null){
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index f6a59e3900..490b94d71c 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -23,11 +23,7 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.minecraft.OreDictUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.core.util.minecraft.*;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -1323,14 +1319,10 @@ public class BioRecipes {
 	}
 
 	private static void recipeBioChip() {
-
 		GT_ModHandler.addShapelessCraftingRecipe(
 				GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 0L), 0, new Object[]{OrePrefixes.circuit.get(Materials.Primitive)});
 
 		long bits = 0;
-
-
-
 		addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 1L, new Object[0]), bits,
 				new Object[]{"d  ", " P ", "   ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
 		addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 2L, new Object[0]), bits,
diff --git a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
index d0c59726de..a5981b15d9 100644
--- a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
+++ b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
@@ -30,6 +30,7 @@ public class AsmConfig {
 	public static boolean enableTcAspectSafety;
 	public static boolean enabledLwjglKeybindingFix;
 	public static boolean enabledFixEntitySetHealth;
+	public static boolean enableThaumicTinkererRepairFix;
 
 	public static boolean disableAllLogging;
 	public static boolean debugMode;
@@ -96,6 +97,14 @@ public class AsmConfig {
 			enableOreDictPatch = prop.getBoolean(false);
 			propOrderDebug.add(prop.getName());	
 			
+			prop = config.get("debug", "enableThaumicTinkererRepairFix", false);
+			prop.comment = "Enable/Disable Patch for Thaumic Repairer";
+			prop.setLanguageKey("gtpp.enableThaumicTinkererRepairFix").setRequiresMcRestart(true);
+			enableThaumicTinkererRepairFix = prop.getBoolean(false);
+			propOrderDebug.add(prop.getName());	
+			
+			
+			
 			
 			
 
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java
index 1dc8c3bc38..05b8054ff8 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java
@@ -2,19 +2,147 @@ package gtPlusPlus.preloader.asm.transformers;
 
 import static org.objectweb.asm.Opcodes.*;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
 import org.apache.logging.log4j.Level;
 import org.objectweb.asm.*;
 
+import cpw.mods.fml.common.Loader;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.Preloader_Logger;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 
 public class ClassTransformer_TT_ThaumicRestorer {	
 
 	private final boolean isValid;
 	private final ClassReader reader;
 	private final ClassWriter writer;
+	
+	private static boolean mInit = false;
+	
+	private static Class mTileRepairerClass;
+	private static Class mTTConfigHandler;
+	private static Class mTinkersConstructCompat;
+	private static Class mThaumicTinkerer;
+	private static Class mTCProxy;
+
+	private static Method mIsTcTool;
+	private static Method mGetTcDamage;
+	private static Method mFixTcDamage;
+	private static Method mSparkle;
+	private static Method mDrawEssentia;
+
+	private static Field mRepairTiconTools;
+	private static Field mTicksExisted;
+	private static Field mInventory;
+	private static Field mTookLastTick;
+	private static Field mDamageLastTick;
+	private static Field mProxyTC;
+	
+	private static boolean repairTConTools = false;
 
 	// thaumic.tinkerer.common.block.tile.TileRepairer
 
+	private static final boolean isTConstructTool(ItemStack aStack) {
+		return ReflectionUtils.invoke(null, mIsTcTool, new Object[] {aStack});
+	}
+	private static final int getDamage(ItemStack aStack) {
+		return (int) ReflectionUtils.invokeNonBool(null, mGetTcDamage, new Object[] {aStack});
+	}
+	private static final boolean fixDamage(ItemStack aStack, int aAmount) {
+		return ReflectionUtils.invoke(null, mFixTcDamage, new Object[] {aStack, aAmount});
+	}
+	private static final int drawEssentia(TileEntity aTile) {
+		return (int) ReflectionUtils.invokeNonBool(aTile, mDrawEssentia, new Object[] {});
+	}
+	private static final void sparkle(float a, float b, float c, int d) {
+		ReflectionUtils.invokeVoid(ReflectionUtils.getFieldValue(mProxyTC), mSparkle, new Object[] {a, b, c, d});
+	}
+	
+	public static void updateEntity(TileEntity aTile) {		
+		if (!mInit) {
+			// Set the classes we need
+			mTileRepairerClass = ReflectionUtils.getClass("thaumic.tinkerer.common.block.tile.TileRepairer");	
+			mTTConfigHandler = ReflectionUtils.getClass("thaumic.tinkerer.common.core.handler.ConfigHandler");	
+			mTinkersConstructCompat = ReflectionUtils.getClass("thaumic.tinkerer.common.compat.TinkersConstructCompat");	
+			mThaumicTinkerer = ReflectionUtils.getClass("thaumic.tinkerer.common.ThaumicTinkerer");	
+			mTCProxy = ReflectionUtils.getClass("thaumcraft.common.CommonProxy");
+			// Set the methods we need
+			mIsTcTool = ReflectionUtils.getMethod(mTinkersConstructCompat, "isTConstructTool", new Class[] {ItemStack.class});
+			mGetTcDamage = ReflectionUtils.getMethod(mTinkersConstructCompat, "getDamage", new Class[] {ItemStack.class});
+			mFixTcDamage = ReflectionUtils.getMethod(mTinkersConstructCompat, "fixDamage", new Class[] {ItemStack.class, int.class});
+			mSparkle = ReflectionUtils.getMethod(mTCProxy, "sparkle", new Class[] {float.class, float.class, float.class, int.class});
+			mDrawEssentia = ReflectionUtils.getMethod(mTileRepairerClass, "drawEssentia", new Class[] {});
+			// Set the fields we need
+			mRepairTiconTools = ReflectionUtils.getField(mTTConfigHandler, "repairTConTools");
+			mTicksExisted = ReflectionUtils.getField(mTileRepairerClass, "ticksExisted");
+			mInventory = ReflectionUtils.getField(mTileRepairerClass, "inventorySlots");
+			mTookLastTick = ReflectionUtils.getField(mTileRepairerClass, "tookLastTick");
+			mDamageLastTick = ReflectionUtils.getField(mTileRepairerClass, "dmgLastTick");
+			mProxyTC = ReflectionUtils.getField(mThaumicTinkerer, "tcProxy");			
+			repairTConTools = (boolean) ReflectionUtils.getFieldValue(mRepairTiconTools);			
+			mInit = true;
+		}
+		if (mInit) {
+			if (mTileRepairerClass.isInstance(aTile)) {
+				int ticksExisted = (int) ReflectionUtils.getFieldValue(mTicksExisted, aTile);
+				ItemStack[] inventorySlots = (ItemStack[]) ReflectionUtils.getFieldValue(mInventory, aTile);
+				boolean tookLastTick = (boolean) ReflectionUtils.getFieldValue(mTookLastTick, aTile);
+				int dmgLastTick = (int) ReflectionUtils.getFieldValue(mDamageLastTick, aTile);
+				ticksExisted++;
+				ReflectionUtils.setField(aTile, mTicksExisted, ticksExisted);				
+				boolean aDidRun = false;				
+		        if (ticksExisted % 10 == 0) {
+		            if (Loader.isModLoaded("TConstruct") && repairTConTools && inventorySlots[0] != null && isTConstructTool(inventorySlots[0])) {
+		                final int dmg = getDamage(inventorySlots[0]);
+		                if (dmg > 0) {
+		                    final int essentia = drawEssentia(aTile);
+		                    fixDamage(inventorySlots[0], essentia);
+		                    aTile.markDirty();
+		                    if (dmgLastTick != 0 && dmgLastTick != dmg) {
+		                        sparkle((float)(aTile.xCoord + 0.25 + Math.random() / 2.0), (float)(aTile.yCoord + 1 + Math.random() / 2.0), (float)(aTile.zCoord + 0.25 + Math.random() / 2.0), 0);
+		                        tookLastTick = true;
+		                    }
+		                    else {
+		                        tookLastTick = false;
+		                    }
+		                }
+		                else {
+		                    tookLastTick = false;
+		                }
+		                dmgLastTick = ((inventorySlots[0] == null) ? 0 : getDamage(inventorySlots[0]));
+		                aDidRun = true;
+		            }
+		            if (inventorySlots[0] != null && inventorySlots[0].getItemDamage() > 0 && inventorySlots[0].getItem().isRepairable()) {
+		                final int essentia2 = drawEssentia(aTile);
+		                final int dmg2 = inventorySlots[0].getItemDamage();
+		                inventorySlots[0].setItemDamage(Math.max(0, dmg2 - essentia2));
+		                aTile.markDirty();
+		                if (dmgLastTick != 0 && dmgLastTick != dmg2) {
+		                    sparkle((float)(aTile.xCoord + 0.25 + Math.random() / 2.0), (float)(aTile.yCoord + 1 + Math.random() / 2.0), (float)(aTile.zCoord + 0.25 + Math.random() / 2.0), 0);
+		                    tookLastTick = true;
+		                }
+		                else {
+		                    tookLastTick = false;
+		                }
+		            }
+		            else {
+		                tookLastTick = false;
+		            }
+		            dmgLastTick = ((inventorySlots[0] == null) ? 0 : inventorySlots[0].getItemDamage());
+		            aDidRun = true;
+		        }		        
+		        if (aDidRun) {
+					ReflectionUtils.setField(aTile, mInventory, inventorySlots);
+					ReflectionUtils.setField(aTile, mTookLastTick, tookLastTick);
+					ReflectionUtils.setField(aTile, mDamageLastTick, dmgLastTick);
+		        }			
+			}
+		}
+	}
+
 	public ClassTransformer_TT_ThaumicRestorer(byte[] basicClass) {
 		ClassReader aTempReader = null;
 		ClassWriter aTempWriter = null;
@@ -26,7 +154,8 @@ public class ClassTransformer_TT_ThaumicRestorer {
 		obfuscated = aMethodStripper.isObfuscated;
 		String aUpdateEntity = obfuscated ? "func_145845_h" : "updateEntity";
 		Preloader_Logger.LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Patching: "+aUpdateEntity+", Are we patching obfuscated methods? "+obfuscated);
-		injectMethod(aUpdateEntity, aTempWriter, obfuscated);
+		//injectMethod(aUpdateEntity, aTempWriter, obfuscated);
+		injectMethodNew(aTempWriter, obfuscated);
 		if (aTempReader != null && aTempWriter != null) {
 			isValid = true;
 		}
@@ -49,6 +178,33 @@ public class ClassTransformer_TT_ThaumicRestorer {
 	public ClassWriter getWriter() {
 		return writer;
 	}
+	
+	public boolean injectMethodNew(ClassWriter cw, boolean obfuscated) {
+		MethodVisitor mv;
+		boolean didInject = false;
+		String aUpdateEntity = obfuscated ? "func_145845_h" : "updateEntity";
+		String aTileEntity = obfuscated ? "aor" : "net/minecraft/tileentity/TileEntity";
+		Preloader_Logger.LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Injecting " + aUpdateEntity + ".");
+		mv = cw.visitMethod(ACC_PUBLIC, aUpdateEntity, "()V", null, null);
+		mv.visitCode();
+		Label l0 = new Label();
+		mv.visitLabel(l0);
+		mv.visitLineNumber(60, l0);
+		mv.visitVarInsn(ALOAD, 0);
+		mv.visitMethodInsn(INVOKESTATIC, "gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer", "updateEntity", "(L"+aTileEntity+";)V", false);
+		Label l1 = new Label();
+		mv.visitLabel(l1);
+		mv.visitLineNumber(61, l1);
+		mv.visitInsn(RETURN);
+		Label l2 = new Label();
+		mv.visitLabel(l2);
+		mv.visitLocalVariable("this", "Lthaumic/tinkerer/common/block/tile/TileRepairer;", null, l0, l2, 0);
+		mv.visitMaxs(1, 1);
+		mv.visitEnd();
+		didInject = true;
+		Preloader_Logger.LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Method injection complete. "+(obfuscated ? "Obfuscated" : "Non-Obfuscated"));
+		return didInject;
+	}
 
 	public boolean injectMethod(String aMethodName, ClassWriter cw, boolean obfuscated) {
 		MethodVisitor mv;
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 398e69a2f9..cb9799fce7 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -272,10 +272,9 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 			return new ClassTransformer_TC_ItemWispEssence(basicClass, obfuscated).getWriter().toByteArray();
 		}
 		//Fix Thaumic Tinkerer Shit
-		//Patching ItemWispEssence to allow invalid item handling
-		if (transformedName.equals(THAUMICTINKERER_TILE_REPAIRER)) {	
-			Preloader_Logger.INFO("Thaumic Tinkerer RepairItem Patch", "Transforming "+transformedName);
-			return new ClassTransformer_TT_ThaumicRestorer(basicClass).getWriter().toByteArray();
+		if (transformedName.equals(THAUMICTINKERER_TILE_REPAIRER) && AsmConfig.enableThaumicTinkererRepairFix) {	
+			//Preloader_Logger.INFO("Thaumic Tinkerer RepairItem Patch", "Transforming "+transformedName);
+			//return new ClassTransformer_TT_ThaumicRestorer(basicClass).getWriter().toByteArray();
 		}
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 173b260d57..b7662ca25e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -19,6 +19,12 @@ public enum GregtechItemList implements GregtechItemContainer {
 	/**
 	 * Items
 	 */
+	
+	// Advanced Hazmat Suit
+	Armour_Hazmat_Advanced_Helmet,
+	Armour_Hazmat_Advanced_Chest,
+	Armour_Hazmat_Advanced_Legs,
+	Armour_Hazmat_Advanced_Boots,
 
 	//Gregtech Machine Parts
 	Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, Electric_Motor_MAX,
@@ -49,6 +55,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	
 	//Recipe Circuit
 	Circuit_BioRecipeSelector,
+	Circuit_T3RecipeSelector,
 	
 	//Circuits
 	Old_Circuit_Primitive, Old_Circuit_Basic, Old_Circuit_Good,
diff --git a/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java b/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java
new file mode 100644
index 0000000000..18fb286d15
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.xmod.ic2;
+
+import gtPlusPlus.core.util.data.EnumUtils;
+import ic2.core.init.InternalName;
+import net.minecraftforge.common.util.EnumHelper;
+
+public class CustomInternalName {
+
+	public static InternalName aHazmatHelmetEx;
+	public static InternalName aHazmatChestEx;
+	public static InternalName aHazmatLegsEx;
+	public static InternalName aHazmatBootsEx;
+	
+	public static void init() {
+		EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
+		EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
+		EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
+		EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});			
+		aHazmatHelmetEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatHelmetEx");
+		aHazmatChestEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatChestplateEx");
+		aHazmatLegsEx = EnumUtils.getValue(InternalName.class, "itemArmorHazmatLeggingsEx");
+		aHazmatBootsEx = EnumUtils.getValue(InternalName.class, "itemArmorRubBootsEx");		
+	}
+
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
index 862ba38748..8c8b2ea7ad 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.ic2.item;
 
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx;
 import gtPlusPlus.core.lib.LoadedMods;
 import net.minecraft.item.ItemStack;
 
@@ -52,6 +53,8 @@ public class IC2_Items {
 		rotor_Material_2 = new ItemStack (new CustomKineticRotor(1));
 		rotor_Material_3 = new ItemStack (new CustomKineticRotor(2));
 		rotor_Material_4 = new ItemStack (new CustomKineticRotor(3));
+		
+		ItemArmorHazmatEx.init();
 
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index 6c43e2b6e0..1f5f9abe1d 100644
--- a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.ic2.recipe;
 
 import static gtPlusPlus.core.recipe.RECIPES_Tools.*;
 
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.enums.*;
@@ -12,10 +13,15 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.ic2.item.IC2_Items;
+import ic2.core.Ic2Items;
 
 public class RECIPE_IC2 {
 
@@ -84,6 +90,7 @@ public class RECIPE_IC2 {
 	public static void initRecipes() {
 		
 		checkForEnderIO();
+		addAdvancedHazmat();
 		
 		if (!CORE.GTNH) {
 			//Rotor Blade Recipes
@@ -236,4 +243,84 @@ public class RECIPE_IC2 {
 
 
 	}
+
+	private static void addAdvancedHazmat() {
+
+		ItemStack[] aBasicHazmatPieces = new ItemStack[] {
+				Ic2Items.hazmatHelmet.copy(), 
+				Ic2Items.hazmatChestplate.copy(), 
+				Ic2Items.hazmatLeggings.copy(),
+				Ic2Items.hazmatBoots.copy()
+				};
+		
+		Material aRubber = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubber);
+		ItemStack aYellowWool = ItemUtils.getSimpleStack(Blocks.wool, 4, 1);
+		ItemStack aBlackWool = ItemUtils.getSimpleStack(Blocks.wool, 15, 1);
+		ItemStack aCoilIC2 = Ic2Items.coil;
+		ItemStack aPlateCobalt = CI.getTieredComponentOfMaterial(Materials.Cobalt, OrePrefixes.plate, 1);
+		ItemStack aGearSmallSteel = CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGtSmall, 1);
+		ItemStack aGearSmallAluminium = CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1);
+		ItemStack aGearPotin = ALLOY.TUMBAGA.getGear(1);
+		ItemStack aGearSiliconCarbide = ALLOY.SILICON_CARBIDE.getGear(1);		
+		
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(2),
+						aBasicHazmatPieces[0],
+						ItemUtils.getSimpleStack(aYellowWool,16),
+						ItemUtils.getSimpleStack(aPlateCobalt, 4),
+						ItemUtils.getSimpleStack(aCoilIC2, 8),
+						ItemUtils.getSimpleStack(aGearSmallAluminium, 4),
+				}, 
+				aRubber.getFluid(144 * 4), 
+				GregtechItemList.Armour_Hazmat_Advanced_Helmet.get(1), 
+				30 * 20, 
+				MaterialUtils.getVoltageForTier(2));
+		
+
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(2),
+						aBasicHazmatPieces[1],
+						ItemUtils.getSimpleStack(aYellowWool, 64),
+						ItemUtils.getSimpleStack(aCoilIC2, 32),
+						ItemUtils.getSimpleStack(aPlateCobalt, 16),
+						ItemUtils.getSimpleStack(aGearSiliconCarbide, 8),
+				}, 
+				aRubber.getFluid(144 * 10), 
+				GregtechItemList.Armour_Hazmat_Advanced_Chest.get(1), 
+				90 * 20, 
+				MaterialUtils.getVoltageForTier(2));
+		
+
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(2),
+						aBasicHazmatPieces[2],
+						ItemUtils.getSimpleStack(aYellowWool, 32),
+						ItemUtils.getSimpleStack(aCoilIC2, 16),
+						ItemUtils.getSimpleStack(aPlateCobalt, 8),
+						ItemUtils.getSimpleStack(aGearSiliconCarbide, 4),
+				}, 
+				aRubber.getFluid(144 * 8), 
+				GregtechItemList.Armour_Hazmat_Advanced_Legs.get(1), 
+				75 * 20, 
+				MaterialUtils.getVoltageForTier(2));
+		
+
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(2),
+						aBasicHazmatPieces[3],
+						ItemUtils.getSimpleStack(aBlackWool, 16),
+						ItemUtils.getSimpleStack(aCoilIC2, 6),
+						ItemUtils.getSimpleStack(aGearSmallSteel, 8),
+						ItemUtils.getSimpleStack(aGearPotin, 4),
+				}, 
+				aRubber.getFluid(144 * 6), 
+				GregtechItemList.Armour_Hazmat_Advanced_Boots.get(1), 
+				45 * 20, 
+				MaterialUtils.getVoltageForTier(2));
+		
+	}
 }
diff --git a/src/resources/assets/ic2/lang/en_US.lang b/src/resources/assets/ic2/lang/en_US.lang
index 3fb59885d4..9b44f2d14e 100644
--- a/src/resources/assets/ic2/lang/en_US.lang
+++ b/src/resources/assets/ic2/lang/en_US.lang
@@ -27,3 +27,9 @@ ic2.SulfuricLithium=Sulfuric Lithium Cell
 ic2.UraniumHexaFluoride=Uranium Hexafluoride Cell
 ic2.ThoriumTetraFluoride=Thorium Tetrafluoride Cell
 ic2.UraniumTetraFluoride=Uranium Tetrafluoride Cell
+
+
+ic2.itemArmorHazmatHelmetEx=Advanced Hazmat Helmet
+ic2.itemArmorHazmatChestplateEx=Advanced Hazmat Suit
+ic2.itemArmorHazmatLeggingsEx=Advanced Hazmat Leggings
+ic2.itemArmorRubBootsEx=Advanced Hazmat Boots
\ No newline at end of file
diff --git a/src/resources/assets/ic2/textures/armor/hazmatEx_1.png b/src/resources/assets/ic2/textures/armor/hazmatEx_1.png
new file mode 100644
index 0000000000..2275007fbe
--- /dev/null
+++ b/src/resources/assets/ic2/textures/armor/hazmatEx_1.png
diff --git a/src/resources/assets/ic2/textures/armor/hazmatEx_2.png b/src/resources/assets/ic2/textures/armor/hazmatEx_2.png
new file mode 100644
index 0000000000..758adafdf2
--- /dev/null
+++ b/src/resources/assets/ic2/textures/armor/hazmatEx_2.png
diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png b/src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png
new file mode 100644
index 0000000000..742d1d7035
--- /dev/null
+++ b/src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png
diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png b/src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png
new file mode 100644
index 0000000000..5340375595
--- /dev/null
+++ b/src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png
diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png b/src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png
new file mode 100644
index 0000000000..80cdca9b23
--- /dev/null
+++ b/src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png
diff --git a/src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png b/src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png
new file mode 100644
index 0000000000..901a8fbc35
--- /dev/null
+++ b/src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index cb477971ac..df6fbaa5b3 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -3176,4 +3176,7 @@ item.FrothRedstoneflotation.name=Redstone Flotation Froth Cell
 item.FrothSpessartineflotation.name=Spessartine Flotation Froth Cell
 item.FrothGrossularflotation.name=Grossular Flotation Froth Cell
 item.FrothAlmandineflotation.name=Almandine Flotation Froth Cell
-item.FrothPyropeflotation.name=Pyrope Flotation Froth Cell
\ No newline at end of file
+item.FrothPyropeflotation.name=Pyrope Flotation Froth Cell
+
+//Added 13/04/20
+item.T3RecipeSelector.name=Programmed Breakthrough Circuit
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png b/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png
new file mode 100644
index 0000000000..8bcfa62ae4
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png