From 401fb0c0eb768a303cd99caf6e43ff34f02c3022 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Wed, 14 Jun 2017 15:50:18 +0200
Subject: [PATCH] The Portable Grid now doesn't despawn anymore when dropped in
 the world, update changelog

---
 CHANGELOG.md                                                | 6 ++++++
 .../refinedstorage/item/ItemBlockPortableGrid.java          | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e7ae54c5..d10564e99 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Refined Storage Changelog
 
+### 1.5
+- Port to Minecraft 1.12 (raoulvdberge)
+- Removed MCMultiPart support (will be re-added as soon as MCMultiPart for MC 1.12 is available) (raoulvdberge)
+- Removed OpenComputers support (will be re-added as soon as OpenComputers for MC 1.12 is available) (raoulvdberge)
+- The Portable Grid now doesn't despawn anymore when dropped in the world (raoulvdberge)
+
 ### 1.4.15
 - Updated Storage Drawers API, fixes crashes (raoulvdberge)
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockPortableGrid.java
index 7bffaa498..7a8122d05 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockPortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockPortableGrid.java
@@ -50,6 +50,11 @@ public class ItemBlockPortableGrid extends ItemBlockEnergyItem {
         return super.onItemUse(player, worldIn, pos, hand, facing, hitX, hitY, hitZ);
     }
 
+    @Override
+    public int getEntityLifespan(ItemStack stack, World world) {
+        return Integer.MAX_VALUE;
+    }
+
     @Override
     public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
         if (oldStack.getItem() == newStack.getItem()) {