+ Added Charge Packs, which can be worn in the Bauble belt slot.

+ Added more recipes for particle related content.
+ Added recipe for Hydrogen Plasma.
+ Added Plasma Tanks.
+ Added Alternative Fusion Reactor.
+ Added recipe for the Super Jukebox.
% Updated Locale files.
$ Hopefully made calls to possibly invalid ItemList values safer.
$ Fixed Large Mixer not working with fluids correctly.
$ Fixed ABS and Adv. EBF not allowing a muffler in the center of the top layer.
$ Fixed Fusion bug, making all recipes take 4x longer than originally required.
$ Fixed recipes using Redstone Alloy as a material in tiered recipes. (Makes ULV Energy Cores craftable again)
$ Fixed Nano Healing Bauble.
$ Fixed annoying low transfer rate of Railcraft. (This should be higher when playing with GT anyway, it's now 4x, disabled in ASM config).
$ Fixed the fact that Portable tanks were still portable in GTNH.

1 files changed, 99 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 94486d472b..ace4876639 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -17,8 +17,10 @@ import gregtech.api.util.Recipe_GT;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.data.ArrayUtils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
@@ -943,6 +945,103 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		}
 	}
 
+	@Override
+	public void addFluidExtractionRecipe(ItemStack input, Object input2, FluidStack output, int aTime, int aEu,	int aSpecial) {
+		MaterialGenerator.addFluidExtractionRecipe(input, input2, output, aSpecial, aTime, aEu);
+		
+	}
+	
+	
+
+
+	 
+	/**
+     * Adds a Fusion reactor Recipe
+     *
+     * @param aInputStackA                        = first Input (not null, and respects StackSize)
+     * @param aInputStackB                        = second Input (not null, and respects StackSize)
+     * @param plasma                        = Output of the Fusion (can be null, and respects StackSize)
+     * @param aOutputChance = chance to output plasma (can be 0)
+     * @param aFusionDurationInTicks         = How many ticks the Fusion lasts (must be > 0)
+     * @param aEu           = The EU generated per Tick (can even be negative!)
+     * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+     */	
+		@Override
+		public boolean addFusionReactorRecipe(FluidStack aInputStackA, FluidStack aInputStackB, FluidStack plasma,
+				int aOutputChance, int aFusionDurationInTicks, int aEu, int aSpecial) {
+			if (aInputStackA == null || aInputStackB == null || plasma == null || aFusionDurationInTicks < 1 || aEu < 1 || aSpecial < 1) {
+	            return false;
+	        }			
+			Recipe_GT aFusionCustom = new Recipe_GT(
+					true,
+					null, 
+					null, 
+					null,
+					new int[] {aOutputChance},
+					new FluidStack[]{aInputStackA, aInputStackB}, 
+					new FluidStack[]{plasma},
+					aFusionDurationInTicks, 
+					aEu, 
+					aSpecial);		
+	        GT_Recipe.GT_Recipe_Map.sFusionRecipes.addRecipe(aFusionCustom);
+	        return true;
+		}
+	
+	
+	
+	
+	
+	 
+		/**
+	     * Adds a Fusion reactor Recipe
+	     *
+	     * @param aInputStackA                        = first Input (not null, and respects StackSize)
+	     * @param aInputStackB                        = second Input (not null, and respects StackSize)
+	     * @param plasma                        = Output of the Fusion (can be null, and respects StackSize)
+	     * @param aFusionDurationInTicks         = How many ticks the Fusion lasts (must be > 0)
+	     * @param aEu           = The EU generated per Tick (can even be negative!)
+	     * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+	     */		
+	@Override
+	public boolean addFusionReactorRecipe(ItemStack aInputStackA, ItemStack aInputStackB, FluidStack plasma,
+			int aFusionDurationInTicks, int aEu, int aSpecial) {		
+		return addFusionReactorRecipe(aInputStackA, aInputStackB, plasma, 10000, aFusionDurationInTicks, aEu, aSpecial);		
+	}
+
+		 
+		/**
+	     * Adds a Fusion reactor Recipe
+	     *
+	     * @param aInputStackA                        = first Input (not null, and respects StackSize)
+	     * @param aInputStackB                        = second Input (not null, and respects StackSize)
+	     * @param plasma                        = Output of the Fusion (can be null, and respects StackSize)
+     * @param aOutputChance = chance to output plasma (can be 0)
+	     * @param aFusionDurationInTicks         = How many ticks the Fusion lasts (must be > 0)
+	     * @param aEu           = The EU generated per Tick (can even be negative!)
+	     * @param aSpecial = EU needed for heating the Reactor up (must be >= 0)
+	     */	
+		@Override
+		public boolean addFusionReactorRecipe(ItemStack aInputStackA, ItemStack aInputStackB, FluidStack plasma,
+				int aOutputChance, int aFusionDurationInTicks, int aEu, int aSpecial) {
+			if (aInputStackA == null || aInputStackB == null || plasma == null || aFusionDurationInTicks < 1 || aEu < 1 || aSpecial < 1) {
+	            return false;
+	        }			
+			Recipe_GT aFusionCustom = new Recipe_GT(
+					true,
+					new ItemStack[]{aInputStackA, aInputStackB}, 
+					null, 
+					null,
+					new int[] {aOutputChance},
+					null, 
+					new FluidStack[]{plasma},
+					aFusionDurationInTicks, 
+					aEu, 
+					aSpecial);		
+	        GT_Recipe.GT_Recipe_Map.sFusionRecipes.addRecipe(aFusionCustom);
+	        return true;
+			
+		}
+