+ Added a config option to adjust the Turbine Rotor removal cut-off point.

+ Added some new Bags/Packs for various things. An Automatic Lunchbox, a Tool Box and a Magicians Satchel.
+ Added full compound of Eglin Steel to ABS. Closes #392.
- Removed all Multi-Tools.
$ Rewrote and Fixed the recipe system. All recipes are queued regardless of when called, then created during the end of the POST_INIT load phase. Fixes too many bugs to list. (Few more to do before tomorrow)
$ Fixed COFH Hard requirement. Closes #398.
% Adjusted the internal map type of the AutoMap. Should improve performance, if only in single digit cpu cycles.

> To-Do) Fix Recipes pertaining to compound materials made from using fluids. State may be detected wrong after recipe system changes.

3 files changed, 172 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 22ef27e8cd..bf9ead6f90 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -123,6 +123,22 @@ public class RECIPES_GREGTECH {
 					FluidUtils.getFluidStack("molten.trinium", 136 * 144), 0, 20 * 3000,
 					2040*4);
 		}
+		
+		//Eglin Steel
+		CORE.RA.addBlastSmelterRecipe(
+				new ItemStack[] { 
+						ItemUtils.getGregtechCircuit(6),
+						ELEMENT.getInstance().IRON.getDust(4),
+						ALLOY.KANTHAL.getDust(1),
+						ALLOY.INVAR.getDust(5),
+						ELEMENT.getInstance().SULFUR.getDust(1),
+						ELEMENT.getInstance().CARBON.getDust(1),
+						ELEMENT.getInstance().SILICON.getDust(4)
+				},
+				ALLOY.EGLIN_STEEL.getFluid(16 * 144),
+				0, 
+				20 * 45,
+				120);
 
 		// Germanium Roasting
 		CORE.RA.addBlastSmelterRecipe(
@@ -432,16 +448,20 @@ public class RECIPES_GREGTECH {
 		// Raisins from Grapes
 		try {
 
+			ItemStack cropGrape = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cropGrape", 1);
+			ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1);
+			
+			if (cropGrape != null && foodRaisins != null)			
 			CORE.RA.addDehydratorRecipe(new ItemStack[] { 
-					ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1)
+					cropGrape
 			}, // Item
 					null, // Fluid input (slot 1)
 					null, // Fluid output (slot 2)
 					new ItemStack[] { 
-							ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1)
+							foodRaisins
 			}, // Output
-					new int[] { 0 }, 10 * 20, // Time in ticks
-					8); // EU
+					new int[] { 0 }, 10, // Time in ticks
+					2); // EU
 
 		}
 		catch (final NullPointerException e) {
@@ -547,7 +567,8 @@ public class RECIPES_GREGTECH {
 					FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), 
 					null, 
 					new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
-							ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) },
+							FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9)
+							},
 					new int[] { 0 }, 120 * 20, // Time in ticks
 					500); // EU
 
@@ -559,7 +580,7 @@ public class RECIPES_GREGTECH {
 						FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144),
 						null,
 						new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
-								ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) },						
+								FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) },						
 						new int[] { 0 },
 						120 * 20, // Time in ticks
 						500); // EU
@@ -1069,14 +1090,19 @@ public class RECIPES_GREGTECH {
 					CI.emptyCells(2), 20 * 20);
 		}
 
-		//Refine GT HF into GT++ HF
-		GT_Values.RA.addChemicalRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid_GT5U", 5),
-				null, // Fluid Input
-				FluidUtils.getFluidStack("hydrofluoricacid", 6000), // Fluid Output
-				CI.emptyCells(7),
-				2 * 20);
+		ItemStack temp_GT5u_SA = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 5);
+		if (temp_GT5u_SA != null) {
+			//Refine GT HF into GT++ HF
+			GT_Values.RA.addChemicalRecipe(
+					ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
+					temp_GT5u_SA,
+					null, // Fluid Input
+					FluidUtils.getFluidStack("hydrofluoricacid", 6000), // Fluid Output
+					CI.emptyCells(7),
+					2 * 20);
+		}
+		
+
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 70df48ed81..1a1dfe64d9 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -1,6 +1,9 @@
 package gtPlusPlus.core.recipe;
 
+import static gtPlusPlus.core.recipe.common.CI.bitsd;
 import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
+import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes;
+import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generateWireRecipes;
 
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
@@ -9,12 +12,16 @@ import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -51,6 +58,7 @@ public class RECIPES_General {
 			run();
 			addCompressedObsidian();
 			addHandPumpRecipes();
+			migratedRecipes();
 		}
 	}
 
@@ -242,6 +250,7 @@ public class RECIPES_General {
 				ItemUtils.getSimpleStack(ModBlocks.blockNet, 2))){
 			Logger.INFO("Added a recipe for Nets.");
 		}
+		
 
 
 	}
@@ -319,6 +328,127 @@ public class RECIPES_General {
 		
 				
 	}
+	
+	private static void migratedRecipes() {
+		
+		RecipeUtils.generateMortarRecipe(ItemUtils.getSimpleStack(ModItems.itemPlateRawMeat), ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1));
+		
+		generateWireRecipes(ELEMENT.getInstance().ZIRCONIUM);
+		generateWireRecipes(ALLOY.HG1223);
+		generateWireRecipes(ALLOY.LEAGRISIUM);
+		generateWireRecipes(ALLOY.TRINIUM_TITANIUM);
+		
+		GT_Materials[] g = new GT_Materials[] {
+				GT_Materials.Staballoy,
+				GT_Materials.Tantalloy60,
+				GT_Materials.Tantalloy61,
+				GT_Materials.Void,
+				GT_Materials.Potin,
+				GT_Materials.MaragingSteel300,
+				GT_Materials.MaragingSteel350,
+				GT_Materials.Inconel690,
+				GT_Materials.Inconel792,
+				GT_Materials.HastelloyX,
+				GT_Materials.TriniumNaquadahCarbonite,
+				
+		};
+		for (GT_Materials e : g) {
+			if (e == GT_Materials.Void) {
+				if (!LoadedMods.Thaumcraft) {
+					continue;
+				}
+			}			
+			int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 64 : 16;
+			generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
+		}
+		
+		Materials[] h = new Materials[] {
+				Materials.Europium,
+				Materials.Tungsten,
+				Materials.DarkSteel,
+				Materials.Clay,
+				Materials.Lead,
+				
+		};
+		
+		for (Materials e : h) {
+			if (e == Materials.DarkSteel) {
+				if (!LoadedMods.EnderIO) {
+					continue;
+				}
+			}			
+			int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 64 : 16;
+			generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
+		}
+		
+		
+		RecipeUtils.addShapedGregtechRecipe(
+				CI.component_Plate[4], "rotorGtStainlessSteel", CI.component_Plate[4],
+				CI.getTieredCircuitOreDictName(3), CI.machineHull_HV, CI.getTieredCircuitOreDictName(3),
+				CI.component_Plate[4], CI.electricPump_HV, CI.component_Plate[4],
+				GregtechItemList.Hatch_Air_Intake.get(1L, new Object[0]));
+
+		RecipeUtils.addShapedGregtechRecipe(CI.component_Plate[6], ALLOY.MARAGING250.getGear(1), CI.component_Plate[6],
+				CI.getTieredCircuitOreDictName(4), GregtechItemList.Casing_AdvancedVacuum.get(1),
+				CI.getTieredCircuitOreDictName(4), CI.component_Plate[5], ItemList.Hatch_Input_IV.get(1),
+				CI.component_Plate[5], GregtechItemList.Hatch_Input_Cryotheum.get(1L, new Object[0]));
+
+		RecipeUtils.addShapedGregtechRecipe(CI.component_Plate[5], ALLOY.MARAGING300.getGear(1), CI.component_Plate[5],
+				CI.getTieredCircuitOreDictName(4), GregtechItemList.Casing_Adv_BlastFurnace.get(1),
+				CI.getTieredCircuitOreDictName(4), CI.component_Plate[6], ItemList.Hatch_Input_IV.get(1),
+				CI.component_Plate[6], GregtechItemList.Hatch_Input_Pyrotheum.get(1L, new Object[0]));
+
+		RecipeUtils.addShapedGregtechRecipe(CI.component_Plate[8], ALLOY.PIKYONIUM.getGear(1), CI.component_Plate[9],
+				CI.getTieredCircuitOreDictName(7), GregtechItemList.Casing_Naq_Reactor_A.get(1),
+				CI.getTieredCircuitOreDictName(7), CI.component_Plate[9], ItemList.Hatch_Input_ZPM.get(1),
+				CI.component_Plate[8], GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0]));
+		
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_LV.get(1) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_MV.get(1) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_HV.get(1) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_EV.get(1) });		
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_IV.get(1) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_LuV.get(1) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_ZPM.get(1) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_UV.get(1) });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd,
+				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), Character.valueOf('P'),
+						GregtechItemList.Pollution_Cleaner_MAX.get(1) });
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	}
+	
+	
+	
+	
+	
+	
+	
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index f28929a66a..cf2e730cbe 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1209,7 +1209,7 @@ public class RECIPES_Machines {
 				//Advanced Vacuum Freezer
 				ItemStack plate = ALLOY.HG1223.getPlateDouble(1);
 				ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1);
-				ItemStack frame = ALLOY.INCOLOY_DS.getFrameBox(1);
+				ItemStack frame = ALLOY.LAFIUM.getFrameBox(1);
 				ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1);
 				ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1);
 
@@ -1246,7 +1246,7 @@ public class RECIPES_Machines {
 				//Advanced Implosion Compressor
 				plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1);
 				gear = ALLOY.LEAGRISIUM.getGear(1);
-				frame = ALLOY.HG1223.getFrameBox(1);
+				frame = ALLOY.CINOBITE.getFrameBox(1);
 				cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1);
 				cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1);