From a667a94c8e0f7d3f79f70abc4e2b2767351d1ca3 Mon Sep 17 00:00:00 2001
From: Joshua Fan <joshuaptfan@gmail.com>
Date: Wed, 27 Jan 2021 09:08:51 -0800
Subject: [PATCH 1/2] Draw plastanium conveyors on conveyors layer (#4446)

---
 .../world/blocks/distribution/StackConveyor.java       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index b279f09b9d..e44218feb4 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/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();

From 96ee32f8ed0aef773447b7394375807a7c3137a7 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Thu, 28 Jan 2021 15:06:30 +0100
Subject: [PATCH 2/2] Custom Game Underline 2: Electric Boogaloo (#4457)

* Update CustomGameDialog.java

* Remove .row() for consistensy
---
 core/src/mindustry/ui/dialogs/CustomGameDialog.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/mindustry/ui/dialogs/CustomGameDialog.java
index e23d8cca38..efe5a157ea 100644
--- a/core/src/mindustry/ui/dialogs/CustomGameDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomGameDialog.java
@@ -25,8 +25,7 @@ public class CustomGameDialog extends BaseDialog{
 
     void setup(){
         clearChildren();
-        add(titleTable);
-        row();
+        add(titleTable).growX().row();
         stack(cont, buttons).grow();
         buttons.bottom();
         cont.clear();