Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/draw/DrawBlock.java

@@ -44,7 +44,7 @@ public abstract class DrawBlock{
 
     /** @return the generated icons to be used for this block. */
     public TextureRegion[] icons(Block block){
-        return new TextureRegion[]{block.region};
+        return new TextureRegion[]{};
     }
 
     public final TextureRegion[] finalIcons(Block block){
@@ -55,7 +55,8 @@ public abstract class DrawBlock{
             }
             return out;
         }
-        return icons(block);
+        TextureRegion[] icons = icons(block);
+        return icons.length == 0 ? new TextureRegion[]{Core.atlas.find("error")} : icons;
     }
 
     public GenericCrafter expectCrafter(Block block){

core/src/mindustry/world/draw/DrawDefault.java

@@ -17,4 +17,9 @@ public class DrawDefault extends DrawBlock{
     public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
         block.drawDefaultPlanRegion(plan, list);
     }
+
+    @Override
+    public TextureRegion[] icons(Block block){
+        return new TextureRegion[]{block.region};
+    }
 }

core/src/mindustry/world/draw/DrawLiquidOutputs.java

@@ -53,10 +53,4 @@ public class DrawLiquidOutputs extends DrawBlock{
             }
         }
     }
-
-    //can't display these properly
-    @Override
-    public TextureRegion[] icons(Block block){
-        return new TextureRegion[]{};
-    }
 }