$ Fixed Workbench recipe not using correct machine casing.

$ Fixed the Extruder and the Alloy smelter eating the shaping molds.
$ Fixed .09 recipes for cells.
% Changed the recipes for the Geothermal Engines and Rocket Engines.

4 files changed, 15 insertions, 13 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 4956327fa8..7dd6ddd2ab 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -192,10 +192,10 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
         setFluidContainerStats(32000 + tLastID, 1L, 64L);
         
         if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
-        	 GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.WroughtIron, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 1L), GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]), 50, 32);
-             GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 1L), GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]), 50, 32);
-             GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Brass, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 1L), GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]), 75, 32);
-             GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Invar, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 1L), GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]), 75, 32);
+        	 GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.WroughtIron, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2L), GregtechItemList.Fluid_Cell_1L.get(1L, new Object[0]), 50, 32);
+             GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Bronze, 2L), GregtechItemList.Fluid_Cell_16L.get(1L, new Object[0]), 50, 32);
+             GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Brass, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 2L), GregtechItemList.Fluid_Cell_36L.get(1L, new Object[0]), 75, 32);
+             GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Invar, 1L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 2L), GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]), 75, 32);
 
         }
         else {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
index 6d84abe37b..627cba7064 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java
@@ -16,8 +16,8 @@ public class RecipeGen_Plates {
 		int tVoltageMultiplier = material.getMeltingPoint_K() >= 2800 ? 64 : 16;
 		ItemStack ingotStackOne = material.getIngot(1);
 		ItemStack ingotStackTwo = material.getIngot(2);
-		ItemStack shape_Mold = ItemList.Shape_Mold_Plate.get(1);
-		ItemStack shape_Extruder = ItemList.Shape_Extruder_Plate.get(1);
+		ItemStack shape_Mold = ItemList.Shape_Mold_Plate.get(0);
+		ItemStack shape_Extruder = ItemList.Shape_Extruder_Plate.get(0);
 		ItemStack plate_Single = material.getPlate(1);
 		ItemStack plate_SingleTwo = material.getPlate(2);
 		ItemStack plate_Double = material.getPlateDouble(1);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
index 961abedc8d..844ba03ec9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java
@@ -5,6 +5,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -38,7 +39,7 @@ public class GregtechGeothermalThermalGenerator {
 					Character.valueOf('E'), ItemList.Electric_Motor_EV,
 					Character.valueOf('C'), GregtechOrePrefixes.circuit.get(Materials.Ultimate),
 					Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Aluminium),
-					Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Titanium)});
+					Character.valueOf('G'), ALLOY.TANTALLOY_61.getGear(1)});
 		
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_IV.get(1L, new Object[0]),
 				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
@@ -48,7 +49,7 @@ public class GregtechGeothermalThermalGenerator {
 			Character.valueOf('E'), ItemList.Electric_Motor_IV,
 			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic),
 			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum),
-			Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.TungstenSteel)});
+			Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
 		
 		final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV;
 		final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.electricMotor_LuV;
@@ -59,8 +60,8 @@ public class GregtechGeothermalThermalGenerator {
 			Character.valueOf('P'), INGREDIENT_1, 
 			Character.valueOf('E'), INGREDIENT_2, 
 			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), 
-			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Tungsten), 
-			Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Chrome)});
+			Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Tungsten),
+			Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index dc9173a502..f75a44bf8b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -5,6 +5,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.RECIPE_CONSTANTS;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -38,7 +39,7 @@ public class GregtechRocketFuelGenerator {
 					Character.valueOf('E'), ItemList.Electric_Motor_EV,
 					Character.valueOf('C'), GregtechOrePrefixes.circuit.get(Materials.Ultimate),
 					Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Aluminium),
-					Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Titanium)});
+					Character.valueOf('G'), ALLOY.TANTALLOY_61.getGear(1)});
 		
 		GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]),
 				GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
@@ -48,7 +49,7 @@ public class GregtechRocketFuelGenerator {
 			Character.valueOf('E'), ItemList.Electric_Motor_IV,
 			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic),
 			Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum),
-			Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.TungstenSteel)});
+			Character.valueOf('G'), ALLOY.STELLITE.getGear(1)});
 		
 		final ItemStack INGREDIENT_1 = RECIPE_CONSTANTS.electricPiston_LuV;
 		final ItemStack INGREDIENT_2 = RECIPE_CONSTANTS.electricMotor_LuV;
@@ -60,7 +61,7 @@ public class GregtechRocketFuelGenerator {
 			Character.valueOf('E'), INGREDIENT_2, 
 			Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), 
 			Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Tungsten), 
-			Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Chrome)});
+			Character.valueOf('G'), ALLOY.ZERON_100.getGear(1)});
 	}
 
 }