From b63758ad782000aff33d119dd5a218eebbd01606 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Tue, 29 Mar 2016 01:39:18 +0200
Subject: [PATCH] Fix getting a stack of unstackable stuff from grid + text
 rendering order

---
 src/main/java/refinedstorage/gui/GuiBase.java                | 4 ++--
 src/main/java/refinedstorage/network/MessageStoragePull.java | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java
index 239ee6099..98adc423c 100755
--- a/src/main/java/refinedstorage/gui/GuiBase.java
+++ b/src/main/java/refinedstorage/gui/GuiBase.java
@@ -159,6 +159,8 @@ public abstract class GuiBase extends GuiContainer {
     }
 
     public void drawItemOverlay(ItemStack stack, String text, int x, int y) {
+        itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, "");
+
         if (text != null) {
             GlStateManager.pushMatrix();
             GlStateManager.translate(x, y, 1);
@@ -182,8 +184,6 @@ public abstract class GuiBase extends GuiContainer {
             GlStateManager.disableBlend();
             GlStateManager.popMatrix();
         }
-
-        itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, "");
     }
 
     public void drawString(int x, int y, String message) {
diff --git a/src/main/java/refinedstorage/network/MessageStoragePull.java b/src/main/java/refinedstorage/network/MessageStoragePull.java
index 23a089b79..9ed5b2f11 100755
--- a/src/main/java/refinedstorage/network/MessageStoragePull.java
+++ b/src/main/java/refinedstorage/network/MessageStoragePull.java
@@ -73,7 +73,9 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer<MessageStor
                     }
                 } else if (message.one) {
                     quantity = 1;
-                } else if (message.shift && quantity > item.getType().getItemStackLimit(item.toItemStack())) {
+                }
+
+                if (quantity > item.getType().getItemStackLimit(item.toItemStack())) {
                     quantity = item.getType().getItemStackLimit(item.toItemStack());
                 }