Merge remote-tracking branch 'origin/master'

2021-01-18 18:04:21 -05:00
parent 82f8e78ec8 f91910e84f
commit 4aa2d9097f
4 changed files with 9 additions and 5 deletions
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -127,11 +127,11 @@ public class Conveyor extends Block implements Autotiler{
                }
            }

-            Draw.z(Layer.block);
+            Draw.z(Layer.block - 0.2f);

            Draw.rect(regions[blendbits][frame], x, y, tilesize * blendsclx, tilesize * blendscly, rotation * 90);

-            Draw.z(Layer.blockOver);
+            Draw.z(Layer.block - 0.1f);

            for(int i = 0; i < len; i++){
                Item item = ids[i];