% Initial Commit

22 files changed, 752 insertions, 165 deletions

diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index eb8d8f546f..c9d3194aad 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -984,7 +984,8 @@ public class Recipe_GT extends GT_Recipe  implements IComparableRecipe{
 					if (mColumn >= 3) {
 						mColumn = 0;
 						mRow++;
-					}					
+					}		
+					if (mColumn <= 2 && mRow <= 3)
 					outputStacks.add(
 							(PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
 									(Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow]));
@@ -1148,7 +1149,8 @@ public class Recipe_GT extends GT_Recipe  implements IComparableRecipe{
 					if (mColumn >= 3) {
 						mColumn = 0;
 						mRow++;
-					}					
+					}		
+					if (mColumn <= 2 && mRow <= 3)					
 					outputStacks.add(
 							(PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
 									(Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow]));
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 0aadef5e4b..a8c880c660 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -101,7 +101,7 @@ public class GTplusplus implements ActionListener {
 		CORE.USER_COUNTRY = GeoUtils.determineUsersCountry();
 
 		// Handle GT++ Config
-		ConfigHandler.handleConfigFile(event);
+		ConfigHandler.handleConfigFile(event);		
 
 		//Check for Dev
 		CORE.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
@@ -146,8 +146,8 @@ public class GTplusplus implements ActionListener {
 		proxy.postInit(event);
 		BookHandler.runLater();
 		Core_Manager.postInit();
-		RecipeGen_Recycling.executeGenerators();
-
+		RecipeGen_Recycling.executeGenerators();	
+		
 		Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
 		Logger.INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: "
 				+ RegistrationHandler.recipesFailed + " |");
@@ -162,9 +162,9 @@ public class GTplusplus implements ActionListener {
 
 	@EventHandler
 	public void serverStarting(final FMLServerStartingEvent event) {
-
-		if (CORE.DEVENV)
-			event.registerServerCommand(new CommandMath());
+	    
+	    if (CORE.DEVENV)
+		event.registerServerCommand(new CommandMath());
 
 		//Chunk Loading
 		Timer h = ChunkManager.createChunkQueue();
@@ -194,15 +194,15 @@ public class GTplusplus implements ActionListener {
 	public void actionPerformed(final ActionEvent arg0) {
 
 	}
-
-
+	
+	
 	/**
 	 * This {@link EventHandler} is called after the {@link FMLPostInitializationEvent} stages of all loaded mods executes successfully.
 	 * {@link #onLoadComplete(FMLLoadCompleteEvent)} exists to inject recipe generation after Gregtech and all other mods are entirely loaded and initialized.
 	 * @param event - The {@link EventHandler} object passed through from FML to {@link #GTplusplus()}'s {@link #instance}.
 	 */
 	@Mod.EventHandler
-	public void onLoadComplete(FMLLoadCompleteEvent event) {
+    public void onLoadComplete(FMLLoadCompleteEvent event) {		
 		RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList();
 		FishPondFakeRecipe.generateFishPondRecipes();
 
@@ -219,14 +219,14 @@ public class GTplusplus implements ActionListener {
 				CORE.RA.addMultiblockElectrolyzerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mDuration, x.mEUt);
 			}
 		}
-
+		
 		//Advanced Vacuum Freezer generation
 		for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) {
-			if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) {
+			if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) {			
 				CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, (x.mDuration/2), x.mEUt);
 			}
 		}
-
+		
 	}
 
 	protected void dumpGtRecipeMap(final GT_Recipe_Map r) {
@@ -249,11 +249,11 @@ public class GTplusplus implements ActionListener {
 		SegmentAnalytics.isEnabled = CORE.ConfigSwitches.enableUpdateChecker;
 		if (!Utils.isServer() && PlayerUtils.isPlayerAlkalus()){
 			SegmentAnalytics.isEnabled = true;
-		}
+		}		
 		new SegmentHelper();
 	}
 
-	private static final boolean setupMaterialBlacklist(){
+	private static final boolean setupMaterialBlacklist(){		
 		int ID = 0;
 		Material.invalidMaterials.put(ID++, Materials._NULL);
 		Material.invalidMaterials.put(ID++, Materials.Clay);
@@ -262,9 +262,9 @@ public class GTplusplus implements ActionListener {
 		Material.invalidMaterials.put(ID++, Materials.Bronze);
 		Material.invalidMaterials.put(ID++, Materials.Hydrogen);
 		//Infused TC stuff
-		Material.invalidMaterials.put(ID++, Materials.InfusedAir);
-		Material.invalidMaterials.put(ID++, Materials.InfusedEarth);
-		Material.invalidMaterials.put(ID++, Materials.InfusedFire);
+		Material.invalidMaterials.put(ID++, Materials.InfusedAir);	
+		Material.invalidMaterials.put(ID++, Materials.InfusedEarth);	
+		Material.invalidMaterials.put(ID++, Materials.InfusedFire);	
 		Material.invalidMaterials.put(ID++, Materials.InfusedWater);
 
 		//EIO Materials
@@ -290,10 +290,10 @@ public class GTplusplus implements ActionListener {
 		//Non GTNH Materials
 		if (!CORE.GTNH){
 			//Mithril - Random Dungeon Loot
-			mGregMatLoader.enableMaterial(Materials.Mithril);
-		}
+			mGregMatLoader.enableMaterial(Materials.Mithril);			
+		}	
 
 		//Force - Alloying
-		mGregMatLoader.enableMaterial(Materials.Force);
+		mGregMatLoader.enableMaterial(Materials.Force);		
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java
index 6ab0b2cbc6..9c51aa7a9b 100644
--- a/src/Java/gtPlusPlus/core/commands/CommandMath.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java
@@ -56,7 +56,7 @@ public class CommandMath implements ICommand
 		final World W = S.getEntityWorld();
 		final EntityPlayer P = CommandUtils.getPlayer(S);
 		if (!W.isRemote && P != null){
-			if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) {
+			if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) {				
 				String[] prefixes = new String[] {
 						"ingot",
 						"plate",
@@ -83,8 +83,8 @@ public class CommandMath implements ICommand
 						"Silver",
 						"Lead",
 						"Aluminium"
-				};
-				AutoMap<EntityItem> itemEntities = new AutoMap<EntityItem>();
+				};			
+				AutoMap<EntityItem> itemEntities = new AutoMap<EntityItem>();			
 				for (String g : prefixes) {
 					for (String s : loots) {
 						itemEntities.put(new EntityItem(W, P.posX, P.posY, P.posZ, ItemUtils.getItemStackOfAmountFromOreDictNoBroken(g+s, 64)));
@@ -92,7 +92,7 @@ public class CommandMath implements ICommand
 				for (EntityItem e : itemEntities.values()) {
 					e.lifespan = 30000;
 				}
-
+						   
 			}
 		}
 
@@ -195,7 +195,7 @@ public class CommandMath implements ICommand
 	public boolean canCommandSenderUseCommand(final ICommandSender var1){
 		final EntityPlayer P = CommandUtils.getPlayer(var1);
 		if (P == null){
-			return false;
+		    return false;
 		}
 		if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) {
 			return true;
@@ -220,4 +220,5 @@ public class CommandMath implements ICommand
 		return true;
 	}
 
-}
\ No newline at end of file
+}
+
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index d34e1a1856..2c09ba1f03 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -58,7 +58,6 @@ public class COMPAT_HANDLER {
 
 			new RECIPES_LaserEngraver();
 			new RECIPES_Extruder();
-			GregtechGeneratorsULV.run();
 			GregtechEnergyBuffer.run();
 			GregtechLFTR.run();
 			GregtechSteamCondenser.run();
diff --git a/src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java b/src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java
new file mode 100644
index 0000000000..d4d3a07e6f
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java
@@ -0,0 +1,84 @@
+package gtPlusPlus.core.item.general.rfchargingpack;
+
+import java.util.List;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
+import cofh.energy.ItemEnergyContainer;
+import gtPlusPlus.core.util.math.MathUtils;
+
+public class ChargingPackBase extends ItemEnergyContainer {
+
+	protected final int mCapacityMax;
+	protected final byte mTier;
+
+	public ChargingPackBase(byte tier) {
+		this(tier, (tier == 1 ? 4000000 : tier == 2 ? 8000000 : tier == 3 ? 16000000 : tier == 4 ? 32000000 : 64000000));
+	}
+
+	private ChargingPackBase(byte tier, int maxStorage) {
+		super(maxStorage);
+		mTier = tier;
+		mCapacityMax = maxStorage;
+	}
+
+	public int getMaxEnergyInput(ItemStack container)
+	{
+		return this.maxReceive;
+	}
+
+	public int getMaxEnergyExtracted(ItemStack container)
+	{
+		return this.maxExtract;
+	}
+
+	@Override
+	public void onUpdate(ItemStack aStack, World aWorld, Entity aEnt, int p_77663_4_, boolean p_77663_5_) {
+		super.onUpdate(aStack, aWorld, aEnt, p_77663_4_, p_77663_5_);
+
+		ItemEnergyContainer current = this;
+		int currentStored = 0;
+		if (current != null) {
+			currentStored = current.getEnergyStored(aStack);
+		}
+		if (currentStored > 0) {
+			if (aEnt instanceof EntityPlayer) {
+				if (((EntityPlayer) aEnt).inventory != null) {
+					for (ItemStack invStack : ((EntityPlayer) aEnt).inventory.mainInventory) {
+						if (invStack != null) {
+							if (invStack.getItem() instanceof ItemEnergyContainer) {
+								if (current != null) {
+									currentStored = current.getEnergyStored(aStack);
+									if (currentStored > 0) {
+										int mTransLimit;
+										int mMaxStorage;
+										int mCurrent;
+										mTransLimit = getMaxEnergyInput(invStack);
+										mMaxStorage = current.getMaxEnergyStored(invStack);
+										mCurrent = current.getEnergyStored(invStack);										
+										if (mCurrent+mTransLimit <= mMaxStorage) {
+											current.extractEnergy(aStack, current.receiveEnergy(invStack, mTransLimit, false), false);
+										}										
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) {
+		list.add(EnumChatFormatting.RED+"RF Information");
+		list.add(EnumChatFormatting.GRAY+"Extraction Rate: [" +EnumChatFormatting.RED+ this.maxExtract + EnumChatFormatting.GRAY + "Rf/t]" + " Insert Rate: [" +EnumChatFormatting.RED+ this.maxReceive+EnumChatFormatting.GRAY+"Rf/t]");
+		list.add(EnumChatFormatting.GRAY+"Current Charge: ["+EnumChatFormatting.RED+this.getEnergyStored(stack) + EnumChatFormatting.GRAY + "Rf / " + this.getMaxEnergyStored(stack)+"Rf] "+EnumChatFormatting.RED+MathUtils.findPercentage(this.getEnergyStored(stack), this.getMaxEnergyStored(stack))+EnumChatFormatting.GRAY+"%");
+		super.addInformation(stack, p_77624_2_, list, p_77624_4_);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 1b2ef19b53..fe8b638d5b 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -76,7 +76,7 @@ public class Material {
 
 	public Material(String materialName, MaterialState defaultState, short[] rgba, int radiationLevel, MaterialStack[] materialStacks) {
 		this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", radiationLevel, false, materialStacks);
-	}
+	}	
 
 	public Material(String materialName, MaterialState defaultState, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){
 		this(materialName, defaultState, null, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
@@ -104,7 +104,7 @@ public class Material {
 
 	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
 		this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, inputs);
-	}
+	}	
 
 	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean addCells,final MaterialStack... inputs) {
 		this (materialName, defaultState, null, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, addCells, true, inputs);
@@ -113,7 +113,7 @@ public class Material {
 	public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
 		this (materialName, defaultState, null, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, true, inputs);
 	}
-
+	
 	public Material(final String materialName, final MaterialState defaultState, final TextureSet set, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean generateCells, final MaterialStack... inputs){
 		this (materialName, defaultState, null, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, true, inputs);
 	}
@@ -289,33 +289,33 @@ public class Material {
 				this.vChemicalFormula = "??";
 			}
 
-			if (generateFluid){
-				final Materials isValid = Materials.get(this.getLocalizedName());
-				if (FluidUtils.getFluidStack(localizedName, 1) != null){
-					this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid();
+            if (generateFluid){
+			final Materials isValid = Materials.get(this.getLocalizedName());
+			if (FluidUtils.getFluidStack(localizedName, 1) != null){
+				this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid();
+			}
+			else if (isValid == null || isValid == Materials._NULL){
+				this.vMoltenFluid = this.generateFluid();
+			}
+			else {
+				if (isValid.mFluid != null){
+					this.vMoltenFluid = isValid.mFluid;
 				}
-				else if (isValid == null || isValid == Materials._NULL){
-					this.vMoltenFluid = this.generateFluid();
+				else if (isValid.mGas != null){
+					this.vMoltenFluid = isValid.mGas;
 				}
 				else {
-					if (isValid.mFluid != null){
-						this.vMoltenFluid = isValid.mFluid;
-					}
-					else if (isValid.mGas != null){
-						this.vMoltenFluid = isValid.mGas;
-					}
-					else {
-						this.vMoltenFluid = this.generateFluid();
-					}
+					this.vMoltenFluid = this.generateFluid();
 				}
-
-				this.vPlasma = this.generatePlasma();
-			}
-			else {
-				this.vMoltenFluid = null;
-				this.vPlasma = null;
 			}
 
+			this.vPlasma = this.generatePlasma();
+        }
+        else {
+            this.vMoltenFluid = null;
+            this.vPlasma = null;
+        }
+
 			String ratio = "";
 			if (this.vSmallestRatio != null) {
 				for (int hu=0;hu<this.vSmallestRatio.length;hu++){
@@ -344,17 +344,17 @@ public class Material {
 	public final TextureSet getTextureSet() {
 		synchronized(this) {
 			return textureSet;
-		}
+		}		
 	}
 
 	public TextureSet setTextureSet(TextureSet set) {
 		if (set != null) {
-			return set;
+			return set;			
 		}
 		else {
 			// build hash table with count
 			AutoMap<Material> sets = new AutoMap<Material>();
-			if (this.vMaterialInput != null) {
+			if (this.vMaterialInput != null) {				
 				for (MaterialStack r : this.vMaterialInput) {
 					if (r.getStackMaterial().getTextureSet().mSetName.toLowerCase().contains("fluid")) {
 						sets.put(ELEMENT.getInstance().GOLD);
@@ -362,16 +362,16 @@ public class Material {
 					else {
 						sets.put(r.getStackMaterial());
 					}
-				}
-				TextureSet mostUsedTypeTextureSet = (TextureSet) MaterialUtils.getMostCommonTextureSet(new ArrayList<Material>(sets.values()));
+				}				
+				TextureSet mostUsedTypeTextureSet = (TextureSet) MaterialUtils.getMostCommonTextureSet(new ArrayList<Material>(sets.values()));		        
 				if (mostUsedTypeTextureSet != null && mostUsedTypeTextureSet instanceof TextureSet) {
 					Logger.MATERIALS("Set textureset for "+this.localizedName+" to be "+mostUsedTypeTextureSet.mSetName+".");
 					return mostUsedTypeTextureSet;
-				}
+				}		        
 			}
 		}
 		Logger.MATERIALS("Set textureset for "+this.localizedName+" to be "+Materials.Iron.mIconSet.mSetName+". [Fallback]");
-		return Materials.Iron.mIconSet;
+		return Materials.Iron.mIconSet;		
 	}
 
 	public final String getLocalizedName(){
@@ -402,7 +402,7 @@ public class Material {
 	final public short[] getRGBA(){
 		if (this.RGBA != null) {
 			if (this.RGBA.length == 4){
-				return this.RGBA;
+				return this.RGBA;				
 			}
 			else {
 				return new short[]{this.RGBA[0], this.RGBA[1], this.RGBA[2], 0};
@@ -570,17 +570,17 @@ public class Material {
 	}
 	public final ItemStack getCrushedCentrifuged(final int stacksize){
 		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("crushedCentrifuged"+this.unlocalizedName, stacksize);
-	}
+	}	
 	public final ItemStack getDustPurified(final int stacksize){
 		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPure"+this.unlocalizedName, stacksize);
 	}
 	public final ItemStack getDustImpure(final int stacksize){
 		return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustImpure"+this.unlocalizedName, stacksize);
-	}
+	}	
 	public final boolean hasSolidForm() {
 		if (this.getDust(1) != null || this.getBlock(1) != null || this.getSmallDust(1) != null || this.getTinyDust(1) != null) {
 			return true;
-		}
+		}		
 		return false;
 	}
 
@@ -605,7 +605,7 @@ public class Material {
 					Logger.INFO("Failed setting slot "+i+", using "+this.localizedName);
 				}
 			}
-			return temp;
+			return temp;			
 		}
 		return new ItemStack[]{};
 	}
@@ -781,8 +781,8 @@ public class Material {
 					if (a5 != null){
 						Logger.INFO("Using a pre-defined Fluid from GT. Plasma.");
 						return a5.getFluid();
-					}
-					Logger.INFO("Using null.");
+					}			
+					Logger.INFO("Using null.");	
 					return null;
 				}
 			}
@@ -791,37 +791,37 @@ public class Material {
 		if (this.materialState == MaterialState.SOLID){
 			if (isValid.mFluid != null){
 				Logger.INFO("Using a pre-defined Fluid from GT. mFluid.");
-				return isValid.mFluid;
-			}
+				return isValid.mFluid;			
+			}	
 			else if (isValid.mStandardMoltenFluid != null){
 				Logger.INFO("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
-				return isValid.mStandardMoltenFluid;
+				return isValid.mStandardMoltenFluid;		
 			}
 		}
 		else if (this.materialState == MaterialState.GAS){
 			if (isValid.mGas != null){
 				Logger.INFO("Using a pre-defined Fluid from GT. mGas.");
-				return isValid.mGas;
-			}
+				return isValid.mGas;			
+			}	
 		}
 		else if (this.materialState == MaterialState.LIQUID || this.materialState == MaterialState.PURE_LIQUID){
 			if (isValid.mFluid != null){
 				Logger.INFO("Using a pre-defined Fluid from GT. mFluid.");
-				return isValid.mFluid;
-			}
+				return isValid.mFluid;			
+			}	
 			else if (isValid.mGas != null){
 				Logger.INFO("Using a pre-defined Fluid from GT. mGas.");
-				return isValid.mGas;
+				return isValid.mGas;			
 			}
 			else if (isValid.mStandardMoltenFluid != null){
 				Logger.INFO("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
-				return isValid.mStandardMoltenFluid;
+				return isValid.mStandardMoltenFluid;		
 			}
-		}
+		}		
 
 		Logger.INFO("Generating our own fluid.");
 		//Generate a Cell if we need to
-		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){
+		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){			
 			if (this.vGenerateCells){
 				new BaseItemCell(this);
 				Logger.INFO("Generated a cell for "+this.getUnlocalizedName());
@@ -873,7 +873,7 @@ public class Material {
 		if (this.materialState == MaterialState.ORE){
 			return null;
 		}
-		final Materials isValid = Materials.get(this.getLocalizedName());
+		final Materials isValid = Materials.get(this.getLocalizedName());		
 
 		if (!this.vGenerateCells){
 			return null;
@@ -885,8 +885,8 @@ public class Material {
 		}
 		if (isValid.mPlasma != null){
 			Logger.INFO("Using a pre-defined Plasma from GT.");
-			return isValid.mPlasma;
-		}
+			return isValid.mPlasma;			
+		}	
 
 		Logger.INFO("Generating our own Plasma.");
 		return FluidUtils.addGTPlasma(this);
@@ -894,10 +894,10 @@ public class Material {
 
 
 
-	final public FluidStack getFluid(final int fluidAmount) {
+	final public FluidStack getFluid(final int fluidAmount) {		
 		if (this.vMoltenFluid == null){
 			return null;
-		}
+		}		
 		final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount);
 		return moltenFluid;
 	}
@@ -987,4 +987,4 @@ public class Material {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index ba7e3246e6..bc3e67623d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -961,11 +961,41 @@ public class RECIPES_GREGTECH {
 				FluidUtils.getFluidStack("molten.tantalum", 144 * 4),
 				ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8), 32, 120);
 		addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1),
-				ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("nitrogen", 1000),
+				ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("oxygen", 1000),
 				ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240);
-		addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
+				
+		//Tier 2-6
+		ItemStack T1 = GregtechItemList.Casing_Vanadium_Redox.get(1);
+		ItemStack T2 = GregtechItemList.Casing_Vanadium_Redox_IV.get(1);
+		ItemStack T3 = GregtechItemList.Casing_Vanadium_Redox_LuV.get(1);
+		ItemStack T4 = GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1);
+		ItemStack T5 = GregtechItemList.Casing_Vanadium_Redox_UV.get(1);
+		ItemStack T6 = GregtechItemList.Casing_Vanadium_Redox_MAX.get(1);
+		
+		addAR(T1,
+			ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4),
+			FluidUtils.getFluidStack("nitrogen", 2000),
+			T2, 128, 2000);
+		addAR(T2,
+			ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4),
+			FluidUtils.getFluidStack("helium", 2000),
+			T3, 256, 8000);
+		addAR(T3,
+			ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4),
+			FluidUtils.getFluidStack("argon", 4000),
+			T4, 512, 32000);
+		addAR(T4,
+			ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4),
+			FluidUtils.getFluidStack("radon", 4000),
+			T5, 1024, 128000);
+		addAR(T5,
+			ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4),
+			FluidUtils.getFluidStack("krypton", 500),
+			T6, 2048, 512000);
+				
+		/*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
 				ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null,
-				GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);
+				GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/
 	}
 
 	private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final ItemStack outputA,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 34653bf772..55b7793f93 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -141,7 +141,7 @@ public class RECIPES_Machines {
 	public static String pipeTier10 = "pipeHuge"+"HastelloyX";
 	public static String pipeTier11 = "pipeHuge"+"Europium";
 
-	//IV MACHINES
+	// EV/IV MACHINES
 	public static ItemStack EV_MACHINE_Electrolyzer;
 	public static ItemStack EV_MACHINE_Centrifuge;
 	public static ItemStack EV_MACHINE_BendingMachine;
@@ -151,6 +151,10 @@ public class RECIPES_Machines {
 	public static ItemStack EV_MACHINE_Cutter;
 	public static ItemStack EV_MACHINE_MassFabricator;
 	public static ItemStack EV_MACHINE_Extruder;
+	public static ItemStack EV_MACHINE_Sifter;
+	public static ItemStack EV_MACHINE_ThermalCentrifuge;
+	public static ItemStack EV_MACHINE_OreWasher;
+	public static ItemStack EV_MACHINE_AlloySmelter;
 
 
 	//Cables
@@ -215,6 +219,8 @@ public class RECIPES_Machines {
 			boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
 
 			//IV MACHINES
+			
+			if (!CORE.GTNH){			
 			EV_MACHINE_Electrolyzer = ItemList.Machine_EV_Electrolyzer.get(1);
 			EV_MACHINE_BendingMachine= ItemList.Machine_EV_Bender.get(1);
 			EV_MACHINE_Wiremill= ItemList.Machine_EV_Wiremill.get(1);
@@ -224,6 +230,28 @@ public class RECIPES_Machines {
 			EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1);
 			EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1);
 			EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1);
+			EV_MACHINE_Sifter = ItemList.Machine_EV_Sifter.get(1);
+			EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1);
+			EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1);
+			EV_MACHINE_AlloySmelter = ItemList.Machine_EV_AlloySmelter.get(1);  
+			}
+			//Balance or some shit
+			else {			    
+			EV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1);
+			EV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1);
+			EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1);
+			HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1);
+			EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1);
+			EV_MACHINE_MassFabricator= ItemList.Machine_LuV_Massfab.get(1);
+			EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1);
+			EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1);
+			EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1);
+			EV_MACHINE_Sifter = ItemList.Machine_IV_Sifter.get(1);
+			EV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1);
+			EV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1);
+			EV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1);  
+			}
+			
 
 
 		}
@@ -277,7 +305,7 @@ public class RECIPES_Machines {
 			//Buffer Core
 			RecipeUtils.addShapedGregtechRecipe(
 					CI.component_Plate[1], cableTier1, CI.component_Plate[1],
-					CI.circuitPrimitive, IC2MFE, CI.circuitPrimitive,
+					CI.circuitPrimitive, "plateStaballloy", CI.circuitPrimitive,
 					CI.component_Plate[1], cableTier1, CI.component_Plate[1],
 					RECIPE_BufferCore_ULV);
 			RecipeUtils.addShapedGregtechRecipe(
@@ -701,7 +729,7 @@ public class RECIPES_Machines {
 				//Blast Smelter
 				RecipeUtils.addShapedGregtechRecipe(
 						"plateZirconiumCarbide", CI.circuitTier4, "plateZirconiumCarbide",
-						cableTier4, CI.machineCasing_EV, cableTier4,
+						cableTier4, EV_MACHINE_AlloySmelter, cableTier4,
 						"plateZirconiumCarbide", CI.circuitTier3, "plateZirconiumCarbide",
 						RECIPE_IndustrialBlastSmelterController);
 				//Blast Smelter Frame Casing
@@ -753,7 +781,7 @@ public class RECIPES_Machines {
 				//Industrial Sieve
 				RecipeUtils.addShapedGregtechRecipe(
 						"plateEglinSteel", CI.circuitTier2, "plateEglinSteel",
-						cableTier3, CI.machineCasing_MV, cableTier3,
+						cableTier3, EV_MACHINE_Sifter, cableTier3,
 						"plateEglinSteel", CI.circuitTier2, "plateEglinSteel",
 						RECIPE_IndustrialSieveController);
 				//Industrial Sieve Casing
@@ -1061,15 +1089,15 @@ public class RECIPES_Machines {
 
 			if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){
 				RecipeUtils.recipeBuilder(
-						null, "plateIncoloy020", null,
+						"screwTitanium", "plateIncoloy020", "screwTitanium",
 						"plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020",
-						null, "plateIncoloy020", null,
+						"screwTitanium", "plateIncoloy020", "screwTitanium",
 						GregtechItemList.Casing_Power_SubStation.get(Casing_Amount));
 
-				ItemStack mBattery = (!CORE.GTNH ? ItemList.Energy_LapotronicOrb2.get(1) : ItemList.ZPM2.get(1));
+				ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
 
 				RecipeUtils.recipeBuilder(
-						"plateIncoloyMA956", GregtechItemList.Battery_RE_EV_Lithium.get(1), "plateIncoloyMA956",
+						"plateIncoloyMA956", mBattery, "plateIncoloyMA956",
 						GregtechItemList.Casing_Power_SubStation.get(1), GregtechItemList.Casing_Vanadium_Redox.get(1), GregtechItemList.Casing_Power_SubStation.get(1),
 						"plateIncoloy020", "plateInc