Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	gradle.properties

core/src/mindustry/content/Blocks.java

@@ -801,12 +801,12 @@ public class Blocks implements ContentList{
         }};
 
         disassembler = new Separator("disassembler"){{
-            requirements(Category.crafting, with(Items.graphite, 140, Items.titanium, 100, Items.silicon, 150, Items.surgeAlloy, 70));
+            requirements(Category.crafting, with(Items.plastanium, 40, Items.titanium, 100, Items.silicon, 150, Items.thorium, 80));
             results = with(
                 Items.sand, 4,
                 Items.graphite, 2,
                 Items.titanium, 2,
-                Items.thorium, 1
+                Items.thorium, 2
             );
             hasPower = true;
             craftTime = 15f;