From f05f216f308479f320b4168cbcfc98ec6a4e41e1 Mon Sep 17 00:00:00 2001
From: Techlone <techlone.mc@gmail.com>
Date: Sun, 12 Mar 2017 00:16:10 +0500
Subject: [PATCH 1/4] Added new config value useOnlyGoodSolderingMaterials

---
 .../java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index c89ba0e6..a0811910 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -491,8 +491,9 @@ if(Loader.isModLoaded("Railcraft")){
 
         GT_Values.RA.addFormingPressRecipe(ItemList.Food_Dough_Sugar.get(4L, new Object[0]), ItemList.Shape_Mold_Cylinder.get(0L, new Object[0]), ItemList.Food_Raw_Cake.get(1L, new Object[0]), 384, 4);
         GT_Values.RA.addFormingPressRecipe(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L, new Object[0]), ItemList.Arrow_Head_Glass_Emtpy.get(1L, new Object[0]), 64, 4);
+        boolean useOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", false);
         for (Materials tMat : Materials.values()) {
-            if ((tMat.mStandardMoltenFluid != null) && (tMat.contains(SubTag.SOLDERING_MATERIAL))) {
+            if (tMat.mStandardMoltenFluid != null && tMat.contains(SubTag.SOLDERING_MATERIAL) && !(useOnlyGoodSolderingMaterials && !tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD))) {
                 int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2;
                 //Circuit soldering
                 //Integraded Circuits

From 556fa42c372c7be7c891c16cc6647c966ca23aaa Mon Sep 17 00:00:00 2001
From: Techlone <techlone.mc@gmail.com>
Date: Sun, 12 Mar 2017 23:45:12 +0500
Subject: [PATCH 2/4] fix adv circuit

---
 src/main/java/gregtech/GT_Mod.java                        | 2 ++
 src/main/java/gregtech/api/GregTech_API.java              | 3 +++
 .../gregtech/loaders/oreprocessing/ProcessingCircuit.java | 8 +-------
 .../gregtech/loaders/postload/GT_MachineRecipeLoader.java | 8 ++++++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 4ad00b4f..4a068f75 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -263,6 +263,8 @@ public class GT_Mod implements IGT_Mod {
         GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", false);
         GregTech_API.meIOLoaded = Loader.isModLoaded("EnderIO");
 
+        GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", GregTech_API.mUseOnlyGoodSolderingMaterials);
+
         if (tMainConfig.get("general", "hardermobspawners", true).getBoolean(true)) {
             Blocks.mob_spawner.setHardness(500.0F).setResistance(6000000.0F);
         }
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index de21d02f..6318ff93 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -197,6 +197,9 @@ public class GregTech_API {
     public static boolean mMagneticraft = false;
     public static boolean mImmersiveEngineering = false;
     public static boolean mGTPlusPlus = false;
+
+    public static boolean mUseOnlyGoodSolderingMaterials = false;
+
     private static final String aTextIC2Lower = MOD_ID_IC2.toLowerCase(Locale.ENGLISH);
     /**
      * Getting assigned by the Mod loading
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
index 63297c53..b006872c 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
@@ -34,13 +34,7 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi
                 GT_ModHandler.addShapelessCraftingRecipe(ItemList.Circuit_Basic.get(1L, new Object[0]), new Object[]{ItemList.Circuit_Integrated.getWildcard(1L, new Object[0])});
                break;
             case "Advanced":
-            	GT_ModHandler.removeRecipeByOutput(aStack);
-                GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_Transistor.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.SolderingAlloy.getMolten(72), aStack, 800, 28);
-                GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_TransistorSMD.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.SolderingAlloy.getMolten(72), aStack, 800, 28);
-                GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_Transistor.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.Tin.getMolten(144), aStack, 800, 28);
-                GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_TransistorSMD.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.Tin.getMolten(144), aStack, 800, 28);
-                GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_Transistor.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.Lead.getMolten(288), aStack, 800, 28);
-                GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_TransistorSMD.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},Materials.Lead.getMolten(288), aStack, 800, 28);
+                GT_ModHandler.removeRecipeByOutput(aStack);
                break;
         }
     }
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index a0811910..ac37994c 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -491,9 +491,8 @@ if(Loader.isModLoaded("Railcraft")){
 
         GT_Values.RA.addFormingPressRecipe(ItemList.Food_Dough_Sugar.get(4L, new Object[0]), ItemList.Shape_Mold_Cylinder.get(0L, new Object[0]), ItemList.Food_Raw_Cake.get(1L, new Object[0]), 384, 4);
         GT_Values.RA.addFormingPressRecipe(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L, new Object[0]), ItemList.Arrow_Head_Glass_Emtpy.get(1L, new Object[0]), 64, 4);
-        boolean useOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", false);
         for (Materials tMat : Materials.values()) {
-            if (tMat.mStandardMoltenFluid != null && tMat.contains(SubTag.SOLDERING_MATERIAL) && !(useOnlyGoodSolderingMaterials && !tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD))) {
+            if (tMat.mStandardMoltenFluid != null && tMat.contains(SubTag.SOLDERING_MATERIAL) && !(GregTech_API.mUseOnlyGoodSolderingMaterials && !tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD))) {
                 int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2;
                 //Circuit soldering
                 //Integraded Circuits
@@ -501,6 +500,11 @@ if(Loader.isModLoaded("Railcraft")){
                 GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(1,o),ItemList.Circuit_Parts_ResistorSMD.get(2,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Basic.get(1,o), 200, 8);
                 GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(3,o),ItemList.Circuit_Parts_Resistor.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 8)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Integrated_Good.get(1,o), 400, 16);
                 GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(3,o),ItemList.Circuit_Parts_ResistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 8)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Integrated_Good.get(1,o), 400, 16);
+
+                //Advanced circuit
+                GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_Transistor.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},tMat.getMolten(144L * tMultiplier / 2L), GT_ModHandler.getIC2Item("advancedCircuit", 1L), 800, 28);
+                GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_TransistorSMD.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},tMat.getMolten(144L * tMultiplier / 2L), GT_ModHandler.getIC2Item("advancedCircuit", 1L), 800, 28);
+
                 //Highly Integrated Circuits
                 GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Chip_CPU.get(1,o),ItemList.Circuit_Parts_Resistor.get(4,o),ItemList.Circuit_Parts_Capacitor.get(4,o),ItemList.Circuit_Parts_Transistor.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.RedAlloy, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Processor.get(1,o), 200, 60);
                 GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Epoxy.get(1,o),ItemList.Circuit_Processor.get(3,o),ItemList.Circuit_Parts_Coil.get(4,o),ItemList.Circuit_Parts_Capacitor.get(4,o),ItemList.Circuit_Chip_Ram.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.RedAlloy, 12)},tMat.getMolten(144L * tMultiplier), ItemList.Circuit_Computer.get(1,o), 400, 90);

From 76e82ed3553cedb2c9ebef4cf033472925e4caf1 Mon Sep 17 00:00:00 2001
From: Dimach <dimach2142@gmail.com>
Date: Wed, 15 Mar 2017 04:51:15 +0200
Subject: [PATCH 3/4] Implement #292.

---
 .../common/gui/GT_Container_Regulator.java    |  16 +++++----
 .../GT_MetaTileEntity_Regulator.java          |  34 ++++++++++++++++--
 .../gregtech/textures/gui/Regulator.png       | Bin 4041 -> 1986 bytes
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
index 3e8f9402..c9e51ecb 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
@@ -36,6 +36,8 @@ public class GT_Container_Regulator
         addSlotToContainer(new Slot(this.mTileEntity, 7, 26, 42));
         addSlotToContainer(new Slot(this.mTileEntity, 8, 44, 42));
 
+        addSlotToContainer(new Slot(this.mTileEntity, 19, 44, 63));
+
         addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 9, 64, 7, false, true, 1));
         addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 10, 81, 7, false, true, 1));
         addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 11, 98, 7, false, true, 1));
@@ -60,7 +62,7 @@ public class GT_Container_Regulator
     }
 
     public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
-        if (aSlotIndex < 9) {
+        if (aSlotIndex < 10) {
             return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
         }
         Slot tSlot = (Slot) this.inventorySlots.get(aSlotIndex);
@@ -68,7 +70,7 @@ public class GT_Container_Regulator
             if (this.mTileEntity.getMetaTileEntity() == null) {
                 return null;
             }
-            if (aSlotIndex == 27) {
+            if (aSlotIndex == 28) {
                 ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput);
                 if (((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput) {
                     GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");
@@ -77,7 +79,7 @@ public class GT_Container_Regulator
                 }
                 return null;
             }
-            if ((aSlotIndex < 18)) {
+            if ((aSlotIndex < 19)) {
                 ItemStack tStack = aPlayer.inventory.getItemStack();
                 if (tStack != null) {
                     tSlot.putStack(GT_Utility.copy(new Object[]{tStack}));
@@ -96,8 +98,8 @@ public class GT_Container_Regulator
                 }
                 return null;
             }
-            if ((aSlotIndex < 27)) {
-                ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 18)] = Math.min(99, Math.max(0, ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 18)] + (aMouseclick == 0 ? -1 : 1) * (aShifthold == 0 ? 1 : 16)));
+            if ((aSlotIndex < 28)) {
+                ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 19)] = Math.min(99, Math.max(0, ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 19)] + (aMouseclick == 0 ? -1 : 1) * (aShifthold == 0 ? 1 : 16)));
                 return null;
             }
         }
@@ -156,10 +158,10 @@ public class GT_Container_Regulator
     }
 
     public int getSlotCount() {
-        return 9;
+        return 10;
     }
 
     public int getShiftClickSlotCount() {
-        return 9;
+        return 10;
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
index 3a89b8c8..04930ae5 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
@@ -18,9 +18,10 @@ import java.util.Arrays;
 public class GT_MetaTileEntity_Regulator
         extends GT_MetaTileEntity_Buffer {
     public int[] mTargetSlots = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+    private boolean charge = false, decharge = false;
 
     public GT_MetaTileEntity_Regulator(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, 19, "Regulating incoming Items");
+        super(aID, aName, aNameRegional, aTier, 20, "Regulating incoming Items");
     }
 
     public GT_MetaTileEntity_Regulator(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
@@ -36,7 +37,7 @@ public class GT_MetaTileEntity_Regulator
     }
 
     public boolean isValidSlot(int aIndex) {
-        return aIndex < 9;
+        return aIndex < 9 || aIndex == 19;
     }
 
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
@@ -90,4 +91,33 @@ public class GT_MetaTileEntity_Regulator
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
         return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (GT_Utility.areStacksEqual(aStack, this.mInventory[(aIndex + 9)]));
     }
+
+    @Override
+    public int rechargerSlotStartIndex() {
+        return 19;
+    }
+
+    @Override
+    public int dechargerSlotStartIndex() {
+        return 19;
+    }
+
+    @Override
+    public int rechargerSlotCount() {
+        return charge ? 1 : 0;
+    }
+
+    @Override
+    public int dechargerSlotCount() {
+        return decharge ? 1 : 0;
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        super.onPostTick(aBaseMetaTileEntity, aTick);
+        if (aBaseMetaTileEntity.isServerSide()) {
+            charge = aBaseMetaTileEntity.getStoredEU() / 2 > aBaseMetaTileEntity.getEUCapacity() / 3;
+            decharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3;
+        }
+    }
 }
diff --git a/src/main/resources/assets/gregtech/textures/gui/Regulator.png b/src/main/resources/assets/gregtech/textures/gui/Regulator.png
index b92a693f13614b463bdde133791a2192f48cc64b..ecc62186e0ea016246043f88bc448226e97e0741 100644
GIT binary patch
literal 1986
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
a8KIf~9f&S@<C8LAS>bd>NNw=m;$H!CFB$p(

literal 4041
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


From 288f44e347097c75933909d5155d47fb66d4c8f6 Mon Sep 17 00:00:00 2001
From: Techlone <techlone.mc@gmail.com>
Date: Thu, 16 Mar 2017 00:24:41 +0500
Subject: [PATCH 4/4] Added a sorting of recipes in NEI

---
 .../java/gregtech/api/util/GT_Recipe.java     | 24 +++++++++++++++++--
 .../gregtech/nei/GT_NEI_DefaultHandler.java   | 15 ++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index d509e6af..30874b28 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -33,7 +33,7 @@ import static gregtech.api.enums.GT_Values.*;
  * <p/>
  * I know this File causes some Errors, because of missing Main Functions, but if you just need to compile Stuff, then remove said erroreous Functions.
  */
-public class GT_Recipe {
+public class GT_Recipe implements Comparable<GT_Recipe> {
     public static volatile int VERSION = 509;
     /**
      * If you want to change the Output, feel free to modify or even replace the whole ItemStack Array, for Inputs, please add a new Recipe, because of the HashMaps.
@@ -412,7 +412,27 @@ public class GT_Recipe {
         return true;
     }
 
-    
+    @Override
+    public int compareTo(GT_Recipe recipe) {
+        // first lowest tier recipes
+        // then fastest
+        // then with lowest special value
+        // then dry recipes
+        // then with fewer inputs
+        if (this.mEUt != recipe.mEUt) {
+            return this.mEUt - recipe.mEUt;
+        } else if (this.mDuration != recipe.mDuration) {
+            return this.mDuration - recipe.mDuration;
+        } else if (this.mSpecialValue != recipe.mSpecialValue) {
+            return this.mSpecialValue - recipe.mSpecialValue;
+        } else if (this.mFluidInputs.length != recipe.mFluidInputs.length) {
+            return this.mFluidInputs.length - recipe.mFluidInputs.length;
+        } else if (this.mInputs.length != recipe.mInputs.length) {
+            return this.mInputs.length - recipe.mInputs.length;
+        }
+        return 0;
+    }
+
     public static class GT_Recipe_AssemblyLine{
         public static final ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes = new ArrayList<GT_Recipe_AssemblyLine>();
         
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index 247a7df4..71e458c6 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -29,8 +29,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.*;
 import java.util.List;
 
 public class GT_NEI_DefaultHandler
@@ -55,6 +54,12 @@ public class GT_NEI_DefaultHandler
         }
     }
 
+    public List<GT_Recipe> getSortedRecipes() {
+        List<GT_Recipe> result = new ArrayList<>(this.mRecipeMap.mRecipeList);
+        Collections.sort(result);
+        return result;
+    }
+
     public static void drawText(int aX, int aY, String aString, int aColor) {
         Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor);
     }
@@ -65,7 +70,7 @@ public class GT_NEI_DefaultHandler
 
     public void loadCraftingRecipes(String outputId, Object... results) {
         if (outputId.equals(getOverlayIdentifier())) {
-            for (GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) {
+            for (GT_Recipe tRecipe : getSortedRecipes()) {
                 if (!tRecipe.mHidden) {
                     this.arecipes.add(new CachedDefaultRecipe(tRecipe));
                 }
@@ -95,7 +100,7 @@ public class GT_NEI_DefaultHandler
                 }
             }
         }
-        for (GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) {
+        for (GT_Recipe tRecipe : getSortedRecipes()) {
             if (!tRecipe.mHidden) {
                 CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
                 for (ItemStack tStack : tResults) {
@@ -129,7 +134,7 @@ public class GT_NEI_DefaultHandler
                 }
             }
         }
-        for (GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) {
+        for (GT_Recipe tRecipe : getSortedRecipes()) {
             if (!tRecipe.mHidden) {
                 CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
                 for (ItemStack tStack : tInputs) {