+ Added recipes for ULV generators.

+ Added recipes for New batteries and their components. (To be use in the charger packs).
% Mildly adjusted Circuit programmer recipe.
% Adjusted Plasma hatch to be output only.
$ Fixed bad tooltips on material blocks/frames.
$ Fixed Lang formatting issue.

19 files changed, 289 insertions, 33 deletions

diff --git a/build.gradle b/build.gradle
index 42ae12af58..6335552b1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,7 @@ javadoc.options.encoding = 'UTF-8'
 
 //Jar Info
 archivesBaseName = "GT-PlusPlus"
-version = "1.7.02.69-nightly"
+version = "1.7.02.71"
 minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
 
 minecraft {
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java
new file mode 100644
index 0000000000..f6c8e86808
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java
@@ -0,0 +1,14 @@
+package gtPlusPlus.core.common.compat;
+
+public class COMPAT_Railcraft {
+
+	public static void OreDict(){
+		run();
+	}
+
+	private static final void run(){	
+		
+		
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 517e3f7c1f..396689ef63 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -15,6 +15,7 @@ import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
 
@@ -44,7 +45,16 @@ public class ItemBlockGtBlock extends ItemBlock {
 			this.blockColour = block.getBlockColor();
 		} else {
 			this.blockColour = block.getBlockColor();
+		}	
+
+		if (block instanceof BlockBaseModular){
+			BlockBaseModular g = (BlockBaseModular) block;
+			this.mMaterial = g.getMaterialEx();
+		}
+		else {
+			this.mMaterial = null;
 		}
+		
 		// GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block",
 		// "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block",
 		// "").replace("-", "").replace("_", "").replace(" ", ""),
@@ -59,24 +69,32 @@ public class ItemBlockGtBlock extends ItemBlock {
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
 		if (this.mMaterial != null) {
-			list.add(this.mMaterial.vChemicalFormula);
-			if (this.mMaterial.vRadiationLevel > 0) {
-				list.add(CORE.GT_Tooltip_Radioactive);
-			}
+			list.add(this.mMaterial.vChemicalFormula);			
 		} else {
-			list.add("Material is Null.");
+			
+			try {
+				BlockBaseModular g = (BlockBaseModular) thisBlock;
+				this.mMaterial = g.getMaterialEx();
+			}
+			catch (Throwable t) {
+				
+			}
+			
+			
+			//list.add("Material is Null.");
 		}
 
+		if (this.isOre) {
 		if (KeyboardUtils.isCtrlKeyDown()) {
 			Block b = Block.getBlockFromItem(stack.getItem());
 			if (b != null) {
 
 				String aTool = b.getHarvestTool(stack.getItemDamage());
 				int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
-				list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
 
 				if (this.mMaterial != null) {
-					list.add("Ore contains:    ");
+					list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
+					list.add("Contains:    ");
 					if (mMaterial.getComposites().isEmpty()) {
 						list.add("- " + mMaterial.getLocalizedName());
 					} else {
@@ -89,6 +107,22 @@ public class ItemBlockGtBlock extends ItemBlock {
 		} else {
 			list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info.");
 		}
+		}
+		else {
+			Block b = Block.getBlockFromItem(stack.getItem());
+			if (b != null) {
+				String aTool = b.getHarvestTool(stack.getItemDamage());
+				int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
+				list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
+			}
+		}
+		
+		if (this.mMaterial != null) {
+			if (this.mMaterial.vRadiationLevel > 0) {
+				list.add(CORE.GT_Tooltip_Radioactive);
+			}
+		}
+		
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
index 74dd2f196c..0dd125bf7b 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
@@ -1,18 +1,45 @@
 package gtPlusPlus.core.item.base.itemblock;
 
 import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
+import java.util.List;
 
 import gtPlusPlus.core.block.base.BlockBaseModular;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
 
 public class ItemBlockGtFrameBox extends ItemBlock{
 
 	protected int blockColour;
+	private Material mMaterial;
+	private int sRadiation;
 
 	public ItemBlockGtFrameBox(final Block block) {
 		super(block);
 		final BlockBaseModular baseBlock = (BlockBaseModular) block;
 		this.blockColour = baseBlock.getRenderColor(1);
+		
+
+
+		if (block instanceof BlockBaseModular){
+			BlockBaseModular g = (BlockBaseModular) block;
+			this.mMaterial = g.getMaterialEx();
+			sRadiation = mMaterial.vRadiationLevel;
+		}
+		else {
+			this.mMaterial = null;
+			sRadiation = 0;
+		}
+		
 		//GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), ItemUtils.getSimpleStack(this));
 	}
 
@@ -20,4 +47,48 @@ public class ItemBlockGtFrameBox extends ItemBlock{
 		return this.blockColour;
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		if (this.mMaterial != null) {
+			list.add(this.mMaterial.vChemicalFormula);
+			if (this.mMaterial.vRadiationLevel > 0) {
+				list.add(CORE.GT_Tooltip_Radioactive);
+			}
+		} else {
+			list.add("Material is Null.");
+		}
+		if (KeyboardUtils.isCtrlKeyDown()) {
+			Block b = Block.getBlockFromItem(stack.getItem());
+			if (b != null) {
+				String aTool = b.getHarvestTool(stack.getItemDamage());
+				int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
+				list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
+				if (this.mMaterial != null) {
+					list.add("Contains:    ");
+					if (mMaterial.getComposites().isEmpty()) {
+						list.add("- " + mMaterial.getLocalizedName());
+					} else {
+						for (MaterialStack m : mMaterial.getComposites()) {
+							list.add("- " + m.getStackMaterial().getLocalizedName() + " x" + m.getPartsPerOneHundred());
+						}
+					}
+				}
+			}
+		} else {
+			list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info.");
+		}
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
+			final boolean p_77663_5_) {
+
+			if (this.sRadiation > 0) {
+				EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding);
+			}
+		}
+	
+
 }
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 25103c0f5a..72781e3e7f 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -174,10 +174,7 @@ public class RECIPES_GREGTECH {
 						CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
 						CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
 						CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
-						CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
-						CI.getTertiaryTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
-						CI.getAlternativeTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
-						
+						CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),						
 				},
 				GregtechItemList.Miniature_Fusion.get(1), 
 				20 * 60 * 5 * (GTNH ? 2 : 1),
@@ -205,6 +202,94 @@ public class RECIPES_GREGTECH {
 				20 * 60 * 1 * (GTNH ? 2 : 1),
 				(int) GT_Values.V[5]);
 		
+		
+		/*
+		 * Contianment casings
+		 */
+		
+		ItemStack[] aGemCasings = new ItemStack[] {
+				GregtechItemList.Battery_Casing_Gem_1.get(1), 
+				GregtechItemList.Battery_Casing_Gem_2.get(1), 
+				GregtechItemList.Battery_Casing_Gem_3.get(1), 
+				GregtechItemList.Battery_Casing_Gem_4.get(1), 
+		};
+		ItemStack[] aResearch = new ItemStack[] {
+				Particle.getBaseParticle(Particle.UNKNOWN), 
+				GregtechItemList.Battery_Casing_Gem_1.get(1), 
+				GregtechItemList.Battery_Casing_Gem_2.get(1), 
+				GregtechItemList.Battery_Casing_Gem_3.get(1),
+		};
+		
+		int aCasingSlot = 0;
+		for (int j = 6; j < 10; j++) {
+			CORE.RA.addAssemblylineRecipe(
+					aResearch[aCasingSlot], 
+					20 * 60 * 60,
+					new ItemStack[] {
+							CI.getTieredComponent(OrePrefixes.plate, j-1, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.circuit, j-2, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.cableGt08, j+1, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.gearGt, j-1, GTNH ? 8 : 4),
+					}, 
+					new FluidStack[] {
+							CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)),
+							CI.getTertiaryTieredFluid(j-2, 144 * 4 * (GTNH ? 16 : 8)),
+							CI.getAlternativeTieredFluid(j, 144 * 6 * (GTNH ? 16 : 8)),
+							
+					},
+					aGemCasings[aCasingSlot++], 
+					20 * 60 * 1 * (GTNH ? 2 : 1),
+					(int) GT_Values.V[j]);
+		}
+		
+		/*
+		 * Gem Battery Recipes
+		 */
+		
+		ItemStack[] aGemBatteries = new ItemStack[] {
+				GregtechItemList.Battery_Gem_1.get(1), 
+				GregtechItemList.Battery_Gem_2.get(1), 
+				GregtechItemList.Battery_Gem_3.get(1), 
+				GregtechItemList.Battery_Gem_4.get(1), 
+		};
+		
+		ItemStack[] aExoticInputs = new ItemStack[] {
+				Particle.getBaseParticle(Particle.PROTON), 
+				Particle.getBaseParticle(Particle.ELECTRON), 
+				Particle.getBaseParticle(Particle.CHARM), 
+				Particle.getBaseParticle(Particle.GRAVITON)			
+		};
+		aCasingSlot = 0;
+		for (int j = 6; j < 10; j++) {
+			CORE.RA.addAssemblylineRecipe(
+					aExoticInputs[aCasingSlot], 
+					20 * 60 * 60 * 5,
+					new ItemStack[] {
+							aGemCasings[aCasingSlot],
+							ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.plate, j, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.circuit, j, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.wireGt16, j+1, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4),
+							CI.getTieredComponent(OrePrefixes.screw, j-1, GTNH ? 8 : 4),
+					}, 
+					new FluidStack[] {
+							CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)),
+							CI.getTertiaryTieredFluid(j-2, 144 * 4 * (GTNH ? 16 : 8)),
+							CI.getAlternativeTieredFluid(j, 144 * 6 * (GTNH ? 16 : 8)),	
+							CI.getTertiaryTieredFluid(j-1, 144 * 5 * (GTNH ? 16 : 8)),							
+					},
+					aGemBatteries[aCasingSlot++], 
+					20 * 60 * 1 * (GTNH ? 2 : 1),
+					(int) GT_Values.V[j]);
+		}
+		
+		
+		
+		
+		
+		
+		
 	}
 
 	private static void laserEngraverRecipes() {		
@@ -1482,7 +1567,7 @@ public class RECIPES_GREGTECH {
 		// Quark Smash
 		CORE.RA.addCyclotronRecipe(
 				CI.getNumberedCircuit(3),
-				FluidUtils.getFluidStack("plasma.hydrogen", 1000),
+				FluidUtils.getFluidStack("plasma.hydrogen", 100),
 				new ItemStack[] {
 						Particle.getBaseParticle(Particle.UP),
 						Particle.getBaseParticle(Particle.DOWN),
@@ -1493,7 +1578,7 @@ public class RECIPES_GREGTECH {
 						}, 
 				null,
 				new int[] { 50, 50, 50, 50, 50, 50 },
-				20 * 300 * 38,
+				20 * 300 * 9,
 				(int) GT_Values.V[7],
 				750 * 20);
 
@@ -1510,8 +1595,8 @@ public class RECIPES_GREGTECH {
 						Particle.getBaseParticle(Particle.TAU_NEUTRINO),
 						}, 
 				null,
-				new int[] { 60, 40, 20, 15, 10, 5 },
-				20 * 300 * 38,
+				new int[] { 600, 40, 20, 15, 10, 5 },
+				20 * 300 * 8,
 				(int) GT_Values.V[7],
 				750 * 20);
 
@@ -1527,8 +1612,8 @@ public class RECIPES_GREGTECH {
 						Particle.getBaseParticle(Particle.HIGGS_BOSON),
 						}, 
 				null,
-				new int[] { 60, 60, 50, 50, 1 },
-				20 * 300 * 38,
+				new int[] { 160, 260, 150, 150, 1 },
+				20 * 300 * 6,
 				(int) GT_Values.V[7],
 				750 * 20);
 		
@@ -1549,7 +1634,7 @@ public class RECIPES_GREGTECH {
 						}, 
 				null,
 				new int[] { 10, 20, 20, 10, 10, 5, 5, 2 },
-				17 * 247 * 134,
+				17 * 247 * 32,
 				(int) GT_Values.V[8],
 				750 * 20);
 		
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index a12e8b28fd..44514f77d9 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -304,8 +304,8 @@ public class RECIPES_Machines {
 						ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (GTNH ? 2 : 1)),						
 						ItemList.Cover_Controller.get(1, CI.electricMotor_MV),
 						CI.machineHull_MV,
-						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2),
-						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 2)
+						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2),
+						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2)
 					}, 
 					ELEMENT.getInstance().IRON.getFluid(144 * 4), 
 					ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
@@ -344,7 +344,7 @@ public class RECIPES_Machines {
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
 						CI.machineHull_LV,
-						ItemUtils.getItemStackOfAmountFromOreDict("circuitBaisc", 8),
+						ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4),
 						ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
 						ItemUtils.getSimpleStack(Blocks.jukebox)
 					}, 
@@ -354,6 +354,27 @@ public class RECIPES_Machines {
 					30);
 			
 
+			//Basic Steam Turbine
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1), "circuitPrimitive", CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1),
+					ALLOY.TUMBAGA.getRotor(1), CI.machineCasing_ULV, ALLOY.TUMBAGA.getRotor(1),
+					CI.getElectricMotor(0, 1), "cableGt01RedAlloy", CI.getElectricMotor(0, 1),
+					GregtechItemList.Generator_Steam_Turbine_ULV.get(1));
+
+			//Basic Gas Turbine
+			RecipeUtils.addShapedGregtechRecipe(
+					"circuitPrimitive", ALLOY.TUMBAGA.getRotor(1), "circuitPrimitive",
+					ALLOY.TUMBAGA.getRotor(1), CI.machineCasing_ULV, ALLOY.TUMBAGA.getRotor(1),
+					CI.getElectricMotor(0, 1), "cableGt01RedAlloy", CI.getElectricMotor(0, 1),
+					GregtechItemList.Generator_Gas_Turbine_ULV.get(1));
+			
+			//Basic Combustion Turbine
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.getElectricPiston(0, 1), "circuitPrimitive", CI.getElectricPiston(0, 1),
+					ALLOY.TUMBAGA.getRotor(1), CI.machineCasing_ULV, CI.getElectricMotor(0, 1),
+					ALLOY.TUMBAGA.getGear(1), "cableGt01RedAlloy", ALLOY.TUMBAGA.getGear(1),
+					GregtechItemList.Generator_Diesel_ULV.get(1));
+
 			
 
 			//Steam Condenser
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index c228364149..f377a2da3d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -84,8 +84,13 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//Computer Cube
 	Gregtech_Computer_Cube, 
 
-	//Custom Batteries (Unused)
-	Battery_Gem_1, Battery_Gem_2, Battery_Gem_3, 
+	//Casings for batteries
+	Battery_Casing_Gem_1, Battery_Casing_Gem_2,
+	Battery_Casing_Gem_3, Battery_Casing_Gem_4,
+	
+	//Custom Batteries
+	Battery_Gem_1, Battery_Gem_2, 
+	Battery_Gem_3, Battery_Gem_4,
 	
 	//Compressed Fusion MK3
 	Compressed_Fusion_Reactor,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
index aeae474fb7..30c1bc2b29 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
@@ -9,6 +9,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -19,7 +20,7 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Input {
+public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Output {
 
 	public final AutoMap<Fluid> mFluidsToUse = new AutoMap<Fluid>();
 	public final int mFluidCapacity;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 7f426f8abb..5f255069bf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -169,12 +169,12 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
 		 * Power Gems
 		 */
 
-		GregtechItemList.Battery_Gem_1.set(this.addItem(tLastID = 66, "Fission Power Cell", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 8L), getTcAspectStack(TC_Aspects.METALLUM, 24L), getTcAspectStack(TC_Aspects.POTENTIA, 16L)}));
-		this.setElectricStats(32000 + tLastID, 32000000L, GT_Values.V[5], 5L, -3L, false);
-		GregtechItemList.Battery_Gem_2.set(this.addItem(tLastID = 68, "Fusion Power Cell", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 16L), getTcAspectStack(TC_Aspects.METALLUM, 32L), getTcAspectStack(TC_Aspects.POTENTIA, 32L)}));
-		this.setElectricStats(32000 + tLastID, 750000000L, GT_Values.V[6], 6L, -3L, false);
-		GregtechItemList.Battery_Gem_3.set(this.addItem(tLastID = 70, "Portable Neutron Star", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 32L), getTcAspectStack(TC_Aspects.METALLUM, 48L), getTcAspectStack(TC_Aspects.POTENTIA, 64L)}));
-		this.setElectricStats(32000 + tLastID, 64000000000L, GT_Values.V[7], 7L, -3L, false);
+		GregtechItemList.Battery_Gem_1.set(this.addItem(tLastID = 66, "Proton Cell", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 8L), getTcAspectStack(TC_Aspects.METALLUM, 24L), getTcAspectStack(TC_Aspects.POTENTIA, 16L)}));
+		this.setElectricStats(32000 + tLastID, 32000000L, GT_Values.V[6], 6L, -3L, false);
+		GregtechItemList.Battery_Gem_2.set(this.addItem(tLastID = 68, "Electron Cell", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 16L), getTcAspectStack(TC_Aspects.METALLUM, 32L), getTcAspectStack(TC_Aspects.POTENTIA, 32L)}));
+		this.setElectricStats(32000 + tLastID, 750000000L, GT_Values.V[7], 7L, -3L, false);
+		GregtechItemList.Battery_Gem_3.set(this.addItem(tLastID = 70, "Quark Entanglement", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 32L), getTcAspectStack(TC_Aspects.METALLUM, 48L), getTcAspectStack(TC_Aspects.POTENTIA, 64L)}));
+		this.setElectricStats(32000 + tLastID, 64000000000L, GT_Values.V[8], 8L, -3L, false);
 		//ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_1.get(1), "batteryFutureBasic");
 		//ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_2.get(1), "batteryFutureGood");
 		//ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_3.get(1), "batteryFutureAdvanced");
@@ -294,6 +294,16 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
 		GregtechItemList.Carbyne_Sheet_Finished.set(this.addItem(104, "Carbyne Composite Panel", "Nanotubes which contain LAC, arranged side by side and compressed further", new Object[0]));
 		GregtechItemList.Laser_Lens_Special.set(this.addItem(105, "Quantum Anomaly", "Probably should shoot it with lasers", new Object[0]));
 
+		GregtechItemList.Battery_Casing_Gem_1.set(this.addItem(106, "Containment Unit I", "Used in crafting", new Object[0]));
+		GregtechItemList.Battery_Casing_Gem_2.set(this.addItem(107, "Containment Unit II", "Used in crafting", new Object[0]));
+		GregtechItemList.Battery_Casing_Gem_3.set(this.addItem(108, "Advanced Containment Unit", "Used in crafting", new Object[0]));
+		GregtechItemList.Battery_Casing_Gem_4.set(this.addItem(109, "Exotic Containment Unit", "Used in crafting", new Object[0]));		
+
+		GregtechItemList.Battery_Gem_4.set(this.addItem(tLastID = 110, "Graviton Anomaly", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 64L), getTcAspectStack(TC_Aspects.METALLUM, 64L), getTcAspectStack(TC_Aspects.POTENTIA, 64L)}));
+		this.setElectricStats(32000 + tLastID, (64000000000L*16), GT_Values.V[9], 9L, -3L, false);
+		
+		
+		
 	}
 
 	private boolean registerComponents_ULV(){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index ace4876639..8f3e49d7b7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -750,7 +750,22 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		return CORE.RA.addComponentMakerRecipe(aInputs, aInputFluid, aOutput1, aDuration, aEUt);		
 	}
 
-	public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
+	public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs_OLD, ItemStack aOutput, int aDuration, int aEUt) {
+		
+		FluidStack[] aFluidInputs = new FluidStack[4];		
+		if (aFluidInputs_OLD != null) {
+			int aC = 0;
+			for (FluidStack s : aFluidInputs) {
+				if (aC > 3) {
+					break;
+				}
+				if (s != null) {
+					aFluidInputs[aC++] = s;
+				}
+			}
+		}
+		
+		
 		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
 			if (aInputs.length < 6 && aFluidInputs.length < 2) {
 				ItemStack[] aInputStack = new ItemStack[] {aResearchItem, aInputs[0], aInputs[1], aInputs[2], aInputs[3], aInputs[4]};
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 723f3b6826..92870c6a08 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -2709,7 +2709,7 @@ tile.playerDoorIce.name=Ice Auto-Door
 tile.playerDoorIron.name=Iron Auto-Door
 tile.playerDoorWood.name=Wooden Auto-Door
 
-/Added 4/2/19
+//Added 4/2/19
 
 item.GTPP.BattPack.06.name=Charge Pack [LuV]
 item.GTPP.BattPack.07.name=Charge Pack [ZPM]
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png
new file mode 100644
index 0000000000..b3b257e59c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png
new file mode 100644
index 0000000000..3d47ce434c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png
new file mode 100644
index 0000000000..2b99670ea1
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png
new file mode 100644
index 0000000000..e516903d26
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png
new file mode 100644
index 0000000000..97767a73c6
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png
index 28005f9c52..d96558c8f5 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png
index 4fa1301387..4d8f366b9c 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png
index 322292e225..e914a7c788 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png