V5.08.25

14 files changed, 188 insertions, 39 deletions

diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java
index efd3e9a865..99e9db3d31 100644
--- a/main/java/gregtech/api/enums/Materials.java
+++ b/main/java/gregtech/api/enums/Materials.java
@@ -231,7 +231,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 	CertusQuartz		( 516, TextureSet.SET_QUARTZ			,   5.0F,     32,  1, 1  |4|8      |64                      , 210, 210, 230,   0,	"Certus Quartz"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes.dyeLightGray	, Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_AspectStack(TC_Aspects.VITREUS, 1))),
 	Ceruclase			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2  |8                               , 255, 255, 255,   0,	"Ceruclase"						,    0,       0,         -1,    0, F, F,   1,   1,   1, Dyes._NULL			),
 	Citrine				(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1                                     , 255, 255, 255,   0,	"Citrine"						,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
-	ChargedCertusQuartz	( 517, TextureSet.SET_QUARTZ			,   5.0F,     32,  1, 1  |4|8      |64                      , 210, 210, 230,   0,	"Charged Certus Quartz"			,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes.dyeLightGray	, Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 2), new TC_AspectStack(TC_Aspects.VITREUS, 1))),
+	//ChargedCertusQuartz	( 517, TextureSet.SET_QUARTZ			,   5.0F,     32,  1, 1  |4|8      |64                      , 210, 210, 230,   0,	"Charged Certus Quartz"			,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes.dyeLightGray	, Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 2), new TC_AspectStack(TC_Aspects.VITREUS, 1))),
 	CobaltHexahydrate	( 853, TextureSet.SET_METALLIC			,   1.0F,      0,  2, 1      |16                            ,  80,  80, 250,   0,	"Cobalt Hexahydrate"			,    0,       0,         -1,    0, F, F,   1,   1,   1, Dyes.dyeBlue		),
 	ConstructionFoam	( 854, TextureSet.SET_DULL				,   1.0F,      0,  2, 1      |16                            , 128, 128, 128,   0,	"Construction Foam"				,    0,       0,         -1,    0, F, F,   1,   1,   1, Dyes.dyeGray		),
 	Chert				( 857, TextureSet.SET_DULL				,   1.0F,      0,  2, 1                                     , 255, 255, 255,   0,	"Chert"							,    0,       0,         -1,    0, F, F,   0,   1,   1, Dyes._NULL			),
@@ -830,7 +830,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 		NetherQuartz			.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
 		CertusQuartz			.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
 		Fluix					.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
-		ChargedCertusQuartz		.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.QUARTZ);
+		//ChargedCertusQuartz		.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.QUARTZ);
 		Phosphorus				.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE);
 		Phosphate				.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE);
 		InfusedAir				.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE);
@@ -943,7 +943,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 		CassiteriteSand			.setOreMultiplier( 2).setSmeltingMultiplier( 2);
 		NetherQuartz			.setOreMultiplier( 2).setSmeltingMultiplier( 2);
 		CertusQuartz			.setOreMultiplier( 2).setSmeltingMultiplier( 2);
-		ChargedCertusQuartz		.setOreMultiplier( 2).setSmeltingMultiplier( 2);
+		//ChargedCertusQuartz		.setOreMultiplier( 2).setSmeltingMultiplier( 2);
 		Phosphorus				.setOreMultiplier( 3).setSmeltingMultiplier( 3);
 		Saltpeter				.setOreMultiplier( 4).setSmeltingMultiplier( 4);
 		Apatite					.setOreMultiplier( 4).setSmeltingMultiplier( 4).setByProductMultiplier(2);
@@ -1083,9 +1083,9 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 		Tungstate				.addOreByProducts(Manganese				, Silver				, Lithium				);
 		Bauxite					.addOreByProducts(Grossular				, Titanium				, Gallium				);
 		QuartzSand				.addOreByProducts(CertusQuartz			, Quartzite				, Barite				);
-		Quartzite				.addOreByProducts(CertusQuartz			, Barite				, ChargedCertusQuartz	);
-		CertusQuartz			.addOreByProducts(Quartzite				, ChargedCertusQuartz	, Barite				);
-		ChargedCertusQuartz		.addOreByProducts(CertusQuartz			, Quartzite				, Barite				);
+		Quartzite				.addOreByProducts(CertusQuartz			, Barite				);
+		CertusQuartz			.addOreByProducts(Quartzite				, Barite				);
+		//ChargedCertusQuartz		.addOreByProducts(CertusQuartz			, Quartzite				, Barite				);
 		Redstone				.addOreByProducts(Cinnabar				, RareEarth				, Glowstone				);
 		Monazite				.addOreByProducts(Thorium				, Neodymium				, RareEarth				);
 		Forcicium				.addOreByProducts(Thorium				, Neodymium				, RareEarth				);
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
index 7d8264d94a..63cd01f54d 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
@@ -1,12 +1,16 @@
 package gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
+import ic2.api.item.IElectricItem;
+import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.*;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -133,11 +137,76 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
 	
 	@Override
 	public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		if(GT_ModHandler.isElectricItem(aStack)&&aStack.getUnlocalizedName().startsWith("gt.metaitem.01.")){
+			String name = aStack.getUnlocalizedName();
+			if(name.equals("gt.metaitem.01.32510")||
+					name.equals("gt.metaitem.01.32511")||
+					name.equals("gt.metaitem.01.32520")||
+					name.equals("gt.metaitem.01.32521")||
+					name.equals("gt.metaitem.01.32530")||
+					name.equals("gt.metaitem.01.32531")){
+			return true;}
+		}
 		return false;
 	}
 	
 	@Override
 	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+		if(!GT_Utility.isStackValid(aStack)){
+			return false;
+		}
+		if(GT_ModHandler.isElectricItem(aStack, this.mTier)){
+			return true;
+		}
 		return false;
 	}
+	
+	public long[] getStoredEnergy(){
+	      long tScale = getBaseMetaTileEntity().getEUCapacity();
+	      long tStored = getBaseMetaTileEntity().getStoredEU();
+				if(mInventory!=null){
+				for(ItemStack aStack : mInventory){
+					if (GT_ModHandler.isElectricItem(aStack)) {
+						
+						if(aStack.getItem() instanceof GT_MetaBase_Item){
+							Long[] stats = ((GT_MetaBase_Item)aStack.getItem()).getElectricStats(aStack);
+							if(stats!=null){
+								tScale = tScale + stats[0];
+								tStored = tStored + ((GT_MetaBase_Item)aStack.getItem()).getRealCharge(aStack);
+							}
+						}else if(aStack.getItem() instanceof IElectricItem){
+							tStored =  tStored + (long)ic2.api.item.ElectricItem.manager.getCharge(aStack);
+							tScale = tScale + (long)((IElectricItem)aStack.getItem()).getMaxCharge(aStack);
+						}
+					}
+				}
+			
+				}
+			return new long[] {tStored,tScale};
+	}
+	
+	private long count=0;
+	private long mStored=0;
+	private long mMax=0;
+	
+	@Override
+	public String[] getInfoData() {
+		count++;
+		if(mMax==0||count%20==0){
+			long[] tmp = getStoredEnergy();
+			mStored=tmp[0];
+			mMax=tmp[1];
+		}
+		
+		return new String[] {
+				getMetaName(),
+				"Stored Items:",
+				Long.toString(mStored),
+				Long.toString(mMax)};
+	}
+	
+	@Override
+	public boolean isGivingInformation() {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
index 97b2c2f9f0..b0cba5024c 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
@@ -467,7 +467,13 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
 	
 	@Override
 	public String[] getInfoData() {
-		return new String[] {"Progress:", (mProgresstime/20)+" secs", (mMaxProgresstime/20)+" secs"};
+		return new String[] {
+				mNEIName,
+				"Progress:", (mProgresstime/20)+" secs", 
+							(mMaxProgresstime/20)+" secs",
+				"Stored Energy:",
+				getBaseMetaTileEntity().getStoredEU()+"EU",
+				getBaseMetaTileEntity().getEUCapacity()+"EU"};
 	}
 	
 	@Override
diff --git a/main/java/gregtech/common/GT_Client.java b/main/java/gregtech/common/GT_Client.java
index 7607e315ac..f893690f10 100644
--- a/main/java/gregtech/common/GT_Client.java
+++ b/main/java/gregtech/common/GT_Client.java
@@ -90,15 +90,15 @@ public class GT_Client extends GT_Proxy
         isFirstClientPlayerTick = true;
         mMessage = "";
         mPosR = Arrays.asList(new Materials[] {
-            Materials.ChargedCertusQuartz, Materials.Enderium, Materials.Vinteum, Materials.Uranium235, Materials.InfusedGold, Materials.Plutonium241, Materials.NaquadahEnriched, Materials.Naquadria, Materials.InfusedOrder, Materials.Force, 
+            /**Materials.ChargedCertusQuartz, **/Materials.Enderium, Materials.Vinteum, Materials.Uranium235, Materials.InfusedGold, Materials.Plutonium241, Materials.NaquadahEnriched, Materials.Naquadria, Materials.InfusedOrder, Materials.Force, 
             Materials.Pyrotheum, Materials.Sunnarium, Materials.Glowstone, Materials.Thaumium, Materials.InfusedVis, Materials.InfusedAir, Materials.InfusedFire, Materials.FierySteel, Materials.Firestone
         });
         mPosG = Arrays.asList(new Materials[] {
-            Materials.ChargedCertusQuartz, Materials.Enderium, Materials.Vinteum, Materials.Uranium235, Materials.InfusedGold, Materials.Plutonium241, Materials.NaquadahEnriched, Materials.Naquadria, Materials.InfusedOrder, Materials.Force, 
+            /**Materials.ChargedCertusQuartz, **/Materials.Enderium, Materials.Vinteum, Materials.Uranium235, Materials.InfusedGold, Materials.Plutonium241, Materials.NaquadahEnriched, Materials.Naquadria, Materials.InfusedOrder, Materials.Force, 
             Materials.Pyrotheum, Materials.Sunnarium, Materials.Glowstone, Materials.InfusedAir, Materials.InfusedEarth
         });
         mPosB = Arrays.asList(new Materials[] {
-            Materials.ChargedCertusQuartz, Materials.Enderium, Materials.Vinteum, Materials.Uranium235, Materials.InfusedGold, Materials.Plutonium241, Materials.NaquadahEnriched, Materials.Naquadria, Materials.InfusedOrder, Materials.InfusedVis, 
+            /**Materials.ChargedCertusQuartz, **/Materials.Enderium, Materials.Vinteum, Materials.Uranium235, Materials.InfusedGold, Materials.Plutonium241, Materials.NaquadahEnriched, Materials.Naquadria, Materials.InfusedOrder, Materials.InfusedVis, 
             Materials.InfusedWater, Materials.Thaumium
         });
         mNegR = Arrays.asList(new Materials[] {
diff --git a/main/java/gregtech/common/GT_Proxy.java b/main/java/gregtech/common/GT_Proxy.java
index 9260b2ce62..97edf9f6db 100644
--- a/main/java/gregtech/common/GT_Proxy.java
+++ b/main/java/gregtech/common/GT_Proxy.java
@@ -1825,9 +1825,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
 				}else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("appliedenergistics2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.CertusQuartz){
 					GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
 					GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
-				}else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("appliedenergistics2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.ChargedCertusQuartz){
-					GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-					GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
 				}else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("appliedenergistics2")&&tOre.mPrefix==OrePrefixes.dust&&tOre.mMaterial==Materials.CertusQuartz){
 					GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
 					GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
diff --git a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
index 35243db699..6f6d887c90 100644
--- a/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
+++ b/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
@@ -138,7 +138,7 @@ public class GT_MetaTileEntity_Boiler_Lava
       }

       if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && (aTick % 8L == 0L))

       {

-        this.mProcessingEnergy -= 2;

+        this.mProcessingEnergy -= 3;

         this.mTemperature += 1;

       }

       aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
index 5c16af3e37..89b8c29e69 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java
@@ -75,14 +75,14 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBloc
 	  {
 		if(GT_ModHandler.isLava(mInputHotFluidHatch.getFluid())){
 			int fluidAmount = mInputHotFluidHatch.getFluidAmount();
-			if(fluidAmount >= 1000){superheated=true;}else{superheated=false;}
-			if(fluidAmount>2000){fluidAmount=2000;}
+			if(fluidAmount >= 500){superheated=true;}else{superheated=false;}
+			if(fluidAmount>1000){fluidAmount=1000;}
 			mInputHotFluidHatch.drain(fluidAmount, true);
 			mOutputColdFluidHatch.fill(FluidRegistry.getFluidStack("ic2pahoehoelava", fluidAmount), true);
 			
 			
 			           this.mMaxProgresstime = 20;
-			           this.mEUt = fluidAmount*2;
+			           this.mEUt = fluidAmount*4;
 			           this.mEfficiencyIncrease = 80;
 		return true;	
 		}
@@ -102,15 +102,22 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBloc
 		}
 		return false;}
 	  
+	   private float water;
+	   private int useWater(float input){
+		   water = water + input;
+		   int usage = (int)water;
+		   water = water - (int)usage;
+		   return  usage;
+	   }
+	  
 	  public boolean onRunningTick(ItemStack aStack)
 	  {
 	    if (this.mEUt > 0)
-	    {System.out.println("EU: "+mEUt+" Eff: "+mEfficiency);
+	    {
 	      int tGeneratedEU = (int)(this.mEUt * 2L * this.mEfficiency / 10000L);
 	      if (tGeneratedEU > 0) {
-	        if (depleteInput(GT_ModHandler.getDistilledWater(((superheated ? tGeneratedEU/2 :tGeneratedEU) + 160) / 160))) {
-							if(superheated){
-								addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", tGeneratedEU/2));
+	        if (depleteInput(GT_ModHandler.getDistilledWater(useWater(((float)(superheated ? tGeneratedEU/2 :tGeneratedEU) + 160f) / 160f)))) {
+							if(superheated){addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", tGeneratedEU/2));
 							}else{
 	          addOutput(GT_ModHandler.getSteam(tGeneratedEU));}
 	        } else {
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index 0f20246eed..e43070333a 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -37,6 +37,15 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 	    		 "Needs a Turbine Item (inside controller GUI)" };
 	   }
 	   
+	   private float water;
+	   private int useWater(float input){
+		   water = water + input;
+		   int usage = (int)water;
+		   water = water - (int)usage;
+		   return  usage;
+	   }
+	   
+	   
 		@Override
 		public boolean checkRecipe(ItemStack aStack) {
 			ArrayList<FluidStack> steams = getStoredFluids();
@@ -47,11 +56,11 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 		    		optFlow = (int) Math.max(Float.MIN_NORMAL, ((GT_MetaGenerated_Tool)aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() * ((GT_MetaGenerated_Tool)aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed*50);
 		    	}
 		    int tEU=0;
-		    int distOut=0;
+		    float distOut=0;
 		    for(int i=0;i<steams.size();i++){
 		    	if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.steam")||steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("ic2.fluidSteam")){
-		    		int out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
-		    		depleteInput(new FluidStack(steams.get(i),out));
+		    		float out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
+		    		depleteInput(new FluidStack(steams.get(i),(int)out));
 		    		distOut += out/160;
 		    		tEU += steams.get(i).amount/2;
 		    	}
@@ -64,7 +73,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 //		      System.out.println("Eff: "+baseEff+" optFlow: "+optFlow+" tEff: "+tEff+" eut: "+mEUt+" out: "+distOut);
 		      this.mEfficiencyIncrease = (this.mMaxProgresstime * 10);
 		      if(mEUt==0){return false;}
-		      addOutput(GT_ModHandler.getDistilledWater(distOut));
+		      addOutput(GT_ModHandler.getDistilledWater(useWater(distOut)));
 		      return true;
 		    }
 		    if(this.mEfficiency>50){
diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
index 2647cf6eef..6a28464ec7 100644
--- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
+++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
@@ -11,7 +11,9 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Bronze;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_ModHandler;

+import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Utility;

+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 

 import java.util.Map;

 import java.util.Random;

@@ -56,13 +58,17 @@ public class GT_MetaTileEntity_Macerator_Bronze
   

   public int checkRecipe()

   {

-    if (null != (this.mOutputItems[0] = GT_ModHandler.getMaceratorOutput(getInputAt(0), true, getOutputAt(0))))

-    {

+  	GT_Recipe_Map tMap = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;

+  	if (tMap == null) return DID_NOT_FIND_RECIPE;

+  	GT_Recipe tRecipe = tMap.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[1], null, null, getAllInputs());

+  	if (tRecipe == null) return DID_NOT_FIND_RECIPE;

+  	if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;

+      if (!canOutput(tRecipe)) {mOutputBlocked++; return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;}

+      if(tRecipe.getOutput(0)!=null) mOutputItems[0] = tRecipe.getOutput(0);

       this.mEUt = 2;

       this.mMaxProgresstime = 800;

-      return 2;

-    }

-    return 0;

+      getInputAt(0).stackSize-=tRecipe.mInputs[0].stackSize;

+      return FOUND_AND_SUCCESSFULLY_USED_RECIPE;

   }

   

   public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)

diff --git a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
index 3fde9702d5..4f8104ccc7 100644
--- a/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
+++ b/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
@@ -1,5 +1,6 @@
 package gregtech.common.tileentities.machines.steam;

 

+import static gregtech.api.enums.GT_Values.V;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Textures;

 import gregtech.api.enums.Textures.BlockIcons;

@@ -10,7 +11,9 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Steel;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_ModHandler;

+import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Utility;

+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 

 import java.util.Map;

 import java.util.Random;

@@ -54,13 +57,17 @@ public class GT_MetaTileEntity_Macerator_Steel
   

   public int checkRecipe()

   {

-    if (null != (this.mOutputItems[0] = GT_ModHandler.getMaceratorOutput(getInputAt(0), true, getOutputAt(0))))

-    {

-      this.mEUt = 6;

-      this.mMaxProgresstime = 400;

-      return 2;

-    }

-    return 0;

+	  	GT_Recipe_Map tMap = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;

+	  	if (tMap == null) return DID_NOT_FIND_RECIPE;

+	  	GT_Recipe tRecipe = tMap.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[1], null, null, getAllInputs());

+	  	if (tRecipe == null) return DID_NOT_FIND_RECIPE;

+	  	if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe;

+	      if (!canOutput(tRecipe)) {mOutputBlocked++; return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;}

+	      if(tRecipe.getOutput(0)!=null) mOutputItems[0] = tRecipe.getOutput(0);

+	      this.mEUt = 6;

+	      this.mMaxProgresstime = 400;

+	      getInputAt(0).stackSize-=tRecipe.mInputs[0].stackSize;

+	      return FOUND_AND_SUCCESSFULLY_USED_RECIPE;

   }

   

   public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)

diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
index dca6a92998..be75334a3e 100644
--- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
+++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
@@ -184,6 +184,30 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach
 	public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
 		return true;
 	}
+	
+	@Override
+	public String[] getInfoData() {
+		
+		if(mItemStack==null){
+			return new String[]{
+					"Quantum Chest",
+					"Stored Items:",
+					"No Items",
+					Integer.toString(0),
+					Integer.toString(getMaxItemCount())};
+		}
+		return new String[] {
+				"Quantum Chest",
+				"Stored Items:",
+				mItemStack.getDisplayName(),
+				Integer.toString(mItemCount),
+				Integer.toString(getMaxItemCount())};
+	}
+	
+	@Override
+	public boolean isGivingInformation() {
+		return true;
+	}
 
 	@Override
 	public void saveNBTData(NBTTagCompound aNBT) {
diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
index 1fb314d5c9..c7e855eb66 100644
--- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
+++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
@@ -86,6 +86,30 @@ public class GT_MetaTileEntity_QuantumTank
 	public boolean displaysStackSize() {
 		return false;
 	}
+	
+	@Override
+	public String[] getInfoData() {
+		
+		if(mFluid==null){
+			return new String[]{
+					"Quantum Tank",
+					"Stored Fluid:",
+					"No Fluid",
+					Integer.toString(0)+"L",
+					Integer.toString(getCapacity())+"L"};
+		}
+		return new String[] {
+				"Quantum Tank",
+				"Stored Fluid:",
+				mFluid.getLocalizedName(),
+				Integer.toString(mFluid.amount)+"L",
+				Integer.toString(getCapacity())+"L"};
+	}
+	
+	@Override
+	public boolean isGivingInformation() {
+		return true;
+	}
 
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index ac38b8e17c..fe6d745047 100644
--- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -1096,7 +1096,7 @@ public class GT_MachineRecipeLoader
     GT_Values.RA.addCentrifugeRecipe(GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 45), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.BasalticMineralSand, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Olivine, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Obsidian, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Flint, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.RareEarth, 1L), new int[] { 2000, 2000, 2000, 2000, 2000, 2000 }, 64, 20);
     
     GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Blocks.cobblestone), GT_ModHandler.getMaceratorRecipeList(), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L));
-    GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Blocks.stone), GT_ModHandler.getMaceratorRecipeList(),new ItemStack(Blocks.cobblestone));
+    GT_Utility.removeSimpleIC2MachineRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lapis, 1L), GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L, new Object[0]));
     
     if (GregTech_API.sThaumcraftCompat != null)
     {
diff --git a/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index 8888e81934..c51dcdf97c 100644
--- a/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -439,7 +439,7 @@ public class GT_Loader_Item_Block_And_Fluid
       }

     }

     GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.cobblestone, 1, 32767), new ItemStack(Blocks.sand, 1), null, 0, false);

-    GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.stone, 1, 32767), new ItemStack(Blocks.cobblestone, 1), null, 0, false);

+    //GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.stone, 1, 32767), new ItemStack(Blocks.cobblestone, 1), null, 0, false);

     GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.gravel, 1, 32767), new ItemStack(Items.flint, 1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Flint, 1L), 10, false);

     GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.furnace, 1, 32767), new ItemStack(Blocks.sand, 6), null, 0, false);

     GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.lit_furnace, 1, 32767), new ItemStack(Blocks.sand, 6), null, 0, false);