+ Implemented a handful of new recipes.

> GT Recipe handling is now applicable to all GT content, so adding a recipe also adds disassembler, macerator, etc.

% Changed the Energy Buffer a lil bit. Hopefully doesn't break existing buffers.

4 files changed, 179 insertions, 171 deletions

diff --git a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
index cead9d8cd6..9430efa20d 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java
@@ -148,176 +148,176 @@ public class RECIPES_MachineComponents {
 
 	private static void run(){
 		//Electric Motors
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier7, wireTier7, rodTier7a,
 				wireTier7, rodTier7b, wireTier7,
 				rodTier7a, wireTier7, cableTier7,
 				electricMotor_LuV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier8, wireTier8, rodTier8a,
 				wireTier8, rodTier8b, wireTier8,
 				rodTier8a, wireTier8, cableTier8,
 				electricMotor_ZPM);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier9, wireTier9, rodTier9a,
 				wireTier9, rodTier9b, wireTier9,
 				rodTier9a, wireTier9, cableTier9,
 				electricMotor_UV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier10, wireTier10, rodTier10a,
 				wireTier10, rodTier10b, wireTier10,
 				rodTier10a, wireTier10, cableTier10,
 				electricMotor_MAX);
 
 		//Electric Pump
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier7, rotorTier7, itemRubberRing,
 				craftingToolScrewdriver, pipeTier7, craftingToolWrench,
 				itemRubberRing, electricMotor_LuV, cableTier7,
 				electricPump_LuV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier8, rotorTier8, itemRubberRing,
 				craftingToolScrewdriver, pipeTier8, craftingToolWrench,
 				itemRubberRing, electricMotor_ZPM, cableTier8,
 				electricPump_ZPM);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier9, rotorTier9, itemRubberRing,
 				craftingToolScrewdriver, pipeTier9, craftingToolWrench,
 				itemRubberRing, electricMotor_UV, cableTier9,
 				electricPump_UV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier10, rotorTier10, itemRubberRing,
 				craftingToolScrewdriver, pipeTier10, craftingToolWrench,
 				itemRubberRing, electricMotor_MAX, cableTier10,
 				electricPump_MAX);
 
 		//Electric Pump
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateTier7, plateTier7, plateTier7,
 				cableTier7, rodTier7a, rodTier7a,
 				cableTier7, electricMotor_LuV, smallGearTier7,
 				electricPiston_LuV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateTier8, plateTier8, plateTier8,
 				cableTier8, rodTier8a, rodTier8a,
 				cableTier8, electricMotor_ZPM, smallGearTier8,
 				electricPiston_ZPM);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateTier9, plateTier9, plateTier9,
 				cableTier9, rodTier9a, rodTier9a,
 				cableTier9, electricMotor_UV, smallGearTier9,
 				electricPiston_UV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateTier10, plateTier10, plateTier10,
 				cableTier10, rodTier10a, rodTier10a,
 				cableTier10, electricMotor_MAX, smallGearTier10,
 				electricPiston_MAX);
 
 		//Robot Arms
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier7, cableTier7, cableTier7,
 				electricMotor_LuV, rodTier7a, electricMotor_LuV,
 				electricPiston_LuV, circuitTier7, rodTier7a,
 				robotArm_LuV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier8, cableTier8, cableTier8,
 				electricMotor_ZPM, rodTier8a, electricMotor_ZPM,
 				electricPiston_ZPM, circuitTier8, rodTier8a,
 				robotArm_ZPM);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier9, cableTier9, cableTier9,
 				electricMotor_UV, rodTier9a, electricMotor_UV,
 				electricPiston_UV, circuitTier9, rodTier9a,
 				robotArm_UV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				cableTier10, cableTier10, cableTier10,
 				electricMotor_MAX, rodTier10a, electricMotor_MAX,
 				electricPiston_MAX, circuitTier10, rodTier10a,
 				robotArm_MAX);
 
 		//Conveyor Modules
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				electricMotor_LuV, cableTier7, electricMotor_LuV,
 				plateRubber, plateRubber, plateRubber,
 				conveyorModule_LuV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				electricMotor_ZPM, cableTier8, electricMotor_ZPM,
 				plateRubber, plateRubber, plateRubber,
 				conveyorModule_ZPM);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				electricMotor_UV, cableTier9, electricMotor_UV,
 				plateRubber, plateRubber, plateRubber,
 				conveyorModule_UV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateRubber, plateRubber, plateRubber,
 				electricMotor_MAX, cableTier10, electricMotor_MAX,
 				plateRubber, plateRubber, plateRubber,
 				conveyorModule_MAX);
 
 		//Emitter Modules
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				rodTier7c, rodTier7c, circuitTier7,
 				cableTier7, circuitTier6, rodTier7c,
 				circuitTier7, cableTier7, rodTier7c,
 				emitter_LuV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				rodTier8c, rodTier8c, circuitTier8,
 				cableTier8, circuitTier7, rodTier8c,
 				circuitTier8, cableTier8, rodTier8c,
 				emitter_ZPM);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				rodTier9c, rodTier9c, circuitTier9,
 				cableTier9, circuitTier8, rodTier9c,
 				circuitTier9, cableTier9, rodTier9c,
 				emitter_UV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				rodTier10c, rodTier10c, circuitTier10,
 				cableTier10, circuitTier9, rodTier10c,
 				circuitTier10, cableTier10, rodTier10c,
 				emitter_MAX);
 
 		//Field Generator Modules
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				wireTier7, circuitTier7, wireTier7,
 				circuitTier7, circuitTier6, circuitTier7,
 				wireTier7, circuitTier7, wireTier7,
 				fieldGenerator_LuV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				wireTier8, circuitTier8, wireTier8,
 				circuitTier8, circuitTier7, circuitTier8,
 				wireTier8, circuitTier8, wireTier8,
 				fieldGenerator_ZPM);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				wireTier9, circuitTier9, wireTier9,
 				circuitTier9, circuitTier8, circuitTier9,
 				wireTier9, circuitTier9, wireTier9,
 				fieldGenerator_UV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				wireTier10, circuitTier10, wireTier10,
 				circuitTier10, circuitTier9, circuitTier10,
 				wireTier10, circuitTier10, wireTier10,
 				fieldGenerator_MAX);
 
 		//Sensor Modules
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateTier7, null, circuitTier6,
 				plateTier7, rodTier7c, null,
 				circuitTier7, plateTier7, plateTier7,
 				sensor_LuV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateTier8, null, circuitTier7,
 				plateTier8, rodTier8c, null,
 				circuitTier8, plateTier8, plateTier8,
 				sensor_ZPM);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateTier9, null, circuitTier8,
 				plateTier9, rodTier9c, null,
 				circuitTier9, plateTier9, plateTier9,
 				sensor_UV);
-		UtilsRecipe.recipeBuilder(
+		UtilsRecipe.addShapedGregtechRecipe(
 				plateTier10, null, circuitTier9,
 				plateTier10, rodTier10c, null,
 				circuitTier10, plateTier10, plateTier10,
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
index 1bbefdc9e3..739df0dcea 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
@@ -342,137 +342,137 @@ public class RECIPES_Machines {
 					RECIPES_Shapeless.dustStaballoy);
 
 			//Buffer Core
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier1, cableTier1, plateTier1,
 					circuitPrimitive, IC2MFE, circuitPrimitive,
 					plateTier1, cableTier1, plateTier1,
 					RECIPE_BufferCore_ULV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier2, cableTier2, plateTier2,
 					circuitTier1, IC2MFE, circuitTier1,
 					plateTier2, cableTier2, plateTier2,
 					RECIPE_BufferCore_LV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier3, cableTier3, plateTier3,
 					RECIPE_BufferCore_LV, circuitTier2, RECIPE_BufferCore_LV,
 					plateTier3, cableTier3, plateTier3,
 					RECIPE_BufferCore_MV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier4, cableTier4, plateTier4,
 					RECIPE_BufferCore_MV, circuitTier3, RECIPE_BufferCore_MV,
 					plateTier4, cableTier4, plateTier4,
 					RECIPE_BufferCore_HV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier5, cableTier5, plateTier5,
 					RECIPE_BufferCore_HV, circuitTier4, RECIPE_BufferCore_HV,
 					plateTier5, cableTier5, plateTier5,
 					RECIPE_BufferCore_EV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier6, cableTier6, plateTier6,
 					RECIPE_BufferCore_EV, circuitTier5, RECIPE_BufferCore_EV,
 					plateTier6, cableTier6, plateTier6,
 					RECIPE_BufferCore_IV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier7, cableTier7, plateTier7,
 					RECIPE_BufferCore_IV, circuitTier6, RECIPE_BufferCore_IV,
 					plateTier7, cableTier7, plateTier7,
 					RECIPE_BufferCore_LuV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier8, cableTier8, plateTier8,
 					RECIPE_BufferCore_LuV, circuitTier7, RECIPE_BufferCore_LuV,
 					plateTier8, cableTier8, plateTier8,
 					RECIPE_BufferCore_ZPM);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier9, cableTier9, plateTier9,
 					RECIPE_BufferCore_ZPM, circuitTier8, RECIPE_BufferCore_ZPM,
 					plateTier9, cableTier9, plateTier9,
 					RECIPE_BufferCore_UV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier10, cableTier10, plateTier10,
 					RECIPE_BufferCore_UV, circuitTier9, RECIPE_BufferCore_UV,
 					plateTier10, cableTier10, plateTier10,
 					RECIPE_BufferCore_MAX);
 
 
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier1, RECIPE_BufferCore_ULV, wireTier1,
 					wireTier1, machineCasing_ULV, wireTier1,
 					circuitPrimitive, circuitTier1, circuitPrimitive,
 					RECIPE_Buffer_ULV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier2, RECIPE_BufferCore_LV, wireTier2,
 					wireTier2, machineCasing_LV, wireTier2,
 					circuitTier1, RECIPE_BufferCore_LV, circuitTier1,
 					RECIPE_Buffer_LV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier3, RECIPE_BufferCore_MV, wireTier3,
 					wireTier3, machineCasing_MV, wireTier3,
 					circuitTier2, RECIPE_BufferCore_MV, circuitTier2,
 					RECIPE_Buffer_MV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier4, RECIPE_BufferCore_HV, wireTier4,
 					wireTier4, machineCasing_HV, wireTier4,
 					circuitTier3, RECIPE_BufferCore_HV, circuitTier3,
 					RECIPE_Buffer_HV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier5, RECIPE_BufferCore_EV, wireTier5,
 					wireTier5, machineCasing_EV, wireTier5,
 					circuitTier4, RECIPE_BufferCore_EV, circuitTier4,
 					RECIPE_Buffer_EV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier6, RECIPE_BufferCore_IV, wireTier6,
 					wireTier6, machineCasing_IV, wireTier6,
 					circuitTier5, RECIPE_BufferCore_IV, circuitTier5,
 					RECIPE_Buffer_IV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier7, RECIPE_BufferCore_LuV, wireTier7,
 					wireTier7, machineCasing_LuV, wireTier7,
 					circuitTier6, RECIPE_BufferCore_LuV, circuitTier6,
 					RECIPE_Buffer_LuV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier8, RECIPE_BufferCore_ZPM, wireTier8,
 					wireTier8, machineCasing_ZPM, wireTier8,
 					circuitTier7, RECIPE_BufferCore_ZPM, circuitTier7,
 					RECIPE_Buffer_ZPM);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					wireTier9, RECIPE_BufferCore_UV, wireTier9,
 					wireTier9, machineCasing_UV, wireTier9,
 					circuitTier8, RECIPE_BufferCore_UV, circuitTier8,
 					RECIPE_Buffer_UV);
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier11, RECIPE_BufferCore_MAX, plateTier11,
 					wireTier10, machineCasing_MAX, wireTier10,
 					circuitTier9, RECIPE_BufferCore_MAX, circuitTier9,
 					RECIPE_Buffer_MAX);
 
 			//Steam Condenser
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					pipeLargeCopper, pipeHugeSteel, pipeLargeCopper,
 					plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy,
 					plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy,
 					RECIPE_SteamCondenser);
 
 			//Iron BF
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron",
 					boiler_Coal, machineCasing_ULV, boiler_Coal,
 					"plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron",
 					RECIPE_IronBlastFurnace);
 			//Iron plated Bricks
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron",
 					"plateAnyIron", blockBricks, "plateAnyIron",
 					"plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron",
 					RECIPE_IronPlatedBricks);
 
 			//Industrial Centrifuge
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					circuitTier6, pipeHugeStainlessSteel, circuitTier6,
 					plateTier6, IV_MACHINE_Centrifuge, plateTier6,
 					plateTier8, machineCasing_IV, plateTier8,
 					RECIPE_IndustrialCentrifugeController);
 			//Centrifuge Casing
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier6, "stickElectrum", plateTier6,
 					plateTier8, "stickElectrum", plateTier8,
 					plateTier6, "stickElectrum", plateTier6,
@@ -480,7 +480,7 @@ public class RECIPES_Machines {
 
 			if (LoadedMods.Railcraft){
 				//Industrial Coke Oven
-				UtilsRecipe.recipeBuilder(
+				UtilsRecipe.addShapedGregtechRecipe(
 						plateCobalt, circuitTier4, plateCobalt,
 						machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV,
 						plateCobalt, circuitTier5, plateCobalt,
@@ -488,78 +488,78 @@ public class RECIPES_Machines {
 			}
 			if (LoadedMods.ImmersiveEngineering){
 				//Industrial Coke Oven
-				UtilsRecipe.recipeBuilder(
+				UtilsRecipe.addShapedGregtechRecipe(
 						plateCobalt, circuitTier4, plateCobalt,
 						machineCasing_HV, INPUT_IECokeOvenBlock, machineCasing_HV,
 						plateCobalt, circuitTier5, plateCobalt,
 						RECIPE_IndustrialCokeOvenController);
 			}
 			//Coke Oven Frame Casing
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateTier8, rodTier8, plateTier8,
 					rodTier8, "frameGtCobalt", rodTier8,
 					plateTier8, rodTier8, plateTier8,
 					RECIPE_IndustrialCokeOvenFrame);
 			//Coke Oven Coil 1
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateBronze, plateBronze, plateBronze,
 					"frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze",
 					plateBronze, plateBronze, plateBronze,
 					RECIPE_IndustrialCokeOvenCasingA);
 			//Coke Oven Coil 2
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					plateSteel, plateSteel, plateSteel,
 					"frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel",
 					plateSteel, plateSteel, plateSteel,
 					RECIPE_IndustrialCokeOvenCasingB);
 
 			//Electrolyzer Frame Casing
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateSterlingSilver", "stickLongChrome", "plateSterlingSilver",
 					"stickLongSterlingSilver", "frameGtSterlingSilver", "stickLongSterlingSilver",
 					"plateSterlingSilver", "stickLongSterlingSilver", "plateSterlingSilver",
 					RECIPE_IndustrialElectrolyzerFrame);
 			//Industrial Electrolyzer
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateSterlingSilver", circuitTier6, "plateSterlingSilver",
 					machineCasing_EV, IV_MACHINE_Electrolyzer, machineCasing_EV,
 					"plateSterlingSilver", "rotorSterlingSilver", "plateSterlingSilver",
 					RECIPE_IndustrialElectrolyzerController);
 
 			//Material Press Frame Casing
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateTitanium", "stickLongTitanium", "plateTitanium",
 					"stickMagnesium", "frameGtTitanium", "stickMagnesium",
 					"plateTitanium", "stickLongTitanium", "plateTitanium",
 					RECIPE_IndustrialMaterialPressFrame);
 			//Industrial Material Press
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateTitanium", circuitTier5, "plateTitanium",
 					machineCasing_EV, IV_MACHINE_BendingMachine, machineCasing_EV,
 					"plateTitanium", circuitTier5, "plateTitanium",
 					RECIPE_IndustrialMaterialPressController);
 
 			//Maceration Frame Casing
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"platePalladium", "platePalladium", "platePalladium",
 					"stickPlatinum", "frameGtPalladium", "stickPlatinum",
 					"platePalladium", "stickLongPalladium", "platePalladium",
 					RECIPE_IndustrialMacerationStackFrame);
 			//Industrial Maceration stack 
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateDenseCarbon", IV_MACHINE_Macerator, "plateDenseCarbon",
 					IV_MACHINE_Macerator, circuitTier8, IV_MACHINE_Macerator,
 					"plateDenseCarbon", machineCasing_IV, "plateDenseCarbon",
 					RECIPE_IndustrialMacerationStackController);
 
 			//Wire Factory Frame Casing
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateBlueSteel", "stickBlueSteel", "plateBlueSteel",
 					"stickBlueSteel", "frameGtBlueSteel", "stickBlueSteel",
 					"plateBlueSteel", "stickBlueSteel", "plateBlueSteel",
 					RECIPE_IndustrialWireFactoryFrame);
 			//Industrial Wire Factory
-			UtilsRecipe.recipeBuilder(
+			UtilsRecipe.addShapedGregtechRecipe(
 					"plateOsmium", machineCasing_IV, "plateOsmium",
 					circuitTier6, IV_MACHINE_Wiremill, circuitTier6,
 					"plateOsmium", machineCasing_IV, "plateOsmium",
diff --git a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
index 50392e1fd9..ccd858d673 100644
--- a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
+++ b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
@@ -1,5 +1,7 @@
 package miscutil.core.util.recipe;
 
+import gregtech.api.util.GT_ModHandler;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -14,6 +16,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
+import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -21,9 +24,9 @@ import cpw.mods.fml.common.registry.GameRegistry;
 public class UtilsRecipe {
 
 	public static void recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){	
-	
+
 		ArrayList<Object> validSlots = new ArrayList<Object>();
-	
+
 		Utils.LOG_INFO("Trying to add a recipe for "+resultItem.toString());
 		String a,b,c,d,e,f,g,h,i;
 		if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);}
@@ -44,8 +47,8 @@ public class UtilsRecipe {
 		Utils.LOG_WARNING(h);
 		if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);}
 		Utils.LOG_WARNING(i);
-	
-	
+
+
 		Utils.LOG_ERROR("_______");
 		String lineOne = a+b+c;
 		Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|");
@@ -56,7 +59,7 @@ public class UtilsRecipe {
 		String lineThree = g+h+i;
 		Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|");
 		Utils.LOG_ERROR("_______");
-	
+
 		validSlots.add(0, lineOne);
 		validSlots.add(1, lineTwo);
 		validSlots.add(2, lineThree);
@@ -95,12 +98,12 @@ public class UtilsRecipe {
 				}
 			}	
 		}
-	
+
 		try {
 			GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray()));		
 			Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString());
 			if (!COMPAT_HANDLER.areInitItemsLoaded){
-			RegistrationHandler.recipesSuccess++;
+				RegistrationHandler.recipesSuccess++;
 			}
 			else {
 				LateRegistrationHandler.recipesSuccess++;
@@ -114,18 +117,18 @@ public class UtilsRecipe {
 			Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName());
 			if (!COMPAT_HANDLER.areInitItemsLoaded){
 				RegistrationHandler.recipesFailed++;
-				}
-				else {
-					LateRegistrationHandler.recipesFailed++;
-				}			
+			}
+			else {
+				LateRegistrationHandler.recipesFailed++;
+			}			
 		}
 	}
 
 	public static void shapelessBuilder(ItemStack Output, Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9){
 		//Item output_ITEM = Output.getItem();
-	
+
 		ArrayList<Object> validSlots = new ArrayList<Object>();
-	
+
 		Utils.LOG_INFO("Trying to add a recipe for "+Output.toString());
 		String a,b,c,d,e,f,g,h,i;
 		if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);}
@@ -146,8 +149,8 @@ public class UtilsRecipe {
 		Utils.LOG_WARNING(h);
 		if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);}
 		Utils.LOG_WARNING(i);
-	
-	
+
+
 		Utils.LOG_ERROR("_______");
 		Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|");
 		Utils.LOG_ERROR("_______");
@@ -155,7 +158,7 @@ public class UtilsRecipe {
 		Utils.LOG_ERROR("_______");
 		Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|");
 		Utils.LOG_ERROR("_______");
-	
+
 		validSlots.add(0, a);
 		validSlots.add(1, b);
 		validSlots.add(2, c);
@@ -165,7 +168,7 @@ public class UtilsRecipe {
 		validSlots.add(6, g);
 		validSlots.add(7, h);
 		validSlots.add(8, i);
-	
+
 		try {
 			//GameRegistry.addRecipe(new ShapelessOreRecipe(Output, outputAmount), (Object[]) validSlots.toArray());
 			GameRegistry.addRecipe(new ShapelessOreRecipe(Output, (Object[]) validSlots.toArray()));
@@ -181,8 +184,8 @@ public class UtilsRecipe {
 			Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+Output.getUnlocalizedName());
 			RegistrationHandler.recipesFailed++;
 		}
-	
-	
+
+
 		//GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1), new Object[] {slot_1, slot_2});
 	}
 
@@ -231,7 +234,7 @@ public class UtilsRecipe {
 			default:
 				break;
 			}
-		recipeBuilder(a, b, c, d, e, f, g, h, i, outPut);
+			recipeBuilder(a, b, c, d, e, f, g, h, i, outPut);
 		}
 	}
 
@@ -306,4 +309,85 @@ public class UtilsRecipe {
 		return false;
 	}
 
+
+
+
+
+
+	public static void addShapedGregtechRecipe( 
+			Object InputItem1, Object InputItem2, Object InputItem3,
+			Object InputItem4, Object InputItem5, Object InputItem6,
+			Object InputItem7, Object InputItem8, Object InputItem9,
+			ItemStack OutputItem){
+
+		if ((!(InputItem1 instanceof ItemStack) && !(InputItem1 instanceof String)) || 
+				(!(InputItem2 instanceof ItemStack) && !(InputItem2 instanceof String)) || 
+				(!(InputItem3 instanceof ItemStack) && !(InputItem3 instanceof String)) || 
+				(!(InputItem4 instanceof ItemStack) && !(InputItem4 instanceof String)) || 
+				(!(InputItem5 instanceof ItemStack) && !(InputItem5 instanceof String)) || 
+				(!(InputItem6 instanceof ItemStack) && !(InputItem6 instanceof String)) || 
+				(!(InputItem7 instanceof ItemStack) && !(InputItem7 instanceof String)) || 
+				(!(InputItem8 instanceof ItemStack) && !(InputItem8 instanceof String)) || 
+				(!(InputItem9 instanceof ItemStack) && !(InputItem9 instanceof String))){
+			Utils.LOG_INFO("One Input item was not an ItemStack of an OreDict String.");
+			return;
+		}
+
+		/*if  (InputItem1 instanceof String) {
+			String temp = (String) InputItem1;
+			InputItem1 = getItemStackFromOreDict(temp);
+		}
+		if	(InputItem2 instanceof String) {
+			String temp = (String) InputItem2;
+			InputItem2 = getItemStackFromOreDict(temp);
+		}
+		if	(InputItem3 instanceof String) {
+			String temp = (String) InputItem3;
+			InputItem3 = getItemStackFromOreDict(temp);
+		}
+		if	(InputItem4 instanceof String) {
+			String temp = (String) InputItem4;
+			InputItem4 = getItemStackFromOreDict(temp);
+		}
+		if	(InputItem5 instanceof String) {
+			String temp = (String) InputItem5;
+			InputItem5 = getItemStackFromOreDict(temp);
+		}
+		if	(InputItem6 instanceof String) {
+			String temp = (String) InputItem6;
+			InputItem6 = getItemStackFromOreDict(temp);
+		}
+		if	(InputItem7 instanceof String) {
+			String temp = (String) InputItem7;
+			InputItem7 = getItemStackFromOreDict(temp);
+		}
+		if	(InputItem8 instanceof String) { 
+			String temp = (String) InputItem8;
+			InputItem8 = getItemStackFromOreDict(temp);
+		}
+		if	(InputItem9 instanceof String) {
+			String temp = (String) InputItem9;
+			InputItem9 = getItemStackFromOreDict(temp);
+		}*/
+
+		GT_ModHandler.addCraftingRecipe(OutputItem, 
+				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | 
+				GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+				new Object[]{"ABC", "DEF", "GHI", 
+				'A', InputItem1,  
+				'B', InputItem2,  
+				'C', InputItem3,  
+				'D', InputItem4,  
+				'E', InputItem5,  
+				'F', InputItem6,  
+				'G', InputItem7,  
+				'H', InputItem8,  
+				'I', InputItem9});		
+	}
+
+	public static ItemStack getItemStackFromOreDict(String oredictName){
+		ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName);
+		return oreDictList.get(0);
+	}
+
 }
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
index f6d4e37c65..5a9c00e77d 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -3,13 +3,7 @@ package miscutil.core.xmod.gregtech.api.metatileentity.implementations;
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_Container_1by1;
-import gregtech.api.gui.GT_Container_2by2;
-import gregtech.api.gui.GT_Container_3by3;
-import gregtech.api.gui.GT_Container_4by4;
 import gregtech.api.gui.GT_GUIContainer_1by1;
-import gregtech.api.gui.GT_GUIContainer_2by2;
-import gregtech.api.gui.GT_GUIContainer_3by3;
-import gregtech.api.gui.GT_GUIContainer_4by4;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -27,12 +21,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-/**
- * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
- * 
- * This is the main construct for my Basic Machines such as the Automatic Extractor
- * Extend this class to make a simple Machine
- */
 public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
 	/*
@@ -45,7 +33,6 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
 	public GregtechMetaEnergyBuffer(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
 		super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription);
-		//setCreativeTab(AddToCreativeTab.tabMachines);
 	}
 
 	public GregtechMetaEnergyBuffer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
@@ -193,68 +180,27 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
 
 	@Override
-	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory,
-			IGregTechTileEntity aBaseMetaTileEntity) {
-		switch (mInventory.length) {
-		case  1: return new GT_Container_1by1(aPlayerInventory, aBaseMetaTileEntity);
-		case  4: return new GT_Container_2by2(aPlayerInventory, aBaseMetaTileEntity);
-		case  9: return new GT_Container_3by3(aPlayerInventory, aBaseMetaTileEntity);
-		case 16: return new GT_Container_4by4(aPlayerInventory, aBaseMetaTileEntity);
-		}
+	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
 		return new GT_Container_1by1(aPlayerInventory, aBaseMetaTileEntity);
 	}
 
 	@Override
-	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory,
-			IGregTechTileEntity aBaseMetaTileEntity) {
-		switch (mInventory.length) {
-		case  1: return new GT_GUIContainer_1by1(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
-		case  4: return new GT_GUIContainer_2by2(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
-		case  9: return new GT_GUIContainer_3by3(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
-		case 16: return new GT_GUIContainer_4by4(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
-		}
+	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
 		return new GT_GUIContainer_1by1(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
 	}
 
 	@Override
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-		if (aBaseMetaTileEntity.isServerSide()) {
-			mCharge = aBaseMetaTileEntity.getStoredEU() / 2 > aBaseMetaTileEntity
-					.getEUCapacity() / 3;
-			mDecharge = aBaseMetaTileEntity.getStoredEU()     < aBaseMetaTileEntity.getEUCapacity() / 3;
-			mBatteryCount = 1;
-			mChargeableCount = 1;
-			for (ItemStack tStack : mInventory) if (GT_ModHandler.isElectricItem(tStack, mTier)) {
-				if (GT_ModHandler.isChargerItem(tStack)) mBatteryCount++;
-				mChargeableCount++;
-			}
-		}
+		
 	}
 
 	@Override
 	public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-		if(GT_ModHandler.isElectricItem(aStack)&&aStack.getUnlocalizedName().startsWith("gt.metaitem.01.")){
-			String name = aStack.getUnlocalizedName();
-			if(name.equals("gt.metaitem.01.32510")||
-					name.equals("gt.metaitem.01.32511")||
-					name.equals("gt.metaitem.01.32520")||
-					name.equals("gt.metaitem.01.32521")||
-					name.equals("gt.metaitem.01.32530")||
-					name.equals("gt.metaitem.01.32531")){
-				return true;
-			}
-		}
 		return false;
 	}
 
 	@Override
 	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
-		if(!GT_Utility.isStackValid(aStack)){
-			return false;
-		}
-		if(GT_ModHandler.isElectricItem(aStack, this.mTier)){
-			return true;
-		}
 		return false;
 	}
 
@@ -315,99 +261,77 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
 
 	@Override
 	public int[] getAccessibleSlotsFromSide(int p_94128_1_) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_,
-			int p_102007_3_) {
-		// TODO Auto-generated method stub
+	public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) {
 		return false;
 	}
 
 	@Override
-	public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_,
-			int p_102008_3_) {
-		// TODO Auto-generated method stub
+	public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) {
 		return false;
 	}
 
 	@Override
 	public int getSizeInventory() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
 	public ItemStack getStackInSlot(int p_70301_1_) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public ItemStack getStackInSlotOnClosing(int p_70304_1_) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) {
-		// TODO Auto-generated method stub
-
 	}
 
 	@Override
 	public String getInventoryName() {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public boolean hasCustomInventoryName() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public int getInventoryStackLimit() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
 	public void markDirty() {
-		// TODO Auto-generated method stub
-
 	}
 
 	@Override
 	public boolean isUseableByPlayer(EntityPlayer p_70300_1_) {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public void openInventory() {
-		// TODO Auto-generated method stub
-
 	}
 
 	@Override
 	public void closeInventory() {
-		// TODO Auto-generated method stub
-
 	}
 
 	@Override
 	public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) {
-		// TODO Auto-generated method stub
 		return false;
 	}