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

 Conflicts:

	gradle.properties

core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java

@@ -85,7 +85,7 @@ public class LiquidTurret extends Turret{
 
         @Override
         public boolean shouldActiveSound(){
-            return wasShooting;
+            return wasShooting && enabled;
         }
 
         @Override

core/src/mindustry/world/blocks/environment/Prop.java

@@ -12,8 +12,6 @@ public class Prop extends Block{
         breakable = true;
         alwaysReplace = true;
         instantDeconstruct = true;
-        
-        deconstructThreshold = 0.35f;
         breakEffect = Fx.breakProp;
     }
 

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

@@ -34,7 +34,7 @@ public class PayloadMassDriver extends PayloadBlock{
     public Sound shootSound = Sounds.shootBig;
     public float shake = 3f;
 
-    public Effect transferEffect = new Effect(11f, 300f, e -> {
+    public Effect transferEffect = new Effect(11f, 600f, e -> {
         if(!(e.data instanceof PayloadMassDriverData data)) return;
         Tmp.v1.set(data.x, data.y).lerp(data.ox, data.oy, Interp.sineIn.apply(e.fin()));
         data.payload.set(Tmp.v1.x, Tmp.v1.y, e.rotation);

core/src/mindustry/world/blocks/production/Separator.java

@@ -128,19 +128,17 @@ public class Separator extends Block{
             return !consumes.itemFilters.get(item.id);
         }
 
-        //TODO write seed in 128 release, don't write it now for compatibility with 127.x
-        //@Override
-        //public byte version(){
-        //    return 1;
-        //}
+        @Override
+        public byte version(){
+            return 1;
+        }
 
         @Override
         public void write(Writes write){
             super.write(write);
             write.f(progress);
             write.f(warmup);
-            //TODO see above
-            //write.i(seed);
+            write.i(seed);
         }
 
         @Override
@@ -148,8 +146,7 @@ public class Separator extends Block{
             super.read(read, revision);
             progress = read.f();
             warmup = read.f();
-            //TODO see above
-            //if(revision == 1) seed = read.i();
+            if(revision == 1) seed = read.i();
         }
     }
 }