From a51865e5c519d34b7cb5c490f0ddd145ff361d27 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sat, 7 Jan 2017 02:11:48 +0100
Subject: [PATCH] Fixed solderer recipe conflicts, fixes #832

---
 .../solderer/SoldererRecipeUpgrade.java        |  4 ++--
 .../refinedstorage/proxy/ProxyCommon.java      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java
index 8a47897d6..4f063138d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java
@@ -17,16 +17,16 @@ public class SoldererRecipeUpgrade implements ISoldererRecipe {
         this.result = new ItemStack(RSItems.UPGRADE, 1, type);
 
         this.rows.add(ItemUpgrade.getRequirement(result));
-        this.rows.add(new ItemStack(RSItems.UPGRADE, 1, 0));
         this.rows.add(new ItemStack(Items.REDSTONE));
+        this.rows.add(new ItemStack(RSItems.UPGRADE, 1, 0));
     }
 
     public SoldererRecipeUpgrade(ItemStack result) {
         this.result = result;
 
         this.rows.add(ItemUpgrade.getRequirement(result));
-        this.rows.add(new ItemStack(RSItems.UPGRADE, 1, 0));
         this.rows.add(new ItemStack(Items.REDSTONE));
+        this.rows.add(new ItemStack(RSItems.UPGRADE, 1, 0));
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
index 735275773..202d3ae7b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
@@ -328,27 +328,27 @@ public class ProxyCommon {
         API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
             new ItemStack(RSBlocks.GRID, 1, EnumGridType.CRAFTING.getId()),
             500,
+            new ItemStack(Blocks.CRAFTING_TABLE),
             new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-            new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
-            new ItemStack(Blocks.CRAFTING_TABLE)
+            new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId())
         ));
 
         // Pattern Grid
         API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
             new ItemStack(RSBlocks.GRID, 1, EnumGridType.PATTERN.getId()),
             500,
+            new ItemStack(RSItems.PATTERN),
             new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-            new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
-            new ItemStack(RSItems.PATTERN)
+            new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId())
         ));
 
         // Fluid Grid
         API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
             new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()),
             500,
+            new ItemStack(Items.BUCKET),
             new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-            new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
-            new ItemStack(Items.BUCKET)
+            new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId())
         ));
 
         // Wireless Grid
@@ -667,8 +667,8 @@ public class ProxyCommon {
         API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
             new ItemStack(RSBlocks.INTERFACE),
             200,
-            new ItemStack(RSBlocks.IMPORTER),
             new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+            new ItemStack(RSBlocks.IMPORTER),
             new ItemStack(RSBlocks.EXPORTER)
         ));
 
@@ -677,8 +677,8 @@ public class ProxyCommon {
             new ItemStack(RSBlocks.FLUID_INTERFACE),
             200,
             new ItemStack(Items.BUCKET),
-            new ItemStack(RSBlocks.INTERFACE),
-            new ItemStack(Items.BUCKET)
+            new ItemStack(Items.REDSTONE),
+            new ItemStack(RSBlocks.INTERFACE)
         ));
 
         // Grid Filter