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

core/src/mindustry/content/Fx.java

@@ -1908,7 +1908,7 @@ public class Fx{
         rand.setSeed(e.id);
         Tmp.v1.trns(e.rotation, e.finpow() * 90f * rand.random(0.2f, 1f));
         Fill.circle(e.x + Tmp.v1.x, e.y + Tmp.v1.y, 8f * rand.random(0.6f, 1f) * e.fout(0.2f));
-    }).layer(Layer.block + 1f),
+    }).layer(Layer.groundUnit + 1f),
 
     unitShieldBreak = new Effect(35, e -> {
         if(!(e.data instanceof Unitc)) return;

core/src/mindustry/content/UnitTypes.java

@@ -1504,15 +1504,13 @@ public class UnitTypes implements ContentList{
             trailY = -4f;
             trailScl = 1.9f;
 
-            abilities.add(new StatusFieldAbility(StatusEffects.overclock, 60f * 6, 60f * 6f, 60f));
-
             weapons.add(new Weapon("mount-weapon"){{
-                reload = 15f;
+                reload = 10f;
                 x = 5f;
                 y = 3.5f;
                 rotate = true;
                 rotateSpeed = 5f;
-                inaccuracy = 10f;
+                inaccuracy = 8f;
                 ejectEffect = Fx.casing1;
                 shootSound = Sounds.shoot;
                 bullet = Bullets.flakLead;
@@ -1528,7 +1526,15 @@ public class UnitTypes implements ContentList{
                 shake = 1.5f;
                 ejectEffect = Fx.casing2;
                 shootSound = Sounds.bang;
-                bullet = Bullets.artilleryDense;
+                bullet = new ArtilleryBulletType(3f, 20, "shell"){{
+                    hitEffect = Fx.flakExplosion;
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 11f;
+                    collidesTiles = false;
+                    splashDamageRadius = 30f * 0.75f;
+                    splashDamage = 40f;
+                }};
             }});
         }};
 
@@ -1863,6 +1869,8 @@ public class UnitTypes implements ContentList{
             trailScl = 1.9f;
             ammoType = new ItemAmmoType(Items.coal);
 
+            abilities.add(new StatusFieldAbility(StatusEffects.overclock, 60f * 6, 60f * 6f, 60f));
+
             buildSpeed = 2f;
 
             weapons.add(new Weapon("plasma-mount-weapon"){{

core/src/mindustry/ui/dialogs/ModsDialog.java

@@ -410,14 +410,14 @@ public class ModsDialog extends BaseDialog{
             browserTable.clear();
             int i = 0;
 
-            Seq<ModListing> listings = rlistings;
+            var listings = rlistings;
             if(!orderDate){
                 listings = rlistings.copy();
                 listings.sortComparing(m1 -> -m1.stars);
             }
 
             for(ModListing mod : listings){
-                if((mod.hasJava && Vars.ios) || !searchtxt.isEmpty() && !mod.repo.toLowerCase().contains(searchtxt.toLowerCase()) || (Vars.ios && mod.hasScripts)) continue;
+                if((mod.hasJava && Vars.ios) || (!Strings.matches(searchtxt, mod.name) && !Strings.matches(searchtxt, mod.repo)) || (Vars.ios && mod.hasScripts)) continue;
 
                 float s = 64f;