Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/Block.java

@@ -86,7 +86,7 @@ public class Block extends UnlockableContent{
     public boolean solid;
     /** whether this block CAN be solid. */
     public boolean solidifes;
-    /** whether this is rotateable */
+    /** whether this is rotatable */
     public boolean rotate;
     /** number of different variant regions to use */
     public int variants = 0;

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

@@ -153,6 +153,11 @@ public class StackConveyor extends Block implements Autotiler{
             Draw.z(Layer.block - 0.15f);
             super.drawCracks();
         }
+        
+        @Override
+        public void payloadDraw(){
+            Draw.rect(block.fullIcon, x, y);
+        }
 
         @Override
         public void onProximityUpdate(){

core/src/mindustry/world/blocks/payloads/BuildPayload.java

@@ -80,6 +80,7 @@ public class BuildPayload implements Payload{
     @Override
     public void set(float x, float y, float rotation){
         build.set(x, y);
+        build.payloadRotation = rotation;
     }
 
     @Override