Merge branch 'unstable_BLOOD' into reMerge

# Conflicts:
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java

3 files changed, 24 insertions, 19 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
index 3d68f6c813..d2092f0b34 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
@@ -224,14 +224,16 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
         if (aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isUniversalEnergyStored(getMinimumStoredEU()) && (aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified() || aTimer % 200 == 0 || mSuccess > 0)) {
             mSuccess--;
             moveItems(aBaseMetaTileEntity, aTimer);
-            System.out.println("inv "+bInvert+" full "+bRedstoneIfFull);
-            aBaseMetaTileEntity.setGenericRedstoneOutput(bInvert);
+            for(byte b = 0;b<6;b++)
+            	aBaseMetaTileEntity.setInternalOutputRedstoneSignal(b,bInvert ? (byte)15 : (byte)0);
             if (bRedstoneIfFull) {
-                aBaseMetaTileEntity.setGenericRedstoneOutput(!bInvert);
+                for(byte b = 0;b<6;b++)
+                    aBaseMetaTileEntity.setInternalOutputRedstoneSignal(b,bInvert ? (byte)0 : (byte)15);
                 for (int i = 0; i < mInventory.length; i++)
                     if (isValidSlot(i)) {
                         if (mInventory[i] == null) {
-                            aBaseMetaTileEntity.setGenericRedstoneOutput(bInvert);
+                            for(byte b = 0;b<6;b++)
+                                aBaseMetaTileEntity.setInternalOutputRedstoneSignal(b,bInvert ? (byte)15 : (byte)0);
                             aBaseMetaTileEntity.decreaseStoredEnergyUnits(1, true);
                             break;
                         }
@@ -240,6 +242,12 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
         }
     }
 
+    @Override
+    public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
+    	for(byte b = 0;b<6;b++)
+            aBaseMetaTileEntity.setInternalOutputRedstoneSignal(b,(byte)0);
+    }
+
     protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
         int tCost = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize, (byte) 64, (byte) 1);
         if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) {
@@ -262,4 +270,4 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
     public boolean allowGeneralRedstoneOutput(){
     	return true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
index 4b61da0f3f..ccb4896d68 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
@@ -36,7 +36,6 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     public static ThreadLocal<GT_TileEntity_Ores> mTemporaryTileEntity = new ThreadLocal();
     public static boolean FUCKING_LOCK = false;
     public static boolean tHideOres;
-    public static int tOreMetaCount;
     private final String aTextName = ".name";
     private final String aTextSmall = "Small ";
 
@@ -46,7 +45,6 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         setStepSound(soundTypeStone);
         setCreativeTab(GregTech_API.TAB_GREGTECH_ORES);
         tHideOres = Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres;
-        tOreMetaCount = aOreMetaCount;
         if(aOreMetaCount > 8 || aOreMetaCount < 0) aOreMetaCount = 8;
 
         for (int i = 0; i < 16; i++) {
@@ -59,12 +57,11 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
                     GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + aTextName, aTextSmall + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                     if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0) {
                         GT_OreDictUnificator.registerOre(this.getProcessingPrefix()[j] != null ? this.getProcessingPrefix()[j].get(GregTech_API.sGeneratedMaterials[i]) : "", new ItemStack(this, 1, i + (j * 1000)));
-                        if (tHideOres) {
-                            if(!(j == 0 && !aHideFirstMeta)){
-                                codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000)));}
+                    if (tHideOres) {
+                        if(!(j == 0 && !aHideFirstMeta)){
+                            codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000)));}
                             codechicken.nei.api.API.hideItem(new ItemStack(this, 1, (i + 16000) + (j * 1000)));
-                        }
-                    }
+                    }}
                 }
             }
         }
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index bb4d700ff7..e71ae6ddc2 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -213,13 +213,13 @@ public class GT_Achievements {
         registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false);
         registerAchievement("whatnow", 4, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false);
 
-        if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){
-            for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
-                if ((GregTech_API.sGeneratedMaterials[i] != null) && !oreList.contains(GregTech_API.sGeneratedMaterials[i])) {
-                    codechicken.nei.api.API.hideItem(GT_OreDictUnificator.get(OrePrefixes.ore, GregTech_API.sGeneratedMaterials[i], 1));
-                }
-            }
-        }
+//        if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){
+//            for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
+//                if ((GregTech_API.sGeneratedMaterials[i] != null) && !oreList.contains(GregTech_API.sGeneratedMaterials[i])) {
+//                    codechicken.nei.api.API.hideItem(GT_OreDictUnificator.get(OrePrefixes.ore, GregTech_API.sGeneratedMaterials[i], 1));
+//                }
+//            }
+//        }
         if (GT_Mod.gregtechproxy.mAchievements) {
             AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) this.achievementList.values().toArray(
                     new Achievement[this.achievementList.size()])));