Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/Blocks.java

@@ -913,7 +913,7 @@ public class Blocks implements ContentList{
         plastaniumConveyor = new StackConveyor("plastanium-conveyor"){{
             requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.silicon, 1, Items.graphite, 1));
             health = 75;
-            speed = 0.04f;
+            speed = 2.5f / 60f;
             recharge = 2f;
         }};
 

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

@@ -57,7 +57,7 @@ public class StackConveyor extends Block implements Autotiler{
     public void setStats(){
         super.setStats();
 
-        stats.add(BlockStat.itemsMoved, speed * 60, StatUnit.perSecond);
+        stats.add(BlockStat.itemsMoved, Mathf.round(itemCapacity * speed * 60), StatUnit.itemsSecond);
     }
 
     @Override