+ 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.

2 files changed, 19 insertions, 10 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
index ee4f32c8ad..d04f71e235 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java
@@ -9,6 +9,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp;
 
@@ -54,17 +55,17 @@ public class GregtechHiAmpTransformer {
 		ItemStack mItem_2;
 		ItemStack mItem_3;
 			try {
-				mItem_1 = ItemList.valueOf("Casing_Coil_TungstenSteel").get(1);
+				mItem_1 = Utils.getValueOfItemList("Casing_Coil_TungstenSteel", ItemList.Circuit_Elite).get(1);
 			} catch (Throwable t){	
 				mItem_1 = ItemList.Circuit_Elite.get(1);
 			}
 			try {
-				mItem_2 = ItemList.valueOf("Casing_Coil_Naquadah").get(1);
+				mItem_2 = Utils.getValueOfItemList("Casing_Coil_Naquadah", ItemList.Circuit_Master).get(1);
 			} catch (Throwable t){	
 				mItem_2 = ItemList.Circuit_Master.get(1);
 			}
 			try {
-				mItem_3 = ItemList.valueOf("Casing_Coil_NaquadahAlloy").get(1);
+				mItem_3 = Utils.getValueOfItemList("Casing_Coil_NaquadahAlloy", ItemList.Circuit_Ultimate).get(1);
 			} catch (Throwable t){	
 				mItem_3 = ItemList.Circuit_Ultimate.get(1);
 			}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
index f624b78ab8..30835b6daa 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
@@ -1,26 +1,34 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Plasma;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_MiniFusionPlant;
 
 public class GregtechMiniRaFusion {
 
 	public static void run() {
 		// Register the Simple Fusion Entity.
-		GregtechItemList.Miniature_Fusion.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(994, "machine.simplefusion.tier.01", "Mimir", 8, "Universal Machine for Knowledge and Wisdom", Recipe_GT.Gregtech_Recipe_Map.sSlowFusionRecipes, 2, 9, 64000, 0, 1, "Dehydrator.png", (String) GregTech_API.sSoundList.get(Integer.valueOf(208)), false, false, 0, "EXTRUDER", new Object[]{"CCE", "XMP", "CCE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'X', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.SENSOR, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.FIELD_GENERATOR}).getStackForm(1L));
-
+		GregtechItemList.Miniature_Fusion.set(new GregtechMTE_MiniFusionPlant(31015, "gtplusplus.fusion.single", "Helium Prime").getStackForm(1L));
+		GregtechItemList.Plasma_Tank.set(new GT_MetaTileEntity_Hatch_Plasma(31016, "gtplusplus.tank.plasma", "Plasma Tank").getStackForm(1L));
+		
 	}
 	
 	public static boolean generateSlowFusionrecipes() {		
 		for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList){
 			if (x.mEnabled) {
-				x.mDuration *= 4;
-				Recipe_GT.Gregtech_Recipe_Map.sSlowFusionRecipes.add(x);
+				GT_Recipe y = x.copy();
+				y.mDuration *= 16;				
+				long z = y.mEUt * 4;
+				if (z > Integer.MAX_VALUE) {
+					y.mEnabled = false;
+					continue;
+				}
+				y.mEUt = (int) Math.min(Math.max(0, z), Integer.MAX_VALUE);
+				y.mCanBeBuffered = true;
+				Recipe_GT.Gregtech_Recipe_Map.sSlowFusionRecipes.add(y);
 			}
 		}
 		int mRecipeCount = Recipe_GT.Gregtech_Recipe_Map.sSlowFusionRecipes.mRecipeList.size();