Version 5.08.22-23

19 files changed, 74 insertions, 60 deletions

diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java
index e45ce625d3..efd3e9a865 100644
--- a/main/java/gregtech/api/enums/Materials.java
+++ b/main/java/gregtech/api/enums/Materials.java
@@ -730,7 +730,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 		Water					.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.NO_RECYCLING);
 		Sulfur					.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE);
 		Saltpeter				.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE);
-		Graphite				.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE);
+		Graphite				.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.NO_SMELTING);
 		
 		Wheat					.add(SubTag.FLAMMABLE, SubTag.MORTAR_GRINDABLE);
 		Paper					.add(SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING, SubTag.MORTAR_GRINDABLE, SubTag.PAPER);
diff --git a/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index b574d90f63..292e2d4628 100644
--- a/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -339,6 +339,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
 				if (tStats == null || GT_Utility.setStack(aStack, tStats.getBrokenItem(aStack)) == null) {
 					if (tStats != null) GT_Utility.doSoundAtClient(tStats.getBreakingSound(), 1, 1.0F);
 					if (aStack.stackSize > 0) aStack.stackSize--;
+					
 				}
 			}
 			return true;
diff --git a/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
index e556f4b53c..2d9d8e0c4f 100644
--- a/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
+++ b/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
@@ -21,10 +21,11 @@ import net.minecraft.world.World;
  public class GT_RadioactiveCellIC_Item  extends GT_RadioactiveCell_Item  implements IReactorComponent
   {
     public final int numberOfCells;
-    public final double sEnergy;
+    public final float sEnergy;
     public final int sRadiation;
+    public final float sHeat;
     
-    public GT_RadioactiveCellIC_Item( String aUnlocalized, String aEnglish, int aCellcount, int maxDamage, double aEnergy, int aRadiation)
+    public GT_RadioactiveCellIC_Item( String aUnlocalized, String aEnglish, int aCellcount, int maxDamage, float aEnergy, int aRadiation, float aHeat)
   {
     super(aUnlocalized, aEnglish, aCellcount);
      setMaxStackSize(64);
@@ -32,6 +33,7 @@ import net.minecraft.world.World;
       this.numberOfCells = aCellcount;
       this.sEnergy = aEnergy;
       this.sRadiation = aRadiation;
+      this.sHeat = aHeat;
     
   }
     
@@ -76,7 +78,7 @@ import net.minecraft.world.World;
           checkHeatAcceptor(reactor, x + 1, y, heatAcceptors);
           checkHeatAcceptor(reactor, x, y - 1, heatAcceptors);
           checkHeatAcceptor(reactor, x, y + 1, heatAcceptors);
-          heat = (int) (heat * sEnergy);
+          heat = Math.round(heat * sHeat);
           while ((heatAcceptors.size() > 0) && (heat > 0))
           {
         	  
diff --git a/main/java/gregtech/api/metatileentity/BaseTileEntity.java b/main/java/gregtech/api/metatileentity/BaseTileEntity.java
index 49e7f4eca6..d8a798d19e 100644
--- a/main/java/gregtech/api/metatileentity/BaseTileEntity.java
+++ b/main/java/gregtech/api/metatileentity/BaseTileEntity.java
@@ -127,7 +127,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     @Override
     public final boolean getOpacity(int aX, int aY, int aZ) {
     	if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return false;
-    	return GT_Utility.isBlockOpaque(worldObj, aX, aY, aZ,true,true);
+    	return GT_Utility.isOpaqueBlock(worldObj, aX, aY, aZ);
     }
     
     @Override
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 58336d2116..1ff909d3e1 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -337,9 +337,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 			if (mInventory[1] != null && getBaseMetaTileEntity().getRandomNumber(2) == 0 &&!mInventory[1].getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.")) {
 				if(mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01){
 					((GT_MetaGenerated_Tool)mInventory[1].getItem()).doDamage(mInventory[1], (long) Math.min(mEUt/5, Math.pow(mEUt, 0.7)));
-					if(mInventory[1]!=null&&mInventory[1].getItem().getDamage(mInventory[1])>mInventory[1].getMaxDamage()){
-						mInventory[1]=null;
-					}
+					if(mInventory[1].stackSize==0)mInventory[1]=null;
 				}
 			}
 		}
diff --git a/main/java/gregtech/api/util/GT_Utility.java b/main/java/gregtech/api/util/GT_Utility.java
index 3285661d8f..fea00321ab 100644
--- a/main/java/gregtech/api/util/GT_Utility.java
+++ b/main/java/gregtech/api/util/GT_Utility.java
@@ -1149,13 +1149,8 @@ public class GT_Utility {
 		return aStack;
 	}
 	
-	public static boolean isBlockOccluded(World aWorld, int aX, int aY, int aZ, boolean aIgnoreUnloadedChunks, boolean aDefault) {
-		return isBlockOpaque(aWorld, aX+1, aY, aZ, aIgnoreUnloadedChunks, aDefault) && isBlockOpaque(aWorld, aX-1, aY, aZ, aIgnoreUnloadedChunks, aDefault) && isBlockOpaque(aWorld, aX, aY+1, aZ, T, aDefault) && isBlockOpaque(aWorld, aX, aY-1, aZ, T, aDefault) && isBlockOpaque(aWorld, aX, aY, aZ+1, aIgnoreUnloadedChunks, aDefault) && isBlockOpaque(aWorld, aX, aY, aZ-1, aIgnoreUnloadedChunks, aDefault);
-	}
-	
-	public static boolean isBlockOpaque(World aWorld, int aX, int aY, int aZ, boolean aIgnoreUnloadedChunks, boolean aDefault) {
-		if (aIgnoreUnloadedChunks || aWorld.blockExists(aX, aY, aZ)) return aWorld.getBlock(aX, aY, aZ).isOpaqueCube();
-		return aDefault;
+	public static boolean isOpaqueBlock(World aWorld, int aX, int aY, int aZ) {
+		return aWorld.getBlock(aX, aY, aZ).isOpaqueCube();
 	}
 	
 	public static boolean isBlockAir(World aWorld, int aX, int aY, int aZ) {
@@ -1448,20 +1443,6 @@ public class GT_Utility {
 		return isStackInList(new GT_ItemStack(aStack), aList);
 	}
 	
-//	public static boolean isStackInList2(ItemStack aStack, Collection<GT_ItemStack> aList) {
-//		if (aStack == null) {return F;}
-//		GT_ItemStack bStack = new GT_ItemStack(aStack);
-//		for(Iterator it = aList.iterator();it.hasNext();){
-//	    	GT_ItemStack stack = (GT_ItemStack) it.next();
-//	    	if(stack.mItem==bStack.mItem){
-//	    		if(stack.mMetaData==bStack.mMetaData){
-//	    			return true;
-//	    		}
-//	    	}
-//		}
-//		return false;
-//	}
-	
 	public static boolean isStackInList(GT_ItemStack aStack, Collection<GT_ItemStack> aList) {
 		return aStack != null && (aList.contains(aStack) || aList.contains(new GT_ItemStack(aStack.mItem, aStack.mStackSize, W)));
 	}
diff --git a/main/java/gregtech/common/GT_RecipeAdder.java b/main/java/gregtech/common/GT_RecipeAdder.java
index 22d66a5826..64b1625b89 100644
--- a/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/main/java/gregtech/common/GT_RecipeAdder.java
@@ -10,7 +10,10 @@ import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+
 import java.util.ArrayList;
+
+import crazypants.enderio.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
@@ -123,7 +126,7 @@ public class GT_RecipeAdder
   
   public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt)
   {
-    if ((aInput1 == null) || (aOutput1 == null)) {
+    if ((aInput1 == null) || (aOutput1 == null || Materials.Graphite.contains(aInput1))) {
       return false;
     }
     if ((aInput2 == null) && ((OrePrefixes.ingot.contains(aInput1)) || (OrePrefixes.dust.contains(aInput1)) || (OrePrefixes.gem.contains(aInput1)))) {
diff --git a/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
index 07976c8ee2..6edce96441 100644
--- a/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
@@ -60,7 +60,7 @@ public class GT_TileEntity_Ores
   public Packet getDescriptionPacket()

   {

     if (!this.worldObj.isRemote) {

-      if (GT_Utility.isBlockOccluded(worldObj, xCoord, yCoord, zCoord, false, true)) {

+    	if ((this.mBlocked == (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord + 1, this.yCoord, this.zCoord)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord - 1, this.yCoord, this.zCoord)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord, this.yCoord - 1, this.zCoord)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord, this.yCoord, this.zCoord + 1)) && (GT_Utility.isOpaqueBlock(this.worldObj, this.xCoord, this.yCoord, this.zCoord - 1)) ? 1 : 0) == 0) {

         GT_Values.NW.sendPacketToAllPlayersInRange(this.worldObj, new GT_Packet_Ores(this.xCoord, (short)this.yCoord, this.zCoord, this.mMetaData), this.xCoord, this.zCoord);

       }

     }

diff --git a/main/java/gregtech/common/items/GT_DepletetCell_Item.java b/main/java/gregtech/common/items/GT_DepletetCell_Item.java
index dbc049f1c0..84c38db6b7 100644
--- a/main/java/gregtech/common/items/GT_DepletetCell_Item.java
+++ b/main/java/gregtech/common/items/GT_DepletetCell_Item.java
@@ -7,7 +7,7 @@ import gregtech.api.items.GT_RadioactiveCellIC_Item;
 public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item{
 
 	public GT_DepletetCell_Item(String aUnlocalized, String aEnglish, int aRadiation) {
-		super(aUnlocalized, aEnglish, 1, 1, 0, aRadiation);}
+		super(aUnlocalized, aEnglish, 1, 1, 0, aRadiation,0);}
 	
 	  public void processChamber(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, boolean paramBoolean){}
 	  
diff --git a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
index cbc8d1ee52..7b084c1223 100644
--- a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
+++ b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
@@ -1,5 +1,7 @@
 package gregtech.common.tileentities.generators;

 

+import gregtech.api.GregTech_API;

+import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.Textures;

 import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

@@ -13,6 +15,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 public class GT_MetaTileEntity_FluidNaquadahReactor

   extends GT_MetaTileEntity_BasicGenerator

 {

+	public int mEfficiency;

   public boolean isOutputFacing(byte aSide)

   {

     return (aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing()) && (aSide != getBaseMetaTileEntity().getBackFacing());

@@ -20,12 +23,12 @@ public class GT_MetaTileEntity_FluidNaquadahReactor
   

   public GT_MetaTileEntity_FluidNaquadahReactor(int aID, String aName, String aNameRegional, int aTier)

   {

-    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Cells", new ITexture[0]);

+    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Cells", new ITexture[0]);onConfigLoad();

   }

   

   public GT_MetaTileEntity_FluidNaquadahReactor(String aName, int aTier, String aDescription, ITexture[][][] aTextures)

   {

-    super(aName, aTier, aDescription, aTextures);

+    super(aName, aTier, aDescription, aTextures);onConfigLoad();

   }

   

   public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

@@ -45,9 +48,14 @@ public class GT_MetaTileEntity_FluidNaquadahReactor
   

   public int getEfficiency()

   {

-    return 100;

+    return mEfficiency;

   }

   

+  public void onConfigLoad()

+  {

+				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "FluidNaquadah.efficiency.tier."+this.mTier, 100);

+}

+  

   public ITexture[] getFront(byte aColor)

   {

     return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_FRONT) };

diff --git a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
index 4e85dbfe92..945d0ad084 100644
--- a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
+++ b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
@@ -1,5 +1,7 @@
 package gregtech.common.tileentities.generators;

 

+import gregtech.api.GregTech_API;

+import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.Textures;

 import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

@@ -13,6 +15,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 public class GT_MetaTileEntity_SolidNaquadahReactor

   extends GT_MetaTileEntity_BasicGenerator

 {

+	public int mEfficiency;

   public boolean isOutputFacing(byte aSide)

   {

     return (aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing()) && (aSide != getBaseMetaTileEntity().getBackFacing());

@@ -20,12 +23,12 @@ public class GT_MetaTileEntity_SolidNaquadahReactor
   

   public GT_MetaTileEntity_SolidNaquadahReactor(int aID, String aName, String aNameRegional, int aTier)

   {

-    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Bolts", new ITexture[0]);

+    super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Bolts", new ITexture[0]);onConfigLoad();

   }

   

   public GT_MetaTileEntity_SolidNaquadahReactor(String aName, int aTier, String aDescription, ITexture[][][] aTextures)

   {

-    super(aName, aTier, aDescription, aTextures);

+    super(aName, aTier, aDescription, aTextures);onConfigLoad();

   }

   

   public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

@@ -45,9 +48,14 @@ public class GT_MetaTileEntity_SolidNaquadahReactor
   

   public int getEfficiency()

   {

-    return 80;

+    return mEfficiency;

   }

   

+  public void onConfigLoad()

+  {

+				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SolidNaquadah.efficiency.tier."+this.mTier, 80);

+}

+  

   public ITexture[] getFront(byte aColor)

   {

     return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) };

diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
index 9e4d31e33b..48bd34bf0c 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
 		    int tEU=0;
 		    int distOut=0;
 		    for(int i=0;i<steams.size();i++){
-		    	if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.ic2superheatedsteam")){
+		    	if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("ic2.fluidSuperheatedSteam")){
 		    		int out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
 		    		depleteInput(new FluidStack(steams.get(i),out));
 		    		distOut += out;
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 dc88d453d0..0f20246eed 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
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
 		    int tEU=0;
 		    int 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("fluid.ic2steam")){
+		    	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));
 		    		distOut += out/160;
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 6bc1f36794..fa9ee5e949 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -38,7 +38,16 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
 				  
 				  public String[] getDescription()
 				  {
-				    return new String[] { "Controller Block for the Processing Array", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Robust Tungstensteel Casings for the rest (16 at least!)","Put up to 16 Basic Machines into the GUI Inventory","Currently only fluid Centrifuge Recipes work correctly","Make Deuterium/Tritium with it." };
+				    return new String[] { "Controller Block for the Processing Array", 
+				    					  "Size: 3x3x3 (Hollow)", 
+				    					  "Controller (front centered)", 
+				    					  "1x Input (anywhere)", 
+				    					  "1x Output (anywhere)", 
+				    					  "1x Energy Hatch (anywhere)", 
+				    					  "1x Maintenance Hatch (anywhere)", 
+				    					  "Robust Tungstensteel Casings for the rest (16 at least!)",
+				    					  "Place up to 16 Single Block GT Machines into the GUI Inventory",
+				    					  "They will work the same way as placed directly in world"};
 				  }
 				  
 				  public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/main/java/gregtech/common/tools/GT_Tool_Turbine.java
index bf79012661..89df4bfc85 100644
--- a/main/java/gregtech/common/tools/GT_Tool_Turbine.java
+++ b/main/java/gregtech/common/tools/GT_Tool_Turbine.java
@@ -22,4 +22,5 @@ public abstract class GT_Tool_Turbine extends GT_Tool{
 	 }  
 	   public abstract float getSpeedMultiplier();
 	   public abstract float getMaxDurabilityMultiplier();
+	   public ItemStack getBrokenItem(ItemStack aStack){return null;}
 }
diff --git a/main/java/gregtech/loaders/misc/GT_Achievements.java b/main/java/gregtech/loaders/misc/GT_Achievements.java
index b3aab2914a..43ac6c9736 100644
--- a/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -224,13 +224,14 @@ public int adjY = 9;
 		if(entityplayer==null||!GT_Mod.gregtechproxy.mAchievements){
 			return;
 		}
-		if (this.achievementList.containsKey(textId)) {
-			if(this.issuedAchievements.containsKey((entityplayer.getDisplayName()+textId))){
-			return;	
-			}else{
-			this.issuedAchievements.put((entityplayer.getDisplayName()+textId), true);	
-			entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId));}
-		}
+//		if (this.achievementList.containsKey(textId)) {
+//			if(this.issuedAchievements.containsKey((entityplayer.getDisplayName()+textId))){
+//			return;	
+//			}else{
+//			this.issuedAchievements.put((entityplayer.getDisplayName()+textId), true);	
+			entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId));
+//			}
+//		}
 	}
 
 	public Achievement getAchievement(String textId) {
@@ -268,7 +269,6 @@ public int adjY = 9;
 	}
 	
 	public void issueAchivementHatchFluid(EntityPlayer player, FluidStack fluid){
-		System.out.println("fluidAchievement "+fluid.getFluid().getUnlocalizedName());
 		if (player == null||fluid==null) {
 			return;
 		}
diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
index 4327677823..a52740468c 100644
--- a/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
+++ b/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java
@@ -39,10 +39,4 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe
       }
     }
   }
-}
-
-
-/* Location:              F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingOreSmelting.class
- * Java compiler version: 6 (50.0)
- * JD-Core Version:       0.7.1-SNAPSHOT-20140817
- */
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index cac1cd7c93..2649743261 100644
--- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -622,7 +622,16 @@ public class GT_MachineRecipeLoader
     GT_ModHandler.addCompressionRecipe(new ItemStack(Items.wheat, 9, 0), new ItemStack(Blocks.hay_block, 1, 0));
     GT_ModHandler.addCompressionRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4L), new ItemStack(Blocks.glowstone, 1));
     GT_Values.RA.addCutterRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Graphite, 9L), GT_Values.NI, 500, 48);
-    
+    GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Graphite, 1L));
+    GT_ModHandler.addSmeltingRecipe(GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+    GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L));
+    GT_ModHandler.addSmeltingRecipe(GT_OreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+    GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Graphite, 1L));
+    GT_ModHandler.addSmeltingRecipe(GT_OreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+    GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L));
+    GT_ModHandler.addSmeltingRecipe(GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
+    GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L));
+    GT_ModHandler.addSmeltingRecipe(GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L));
     
     GT_ModHandler.addPulverisationRecipe(GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockSkyStone", 1L, 32767), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 45), GT_Values.NI, 0, false);
     GT_ModHandler.addPulverisationRecipe(GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockSkyChest", 1L, 32767), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 8L, 45), GT_Values.NI, 0, false);
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 f6a4ea62e8..8888e81934 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
@@ -136,13 +136,13 @@ public class GT_Loader_Item_Block_And_Fluid
 					ItemList.Reactor_Coolant_NaK_6.set(GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000));

 					GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_NaK_6.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "PCP", "PDP", "PCP",'C', ItemList.Reactor_Coolant_NaK_3,'P', OrePrefixes.plate.get(Materials.Tin),'D',OrePrefixes.plateDense.get(Materials.Copper) });    

 					

-					ItemList.ThoriumCell_1.set(new GT_RadioactiveCellIC_Item("Thoriumcell", "Fuel Rod (Thorium)", 1, 50000, 0.2D,0));

+					ItemList.ThoriumCell_1.set(new GT_RadioactiveCellIC_Item("Thoriumcell", "Fuel Rod (Thorium)", 1, 50000, 0.2F,0,0.25F));

 					GT_ModHandler.addShapelessCraftingRecipe(ItemList.ThoriumCell_1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] {Ic2Items.fuelRod , OrePrefixes.dust.get(Materials.Thorium) });    

 					

-					ItemList.ThoriumCell_2.set(new GT_RadioactiveCellIC_Item("Double_Thoriumcell", "Double Fuel Rod (Thorium)", 2, 50000, 0.2D,0));

+					ItemList.ThoriumCell_2.set(new GT_RadioactiveCellIC_Item("Double_Thoriumcell", "Double Fuel Rod (Thorium)", 2, 50000, 0.2F,0,0.25F));

 					GT_ModHandler.addCraftingRecipe(ItemList.ThoriumCell_2.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "RPR", "   ", "   ",'R', ItemList.ThoriumCell_1 ,'P', OrePrefixes.plate.get(Materials.Iron) });    

 					

-					ItemList.ThoriumCell_4.set(new GT_RadioactiveCellIC_Item("Quad_Thoriumcell", "Quad Fuel Rod (Thorium)", 4, 50000, 0.2D,0));

+					ItemList.ThoriumCell_4.set(new GT_RadioactiveCellIC_Item("Quad_Thoriumcell", "Quad Fuel Rod (Thorium)", 4, 50000, 0.2F,0,0.25F));

 					GT_ModHandler.addCraftingRecipe(ItemList.ThoriumCell_4.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "RPR", "CPC", "RPR",'R', ItemList.ThoriumCell_1 ,'P', OrePrefixes.plate.get(Materials.Iron),'C', OrePrefixes.plate.get(Materials.Copper) });    

 				

 					ItemList.Depleted_Thorium_1.set(new GT_DepletetCell_Item("ThoriumcellDep","Fuel Rod (Depleted Thorium)",1));