Merge remote-tracking branch 'origin/master'

core/src/mindustry/entities/bullet/EmpBulletType.java

@@ -21,9 +21,7 @@ public class EmpBulletType extends BasicBulletType{
             Vars.indexer.allBuildings(x, y, radius, other -> {
                 if(other.team == b.team){
                     if(other.block.hasPower && other.block.canOverdrive && other.timeScale < timeIncrease){
-                        if(timeIncrease >= other.timeScale){
-                            other.timeScale = Math.max(other.timeScale, timeIncrease);
-                        }
+                        other.timeScale = Math.max(other.timeScale, timeIncrease);
                         other.timeScaleDuration = Math.max(other.timeScaleDuration, timeDuration);
                         chainEffect.at(x, y, 0, hitColor, other);
                         applyEffect.at(other, other.block.size * 7f);

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

@@ -419,9 +419,6 @@ public class Turret extends ReloadTurret{
                     int ii = i;
                     Time.run(burstSpacing * i, () -> {
                         if(dead || !hasAmmo()) return;
-
-                        recoil = recoilAmount;
-
                         tr.trns(rotation, shootLength, Mathf.range(xRand));
                         bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy) + (ii - (int)(shots / 2f)) * spread);
                         effects();
@@ -508,4 +505,4 @@ public class Turret extends ReloadTurret{
             return 1;
         }
     }
-}
+}

servers_v6.json

@@ -7,6 +7,10 @@
     "name": "RCM",
     "address": ["185.104.248.61", "easyplay.su"]
   },
+  {
+    "name": "SkaarjDustry",
+    "address": ["skaarjproject.duckdns.org"]
+  },
   {
     "name": "{AA}",
     "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"]

servers_v7.json

@@ -33,7 +33,7 @@
   },
   {
     "name": "XCore",
-    "address": ["35.202.253.94", "35.202.253.94:2000"]
+    "address": ["skaarjproject.duckdns.org:2000"]
   },
   {
     "name": "Obvilion Network",