Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00
parent ea75a357ca
commit 28b235ef07
531 changed files with 12356 additions and 6286 deletions
--- a/core/src/mindustry/ui/ItemImage.java
+++ b/core/src/mindustry/ui/ItemImage.java
@@ -33,7 +33,7 @@ public class ItemImage extends Stack{

        add(new Table(o -> {
            o.left();
-            o.add(new Image(stack.item.icon(Cicon.medium))).size(32f);
+            o.add(new Image(stack.item.uiIcon)).size(32f);
        }));

        if(stack.amount != 0){