Merge remote-tracking branch 'origin/master'

core/src/mindustry/ui/dialogs/CustomGameDialog.java

@@ -25,8 +25,7 @@ public class CustomGameDialog extends BaseDialog{
 
     void setup(){
         clearChildren();
-        add(titleTable);
+        add(titleTable).growX().row();
-        row();
         stack(cont, buttons).grow();
         buttons.bottom();
         cont.clear();

core/src/mindustry/world/blocks/distribution/StackConveyor.java

@@ -109,6 +109,8 @@ public class StackConveyor extends Block implements Autotiler{
 
         @Override
         public void draw(){
+            Draw.z(Layer.block - 0.2f);
+
             Draw.rect(regions[state], x, y, rotdeg());
 
             for(int i = 0; i < 4; i++){
@@ -117,7 +119,7 @@ public class StackConveyor extends Block implements Autotiler{
                 }
             }
 
-            Draw.z(Layer.blockOver);
+            Draw.z(Layer.block - 0.1f);
 
             Tile from = world.tile(link);
 
@@ -145,6 +147,12 @@ public class StackConveyor extends Block implements Autotiler{
             Draw.rect(lastItem.icon(Cicon.medium), Tmp.v1.x, Tmp.v1.y, size, size, 0);
         }
 
+        @Override
+        public void drawCracks(){
+            Draw.z(Layer.block - 0.15f);
+            super.drawCracks();
+        }
+
         @Override
         public void onProximityUpdate(){
             super.onProximityUpdate();