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

core/assets/bundles/bundle_cs.properties

@@ -1497,7 +1497,7 @@ block.router.details = Nezbytné zlo. Použití hned u produkčních vstupů se
 block.distributor.description = Rozděluje vstupní položky rovnoměrně do sedmi výstupů.
 block.overflow-gate.description = Pokud je směr vpřed ucpán, posílá vstupní položky do stran. Nelze použít vedle jiné brány.
 block.underflow-gate.description = Pokud je směr do stran ucpán, posílá vstupní položky vpřed. Nelze použít vedle jiné brány.
-block.mass-driver.description = Konstrukce pro přepravu položek na velkou vzdálenost. Sesere dávku položek a vystřelí ji k dalšímu hromadnému přenašeči.
+block.mass-driver.description = Konstrukce pro přepravu položek na velkou vzdálenost. Shromáždí dávku položek a vystřelí ji k dalšímu hromadnému přenašeči.
 block.mechanical-pump.description = Pumpuje kapalinu a předává ji dál. Nevyžaduje energii. 
 block.rotary-pump.description = Pumpuje kapalinu a předává ji dál. Vyžaduje energii. 
 block.impulse-pump.description = Pumpuje kapalinu a předává ji dál.

core/assets/bundles/bundle_de.properties

@@ -596,7 +596,7 @@ sectors.stored = Gelagert:
 sectors.resume = Weiterspielen
 sectors.launch = Start
 sectors.select = Auswählen
-sectors.nonelaunch = [lightgray]none (sun)
+sectors.nonelaunch = [lightgray]keiner (Sonne)
 sectors.rename = Sektor umbenennen
 sectors.enemybase = [scarlet]Gegnerische Basis
 sectors.vulnerable = [scarlet]Angriffsgefährdet
@@ -746,7 +746,7 @@ stat.drillspeed = Bohrgeschwindigkeit
 stat.boosteffect = Verstärkungseffekt
 stat.maxunits = Max. aktive Einheiten
 stat.health = Lebenspunkte
-stat.armor = Armor
+stat.armor = Rüstung
 stat.buildtime = Baudauer
 stat.maxconsecutive = Max. Konsekutive
 stat.buildcost = Baukosten
@@ -821,7 +821,7 @@ bullet.damage = [stat]{0}[lightgray] Schaden
 bullet.splashdamage = [stat]{0}[lightgray] Flächenschaden ~[stat] {1}[lightgray] Kacheln
 bullet.incendiary = [stat]entzündend
 bullet.homing = [stat]zielsuchend
-bullet.frags = [stat]{0}[lightgray]x frag bullets:
+bullet.frags = [stat]{0}[lightgray]x Splittergeschosse:
 bullet.lightning = [stat]{0}[lightgray]x Blitz ~ [stat]{1}[lightgray] Schaden
 bullet.buildingdamage = [stat]{0}%[lightgray]Blockschaden
 bullet.knockback = [stat]{0}[lightgray] zurückstoßend
@@ -1231,8 +1231,8 @@ block.door-large.name = Großes Tor
 block.duo.name = Doppelgeschütz
 block.scorch.name = Scatter
 block.scatter.name = Luftgeschütz
-block.hail.name = Hail
-block.lancer.name = Lancer
+block.hail.name = Hagel
+block.lancer.name = Lancier
 block.conveyor.name = Förderband
 block.titanium-conveyor.name = Titan-Förderband
 block.plastanium-conveyor.name = Plastanium-Förderband

core/assets/bundles/bundle_es.properties

@@ -1223,7 +1223,7 @@ block.titanium-wall.name = Muro de Titanio
 block.titanium-wall-large.name = Muro de Titanio grande
 block.plastanium-wall.name = Muro de Plastanio
 block.plastanium-wall-large.name = Muro de Plastanio grande
-block.phase-wall.name = Muro de Fase grande
+block.phase-wall.name = Muro de Fase
 block.phase-wall-large.name = Muro de Fase grande
 block.thorium-wall.name = Muro de Torio
 block.thorium-wall-large.name = Muro de Torio grande

core/src/mindustry/entities/comp/PayloadComp.java

@@ -165,6 +165,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         if(!u.isAdded()) u.team.data().updateCount(u.type, -1);
         u.add();
         u.unloaded();
+        Events.fire(new PayloadDropEvent(self(), u));
 
         return true;
     }
@@ -177,6 +178,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         if(on != null && Build.validPlace(tile.block, tile.team, tx, ty, tile.rotation, false)){
             int rot = (int)((rotation + 45f) / 90f) % 4;
             payload.place(on, rot);
+            Events.fire(new PayloadDropEvent(self(), tile));
 
             if(getControllerName() != null){
                 payload.build.lastAccessed = getControllerName();

core/src/mindustry/game/EventType.java

@@ -238,6 +238,24 @@ public class EventType{
         }
     }
 
+    public static class PayloadDropEvent{
+        public final Unit carrier;
+        public final @Nullable Unit unit;
+        public final @Nullable Building build;
+
+        public PayloadDropEvent(Unit carrier, Unit unit){
+            this.carrier = carrier;
+            this.unit = unit;
+            this.build = null;
+        }
+
+        public PayloadDropEvent(Unit carrier, Building build){
+            this.carrier = carrier;
+            this.build = build;
+            this.unit = null;
+        }
+    }
+
     public static class UnitControlEvent{
         public final Player player;
         public final @Nullable Unit unit;

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

@@ -762,9 +762,6 @@ public class SettingsMenuDialog extends BaseDialog{
         }
 
         public static class AreaTextSetting extends TextSetting{
-            String def;
-            Cons<String> changed;
-    
             public AreaTextSetting(String name, String def, Cons<String> changed){
                 super(name, def, changed);
             }

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

@@ -18,7 +18,7 @@ public class PointDefenseTurret extends ReloadTurret{
     public final int timerTarget = timers++;
     public float retargetTime = 5f;
 
-    public @Load("block-@size") TextureRegion baseRegion;
+    public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
 
     public Color color = Color.white;
     public Effect beamEffect = Fx.pointBeam;

servers_v6.json

@@ -1,11 +1,15 @@
 [
+  {
+    "name": "Sectorized",
+    "address": ["sectorized.ddns.net"]
+  },
   {
     "name": "{AA}",
     "address": ["recessive.net"]
   },
   {
     "name": "Yeet Hosting",
-    "address": ["omegam.mindustry.me:5004", "omegav.mindustry.me:25574", "omegav.mindustry.me:25568"]
+    "address": ["omegam.mindustry.me:5004", "omegav.mindustry.me:25575", "omegav.mindustry.me:25568"]
   },
   {
     "name": "RCM",
@@ -77,7 +81,7 @@
   },
   {
     "name": "TSR", 
-    "address": ["ult4.falix.gg:26904"]
+    "address": ["us01.optik.host:26194", "uk01.optik.host:26164"]
   },
   {
     "name": "Sakura", 
@@ -93,7 +97,7 @@
   },
   {
     "name": "Hungarian",
-    "address": ["hudustry.ddns.net"]
+    "address": ["vajdasimon.ddns.net"]
   },
   {
     "name": "Xpdustry",
@@ -105,7 +109,7 @@
   },
   {
     "name": "Mindustry Español",
-    "address": ["n4.mindustry.me:6578", "n4.mindustry.me:6573", "n4.mindustry.me:6577", "n4.mindustry.me:6576"]
+    "address": ["xpdustry.fr:9000"]
   },
   {
     "name": "CreateDustry",

servers_v7.json

@@ -17,7 +17,7 @@
   },
   {
     "name": "Omega",
-    "address": ["omegam.mindustry.me:5002", "omegam.mindustry.me:5003", "omegam.mindustry.me:5005", "omegam.mindustry.me:5006", "omegam.mindustry.me:5007", "omegam.mindustry.me", "omegam.mindustry.me:4006"]
+    "address": ["omegam.mindustry.me:25577", "omegam.mindustry.me"]
   },
   {
     "name": "MeowLand",
@@ -53,7 +53,7 @@
   },
   {
     "name": "Phoenix Network",
-    "address": ["172.104.253.198"]
+    "address": ["172.104.253.198", "172.104.253.198:6464"]
   },
   {
     "name": "Xpdustry",
@@ -72,11 +72,15 @@
     "address": ["lostdustry.northeurope.cloudapp.azure.com:6568", "lostdustry.northeurope.cloudapp.azure.com:6569", "lostdustry.northeurope.cloudapp.azure.com:6570"]
   },
   {
-    "name": "ALEX",
-    "address": ["dogemindustry.ddns.net:25588"]
+    "name": "Doge Multiverse",
+    "address": ["v7.servegame.com:25578"]
   },
   {
     "name": "Beyond Anarchy",
     "address": ["45.156.25.49"]
+  },
+  {
+    "name": "M-DE",
+    "address": ["mindustry.inc.li:6569", "mindustry.inc.li:6560"]
   }
 ]