From ae86cb55c0a28a867dc6a3c42ae8075af3ca39d1 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Tue, 31 May 2016 21:42:21 +0200
Subject: [PATCH] Better recipe

---
 .../java/refinedstorage/proxy/CommonProxy.java  | 17 ++++++++++++-----
 .../tile/solderer/SoldererRecipeUpgrade.java    |  4 +---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java
index 9a2428e3a..469dd039f 100755
--- a/src/main/java/refinedstorage/proxy/CommonProxy.java
+++ b/src/main/java/refinedstorage/proxy/CommonProxy.java
@@ -326,12 +326,12 @@ public class CommonProxy {
         // Storage Parts
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
             "EPE",
-            "SRS",
-            "ESE",
+            "GSG",
+            "EGE",
             'R', new ItemStack(Items.REDSTONE),
             'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
-            'P', "itemSilicon",
-            'S', new ItemStack(Blocks.GLASS)
+            'S', "itemSilicon",
+            'G', new ItemStack(Blocks.GLASS)
         ));
 
         GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K),
@@ -417,7 +417,14 @@ public class CommonProxy {
         SoldererRegistry.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE));
         SoldererRegistry.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED));
         SoldererRegistry.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_CRAFTING));
-        SoldererRegistry.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_STACK));
+
+        GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK),
+            "USU",
+            "SUS",
+            "USU",
+            'U', new ItemStack(Items.SUGAR),
+            'S', new ItemStack(RefinedStorageItems.UPGRADE, 1, ItemUpgrade.TYPE_SPEED)
+        );
 
         // Storage Blocks
         SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K));
diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeUpgrade.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeUpgrade.java
index 8c7fe30c3..da3130847 100755
--- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeUpgrade.java
+++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeUpgrade.java
@@ -31,11 +31,9 @@ public class SoldererRecipeUpgrade implements ISoldererRecipe {
             case ItemUpgrade.TYPE_RANGE:
                 return new ItemStack(Items.ENDER_PEARL);
             case ItemUpgrade.TYPE_SPEED:
-                return new ItemStack(Blocks.REDSTONE_BLOCK);
+                return new ItemStack(Items.SUGAR);
             case ItemUpgrade.TYPE_CRAFTING:
                 return new ItemStack(Blocks.CRAFTING_TABLE);
-            case ItemUpgrade.TYPE_STACK:
-                return new ItemStack(RefinedStorageItems.UPGRADE, 1, ItemUpgrade.TYPE_SPEED);
         }
 
         return null;