Merge branch 'master' into 1.15

src/main/java/carpet/helpers/InventoryHelper.java

@@ -36,11 +36,15 @@ public class InventoryHelper
         }
 
         if (bet.isEmpty())
+        {
+            tag.remove("BlockEntityTag");
+            changed = true;
+        }
+        if (tag.isEmpty())
         {
             stack.setTag(null);
             changed = true;
         }
-
         return changed;
     }