Merge branch 'master' into fix/same-network-multiple-extract-only-sto…

…rage-bus
GTNewHorizons · Dec 9, 2024 · 503cf8d · 503cf8d
2 parents f5ae6cd + 8187c77
commit 503cf8d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java
@@ -56,7 +56,12 @@ public void addCheckedInformation(final ItemStack stack, final EntityPlayer play
 
             lines.add(String.format(local, freqTooltip));
         }
-        if (data.hasKey("custom_name")) lines.add(data.getString("custom_name"));
+
+        if (data.hasKey("custom_name")) {
+            lines.add(data.getString("custom_name"));
+        } else if (data.hasKey("display") && data.getCompoundTag("display").hasKey("Name")) {
+            lines.add(data.getCompoundTag("display").getString("Name"));
+        }
     }
 
     /**