From 03d9265ebaa49db7b567d54a719aec0ea03b09a4 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sat, 30 Apr 2016 10:07:07 +0200
Subject: [PATCH] Fix being able to use right click on crafting result slot

---
 src/main/java/refinedstorage/container/ContainerGrid.java | 2 +-
 src/main/java/refinedstorage/tile/grid/TileGrid.java      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java
index a76a5f33d..fd251d865 100755
--- a/src/main/java/refinedstorage/container/ContainerGrid.java
+++ b/src/main/java/refinedstorage/container/ContainerGrid.java
@@ -126,6 +126,6 @@ public class ContainerGrid extends ContainerBase {
 
     @Override
     public boolean canMergeSlot(ItemStack stack, Slot slot) {
-        return slot != craftingResultSlot;
+        return slot != craftingResultSlot && super.canMergeSlot(stack, slot);
     }
 }
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index 4e39f9e5b..292fb6b03 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryCraftResult;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
@@ -54,7 +55,7 @@ public class TileGrid extends TileMachine implements IGrid {
         }
     };
     private InventoryCrafting craftingInventory = new InventoryCrafting(craftingContainer, 3, 3);
-    private InventorySimple craftingResultInventory = new InventorySimple("crafting_result", 1);
+    private InventoryCraftResult craftingResultInventory = new InventoryCraftResult();
 
     private InventorySimple patternsInventory = new InventorySimple("patterns", 2, this);
 
@@ -100,7 +101,7 @@ public class TileGrid extends TileMachine implements IGrid {
         return craftingInventory;
     }
 
-    public InventorySimple getCraftingResultInventory() {
+    public InventoryCraftResult getCraftingResultInventory() {
         return craftingResultInventory;
     }