From 3168a98c21496ca016ae8136bf3ef47d2220eb3d Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 5 Jun 2016 00:11:04 +0200
Subject: [PATCH] 0.7.8 done

---
 CHANGELOG.md                                                 | 5 +++++
 .../java/refinedstorage/tile/controller/TileController.java  | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64b13b90d..c84876764 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Refined Storage Changelog
 
+### 0.7.8
+**Bugfixes**
+- Improved Grid performance
+- Fixed crash on some worlds
+
 ### 0.7.7
 **Bugfixes**
 - Fixed buggy reequip animation on wireless grid
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index c62802232..04c02d952 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -13,7 +13,6 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
-import net.minecraftforge.items.ItemHandlerHelper;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.RefinedStorageUtils;
@@ -343,7 +342,9 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
                 if (RefinedStorageUtils.compareStackNoQuantity(stack, otherStack)) {
                     // We copy here so we don't modify the quantity of the ItemStack IStorage uses.
                     // We re-get the ItemStack because the stack may change from a previous iteration in this loop
-                    items.set(i, ItemHandlerHelper.copyStackWithSize(items.get(i), items.get(i).stackSize + otherStack.stackSize));
+                    ItemStack newStack = items.get(i).copy();
+                    newStack.stackSize += otherStack.stackSize;
+                    items.set(i, newStack);
 
                     combinedItems.add(otherStack);
                     combinedItemsIndices.add(j);