Merge

2020-01-18 11:16:03 -05:00
parent b20e0967fd 95352e1729
commit f044f30829
236 changed files with 6310 additions and 6330 deletions
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -635,10 +635,6 @@ public class Blocks implements ContentList{
            );
            hasPower = true;
            craftTime = 35f;
-            spinnerLength = 1.5f;
-            spinnerRadius = 3.5f;
-            spinnerThickness = 1.5f;
-            spinnerSpeed = 3f;
            size = 2;

            consumes.power(1f);