+ Added a mild tweak for OB graves, so that they are now immune to TC Hungry Nodes.

+ Added ability to create Simple Washers using Copper Pipes as well. (Suggested by Bear989Sr)
% Adjusted the voltage returned from getVoltageForTier(tier), to now return the correct voltage, not the voltage of the next tier.
% Adjusted ABS recipe handling, items for output are now supported.
% Adjusted message sent to players when querying Super Buses.
% Changed the Large Assembler & Casing recipes to now require an assembler. Also much harder.
% Adjusted HG-1223, improved it's ABS recipe and tiering.
% Greatly buffed the output of Zhuhai. Please let me know if it needs a nerf.
$ Fixed some issues in GregtechMeta_MultiBlockBase, related to recognition of Control Cores & their bus.
$ Fixed some hatch detection issues during Multiblock structure checks.

2 files changed, 74 insertions, 25 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 456b535606..eca9e278e2 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -21,6 +21,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.Particle;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
@@ -225,6 +226,27 @@ public class RECIPES_GREGTECH {
 				0, 
 				20 * 45,
 				120);
+			
+		//HG1223
+		CORE.RA.addBlastSmelterRecipe(
+				new ItemStack[] { 
+						ItemUtils.getGregtechCircuit(5),
+						ELEMENT.getInstance().MERCURY.getCell(1),
+						ELEMENT.getInstance().BARIUM.getDust(2),
+						ELEMENT.getInstance().CALCIUM.getDust(2),
+						ELEMENT.getInstance().COPPER.getDust(3),
+				},
+				ELEMENT.getInstance().OXYGEN.getFluid(8000),
+				ALLOY.HG1223.getFluid(16 * 144),
+				new ItemStack[] { 
+						CI.emptyCells(1)
+				},
+				100, //Output Chance 
+				20 * 120,
+				122880);
+		
+		
+		
 
 		// Germanium Roasting
 		CORE.RA.addBlastSmelterRecipe(
@@ -1137,7 +1159,7 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null,
 				FluidUtils.getFluidStack("hydrofluoricacid", 144 * 5),
 				FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144 * 5), null, 3000, 500);
-		GT_Values.RA.addMixerRecipe(
+		/*GT_Values.RA.addMixerRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
@@ -1146,7 +1168,7 @@ public class RECIPES_GREGTECH {
 				ALLOY.HG1223.getFluid(144*16), 
 				CI.emptyCells(1),
 				30 * 20,
-				500);
+				500);*/
 	}
 
 	private static void chemicalReactorRecipes() {
@@ -1623,14 +1645,14 @@ public class RECIPES_GREGTECH {
 
 	private static void advancedMixerRecipes() {
 		// HgBa2Ca2Cu3O8
-		CORE.RA.addMixerRecipe(
+		/*CORE.RA.addMixerRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),
 				FluidUtils.getFluidStack("oxygen", 8000),
 				null, CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null,
-				30 * 20, 500);	
+				30 * 20, 500);	*/
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 16559c4fcf..5d8c040996 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -734,7 +734,7 @@ public class RECIPES_Machines {
 						RECIPE_IndustrialSieveGrate);
 			}
 
-			if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){
+			if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){/*
 				//Industrial Tree Farmer
 				RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);
 				RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount);
@@ -759,7 +759,7 @@ public class RECIPES_Machines {
 						"plankWood", "frameGtTumbaga", "plankWood",
 						"plankWood", "plankWood", "plankWood",
 						RECIPE_TreeFarmFrame);
-			}
+			*/}
 
 			if (CORE.ConfigSwitches.enableMachine_Tesseracts){
 				//Tesseracts
@@ -784,11 +784,16 @@ public class RECIPES_Machines {
 				ItemStack washerPipe;
 				if (CORE.ConfigSwitches.enableCustom_Pipes){
 					washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1);
+					RecipeUtils.addShapedGregtechRecipe(
+							plateWrought, CI.electricPump_LV, plateWrought,
+							plateWrought, washerPipe, plateWrought,
+							plateWrought, CI.machineCasing_ULV, plateWrought,
+							GregtechItemList.SimpleDustWasher.get(1));
 				}
-				else {
-					washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1);				
+				else {			
 				}
 				//Add Recipe
+				washerPipe = ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeCopper", 1);					
 				RecipeUtils.addShapedGregtechRecipe(
 						plateWrought, CI.electricPump_LV, plateWrought,
 						plateWrought, washerPipe, plateWrought,
@@ -1091,27 +1096,49 @@ public class RECIPES_Machines {
 						GregtechItemList.Industrial_WashPlant.get(1));
 			}
 
-			if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter){
+			if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter) {
 
-				ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemList.valueOf("Block_IridiumTungstensteel").get(1, ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1)) : ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1);
+				ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK
+						? ItemList.valueOf("Block_IridiumTungstensteel").get(1,
+								ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1))
+						: ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1);
 
-				RecipeUtils.recipeBuilder(
-						"plateTungstenSteel", CI.craftingToolHammer_Hard, "plateTungstenSteel",
-						"plateStellite", aCoreBlock, "plateStellite",
-						"plateTungstenSteel", CI.craftingToolWrench, "plateTungstenSteel",
-						GregtechItemList.Casing_Autocrafter.get(Casing_Amount));
+				aCoreBlock.stackSize = GTNH ? 2 : 1;
 
-				RecipeUtils.recipeBuilder( 
-						"plateTungstenSteel", ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR),"plateTungstenSteel",
-						CI.emitter_IV,GregtechItemList.Gregtech_Computer_Cube.get(1), CI.sensor_IV,
-						"plateTungstenSteel", "cableGt08Osmium","plateTungstenSteel",
-						GregtechItemList.GT4_Multi_Crafter.get(1));
+				CORE.RA.addSixSlotAssemblingRecipe(
+						new ItemStack[] {
+								ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), GTNH ? 2 : 1),
+								aCoreBlock, 
+								CI.getTieredComponent(OrePrefixes.circuit, GTNH ? 3 : 2, 16),
+								CI.getTieredComponent(OrePrefixes.screw, GTNH ? 6 : 5, 32),
+								CI.getTieredComponent(OrePrefixes.bolt, GTNH ? 6 : 5, 12),
+								CI.getTieredComponent(OrePrefixes.plate, GTNH ? 7 : 6, 8), },
+						CI.getTertiaryTieredFluid(6, 144 * (GTNH ? 12 : 4)),
+						GregtechItemList.Casing_Autocrafter.get(Casing_Amount), 20 * 60 * 2,
+						MaterialUtils.getVoltageForTier(GTNH ? 7 : 6));
+
+				CORE.RA.addSixSlotAssemblingRecipe(
+						new ItemStack[] { 
+								GregtechItemList.Casing_Refinery_Structural.get(4),
+								ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, GTNH ? 2 : 1),
+								CI.getTieredComponent(OrePrefixes.cableGt08, GTNH ? 7 : 6, GTNH ? 32 : 16),
+								CI.getEmitter(GTNH ? 7 : 5, 2), 
+								CI.getSensor(GTNH ? 7 : 5, 2),
+								GregtechItemList.Gregtech_Computer_Cube.get(1),
+								},
+						CI.getTieredFluid(7, 144 * (GTNH ? 32 : 8)), GregtechItemList.GT4_Multi_Crafter.get(1),
+						20 * 60 * 5, MaterialUtils.getVoltageForTier(GTNH ? 7 : 6));
+
+				CORE.RA.addSixSlotAssemblingRecipe(
+						new ItemStack[] {
+								ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), Casing_Amount),
+								CI.getEmitter(GTNH ? 5 : 4, GTNH ? 4 : 2), CI.getRobotArm(GTNH ? 5 : 4, GTNH ? 4 : 2),
+								CI.getTieredComponent(OrePrefixes.circuit, GTNH ? 3 : 2, 8),
+								CI.getTieredComponent(OrePrefixes.screw, GTNH ? 4 : 3, 8),
+								CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 4), },
+						CI.getAlternativeTieredFluid(5, 144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
+						20 * 30 * 3, MaterialUtils.getVoltageForTier(GTNH ? 5 : 4));
 
-				RecipeUtils.recipeBuilder( 
-						"plateTungstenSteel",CI.craftingToolSolderingIron,"plateStainlessSteel",
-						CI.robotArm_EV, ItemList.Casing_SolidSteel.get(1), CI.robotArm_EV,
-						"plateStainlessSteel",CI.emitter_EV,"plateTungstenSteel",
-						ItemUtils.getSimpleStack(ModBlocks.blockProjectTable));
 			}
 
 			if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine){