From 28b28cc0d07f66dc375786b2059888d2da2601a5 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Mon, 18 Jul 2016 01:49:00 +0200
Subject: [PATCH] Shift clicking solderer upgrades go in the upgrade slot first

---
 .../java/refinedstorage/container/ContainerSolderer.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/refinedstorage/container/ContainerSolderer.java b/src/main/java/refinedstorage/container/ContainerSolderer.java
index 78a2fcfc6..ee672a684 100755
--- a/src/main/java/refinedstorage/container/ContainerSolderer.java
+++ b/src/main/java/refinedstorage/container/ContainerSolderer.java
@@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.SlotItemHandler;
+import refinedstorage.RefinedStorageItems;
 import refinedstorage.container.slot.SlotOutput;
 import refinedstorage.tile.TileSolderer;
 
@@ -46,8 +47,12 @@ public class ContainerSolderer extends ContainerBase {
                 if (!mergeItemStack(stack, 4 + 4, inventorySlots.size(), false)) {
                     return null;
                 }
-            } else if (!mergeItemStack(stack, 0, 3, false)) { // 0 - 3 because we can't shift click to output slot
-                return null;
+            } else {
+                if (stack.getItem() != RefinedStorageItems.UPGRADE || !mergeItemStack(stack, 4, 4 + 4, false)) {
+                    if (!mergeItemStack(stack, 0, 3, false)) { // 0 - 3 because we can't shift click to output slot
+                        return null;
+                    }
+                }
             }
 
             if (stack.stackSize == 0) {