Merge remote-tracking branch 'origin/master'

* Update bundle_ru.properties

* Update bundle_ru.properties

README.md

@@ -18,7 +18,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 Bleeding-edge builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases).
 
 If you'd rather compile on your own, follow these instructions.
-First, make sure you have [JDK 16-17](https://adoptopenjdk.net/archive.html?variant=openjdk16&jvmVariant=hotspot) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
+First, make sure you have [JDK 16-17](https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
 
 ### Windows
 

annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java

@@ -165,7 +165,7 @@ public class AssetsProcess extends BaseProcessor{
                 loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; soundToId.put(a, $L); idToSound.put($L, a); }",
                 Core.class, filepath, rtype, name, rtype, id, id);
             }else{
-                loadBegin.addStatement("$T.assets.load($S, $L.class)", Core.class, filepath, rtype);
+                loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; }", Core.class, filepath, rtype, name, rtype);
             }
 
             type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());

build.gradle

@@ -23,8 +23,8 @@ buildscript{
 }
 
 plugins{
-    id 'org.jetbrains.kotlin.jvm' version '1.5.31'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.0-RC'
-    id "org.jetbrains.kotlin.kapt" version "1.5.31"
+    id "org.jetbrains.kotlin.kapt" version "1.6.0-RC"
 }
 
 allprojects{

core/assets/bundles/bundle.properties

@@ -288,6 +288,7 @@ save.corrupted = Save file corrupted or invalid!
 empty = <empty>
 on = On
 off = Off
+save.search = Search saved games...
 save.autosave = Autosave: {0}
 save.map = Map: {0}
 save.wave = Wave {0}
@@ -379,9 +380,13 @@ editor.ingame = Edit In-Game
 editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
 editor.center = Center
-editor.search = Search Maps...
+editor.search = Search maps...
 editor.filters = Filter Maps
-editor.showAll = Show Default Maps
+editor.filters.mode = Gamemodes:
+editor.filters.type = Map Type:
+editor.filters.search = Search In:
+editor.filters.author = Author
+editor.filters.description = Description
 workshop = Workshop
 waves.title = Waves
 waves.remove = Remove

core/assets/bundles/bundle_de.properties

@@ -78,13 +78,12 @@ schematic.tagexists = Dieses Tag gibt es schon.
 
 stats = Statistiken
 stat.wave = Wellen besiegt:[accent] {0}
+stat.unitsCreated = Einheiten erzeugt:[accent] {0}
 stat.enemiesDestroyed = Gegner zerstört:[accent] {0}
 stat.built = Blöcke gebaut:[accent] {0}
 stat.destroyed = Blöcke zerstört:[accent] {0}
 stat.deconstructed = Blöcke abgebaut:[accent] {0}
-stat.delivered = Übertragene Ressourcen:
 stat.playtime = Spielzeit:[accent] {0}
-stat.rank = Finaler Rang:[accent] {0}
 
 globalitems = [accent]Gesamtitems
 map.delete = Bist du sicher, dass du die Karte "[accent]{0}[]" löschen möchtest?
@@ -94,6 +93,7 @@ level.mode = Spielmodus:
 coreattack = < Der Kern wird angegriffen! >
 nearpoint = [[ [scarlet]SOFORT DEN SPAWNPUNKT VERLASSEN[] ]\nVernichtung droht
 database = Kern-Datenbank
+database.button = Datenbank
 savegame = Spiel speichern
 loadgame = Spiel laden
 joingame = Spiel beitreten
@@ -169,6 +169,7 @@ launchcore = Kern starten
 filename = Dateiname:
 unlocked = Neuer Inhalt freigeschaltet!
 available = Neue Forschung möglich
+unlock.incampaign = < Für Details in Kampagne freischalten >
 completed = [accent]Abgeschlossen
 techtree = Forschung
 research.legacy = [accent]5.0[] Forschungsdaten gefunden.\nMöchtest du [accent]diese Daten behalten[] oder [accent]sie löschen[] und neu anfangen (empfohlen)?
@@ -215,6 +216,7 @@ hosts.none = [lightgray]Keine LAN-Spiele gefunden!
 host.invalid = [scarlet]Kann keine Verbindung zum Host herstellen.
 
 servers.local = Lokale Server
+servers.local.steam = Offene Spiele & Lokale Server
 servers.remote = Andere Server
 servers.global = Community-Server
 
@@ -316,7 +318,7 @@ data.invalid = Dies sind keine gültigen Spieldaten.
 data.import.confirm = Der Import von externen Daten wird [scarlet] alle[] deine gegenwärtigen Spieldaten löschen.\n[accent]Das kann nicht rückgängig gemacht werden![]\n\nSobald der Import abgeschlossen ist, wird dein Spiel sofort beendet.
 quit.confirm = Willst du wirklich aufhören?
 loading = [accent]Wird geladen...
-reloading = [accent]Lade Mods neu...
+downloading = [accent]Herunterladen...
 saving = [accent]Speichere...
 respawn = [accent][[{0}][] um im Kern zu spawnen
 cancelbuilding = [accent][[{0}][] um den Plan zu leeren
@@ -344,9 +346,9 @@ custom = Benutzerdefiniert
 builtin = Enthalten
 map.delete.confirm = Bist du sicher, dass du diese Karte löschen willst? Dies kann nicht rückgängig gemacht werden!
 map.random = [accent]Zufällige Karte
-map.nospawn = Diese Karte hat keine Kerne, in denen die Spieler beginnen können! Füge einen [royal]orangen[] Kern zu dieser Karte im Editor hinzu.
+map.nospawn = Diese Karte hat keine Kerne, in denen die Spieler beginnen können! Füge einen [#{0}]{1}[] Kern zu dieser Karte im Editor hinzu.
 map.nospawn.pvp = Diese Karte hat keine Kerne für die gegnerischen Spieler! Füge über den Editor [scarlet] nicht-orange[] Kerne zu dieser Karte hinzu.
-map.nospawn.attack = Diese Karte hat keine gegnerischen Kerne, die Spieler angreifen können! Füge über den Editor [scarlet] rote[] Kerne zu dieser Karte hinzu.
+map.nospawn.attack = Diese Karte hat keine gegnerischen Kerne, die Spieler angreifen können! Füge über den Editor a [#{0}]{1}[] Kerne zu dieser Karte hinzu.
 map.invalid = Fehler beim Laden der Karte: Beschädigte oder ungültige Kartendatei.
 workshop.update = Objekt aktualisieren
 workshop.error = Fehler beim Laden von Workshop-Details: {0}
@@ -361,6 +363,7 @@ publish.confirm = Willst du das wirklich veröffentlichen?\n\n[lightgray]Vergewi
 publish.error = Fehler beim Veröffentlichen des Objekts: {0}
 steam.error = Fehler beim Laden der Steam-Dienste.\nError: {0}
 
+editor.cliffs = Wände zu Klippen
 editor.brush = Pinsel
 editor.openin = Öffne im Editor
 editor.oregen = Erze generieren
@@ -376,6 +379,9 @@ editor.ingame = Im Spiel bearbeiten
 editor.publish.workshop = Im Workshop veröffentlichen
 editor.newmap = Neue Karte
 editor.center = Zur Mitte
+editor.search = Karten durchsuchen...
+editor.filters = Karten filtern
+editor.showAll = Standard-Karten anzeigen
 workshop = Workshop
 waves.title = Wellen
 waves.remove = Entfernen
@@ -384,6 +390,7 @@ waves.waves = Welle(n)
 waves.perspawn = pro Spawn
 waves.shields = Schilder pro Welle
 waves.to = bis
+waves.max = maximale Einheiten
 waves.guardian = Boss
 waves.preview = Vorschau
 waves.edit = Bearbeiten...
@@ -392,6 +399,13 @@ waves.load = Aus der Zwischenablage laden
 waves.invalid = Ungültige Wellen in der Zwischenablage.
 waves.copied = Wellen kopiert.
 waves.none = Keine Gegner definiert.\nInfo: Leere Wellenentwürfe werden automatisch mit dem Standard-Entwurf ersetzt.
+waves.sort = Sortieren nach
+waves.sort.reverse = Rückwärts sortieren
+waves.sort.begin = Anfang
+waves.sort.health = Lebenspunkte
+waves.sort.type = Sorte
+waves.units.hide = Alle verstecken
+waves.units.show = Alle anzeigen
 
 
 wavemode.counts = Menge
@@ -538,6 +552,7 @@ configure = Anfangsressourcen festlegen
 loadout = Anfangsressourcen
 resources = Ressourcen
 bannedblocks = Gesperrte Blöcke
+bannedunits = Gesperrte Einheiten
 addall = Alle hinzufügen
 launch.from = Items werden von [accent]{0} []gestartet
 launch.destination = Ziel: {0}
@@ -562,6 +577,8 @@ weather.sandstorm.name = Sandsturm
 weather.sporestorm.name = Sporensturm
 weather.fog.name = Nebel
 
+sectorlist = Sektoren
+sectorlist.attacked = {0} wird angegriffen
 sectors.unexplored = [lightgray]Unentdeckt
 sectors.resources = Ressourcen:
 sectors.production = Produktion:
@@ -617,6 +634,8 @@ sector.biomassFacility.name = Biomass Synthesis Facility
 sector.windsweptIslands.name = Windswept Islands
 sector.extractionOutpost.name = Extraction Outpost
 sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Küstenlinie
+sector.navalFortress.name = Wasserfestung
 
 sector.groundZero.description = Der optimale Ort, um anzufangen. Schwache Gegner und weniger Ressourcen.\nSammele so viel Kupfer und Blei wie möglich.\nGeh weiter.
 sector.frozenForest.description = Auch hier, näher an den Bergen, sind die Sporen. Sogar die niedrigen Temperaturen können sie nicht zurückhalten.\n\nLerne, Strom zu verwenden. Baue Verbrennungsgeneratoren und Reparateure.
@@ -644,10 +663,12 @@ status.sapped.name = Schwächend
 status.electrified.name = Elektrisch
 status.spore-slowed.name = Sporen-verlangsamt
 status.tarred.name = Teerend
+status.overdrive.name = Overdrive
 status.overclock.name = Übertaktend
 status.shocked.name = Schockend
 status.blasted.name = Sprengend
 status.unmoving.name = Unbeweglich
+status.boss.name = Boss
 
 settings.language = Sprache
 settings.data = Spieldaten
@@ -875,6 +896,7 @@ setting.seconds = {0} Sekunden
 setting.milliseconds = {0} Millisekunden
 setting.fullscreen.name = Vollbild
 setting.borderlesswindow.name = Randloses Fenster
+setting.borderlesswindow.name.windows = Randloses Vollbild
 setting.borderlesswindow.description = Neustart vielleicht erforderlich.
 setting.fps.name = FPS anzeigen
 setting.smoothcamera.name = Sanfte Kamerabewegungen
@@ -998,6 +1020,7 @@ rules.wavetimer = Wellen-Timer
 rules.waves = Wellen
 rules.attack = Angriff-Modus
 rules.buildai = KI kann bauen
+rules.aitier = KI Stärke
 rules.cleanupdeadteams = Blöcke von erorberten Teams zerstören (PvP)
 rules.corecapture = Kern nach Zerstörung einnehmen
 rules.polygoncoreprotection = Polygonaler Kernschutz
@@ -1017,12 +1040,15 @@ rules.deconstructrefundmultiplier = Abbau Ressourcen-Rückerstattung
 rules.waitForWaveToEnd = Warten bis Welle endet
 rules.dropzoneradius = Drop-Zonen-Radius:[lightgray] (Kacheln)
 rules.unitammo = Einheiten benötigen Munition
+rules.enemyteam = Gegnerteam
+rules.playerteam = Spielerteam
 rules.title.waves = Wellen
 rules.title.resourcesbuilding = Ressourcen & Blöcke
 rules.title.enemy = Gegner
 rules.title.unit = Einheiten
 rules.title.experimental = Experimentell
 rules.title.environment = Umgebung
+rules.title.teams = Teams
 rules.lighting = Blitze
 rules.enemyLights = Gegnerisches Licht
 rules.fire = Feuer
@@ -1101,13 +1127,13 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Korvus
 
-block.resupply-point.name = Munitionsvorrat
 block.parallax.name = Parallax
 block.cliff.name = Klippe
 block.sand-boulder.name = Sandbrocken
 block.basalt-boulder.name = Basaltbrocken
 block.grass.name = Gras
 block.molten-slag.name = Schlacke
+block.pooled-cryofluid.name = Cryoflüssigkeit
 block.space.name = Weltall
 block.salt.name = Salz
 block.salt-wall.name = Salzwand
@@ -1141,6 +1167,7 @@ block.core-nucleus.name = Kern: Nukleus
 block.deep-water.name = Tiefes Wasser
 block.shallow-water.name = Wasser
 block.tainted-water.name = Dreckiges Wasser
+block.deep-tainted-water.name = Tiefes dreckiges Wasser
 block.darksand-tainted-water.name = Dreckiges Wasser (Dunkler Sand)
 block.tar.name = Teer
 block.stone.name = Stein
@@ -1352,6 +1379,7 @@ hint.placeTurret = Platziere \uf861 [accent]Geschütze[], um deine Basis vor Geg
 hint.breaking = Benutze [accent]Rechtsklick[] und bewege deine Maus, um zu zerstören.
 hint.breaking.mobile = Aktiviere den \ue817 [accent]Hammer[] unten rechts und tippe, um Blöcke zu zerstören.\n\nHalte deinen Finger auf dem Bildschirm, um eine Fläche auszuwählen.
 hint.blockInfo = Genauere Blockinformationen können im [accent]Baumenü[] rechts beim [accent][[?][]-Symbol gefunden werden.
+hint.derelict = [accent]Derelikte[] Blöcke sind kaputte Teile alter Basen, die nicht mehr funktionieren.\n\nSie können für Ressourcen [accent]abgebaut[] werden.
 hint.research = Nehme den \ue875 [accent]Forschen[]-Knopf um neue Technologien zu erforschen.
 hint.research.mobile = Nehme den \ue875 [accent]Forschen[]-Knopf im \ue88c [accent]Menü[], um neue Technologien zu erforschen.
 hint.unitControl = Halte [accent][[L-STRG][] und [accent]klicke[], um alliierte Einheiten oder Geschütze zu steuern.
@@ -1373,6 +1401,7 @@ hint.generator = \uf879 [accent]Verbrennungsgeneratoren[] verbrennen Kohle und
 hint.guardian = [accent]Boss[]-Einheiten sind gepanzert. Schwache Munition wie [accent]Kupfer[] und [accent]Blei[] sind [scarlet]nicht effektiv[].\n\nBenutze bessere Geschütze oder \uf835 [accent]Graphit[] als \uf861Duo-/\uf859Salvenmunition um einen Boss zu besiegen.
 hint.coreUpgrade = Kerne können aufgerüstet werden, indem man [accent]bessere Kerne über sie platziert[].\n\nPlatziere einen  [accent]Fundament[]-Kern über einen  [accent]Scherben[]-Kern. Stelle sicher, dass ausreichend Platz verfügbar ist.
 hint.presetLaunch = Zu grauen [accent]Sektoren[] wie dem [accent]Frozen Forest[] kann man von überall aus hin starten. Es ist nicht nötig, benachbarte Sektoren zu erobern.\n\n[accent]Nummerierte Sektoren[] wie dieser hier sind [accent]optional[].
+hint.presetDifficulty = Dieser Sektor hat eine [scarlet]hohe Gefahrenstufe[].\nOhne richtige Technologie und Vorbereitung ist es [accent]nicht empfohlen[], zu diesem Sektor zu starten.
 hint.coreIncinerate = Wenn dem Kern Materialien zugeführt werden, für die er keinen Platz mehr hat, werden diese [accent]verbrannt[].
 hint.coopCampaign = Wenn du die [accent]Mehrspielerkampagne[] spielst, werden produzierte Items [accent]zu deinen lokalen Sektoren[] geschickt.\n\nNeuen Erforschungen vom Host werden auch übertragen.
 
@@ -1403,7 +1432,7 @@ liquid.slag.description = Kann in Trennern verfeinert oder als Waffe gegen Gegne
 liquid.oil.description = Wird in fortgeschrittener Materialgewinnung und als brennende Munition verwendet.
 liquid.cryofluid.description = Wird als Kühlung in Geschützen, Fabriken oder Reaktoren verwendet.
 
-block.resupply-point.description = Füllt Einheiten in der Nähe mit Kupfermunition wieder auf. Nicht mit Einheiten kompatibel, die Strom benötigen.
+block.derelict =  [lightgray]Derelikt
 block.armored-conveyor.description = Bewegt Materialien voran. Materialien können von der Seite nicht auf das Förderband.
 block.illuminator.description = Eine Lichtquelle.
 block.message.description = Speichert eine Nachricht, die genutzt wird, um mit Verbündeten zu kommunizieren.
@@ -1429,6 +1458,8 @@ block.item-source.description = Produziert unendlich viele Gegenstände. Nur im
 block.item-void.description = Zerstört Materialien, die hereingegeben werden, ohne Strom zu verbrauchen. Nur im Sandkasten-Modus verfügbar.
 block.liquid-source.description = Produziert unendlich Flüssigkeiten. Nur im Sandkasten-Modus verfügbar.
 block.liquid-void.description = Entfernt jegliche Flüssigkeiten. Nur im Sandkasten-Modus verfügbar.
+block.payload-source.description = Produziert unendlich Einheiten. Nur im Sandkasten-Modus verfügbar.
+block.payload-void.description = Entfernt jegliche Einheiten. Nur im Sandkasten-Modus verfügbar.
 block.copper-wall.description = Beschützt Blöcke vor Gegnern.
 block.copper-wall-large.description = Beschützt Blöcke vor Gegnern.
 block.titanium-wall.description = Beschützt Blöcke vor Gegnern.
@@ -1583,7 +1614,7 @@ unit.omura.description = Schießt eine Railgun mit hoher Reichweite, um Gegner z
 unit.alpha.description = Beschützt den Scherbenkern vor Feinden. Baut Blöcke.
 unit.beta.description = Beschützt den Fundamentkern vor Feinden. Baut Blöcke.
 unit.gamma.description = Beschützt den Nukleuskern vor Feinden. Baut Blöcke.
-unit.retusa.description = Platziert Minen und heilt verbündete Einheiten.
+unit.retusa.description = Schießt zielsuchende Torpedos auf Gegner und heilt verbündete Einheiten.
 unit.oxynoe.description = Schießt Block-heilendes Feuer auf Gegner und zerstört gegnerische Projektile.
 unit.cyerce.description = Schießt zielsuchende Cluster-Raketen auf Gegner und heilt verbündete Einheiten.
 unit.aegires.description = Schockt alle gegnerische Einheiten und Blöcke, die das Energiefeld betreten. Heilt alle verbündete.

core/assets/bundles/bundle_es.properties

@@ -379,6 +379,13 @@ editor.ingame = Editar dentro del juego
 editor.publish.workshop = Publicar en el Steam Workshop
 editor.newmap = Nuevo Mapa
 editor.center = Centrar
+editor.search = Buscar mapas...
+editor.filters = Filtrar Mapas
+editor.filters.mode = Modos de juego:
+editor.filters.type = Tipo de mapa:
+editor.filters.search = Buscar en:
+editor.filters.author = Autor
+editor.filters.description = Descripción
 workshop = Steam Workshop
 waves.title = Oleadas
 waves.remove = Borrar
@@ -412,6 +419,7 @@ wavemode.health = por salud
 editor.default = [lightgray]<Por defecto>
 details = Detalles...
 edit = Editar...
+variables = Variables
 editor.name = Nombre:
 editor.spawn = Aparecer unidad
 editor.removeunit = Borrar Unidad
@@ -1291,6 +1299,7 @@ block.plated-conduit.name = Conducto Acorazado
 block.phase-conduit.name = Conducto de Fase
 block.liquid-router.name = Enrutador de Líquidos
 block.liquid-tank.name = Tanque de Líquidos
+block.liquid-container.name = Contenedor de Líquidos
 block.liquid-junction.name = Cruce de Líquidos
 block.bridge-conduit.name = Conducto Puente
 block.rotary-pump.name = Bomba Rotatoria
@@ -1337,13 +1346,19 @@ block.disassembler.name = Desensamblador
 block.silicon-crucible.name = Crisol de silicio
 block.overdrive-dome.name = Campo de Aceleración
 block.interplanetary-accelerator.name = Acelerador Interplanetario
-#experimental, puede ser eliminado
+block.constructor.name = Constructor
-block.block-forge.name = Forja de Carga
+block.constructor.description = Construye estructuras de hasta un tamaño de 2x2.
-block.block-loader.name = Cargador de Carga
+block.large-constructor.name = Constructor grande
-block.block-unloader.name = Descargador de Carga
+block.large-constructor.description = Construye estructuras de hasta un tamaño de 4x4.
-
+block.deconstructor.name = Deconstructor
+block.deconstructor.description = Deconstruye estructuras y unidades, devuelve el 100% de su costo original.
+block.payload-loader.name = Cargador de carga útil
+block.payload-loader.description = Carga objetos y líquidos en los bloques.
+block.payload-unloader.name = Descargador de carga útil
+block.payload-unloader.description = Descarga objetos y líquidos de los bloques.
 block.switch.name = Interruptor
-block.micro-processor.name = Micro Processador
+block.micro-processor.name = Micro Procesador
+
 block.logic-processor.name = Procesador lógico
 block.hyper-processor.name = Hiperprocesador
 block.logic-display.name = Pantalla lógica
@@ -1496,6 +1511,7 @@ block.conduit.description = Mueve líquidos hacia delante. Se usa junto con bomb
 block.pulse-conduit.description = Transporta líquidos rápidamente y almacena más que los conductos estándar.
 block.plated-conduit.description = Transporta líquidos rápidamente pero no acepta líquidos por los lados. Resiste más ante fugas, por lo que no gotea.
 block.liquid-router.description = Acepta líquidos de una dirección y los reparte en hasta 3 direcciones equitativamente. También puede almacenar cierta capacidad de líquido.
+block-liquid-container.description = Almacena una cantidad considerable de líquidos. Lo devuelve en todas las direcciones de salida válidas, como un enrutador de líquidos.
 block.liquid-tank.description = Almacena una gran cantidad de líquidos. Lo devuelve en todas direcciones de salida válidas, como un enrutador de líquidos.
 block.liquid-junction.description = Actúa como un puente para dos conductos que se cruzan.
 block.bridge-conduit.description = Permite transportar líquidos sobre cualquier terreno o estructura.

core/assets/bundles/bundle_fr.properties

@@ -288,6 +288,7 @@ save.corrupted = Fichier de sauvegarde corrompu ou invalide !
 empty = <vide>
 on = Activé
 off = Désactivé
+save.search = Recherche de parties sauvegardées...
 save.autosave = Sauvegarde automatique : {0}
 save.map = Carte : {0}
 save.wave = Vague {0}
@@ -381,7 +382,11 @@ editor.newmap = Nouvelle carte
 editor.center = Centrer
 editor.search = Recherche de cartes...
 editor.filters = Filtrer les cartes
-editor.showAll = Afficher les cartes par défaut
+editor.filters.mode = Modes de jeu :
+editor.filters.type = Type de carte :
+editor.filters.search = Rechercher dans :
+editor.filters.author = Auteur
+editor.filters.description = Description
 workshop = Steam Workshop
 waves.title = Vagues
 waves.remove = Supprimer
@@ -578,6 +583,8 @@ weather.sandstorm.name = Tempête de sable
 weather.sporestorm.name = Tempête de spores
 weather.fog.name = Brouillard
 
+sectorlist = Secteurs
+sectorlist.attacked = {0} pris d'assaut
 sectors.unexplored = [lightgray]Inexploré
 sectors.resources = Ressources :
 sectors.production = Production :

core/assets/bundles/bundle_in_ID.properties

@@ -78,13 +78,12 @@ schematic.tagexists = Tanda ini sudah ada.
 
 stats = Statistik
 stat.wave = Gelombang Terkalahkan:[accent] {0}
+stat.unitsCreated = Unit Terbentuk:[accent] {0}
 stat.enemiesDestroyed = Musuh Terhancurkan:[accent] {0}
 stat.built = Jumlah Blok yang Dibangun:[accent] {0}
 stat.destroyed = Jumlah Blok Dihancurkan Musuh:[accent] {0}
 stat.deconstructed = Jumlah Blok Dihancurkan Pemain:[accent] {0}
-stat.delivered = Sumber Daya yang Diluncurkan:
 stat.playtime = Waktu Bermain:[accent] {0}
-stat.rank = Nilai Akhir: [accent]{0}
 
 globalitems = [accent]Bahan Keseluruhan
 map.delete = Apakah Anda yakin ingin menghapus peta "[accent]{0}[]"?
@@ -94,6 +93,7 @@ level.mode = Mode Permainan:
 coreattack = < Inti sedang diserang! >
 nearpoint = [[ [scarlet]TINGGALKAN TITIK JATUH SEGERA[] ]\npenghancuran akan terjadi
 database = Basis Data Inti
+database.button = Basis Data
 savegame = Simpan Permainan
 loadgame = Muat Permainan
 joingame = Bermain Bersama
@@ -169,6 +169,7 @@ launchcore = Luncurkan Inti
 filename = Nama File:
 unlocked = Konten baru terbuka!
 available = Penelitian baru tersedia!
+unlock.incampaign = < Buka dalam kampanye untuk detail lebih lanjut >
 completed = [accent]Terselesaikan
 techtree = Cabang Teknologi
 research.legacy = Data penelitian [accent]5.0[] ditemukan.\nApakah kamu ingin [accent]memuat data ini[], atau [accent]mengabaikannya[] dan memulai ulang penelitian di kampanye terbaru (disarankan)?
@@ -287,6 +288,7 @@ save.corrupted = [accent]File simpanan rusak atau tidak sah!\nJika Anda baru saj
 empty = <kosong>
 on = Aktif
 off = Nonaktif
+save.search = Cari permainan tersimpan...
 save.autosave = Simpan otomatis: {0}
 save.map = Peta: {0}
 save.wave = Gelombang {0}
@@ -362,6 +364,7 @@ publish.confirm = Apakah Anda yakin untuk menerbitkan item ini?\n\n[lightgray]Pa
 publish.error = Terjadi kesalahan saat menerbitkan item: {0}
 steam.error = Gagal untuk menjalankan layanan Steam.\nKesalahan: {0}
 
+editor.cliffs = Dinding Ke Jurang
 editor.brush = Kuas
 editor.openin = Buka di Penyunting
 editor.oregen = Generasi Sumber Daya
@@ -377,6 +380,13 @@ editor.ingame = Sunting dalam Permainan
 editor.publish.workshop = Terbitkan di Workshop
 editor.newmap = Peta Baru
 editor.center = Pusat
+editor.search = Cari peta...
+editor.filters = Filter Peta
+editor.filters.mode = Mode Permainan:
+editor.filters.type = Tipe Peta:
+editor.filters.search = Cari Dalam:
+editor.filters.author = Pembuat
+editor.filters.description = Deskripsi
 workshop = Workshop
 waves.title = Gelombang
 waves.remove = Hapus
@@ -385,6 +395,7 @@ waves.waves = gelombang
 waves.perspawn = per muncul
 waves.shields = perisai/gelombang
 waves.to = sampai
+waves.max = unit maks
 waves.guardian = Penjaga
 waves.preview = Pratinjau
 waves.edit = Sunting...
@@ -393,6 +404,13 @@ waves.load = Tempel dari Papan klip
 waves.invalid = Gelombang tidak valid di papan klip.
 waves.copied = Gelombang tersalin.
 waves.none = Tidak ada musuh yang didefinisikan.\nIngat bahwa susunan gelombang yang kosong akan diubah menjadi susunan gelombang standar secara otomatis.
+waves.sort = Urut Berdasarkan
+waves.sort.reverse = Urut Balik
+waves.sort.begin = Mulai
+waves.sort.health = Darah
+waves.sort.type = Tipe
+waves.units.hide = Sembunyikan Semua
+waves.units.show = Lihat Semua
 
 #memang sengaja diberi huruf kecil
 wavemode.counts = jumlah
@@ -402,6 +420,7 @@ wavemode.health = darah
 editor.default = [lightgray]<Standar>
 details = Detail...
 edit = Sunting...
+variables = Vars
 editor.name = Nama:
 editor.spawn = Munculkan Unit
 editor.removeunit = Hapus Unit
@@ -538,7 +557,8 @@ configure = Konfigurasi Muatan
 
 loadout = Muatan
 resources = Sumber Daya
-bannedblocks = Balok yang dilarang
+bannedblocks = Balok yang Dilarang
+bannedunits = Unit yang Dilarang
 addall = Tambah Semua
 launch.from = Meluncurkan Dari: [accent]{0}
 launch.destination = Destinasi: {0}
@@ -563,6 +583,8 @@ weather.sandstorm.name = Badai Pasir
 weather.sporestorm.name = Badai Spora
 weather.fog.name = Kabut
 
+sectorlist = Sektor
+sectorlist.attacked = {0} sedang diserang
 sectors.unexplored = [lightgray]Belum Ditelusuri
 sectors.resources = Sumber Daya:
 sectors.production = Produksi:
@@ -618,6 +640,8 @@ sector.biomassFacility.name = Pabrik Sintesis Biomassa
 sector.windsweptIslands.name = Pulau Bersemilir
 sector.extractionOutpost.name = Pos Ekstraksi Terdepan
 sector.planetaryTerminal.name = Pusat Peluncuran Planet
+sector.coastline.name = Tepi Pantai
+sector.navalFortress.name = Benteng Laut
 
 sector.groundZero.description = Lokasi yang optimal untuk bermain satu kali lagi. Sangat sedikit musuh. Beberapa sumber daya dapat dikumpulkan.\nKumpulkan timah dan tembaga sebanyak yang kamu bisa.\nMulai dari sini.
 sector.frozenForest.description = Disini, dekat dengan gunung, spora sudah menyebar. Suhu dingin tidak dapat menahannya.\n\nHasilkan listrik. Bangun generator pembakar. Pelajari cara menggunakan mender.
@@ -645,10 +669,12 @@ status.sapped.name = Melemahkan
 status.electrified.name = Dialiri Listrik
 status.spore-slowed.name = Spora Melambat
 status.tarred.name = Berminyak
+status.overdrive.name = Dipercepat
 status.overclock.name = Melebihi Batas
 status.shocked.name = Mengkejut
 status.blasted.name = Meledak
 status.unmoving.name = Terdiam
+status.boss.name = Guardian
 
 settings.language = Bahasa
 settings.data = Data Game
@@ -875,7 +901,8 @@ setting.saveinterval.name = Jarak Menyimpan
 setting.seconds = {0} detik
 setting.milliseconds = {0} milidetik
 setting.fullscreen.name = Layar Penuh
-setting.borderlesswindow.name = Jendela tak Berbatas[lightgray]
+setting.borderlesswindow.name = Jendela tak Berbatas
+setting.borderlesswindow.name.windows = Layar Penuh tak Berbatas
 setting.borderlesswindow.description = Mulai ulang mungkin diperlukan untuk menerapkan perubahan.
 setting.fps.name = Tunjukkan FPS
 setting.smoothcamera.name = Kamera Halus
@@ -999,10 +1026,11 @@ rules.wavetimer = Pengaturan Waktu Gelombang
 rules.waves = Gelombang
 rules.attack = Mode Penyerangan
 rules.buildai = Bangunan A.I.
+rules.aitier = Tingkatan A.I.
 rules.cleanupdeadteams = Bersihkan Bangunan Tim yang Kalah (PvP)
 rules.corecapture = Tangkap Inti Saat Kehancuran
 rules.polygoncoreprotection = Poligon Pelindung Inti
-rules.enemyCheat = Sumber Daya A.I. Musuh (Tim Merah) Tak Terbatas
+rules.enemyCheat = Sumber Daya A.I. (Tim Merah) Tak Terbatas
 rules.blockhealthmultiplier = Penggandaan Darah Blok
 rules.blockdamagemultiplier = Penggandaan Kekuatan Blok
 rules.unitbuildspeedmultiplier = Penggandaan Kecepatan Munculnya Unit
@@ -1018,12 +1046,15 @@ rules.deconstructrefundmultiplier = Penggandaan Kembalinya Bahan Bangunan yang D
 rules.waitForWaveToEnd = Gelombang Menunggu Musuh
 rules.dropzoneradius = Radius Titik Muncul:[lightgray] (Blok)
 rules.unitammo = Unit Membutuhkan Amunisi
+rules.enemyteam = Tim Musuh
+rules.playerteam = Tim Pemain
 rules.title.waves = Gelombang
 rules.title.resourcesbuilding = Sumber Daya & Bangunan
 rules.title.enemy = Musuh
 rules.title.unit = Unit
 rules.title.experimental = Eksperimental
 rules.title.environment = Lingkungan
+rules.title.teams = Tim
 rules.lighting = Penerangan
 rules.enemyLights = Sinar dari Musuh
 rules.fire = Api
@@ -1102,13 +1133,13 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
 
-block.resupply-point.name = Titik Pemasok Ulang
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Batu Pasir Besar
 block.basalt-boulder.name = Batu Basal Besar
 block.grass.name = Rumput
 block.molten-slag.name = Lahar
+block.pooled-cryofluid.name = Cairan Dingin
 block.space.name = Luar Angkasa
 block.salt.name = Garam
 block.salt-wall.name = Bukit Garam
@@ -1142,6 +1173,7 @@ block.core-nucleus.name = Inti: Nukleus
 block.deep-water.name = Air Dalam
 block.shallow-water.name = Air
 block.tainted-water.name = Air Ternoda
+block.deep-tainted-water.name = Air Dalam Ternoda
 block.darksand-tainted-water.name = Air Ternodai Pasir Hitam
 block.tar.name = Minyak Mentah
 block.stone.name = Batu
@@ -1268,7 +1300,8 @@ block.pulse-conduit.name = Selang Denyut
 block.plated-conduit.name = Pipa Terlapis
 block.phase-conduit.name = Selang Phase
 block.liquid-router.name = Pengarah Cairan
-block.liquid-tank.name = Bak Cairan
+block.liquid-tank.name = Tangki Cairan
+block.liquid-container.name = Kontainer Cairan
 block.liquid-junction.name = Simpangan Cairan
 block.bridge-conduit.name = Jembatan Saluran
 block.rotary-pump.name = Pompa Putaran
@@ -1315,10 +1348,16 @@ block.disassembler.name = Pembongkar
 block.silicon-crucible.name = Pelebur Raksasa
 block.overdrive-dome.name = Kubah Projektor Pemercepat
 block.interplanetary-accelerator.name = Akselerator Antarplanet
-#experimental, may be removed
+block.constructor.name = Konstruktor
-block.block-forge.name = Pemadu Blok
+block.constructor.description = Membuat struktur hingga ubin berukuran 2x2.
-block.block-loader.name = Pemuat Blok
+block.large-constructor.name = Konstruktor Besar
-block.block-unloader.name = Pembongkar Blok
+block.large-constructor.description = Membuat struktur hingga ubin berukuran 4x4.
+block.deconstructor.name = Deskontruktor
+block.deconstructor.description = Mendekonstruksi bangunan dan unit. Mengembalikan 100% dari biaya bahan.
+block.payload-loader.name = Pemuat Blok
+block.payload-loader.description = Memuat cairan dan item ke dalam blok.
+block.payload-unloader.name = Pembongkar Blok
+block.payload-unloader.description = Membongkar cairan dan item dari blok.
 
 block.switch.name = Saklar
 block.micro-processor.name = Prosesor Mikro
@@ -1375,6 +1414,7 @@ hint.generator = \uf879 [accent]Generator Pembakar[] membakar batu bara dan meng
 hint.guardian = Unit [accent]Penjaga[] adalah unit yang diperkuat. Amunisi lemah seperti [accent]Tembaga[] dan [accent]Timah[] [scarlet]tidak efektif[].\n\nGunakan menara yang lebih bagus atau amunisi yang lebih kuat seperti \uf835 [accent]Grafit[] \uf861Duo/\uf859Salvo untuk menghancurkan Penjaga.
 hint.coreUpgrade = Inti dapat ditingkatkan dengan cara [accent]meletakkan yang lebih besar diatasnya[].\n\nLetakan sebuah inti  [accent]Fondasi[] diatas inti  [accent]Shard[]. Pastikan terdapat ruang kosong dari bangunan yang lain.
 hint.presetLaunch = [accent]Zona pendaratan[] yang berwarna abu-abu, seperti [accent]Hutan yang Beku[], dapat diluncurkan dari mana saja. Sektor seperti ini tidak perlu diluncurkan dari sektor terdekat milik kamu.\n\n[accent]Sektor yang bernomor[], seperti yang ini, bisa [accent]dikuasai atau diabaikan[].
+hint.presetDifficulty = Sektor ini memiliki [scarlet]ancaman bahaya musuh yang tinggi[].\nMeluncurkan ke sektor tersebut [accent]tidak disarankan[] tanpa teknologi yang sesuai dan persiapan yang matang.
 hint.coreIncinerate = Setelah inti penuh dengan suatu barang, barang yang setipe akan [accent]dihancurkan[].
 hint.coopCampaign = Ketika bermain [accent]kampanye multiplayer[], barang yang diproduksi di map ini akan diberikan ke [accent]sektor kamu juga[].\n\nSetiap penelitian baru yang dilakukan oleh host juga akan diberikan kepadamu.
 
@@ -1406,7 +1446,6 @@ liquid.oil.description = Digunakan di produksi material lanjutan dan sebagai amu
 liquid.cryofluid.description = Digunakan sebagai pendingin di reaktor, menara, dan pabrik.
 
 block.derelict = [lightgray] Derelik
-block.resupply-point.description = Mengisi ulang amunisi unit terdekat dengan tembaga. Tidak dapat mengisi ulang unit yang menggunakan tenaga baterai.
 block.armored-conveyor.description = Memindahkan barang ke depan. Tidak dapat menerima masukan dari samping.
 block.illuminator.description = Memancarkan cahaya.
 block.message.description = Menyimpan pesan untuk komunikasi antar sekutu.
@@ -1417,7 +1456,7 @@ block.kiln.description = Membakar pasir dan timah menjadi metaglass.
 block.plastanium-compressor.description = Memproduksi plastanium dari minyak dan titanium.
 block.phase-weaver.description = Memproduksi kain phase dari thorium dan banyak pasir.
 block.alloy-smelter.description = Memproduksi campuran logam dari titanium, timah, silikon dan tembaga.
-block.cryofluidmixer.description = Mencampur air dan titanium menjadi cairan dingin.
+block.cryofluid-mixer.description = Mencampur air dan titanium menjadi cairan dingin.
 block.blast-mixer.description = Memproduksi senyawa peledak dari pyratit dan polong spora.
 block.pyratite-mixer.description = Mencampur batu bara, timah dan pasir menjadi pyratit.
 block.melter.description = Melelehkan rongsokan menjadi lava.
@@ -1432,6 +1471,8 @@ block.item-source.description = Mengeluarkan bahan tak terhingga. Sandbox eksklu
 block.item-void.description = Menghancurkan bahan apa saja. Sandbox eksklusif.
 block.liquid-source.description = Mengeluarkan zat cair tak terhingga. Sandbox eksklusif.
 block.liquid-void.description = Menghancurkan zat cair apa saja. Sandbox eksklusif.
+block.payload-source.description = Infinitely outputs payloads. Sandbox only.
+block.payload-void.description = Destroys any payloads. Sandbox only.
 block.copper-wall.description = Melindungi bangunan dari tembakan musuh.
 block.copper-wall-large.description = Melindungi bangunan dari tembakan musuh.
 block.titanium-wall.description = Melindungi bangunan dari tembakan musuh.
@@ -1472,7 +1513,8 @@ block.conduit.description = Memindahkan cairan ke depan. Digunakan dengan pompa
 block.pulse-conduit.description = Memindahkan cairan ke depan. Mengantarkan lebih cepat dan banyak daripada saluran biasa.
 block.plated-conduit.description = Memindahkan cairan ke depan. Tidak menerima cairan dari samping. Tidak bocor.
 block.liquid-router.description = Menerima cairan dari satu arah dan mengeluarkannya ke 3 arah secara rata. Dapat digunakan untuk menyimpan sejumlah cairan.
-block.liquid-tank.description = Menyimpan jumlah cairan yang banyak. Mengeluarkan cairan ke segala arah, sama seperti pengarah cairan.
+block.liquid-container.description = Menyimpan jumlah cairan yang banyak. Mengeluarkan cairan ke segala arah, sama seperti pengarah cairan.
+block.liquid-tank.description = Menyimpan jumlah cairan yang sangat banyak. Mengeluarkan cairan ke segala arah, sama seperti pengarah cairan.
 block.liquid-junction.description = Berguna seperti jembatan untuk dua saluran yang bersimpangan.
 block.bridge-conduit.description = Memindahkan cairan melewati tanah atau bangunan.
 block.phase-conduit.description = Memindahkan cairan melewati tanah atau bangunan. Memiliki jarak yang lebih jauh daripada jembatan cairan, namun memerlukan tenaga.
@@ -1737,6 +1779,7 @@ lenum.itemdrop = Menjatuhkan bahan.
 lenum.itemtake = Mengambil bahan dari suatu bangunan.
 lenum.paydrop = Menurunkan muatan yang ada.
 lenum.paytake = Mengangkut muatan pada lokasi ini.
+lenum.payenter = Masuk/mendarat pada blok muatan yang saat ini unit sedang berdiri.
 lenum.flag = Tanda numerik unit.
 lenum.mine = Menambang pada sebuah posisi.
 lenum.build = Membangun sebuah sttruktur.

core/assets/bundles/bundle_ja.properties

@@ -288,6 +288,7 @@ save.corrupted = [accent]セーブファイルが無効、または破損しま
 empty = <空>
 on = オン
 off = オフ
+save.search = セーブデータを検索...
 save.autosave = 自動保存: {0}
 save.map = マップ: {0}
 save.wave = ウェーブ {0}
@@ -381,7 +382,11 @@ editor.newmap = 新しいマップ
 editor.center = 中心
 editor.search = マップを検索...
 editor.filters = マップをフィルターする
-editor.showAll = デフォルトマップを表示
+editor.filters.mode = ゲームモード:
+editor.filters.type = マップタイプ:
+editor.filters.search = 検索:
+editor.filters.author = 作者
+editor.filters.description = 説明
 workshop = ワークショップ
 waves.title = ウェーブ
 waves.remove = 削除
@@ -415,6 +420,7 @@ wavemode.health = 総体力
 editor.default = [lightgray]<デフォルト>
 details = 詳細...
 edit = 編集...
+variables = 変数
 editor.name = 名前:
 editor.spawn = ユニットを出す
 editor.removeunit = ユニットを消す
@@ -1299,6 +1305,7 @@ block.plated-conduit.name = メッキパイプ
 block.phase-conduit.name = フェーズパイプ
 block.liquid-router.name = 液体ルーター
 block.liquid-tank.name = 液体タンク
+block.liquid-container.name = 液体コンテナ
 block.liquid-junction.name = 液体ジャンクション
 block.bridge-conduit.name = ブリッジパイプ
 block.rotary-pump.name = ロータリーポンプ
@@ -1345,10 +1352,16 @@ block.disassembler.name = ディスアセンブラー
 block.silicon-crucible.name = シリコンクルーシブル
 block.overdrive-dome.name = 加速ドーム
 block.interplanetary-accelerator.name = 惑星間加速器
-#experimental, may be removed
+block.constructor.name = コンストラクター
-block.block-forge.name = ブロックフォージ
+block.constructor.description = 最大で2x2の大きさの構造物を建造します。
-block.block-loader.name = ブロック積載機
+block.large-constructor.name = 大型コンストラクター
-block.block-unloader.name = ブロック搬出機
+block.large-constructor.description = 最大で4x4の大きさの構造物を建造します。
+block.deconstructor.name = デコンストラクター
+block.deconstructor.description = 構造物やユニットを解体します。建造費の100％が戻ってきます。
+block.payload-loader.name = ペイロード搬入機
+block.payload-loader.description = 液体や資源をブロックに搬入します。
+block.payload-unloader.name = ペイロード搬出機
+block.payload-unloader.description = ブロックから液体や資源を搬出します。
 
 block.switch.name = スイッチ
 block.micro-processor.name = マイクロプロセッサー
@@ -1505,6 +1518,7 @@ block.conduit.description = 一般的な液体輸送ブロックです。液体
 block.pulse-conduit.description = 高度な液体輸送ブロックです。通常のパイプより速くたくさんの液体を輸送することができます。
 block.plated-conduit.description = パルスパイプと同じ速度で液体を輸送することができ、耐久性に優れています。\nまた、パイプ以外による側面への入力を受け入れません。
 block.liquid-router.description = 搬入したアイテムをほかの3方向へ均等に搬出します。液体の漏れを防ぐことができます。一つの資源から複数に分ける際などに使われます。
+block.liquid-container.description = 中量の液体を保管しておくことができます。液体ルーターと同様に四方へ搬出できます。
 block.liquid-tank.description = 大量の液体を保管しておくことができます。需要が不安定な製造設備や重要な施設の冷却水の予備などとして使用されます。
 block.liquid-junction.description = パイプを他のパイプと交差できるようにします。それぞれ搬入した液体を前方に搬出します。パイプで複雑な構造を組み立てるときなどに使われます。
 block.bridge-conduit.description = 高度な液体輸送ブロックです。地形や建物を超えて、3ブロック離れた場所に液体を輸送することができます。

core/assets/bundles/bundle_ko.properties

@@ -288,6 +288,7 @@ save.corrupted = [accent]손상되었거나 잘못된 저장 파일입니다!
 empty = <비어있음>
 on = 활성화
 off = 비활성화
+save.search = 세이브 파일 검색
 save.autosave = 자동저장: {0}
 save.map = 맵: {0}
 save.wave = {0} 단계
@@ -381,7 +382,11 @@ editor.newmap = 신규 맵
 editor.center = 중앙
 editor.search = 맵 검색하기
 editor.filters = 맵 필터링하기
-editor.showAll = 기본 맵 보기
+editor.filters.mode = 게임 모드:
+editor.filters.type = 맵 유형:
+editor.filters.search = 검색:
+editor.filters.author = 제작자
+editor.filters.description = 설명
 workshop = 창작마당
 waves.title = 단계
 waves.remove = 삭제
@@ -415,6 +420,7 @@ wavemode.health = 체력
 editor.default = [lightgray]<기본값>
 details = 설명...
 edit = 편집...
+variables = 변수
 editor.name = 이름:
 editor.spawn = 유닛 생성
 editor.removeunit = 유닛 삭제
@@ -1342,15 +1348,15 @@ block.disassembler.name = 광재 분해기
 block.silicon-crucible.name = 실리콘 도가니
 block.overdrive-dome.name = 대형 과부하 프로젝터
 block.interplanetary-accelerator.name = 성간 코어 가속기
-block.constructor.name = 제작대
+block.constructor.name = 블록 제작대
 block.constructor.description = 최대 2x2 크기의 블록을 제작합니다.
-block.large-constructor.name = 대형 제작대
+block.large-constructor.name = 대형 블록 제작대
 block.large-constructor.description = 최대 4x4 크기의 블록을 제작합니다.
-block.deconstructor.name = 분해기
+block.deconstructor.name = 화물 해체기
 block.deconstructor.description = 블록과 유닛을 분해합니다. 건설 비용의 100%를 돌려받습니다.
-block.payload-loader.name = 블록 로더
+block.payload-loader.name = 화물 로더
 block.payload-loader.description = 들어간 블록에 액체와 아이템을 저장합니다.
-block.payload-unloader.name = 블록 언로더
+block.payload-unloader.name = 화물 언로더
 block.payload-unloader.description = 들어간 블록에서 액체와 아이템을 가져옵니다.
 
 block.switch.name = 스위치

core/assets/bundles/bundle_pt_BR.properties

@@ -18,10 +18,12 @@ linkfail = Falha ao abrir o link\nO Url foi copiado para a área de transferênc
 screenshot = Screenshot salvo para {0}
 screenshot.invalid = Este mapa é grande demais, você pode estar potencialmente sem memória suficiente para captura de tela.
 gameover = O núcleo foi destruído.
+gameover.disconnect = Desconectado
 gameover.pvp = O time[accent] {0}[] ganhou!
+gameover.waiting = [accent]Esperando pelo próximo mapa...
 highscore = [accent]Novo recorde!
 copied = Copiado
-indev.popup = [accent]v6[] está atualmente em [accent]alpha[].\n[lightgray]Isso significa:[]\n[scarlet]- A campanha está inacabada[]\n- Está faltando conteúdo\n - A maioria das [scarlet]IAs das unidades[] não funciona adequadamente\n- A maioria das unidades estão inacabadas\n- Tudo o que você ver está sujeito a mudanças ou remoção.\n\nReporte bugs ou crashes em [accent]Github[].
+indev.campaign = [accent]Parabéns! Você chegou ao fim da campanha![]\n\nEsse é todo o conteudo do jogo até o momento. Viagem interplanetária será adicionada em futuras atualizações.
 indev.notready = Essa parte do jogo ainda não esta pronta
 
 load.sound = Sons
@@ -39,11 +41,19 @@ be.ignore = Ignorar
 be.noupdates = Nenhuma atualização encontrada.
 be.check = Checar por atualizações
 
+mods.browser = Mod Browser
+mods.browser.selected = Mod selecionado
+mods.browser.add = Instalar
+mods.browser.reinstall = Reinstalar
+mods.github.open = Repo
+mods.browser.sortdate = Ordenar por mais recente
+mods.browser.sortstars = Ordenar por estrelas
+
 schematic = Esquema
 schematic.add = Salvar esquema
 schematics = Esquemas
 schematic.replace = Um esquema com esse nome já existe. Substituí-lo?
-schematic.exists = Um esquema com esse nome já existe. Substituí-lo?
+schematic.exists = Um esquema com esse nome já existe.
 schematic.import = Importar esquema...
 schematic.exportfile = Exportar arquivo
 schematic.importfile = Importar arquivo
@@ -56,7 +66,7 @@ schematic.saved = Esquema salvo.
 schematic.delete.confirm = Esse esquema será apagado. Tem certeza?
 schematic.rename = Renomear esquema
 schematic.info = {0}x{1}, {2} blocos
-schematic.disabled = [scarlet]Esquemas desativados[]\nVocê precisa de permissão para usar esquemas nesse [accent]mapa[] ou [accent]servidor.
+schematic.disabled = [scarlet]Esquemas desativados[]\nVocê não tem permissão para usar esquemas nesse [accent]mapa[] ou [accent]servidor.
 schematic.tags = Tags:
 schematic.edittags = Editar Tags
 schematic.addtag = Adicionar Tag
@@ -66,6 +76,7 @@ schematic.renametag = Renomear Tag
 schematic.tagdelconfirm = Deletar essa tag completamente?
 schematic.tagexists = Essa tag já existe.
 
+stats = Estatísticas
 stat.wave = Hordas derrotadas:[accent] {0}
 stat.enemiesDestroyed = Inimigos destruídos:[accent] {0}
 stat.built = Construções construídas:[accent] {0}
@@ -73,7 +84,6 @@ stat.destroyed = Construções destruídas:[accent] {0}
 stat.deconstructed = Construções desconstruídas:[accent] {0}
 stat.delivered = Recursos lançados:
 stat.playtime = Tempo jogado:[accent] {0}
-stat.rank = Classificação final: [accent]{0}
 
 globalitems = [accent]Itens Globais
 map.delete = Certeza que quer deletar o mapa "[accent]{0}[]"?
@@ -82,13 +92,16 @@ level.select = Seleção de fase
 level.mode = Modo de jogo:
 coreattack = < O núcleo está sob ataque! >
 nearpoint = [[ [scarlet]SAIA DO PONTO DE SPAWN IMEDIATAMENTE[] ]\nANIQUILAÇÃO IMINENTE
-database = Banco de dados
+database = Banco de dados do núcleo
+database.button = Banco de dados
 savegame = Salvar jogo
 loadgame = Carregar jogo
 joingame = Entrar no jogo
 customgame = Jogo customi-\nzado
 newgame = Novo jogo
 none = <nenhum>
+none.found = [lightgray]<nenhum encontrado>
+none.inmap = [lightgray]<nenhum no mapa>
 minimap = Mini-mapa
 position = Posição
 close = Fechar
@@ -109,17 +122,20 @@ committingchanges = Enviando mudanças
 done = Feito
 feature.unsupported = Seu dispositivo não suporta essa função.
 
-mods.alphainfo = Lembre-se que o sistema de mods está em alpha, e[scarlet] que eles talvez contenham erros e instabilidades[].\nReporte quaisquer problemas no Discord ou GitHub do Mindustry.
+mods.initfailed = [red]⚠[] A instância anterior do Mindustry falhou ao inicializar. Provavelmente causado por mods com problema.\n\nPara previnir um loop de crash, [red]todos os mods foram desativados.[]
 mods = Mods
 mods.none = [lightgray]Nenhum mod encontrado!
 mods.guide = Guia de mods
 mods.report = Reportar um Bug
 mods.openfolder = Abrir pasta de mods
+mods.viewcontent = Ver conteúdo
 mods.reload = Recarregar
 mods.reloadexit = O jogo vai fechar, para poder recarregar os mods.
+mod.installed = [[Instalado]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Ativado
 mod.disabled = [scarlet]Desativado
+mod.multiplayer.compatible = [gray]Compatível com multiplayer
 mod.disable = Desati-\nvar
 mod.content = Conteúdo:
 mod.delete.error = Incapaz de deletar o mod. O arquivo talvez esteja em uso.
@@ -152,8 +168,13 @@ planetmap = Mapa do Planeta
 launchcore = Lançar núcleo
 filename = Nome do arquivo:
 unlocked = Novo bloco desbloqueado!
+available = Nova pesquisa disponível!
+unlock.incampaign = < Desbloqueie na campanha para mais detalhes >
 completed = [accent]Completado
 techtree = Árvore Tecnológica
+research.legacy = dados de pesquisa da versão [accent]5.0[] encontrados.\nVocê quer [accent]carregar esses dados[], ou [accent]descartar eles[] e recomeçar as pesquisas da nova campanha (recomendado)?
+research.load = Carregar
+research.discard = Descartar
 research.list = [lightgray]Pesquise:
 research = Pesquisar
 researched = [lightgray]{0} Pesquisado.
@@ -188,22 +209,30 @@ hostserver.mobile = Hospedar\nJogo
 host = Hospedar
 hosting = [accent]Abrindo servidor...
 hosts.refresh = Recarregar
-hosts.discovering = Descobrindo jogos em lan
+hosts.discovering = Descobrindo jogos em LAN
 hosts.discovering.any = Descobrindo jogos
 server.refreshing = Atualizando servidor
 hosts.none = [lightgray]Nenhum jogo LAN encontrado!
 host.invalid = [scarlet]Não foi possivel hospedar
 
 servers.local = Servidores locais
+servers.local.steam = Jogos públicos e servidores locais
 servers.remote = Servidores remotos
 servers.global = Servidores da comunidade
 
+servers.disclaimer = Servidores da comunidade [accent]não[] controlados pelo desenvolvedor.\n\nOs servidores podem conter conteúdo não apropriado para todas as idades.
+servers.showhidden = Mostrar servidores escondidos
+server.shown = Mostrar
+server.hidden = Esconder
+
 trace = Rastrear jogador
 trace.playername = Nome do jogador: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = ID unico: [accent]{0}
+trace.id = ID: [accent]{0}
 trace.mobile = Cliente móvel: [accent]{0}
 trace.modclient = Cliente customizado: [accent]{0}
+trace.times.joined = Vezes que entrou: [accent]{0}
+trace.times.kicked = Vezes que foi expulso: [accent]{0}
 invalidid = ID do cliente invalido! Reporte o bug
 server.bans = Banidos
 server.bans.none = Nenhum jogador banido encontrado!
@@ -216,29 +245,30 @@ server.outdated = [crimson]Servidor desatualizado![]
 server.outdated.client = [crimson]Cliente desatualizado![]
 server.version = [lightgray]Versão: {0}
 server.custombuild = [accent]Versão customizada
-confirmban = Certeza que quer banir este jogador?
+confirmban = Certeza que quer banir "{0}[white]"?
-confirmkick = Certeza que quer expulsar o jogador?
+confirmkick = Certeza que quer expulsar "{0}[white]"?
-confirmvotekick = Você tem certeza de que quer votar para expulsar este jogador?
+confirmvotekick = Você tem certeza de que quer votar para expulsar "{0}[white]"?
 confirmunban = Certeza que quer desbanir este jogador?
-confirmadmin = Certeza que quer fazer este jogador um administrador?
+confirmadmin = Certeza que quer fazer "{0}[white]" um administrador?
-confirmunadmin = Certeza que quer remover o status de adminstrador deste jogador?
+confirmunadmin = Certeza que quer remover o status de adminstrador do "{0}[white]"?
 joingame.title = Entrar no jogo
 joingame.ip = IP:
 disconnect = Desconectado.
 disconnect.error = Erro de conexão.
 disconnect.closed = Conexão fechada.
 disconnect.timeout = Tempo esgotado.
-disconnect.data = Falha ao abrir os dados do mundo!
+disconnect.data = Falha ao carregar os dados do mundo!
 cantconnect = Impossível conectar ([accent]{0}[]).
 connecting = [accent]Conectando...
+reconnecting = [accent]Reconectando...
 connecting.data = [accent]Carregando dados do mundo...
-server.port = Port:
+server.port = Porta:
-server.addressinuse = Senha em uso!
+server.addressinuse = Porta em uso!
 server.invalidport = Numero de port inválido!
 server.error = [crimson]Erro ao hospedar o servidor: [accent]{0}
 save.new = Novo save
 save.overwrite = Você tem certeza que quer sobrescrever este save?
-overwrite = sobrescrever
+overwrite = Sobrescrever
 save.none = Nenhum save encontrado!
 savefail = Falha ao salvar jogo!
 save.delete.confirm = Certeza que quer deletar este save?
@@ -252,12 +282,13 @@ save.newslot = Nome do save:
 save.rename = Renomear
 save.rename.text = Novo jogo:
 selectslot = Selecione um lugar para salvar.
-slot = [accent]Conexões {0}
+slot = [accent]Slot {0}
 editmessage = Editar mensagem
 save.corrupted = [accent]Save corrompido ou inválido!
 empty = <vazio>
 on = Ligado
 off = Desligado
+save.search = Procurando jogos salvos...
 save.autosave = Salvar automaticamente: {0}
 save.map = Mapa: {0}
 save.wave = Horda {0}
@@ -276,6 +307,7 @@ cancel = Cancelar
 openlink = Abrir Link
 copylink = Copiar link
 back = Voltar
+max = Máximo
 crash.export = Exportar Históricos de Crashes.
 crash.none = Nenhum Histórico de Crashes Encontrado.
 crash.exported = Históricos de Crashes Exportado.
@@ -286,25 +318,28 @@ data.exported = Dados exportados.
 data.invalid = Estes dados de jogo não são válidos.
 data.import.confirm = Importar dados externos irá deletar[scarlet] todos[] os seus dados atuais.\n[accent]Isso não pode ser desfeito![]\n\nQuando seus dados serão importados, seu jogo irá sair imediatamente.
 quit.confirm = Você tem certeza que quer sair?
-quit.confirm.tutorial = Você tem certeza que você sabe o que você esta fazendo?\nO tutorial pode ser refeito nas [accent] Configurações->Jogo->Refazer Tutorial.[]
 loading = [accent]Carregando...
-reloading = [accent]Recarregando mods...
+reloading = [accent]Recarregando...
 saving = [accent]Salvando...
 respawn = [accent][[{0}][] para nascer no núcleo
 cancelbuilding = [accent][[{0}][] para cancelar a construção
 selectschematic = [accent][[{0}][] para selecionar + copiar
 pausebuilding = [accent][[{0}][] para parar a construção
 resumebuilding = [scarlet][[{0}][] para continuar a construção
+enablebuilding = [scarlet][[{0}][] para habilitar construção
+showui = Interface escondida.\nPressione [accent][[{0}][] para mostrar a interface.
 wave = [accent]Horda {0}
 wave.cap = [accent]Horda {0}/{1}
 wave.waiting = Proxima horda em {0}
 wave.waveInProgress = [lightgray]Horda em progresso
-waiting = Aguardando...
+waiting = Esperando...
 waiting.players = Esperando por jogadores...
 wave.enemies = [lightgray]{0} inimigos restantes
 wave.enemy = [lightgray]{0} inimigo restante
-wave.guardianwarn = Guardião se aproximando em [accent]{0}[] Hordas.
+wave.enemycores = [accent]{0}[lightgray] núcleos inimigos
-wave.guardianwarn.one = Guardião se aproximando em [accent]{0}[] Horda.
+wave.enemycore = [accent]{0}[lightgray] núcleo inimigo
+wave.guardianwarn = Guardião se aproximando em [accent]{0}[] hordas.
+wave.guardianwarn.one = Guardião se aproximando em [accent]{0}[] horda.
 loadimage = Carregar\nimagem
 saveimage = Salvar\nimagem
 unknown = Desconhecido
@@ -329,6 +364,7 @@ publish.confirm = Você tem certeza de que quer publicar isso?\n\n[lightgray]Pri
 publish.error = Erro publicando o item: {0}
 steam.error = Falha em iniciar os serviços da Steam.\nErro: {0}
 
+editor.cliffs = Paredes para Penhascos
 editor.brush = Pincel
 editor.openin = Abrir no editor
 editor.oregen = Geração de minério
@@ -344,15 +380,22 @@ editor.ingame = Editar em jogo
 editor.publish.workshop = Publicar na oficina
 editor.newmap = Novo mapa
 editor.center = Centro
+editor.search = Procurar mapas...
+editor.filters = Filtrar mapas
+editor.filters.mode = Modos de jogo:
+editor.filters.type = Tipo:
+editor.filters.search = Procurar em:
+editor.filters.author = Autor
+editor.filters.description = Descrição
 workshop = Oficina
 waves.title = Hordas
 waves.remove = Remover
-waves.never = <nunca>
 waves.every = a cada
 waves.waves = Horda(s)
 waves.perspawn = por spawn
 waves.shields = Escudo/Horda
 waves.to = para
+waves.max = quantidade máxima
 waves.guardian = Guardião
 waves.preview = Pré-visualizar
 waves.edit = Editar...
@@ -361,7 +404,15 @@ waves.load = Carregar da área de transferência
 waves.invalid = Hordas inválidas na área de transferência.
 waves.copied = Hordas copiadas.
 waves.none = Sem hordas definidas.\nNote que layouts vazios de hordas serão automaticamente substituídos pelo layout padrão.
+waves.sort = Ordenar por
+waves.sort.reverse = Inverter ordem
+waves.sort.begin = Começar
+waves.sort.health = Vida
+waves.sort.type = Tipo
+waves.units.hide = Esconder tudo
+waves.units.show = Mostrar tudo
 
+# esses são intencionalmente em letras minúsculas
 wavemode.counts = quantidade
 wavemode.totals = total
 wavemode.health = vida
@@ -369,6 +420,7 @@ wavemode.health = vida
 editor.default = [lightgray]<padrão>
 details = Detalhes...
 edit = Editar...
+variables = Variáveis
 editor.name = Nome:
 editor.spawn = Criar unidade
 editor.removeunit = Remover unidade

core/assets/bundles/bundle_ru.properties

@@ -286,6 +286,7 @@ save.corrupted = [accent]Сохранённый файл повреждён ил
 empty = <пусто>
 on = Вкл
 off = Выкл
+save.search = Поиск сохранений...
 save.autosave = Автосохранение: {0}
 save.map = Карта: {0}
 save.wave = Волна {0}
@@ -378,7 +379,11 @@ editor.newmap = Новая карта
 editor.center = Центрировать
 editor.search = Поиск карт...
 editor.filters = Фильтры
-editor.showAll = Показать карты по умолчанию
+editor.filters.mode = Режимы игры:
+editor.filters.type = Тип карты
+editor.filters.search = Искать по
+editor.filters.author = Автору
+editor.filters.description = Описанию
 workshop = Мастерская
 waves.title = Волны
 waves.remove = Удалить
@@ -386,6 +391,11 @@ waves.every = каждый
 waves.waves = волна(ы)
 waves.perspawn = за появление
 waves.shields = ед. щита/волну
+waves.sort = Сортировать по
+waves.sort.reverse = Обратная сортировка
+waves.sort.begin = Начало
+waves.sort.health = Здоровье
+waves.sort.type = Тип
 waves.to = до
 waves.max = максимум единиц
 waves.guardian = Страж
@@ -890,6 +900,7 @@ setting.seconds = {0} секунд
 setting.milliseconds = {0} миллисекунд
 setting.fullscreen.name = Полноэкранный режим
 setting.borderlesswindow.name = Безрамочное окно
+setting.borderlesswindow.description = Для вступления изменений в силу может потребоваться перезагрузка игры.
 setting.fps.name = Показывать FPS и пинг
 setting.smoothcamera.name = Плавная камера
 setting.vsync.name = Вертикальная синхронизация
@@ -1508,7 +1519,7 @@ block.liquid-router.description = Принимает жидкости из од
 block.liquid-tank.description = Хранит большое количество жидкости. Выводит жидкости во все стороны, подобно жидкостному маршрутизатору.
 block.liquid-junction.description = Действует как мост для двух пересекающихся трубопроводов.
 block.bridge-conduit.description = Перемещает жидкости над любой местностью или зданиями.
-block.liquid-container.description = Хранит большое количество жидкости. Выводит их во все стороны, как жидкостный маршрутизатор.
+block.liquid-container.description = Хранит небольшое количество жидкости. Выводит жидкости во все стороны, подобно жидкостному маршрутизатору.
 block.phase-conduit.description = Перемещает жидкости над любой местностью или зданиями. Большая дистанция, чем у жидкостного моста, но требует энергию.
 block.power-node.description = Передает питание на подключенные узлы. Узел будет получать питание или поставлять питание на любые соседние блоки.
 block.power-node-large.description = Усовершенствованный силовой узел с большей дальностью.

core/assets/bundles/bundle_th.properties

@@ -154,7 +154,7 @@ mod.import.file = นำเข้าไฟล์
 mod.import.github = นำเข้าม็อดจาก Github
 mod.jarwarn = [scarlet]ม็อดไฟล์ JAR นั้นค่อนข้างไม่ปลอดภัย[]\nกรุณาเช็กให้แน่ใจว่าคุณนำเข้าม็อดนี้จะแหล่งที่เชื่อถือได้!
 mod.item.remove = ไอเท็มนี้เป็นส่วนหนึ่งของม็อด [accent]'{0}'[] หากต้องการนำออก กรุณาถอนการติดตั้งม็อดนั้น
-mod.remove.confirm = ม็อดนี้จะถูกลบ
+mod.remove.confirm = ม็อดนี้จะถูกลบออกไป
 mod.author = [lightgray]ผู้สร้าง:[] {0}
 mod.missing = เซฟนี้มีม็อดที่คุณพึ่งอัปเดตหรือไม่ได้ติดตั้งแล้ว อาจทำให้เซฟเสีย คุณแน่จะหรือว่าจะโหลดเซฟนี้?\n[lightgray]ม็อดที่ใช้:\n{0}
 mod.preview.missing = ก่อนที่จะนำม็อดไปลงในเวิร์กช็อป คุณต้องใส่รูปพรีวิวก่อน\nใส่รูปชื่อ[accent] preview.png[] ลงในโฟลเดอร์ของม็อดแล้วลองอีกครั้ง
@@ -233,7 +233,7 @@ trace.mobile = ไคลเอนต์โทรศัพท์: [accent]{0}
 trace.modclient = ไคลเอนต์ปรับแต่ง: [accent]{0}
 trace.times.joined = เวลาเข้า: [accent]{0}
 trace.times.kicked = เวลาโดนเตะ: [accent]{0}
-invalidid = client ID ไม่ถูกต้อง! กรุณารายงานบัคนี้
+invalidid = ไคลเอนต์ ID ไม่ถูกต้อง! กรุณารายงานบัคนี้
 server.bans = แบน
 server.bans.none = ไม่พบผู้เล่นที่ถูกแบน!
 server.admins = แอดมิน
@@ -282,12 +282,13 @@ save.newslot = ชื่อเซฟ:
 save.rename = เปลี่ยนชื่อ
 save.rename.text = ชื่อใหม่:
 selectslot = เลือกเซฟ
-slot = [accent]Slot {0}
+slot = [accent]สล็อต {0}
 editmessage = แก้ไขข้อความ
 save.corrupted = ไฟล์เซฟเสียหายหรือไม่ถูกต้อง!
 empty = <ว่างเปล่า>
 on = เปิด
 off = ปิด
+save.search = ค้นหาเซฟเกม...
 save.autosave = เซฟอัตโนมัติ: {0}
 save.map = แมพ: {0}
 save.wave = คลื่นที่ {0}
@@ -361,14 +362,14 @@ missing = ไอเท็มนี้ถูกลบหรือย้าย\n[l
 publishing = [accent]กำลังเผยแพร่...
 publish.confirm = คุณแน่ใจหรือว่าจะเผยแพร่สิ่งนี้?\n\n[lightgray]คุณต้องแน่ใจก่อนว่าคุณเห็นด้วยกับ Workshop EULA มิฉนั้นไอเท็มของคุณจะไม่ปรากฏ!
 publish.error = เกิดข้อผิดพลาดการเผยแพร่ไอเท็มดังต่อไปนี้: {0}
-steam.error = ไม่สามารถเริ่ม Steam service ได้\nError: {0}
+steam.error = ไม่สามารถเริ่ม Steam service ได้\nข้อผิดพลาด: {0}
 
 editor.cliffs = เปลี่ยนกำแพงเป็นหน้าผา
 editor.brush = แปรง
 editor.openin = เปิดในตัวแก้ไข
 editor.oregen = การเกิดของแร่
 editor.oregen.info = การเกิดของแร่:
-editor.mapinfo = ข้อมูลของแมพ
+editor.mapinfo = ข้อมูลแมพ
 editor.author = ผู้สร้าง:
 editor.description = คำอธิบาย:
 editor.nodescription = แมพจำเป็นต้องมีคำอธิบายอย่างน้อย 4 ตัวอักษรจึงจะสามารถเผยแพร่ได้
@@ -381,7 +382,11 @@ editor.newmap = แมพใหม่
 editor.center = ศูนย์กลางแมพ
 editor.search = ค้นหาแมพ...
 editor.filters = ตัวกรองแมพ
-editor.showAll = แสดงแมพค่าเริ่มต้น
+editor.filters.mode = เกมโหมด:
+editor.filters.type = ประเภทแมพ:
+editor.filters.search = ค้นหาจาก:
+editor.filters.author = ผู้สร้าง
+editor.filters.description = คำอธิบาย
 workshop = เวิร์กช็อป
 waves.title = คลื่น
 waves.remove = ลบ
@@ -415,6 +420,7 @@ wavemode.health = พลังชีวิต
 editor.default = [lightgray]<ค่าเริ่มต้น>
 details = รายละเอียด...
 edit = แก้ไข...
+variables = ตัวแปร
 editor.name = ชื่อ:
 editor.spawn = สร้างยูนิต
 editor.removeunit = ลบยูนิต
@@ -425,7 +431,7 @@ editor.errorimage = ไฟล์นั้นคือไฟล์รูป ไ
 editor.errorlegacy = แมพนี้เก่าเกินไปและใช้รูปแบบแมพแบบเก่าที่ไม่สนับสนุนแล้ว
 editor.errornot = นี่ไม่ใช้ไฟล์แมพ
 editor.errorheader = ไฟล์แมพนี้เสียหรือไม่ถูกต้อง
-editor.errorname = แมพไม่มีการกำหนดชื่อ คุณกำลังโหลดไฟล์เซฟอยู่หรือป่าว?
+editor.errorname = แมพไม่มีการกำหนดชื่อ คุณกำลังพยายามโหลดไฟล์เซฟอยู่หรือไม่?
 editor.update = อัปเดต
 editor.randomize = สุ่ม
 editor.apply = ใช้
@@ -563,12 +569,12 @@ guardian = ผู้พิทักษ์
 connectfail = [crimson]การเชื่อมต่อผิดพลาด:\n\n[accent]{0}
 error.unreachable = เซิร์ฟเวอร์ไม่สามารถเข้าถึงได้\nแน่ใจหรือว่าที่อยู่เขียนถูกต้อง?
 error.invalidaddress = ที่อยู่ไม่ถูกต้อง
-error.timedout = Timed out!\nเช็กให้แน่ใจว่า port forwarding ของโฮสต์เปิดอยู่และที่อยู่นั้นถูกต้อง!
+error.timedout = หมดเวลา!\nเช็กให้แน่ใจว่า port forwarding ของโฮสต์เปิดอยู่และที่อยู่นั้นถูกต้อง!
-error.mismatch = Packet error:\nอาจเกิดจากเวอร์ชั่นของ ไคลเอนต์/เซิร์ฟเวอร์ ไม่ตรงกัน\nเช็กให้แน่ใจว่าคุณและโฮสต์ใช้ Mindustry เวอร์ชั่นล่าสุด!
+error.mismatch = ข้อผิดพลาดของแพ็คเก็ต:\nอาจเกิดจากเวอร์ชั่นของ ไคลเอนต์/เซิร์ฟเวอร์ ไม่ตรงกัน\nเช็กให้แน่ใจว่าคุณและโฮสต์ใช้ Mindustry เวอร์ชั่นล่าสุด!
 error.alreadyconnected = เชื่อมต่ออยู่แล้ว
 error.mapnotfound = ไม่พบไฟล์แมพ
-error.io = Network I/O error
+error.io = ข้อผิดพลาด I/O ของเครือข่าย
-error.any = Error: เครือข่ายที่ไม่รู้จัก
+error.any = ข้อผิดพลาด: เครือข่ายที่ไม่รู้จัก
 error.bloom = ไม่สามารถเริ่มต้นบลูมได้\nอุปกรณ์ของคุณอาจไม่รองรับ
 
 weather.rain.name = ฝน
@@ -610,8 +616,8 @@ sector.changeicon = เปลี่ยนไอคอน
 threat.low = ต่ำ
 threat.medium = กลาง
 threat.high = สูง
-threat.extreme = ร้ายแรง
+threat.extreme = วิบัติภัย
-threat.eradication = มหาวิบัติ
+threat.eradication = ทำลายล้าง
 
 planets = ดาวเคราะห์
 
@@ -630,8 +636,8 @@ sector.overgrowth.name = โอเวอร์โกรว์ด
 sector.tarFields.name = ราบลุ่มน้ำมัน
 sector.saltFlats.name = ที่ราบเกลือ
 sector.fungalPass.name = ทางผ่านฟังกัล
-sector.biomassFacility.name = แหล่งสังเคราะห์ชีวมวล
+sector.biomassFacility.name = สถานสังเคราะห์ชีวมวล
-sector.windsweptIslands.name = หมู่เกาะวินด์สเวปท์
+sector.windsweptIslands.name = หมู่เกาะพหุวายุ
 sector.extractionOutpost.name = ด่านส่งทรัพยากร
 sector.planetaryTerminal.name = ท่าปล่อยจรวดอวกาศยาน
 sector.coastline.name = แนวชายฝั่ง
@@ -1138,7 +1144,7 @@ block.space.name = อวกาศ
 block.salt.name = เกลือ
 block.salt-wall.name = กำแพงเกลือ
 block.pebbles.name = ก้อนกรวด
-block.tendrils.name = ไม้เลื้อย
+block.tendrils.name = เถาวัลย์
 block.sand-wall.name = กำแพงทราย
 block.spore-pine.name = ต้นสนสปอร์
 block.spore-wall.name = กำแพงสปอร์
@@ -1343,15 +1349,10 @@ block.silicon-crucible.name = เบ้าหลอมซิลิคอน
 block.overdrive-dome.name = โดมเร่งประสิทธิภาพ
 block.interplanetary-accelerator.name = ฐานเร่งความเร็วระหว่างดาวเคราะห์
 block.constructor.name = เครื่องก่อสร้าง
-block.constructor.description = สรรค์สร้างสิ่งก่อสร้างขนาดจนถึง 2x2 ช่อง
 block.large-constructor.name = เครื่องก่อสร้างขนาดใหญ่
-block.large-constructor.description = สรรค์สร้างสิ่งก่อสร้างขนาดจนถึง 4x4 ช่อง
 block.deconstructor.name = เครื่องลบทำลาย
-block.deconstructor.description = ลบทำลายสิ่งก่อสร้างและยูนิต คืน 100% ของทรัพยากรที่ใช้ในการสร้าง
 block.payload-loader.name = เครื่องโหลดสิ่งบรรทุก
-block.payload-loader.description = โหลดของเหลวและไอเท็มเข้าไปในบล็อก
 block.payload-unloader.name = เครื่องถ่ายสิ่งบรรทุก
-block.payload-unloader.description = ถ่ายของเหลวและไอเท็มออกจากบล็อก
 
 block.switch.name = สวิตช์
 block.micro-processor.name = ตัวประมวลผลขนาดเล็ก
@@ -1522,7 +1523,7 @@ block.conduit.description = เคลื่อนย้ายของเหล
 block.pulse-conduit.description = เคลื่อนย้ายของเหลวไปข้างหน้า เคลื่อนย้ายได้เร็วขึ้นและเก็บของเหลวได้เยอะกว่าท่อน้ำธรรมดา
 block.plated-conduit.description = เคลื่อนย้ายของเหลวไปข้างหน้า ไม่รับของเหลวจากด้านข้างนอกจากท่อน้ำด้วยกันเอง\nไม่รั่ว และมีเกราะที่หนากว่า 
 block.liquid-router.description = รับของเหลวจากทางเดียวแล้วส่งออกสามทางเท่าๆกัน สามารถเก็บของเหลวได้จำนวนหนึ่ง\nมีประโยชน์สำหรับการส่งของเหลวจากปั้มไปยังหลายที่
-block.liquid-container.description = เก็บของเหลวจำนวนปานกลาง ส่งออกไปรอบด้านคล้ายกับเร้าเตอร์ของเหลว\nเหมาะในการใช้กับเครื่องโหลดและถ่ายสิ่งบรรทุกสำหรับการขนส่งของเหลวทางไกล
+block.liquid-container.description = เก็บของเหลวจำนวนปานกลาง ส่งออกไปรอบด้านคล้ายกับ\nเร้าเตอร์ของเหลว เหมาะในการใช้กับเครื่องโหลดและถ่ายสิ่งบรรทุกสำหรับ\nการขนส่งของเหลวทางไกล
 block.liquid-tank.description = เก็บของเหลวจำนวนมาก ส่งออกไปรอบด้านคล้ายกับเร้าเตอร์ของเหลว\nเหมาะในการใช้เพื่อสร้างกันชนในเวลาที่ของเหลวไม่คงที่\nหรือเวลาที่ใช้ของเหลวเป็นจำนวนมาก
 block.liquid-junction.description = ทำหน้าที่เป็นสะพานสำหรับท่อน้ำสองท่อตัดกันที่มีของเหลวสองชนิดแล้วจะไปคนละที่
 block.bridge-conduit.description = เคลื่อนย้ายของเหลวข้ามสิ่งก่อสร้างหรือกำแพง
@@ -1604,6 +1605,11 @@ block.large-logic-display.description = แสดงกราฟิกโดย
 block.interplanetary-accelerator.description = หอคอยเรลกันแม่เหล็กไฟฟ้าขนาดมหึมา เร่งความเร็วแกนกลางเพื่อบินสู่อวกาศไปยังดาวเคราะห์อื่นๆ
 block.repair-turret.description = ซ่อมแซมยูนิตที่อยู่ในรัศมีของมันอย่างต่อเนื่อง สามารถใช้ของเหลวมาหล่อเย็นเพื่อเพิ่มประสิทธิภาพได้
 block.payload-propulsion-tower.description = บล็อกขนส่งสิ่งบรรทุกทางไกล\nยิงสิ่งบรรทุกไปยังหอเคลื่อนย้ายสิ่งบรรทุกอีกเครื่องที่เชื่อมต่อไว้
+block.constructor.description = สรรค์สร้างสิ่งก่อสร้างขนาดจนถึง 2x2 ช่อง
+block.large-constructor.description = สรรค์สร้างสิ่งก่อสร้างขนาดจนถึง 4x4 ช่อง
+block.deconstructor.description = ลบทำลายสิ่งก่อสร้างและยูนิต คืนทรัพยากรทั้งหมดที่ใช้ในการก่อสร้าง
+block.payload-loader.description = โหลดของเหลวและไอเท็มเข้าไปในบล็อก
+block.payload-unloader.description = ถ่ายของเหลวและไอเท็มออกจากบล็อก
 
 unit.dagger.description = ยิงกระสุนธรรมดาใส่ศัตรูที่อยู่ใกล้เคียง
 unit.mace.description = ยิงเปลวไฟเผาไหม้ใส่ศัตรูที่อยู่ใกล้เคียง

core/assets/bundles/bundle_tr.properties

@@ -288,6 +288,7 @@ save.corrupted = [accent]Kayıt dosyası bozuk veya geçersiz!
 empty = <boş>
 on = Aç
 off = Kapa
+save.search = Kayıtlı Oyun Ara...
 save.autosave = Otomatik kayıt: {0}
 save.map = Harita: {0}
 save.wave = Dalga {0}
@@ -381,7 +382,11 @@ editor.newmap = Yeni Harita
 editor.center = Ortala
 editor.search = Harita Ara...
 editor.filters = Harita Filtrele
-editor.showAll = Varsayılan Haritaları Göster
+editor.filters.mode = Oyun Modları:
+editor.filters.type = Harita Türleri:
+editor.filters.search = Ara:
+editor.filters.author = Yapımcı
+editor.filters.description = Açıklama
 workshop = Atölye
 waves.title = Dalgalar
 waves.remove = Kaldır

core/assets/bundles/bundle_uk_UA.properties

@@ -350,6 +350,7 @@ workshop.error = Помилка під час отримання інформа
 map.publish.confirm = Ви дійсно хочете опублікувати цю мапу?\n\n[lightgray]Спершу переконайтеся, що ви згодні з Ліцензійною угодою Steam, або ваші мапи не з’являться!
 workshop.menu = Виберіть, що ви хочете зробити з цим предметом.
 workshop.info = Інформація про предмет
+workshop.info = Інформація про предмет
 changelog = Змінопис (за бажанням):
 eula = Ліцензійна угода Steam
 missing = Цей предмет було видалено або переміщено.\n[lightgray]Список Майстерні тепер автоматично від’єднано.
@@ -643,6 +644,7 @@ status.overclock.name = Прискорений
 status.shocked.name = Шокований
 status.blasted.name = Підірваний
 status.unmoving.name = Незворушний
+status.boss.name = Вартовий
 
 settings.language = Мова
 settings.data = Ігрові дані
@@ -1422,6 +1424,8 @@ block.item-source.description = Постійно створює предмети
 block.item-void.description = Руйнує будь-які предмети. Тільки пісочниця.
 block.liquid-source.description = Постійно виробляє рідини. Тільки пісочниця.
 block.liquid-void.description = Випаровує будь-які рідини. Тільки пісочниця.
+block.payload-source.description = Нескінченно створює і виводить вантажі. Тільки пісочниця.
+block.payload-void.description = Знищує будь-які вантажі. Тільки пісочниця.
 block.copper-wall.description = Захищає споруди від ворожих снарядів.
 block.copper-wall-large.description = Захищає споруди від ворожих снарядів.
 block.titanium-wall.description = Захищає споруди від ворожих снарядів.
@@ -1454,7 +1458,7 @@ block.router.details = Необхідне зло. Не використовуй
 block.distributor.description = Розділяє предмети до 7 інших напрямків порівну.
 block.overflow-gate.description = Вивантажує лише ліворуч і праворуч, якщо передній шлях заблокований.
 block.underflow-gate.description = Повна протилежність надмірному затвору. Виводить предмет прямо, якщо лівий і правий шлях заблоковано.
-block.mass-driver.description = Найкращий блок для транспортування предметів. Збирає кілька предметів, а потім вистрілює їх до іншої електромагнітної катапульти на велику відстань. Для роботи потребує енергія.
+block.mass-driver.description = Найкращий блок для транспортування предметів. Збирає кілька предметів, а потім вистрілює їх до іншої електромагнітної катапульти на велику відстань. Для роботи потребує енергію.
 block.mechanical-pump.description = Дешевий насос із повільним виходом, але не потребує енергоспоживання.
 block.rotary-pump.description = Удосконалений насос. Насоси більше викачують, але потребують енергію.
 block.thermal-pump.description = Найкращий насос.

core/assets/bundles/bundle_vi.properties

@@ -78,13 +78,12 @@ schematic.tagexists = Thẻ đã tồn tại.
 
 stats = Thống kê
 stat.wave = Đợt đã vượt qua:[accent] {0}
+stat.unitsCreated = Quân lính đã tạo:[accent] {0}
 stat.enemiesDestroyed = Kẻ thù bị tiêu diệt:[accent] {0}
 stat.built = Số công trình đã xây dựng:[accent] {0}
 stat.destroyed = Số công trình đã bị phá:[accent] {0}
 stat.deconstructed = Số công trình được xây dựng lại:[accent] {0}
-stat.delivered = Lượng tài nguyên được phóng:
 stat.playtime = Thời gian chơi:[accent] {0}
-stat.rank = Xếp hạng: [accent]{0}
 
 globalitems = [accent]Toàn bộ vật phẩm
 map.delete = Bạn có chắc chắn muốn xóa bản đồ "[accent]{0}[]"?
@@ -94,6 +93,7 @@ level.mode = Chế độ:
 coreattack = < Căn cứ đang bị tấn công! >
 nearpoint = [[ [scarlet]RỜI KHỎI KHU VỰC ĐÁP NGAY LẬP TỨC[] ]\nsự hủy diệt sắp xảy ra
 database = Cơ sở dữ liệu
+database.button = Cơ sở dữ liệu
 savegame = Lưu trò chơi
 loadgame = Tải lại màn chơi
 joingame = Tham gia trò chơi
@@ -101,6 +101,7 @@ customgame = Tùy chỉnh
 newgame = Trò chơi mới
 none = <trống>
 none.found = [lightgray]<không tìm thấy>
+none.inmap = [lightgray]<không có trong bản đồ>
 minimap = Bản đồ nhỏ
 position = Vị trí
 close = Đóng
@@ -168,6 +169,7 @@ launchcore = Phóng căn cứ
 filename = Tên tệp:
 unlocked = Đã mở khóa nội dung mới!
 available = Đã có mục nghiên cứu mới!
+unlock.incampaign = < Mở khóa trong chiến dịch để biết chi tiết >
 completed = [accent]Hoàn tất
 techtree = Tiến trình
 research.legacy = Dữ liệu nghiên cứu từ phiên bản[accent]5.0[] được tìm thấy.\nBạn có muốn [accent]tải dữ liệu này[], hoặc [accent]bỏ qua[] và bắt đầu nghiên cứu lại trong chiến dịch mới (khuyến nghị)?
@@ -214,6 +216,7 @@ hosts.none = [lightgray]Không có máy chủ cục bộ nào được tìm th
 host.invalid = [scarlet]Không thể kết nối đến máy chủ.
 
 servers.local = Máy chủ cục bộ
+servers.local.steam = Màn chơi hiện có & Máy chủ cục bộ
 servers.remote = Máy chủ tùy chỉnh
 servers.global = Máy chủ từ cộng đồng
 
@@ -285,6 +288,7 @@ save.corrupted = Tệp bản lưu bị hỏng hoặc không hợp lệ!
 empty = <trống>
 on = Bật
 off = Tắt
+save.search = Tìm kiếm màn chơi đã lưu...
 save.autosave = Tự động lưu: {0}
 save.map = Bản đồ: {0}
 save.wave = Đợt {0}
@@ -315,7 +319,7 @@ data.invalid = Đây không phải dữ liệu trò chơi hợp lệ.
 data.import.confirm = Nhập dữ liệu bên ngoài sẽ ghi đè[scarlet] tất cả[] dữ liệu trò chơi hiện tại.\n[accent]Điều này không thể hoàn tác![]\n\nSau khi dữ liệu được nhập, trò chơi của bạn sẽ thoát ngay lập tức.
 quit.confirm = Bạn có chắc muốn thoát?
 loading = [accent]Đang tải...
-reloading = [accent]Đang tải lại Mods...
+downloading = [accent]Đang tải xuống...
 saving = [accent]Đang lưu...
 respawn = [accent][[{0}][] để hồi sinh tại căn cứ
 cancelbuilding = [accent][[{0}][] để hủy xây
@@ -360,6 +364,7 @@ publish.confirm = Bạn có chắc chắn muốn xuất bản không?\n\n[lightg
 publish.error = Lỗi khi xuất bản: {0}
 steam.error = Không thể khởi chạy dịch vụ Steam.\nLỗi: {0}
 
+editor.cliffs = Chuyển tường thành vách đá
 editor.brush = Kích thước
 editor.openin = Mở trong trình chỉnh sửa
 editor.oregen = Cấu trúc quặng
@@ -375,6 +380,13 @@ editor.ingame = Chỉnh sửa trong trò chơi
 editor.publish.workshop = Xuất bản lên Workshop
 editor.newmap = Bản đồ mới
 editor.center = Trung tâm
+editor.search = Tìm kiếm bản đồ...
+editor.filters = Lọc bản đồ
+editor.filters.mode = Chế độ:
+editor.filters.type = Kiểu bản đồ:
+editor.filters.search = Tìm kiếm trongtrong:
+editor.filters.author = Tác giả
+editor.filters.description = Miêu tả
 workshop = Workshop
 waves.title = Đợt
 waves.remove = Xóa
@@ -383,6 +395,7 @@ waves.waves = đợt
 waves.perspawn = mỗi lần xuất hiện
 waves.shields = khiên/đợt
 waves.to = đến
+waves.max = Số lượng quân lính tối đa
 waves.guardian = Boss
 waves.preview = Xem trước
 waves.edit = Chỉnh sửa...
@@ -391,6 +404,13 @@ waves.load = Lấy từ bộ nhớ tạm
 waves.invalid = Lượt không hợp lệ trong bộ nhớ tạm.
 waves.copied = Đã sao chép lượt.
 waves.none = Không có kẻ thù được xác định.\nLưu ý rằng bố cục mỗi đợt trống sẽ tự động được thay thế bằng bố cục mặc định.
+waves.sort = Sắp xếp theo
+waves.sort.reverse = Đảo ngược sắp xếp
+waves.sort.begin = Bắt đầu
+waves.sort.health = Máu
+waves.sort.type = Thể loại
+waves.units.hide = Ẩn tất cả
+waves.units.show = Hiện tất cả
 
 #these are intentionally in lower case
 wavemode.counts = số lượng
@@ -400,6 +420,7 @@ wavemode.health = máu
 editor.default = [lightgray]<Mặc định>
 details = Chi tiết...
 edit = Chỉnh sửa...
+variables = Thông số
 editor.name = Tên:
 editor.spawn = Thêm kẻ địch
 editor.removeunit = Xóa kẻ địch
@@ -537,6 +558,7 @@ configure = Tùy chỉnh vật phẩm
 loadout = Vật phẩm
 resources = Tài nguyên
 bannedblocks = Khối bị cấm
+bannedunits = Quân lính bị cấm
 addall = Thêm tất cả
 launch.from = Đang phóng từ: [accent]{0}
 launch.destination = Đích đến: {0}
@@ -561,10 +583,13 @@ weather.sandstorm.name = Bão cát
 weather.sporestorm.name = Bão bào tử
 weather.fog.name = Sương mù
 
+sectorlist = Khu vực
+sectorlist.attacked = {0} đang bị tấn công
 sectors.unexplored = [lightgray]Chưa được khám phá
 sectors.resources = Tài nguyên:
 sectors.production = Sản lượng:
 sectors.export = Xuất:
+sectors.import = Nhập:
 sectors.time = Thời gian:
 sectors.threat = Mối đe dọa:
 sectors.wave = Đợt:
@@ -632,6 +657,8 @@ sector.windsweptIslands.description = Xa hơn đường bờ biển là chuỗi
 sector.extractionOutpost.description = Một tiền đồn xa, được kẻ thù xây dựng với mục đích phóng nguồn lực sang các khu vực khác.\n\nCông nghệ vận tải xuyên ngành là điều cần thiết để chinh phục hơn nữa. Phá hủy căn cứ. Nghiên cứu bệ phóng của họ.
 sector.impact0078.description = Đây là tàn tích của tàu vận chuyển giữa các vì sao lần đầu tiên đi vào hệ thống này.\n\nLấy càng nhiều càng tốt từ đống đổ nát. Nghiên cứu bất kỳ công nghệ nguyên vẹn nào.
 sector.planetaryTerminal.description = Mục tiêu cuối cùng.\n\nCăn cứ ven biển này chứa một cấu trúc có khả năng phóng căn cứ tới các hành tinh địa phương. Nó được bảo vệ cực kỳ cẩn thận.\n\nSản xuất quân lính hải quân. Loại bỏ kẻ thù càng nhanh càng tốt. Nghiên cứu cấu trúc phóng.
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
 
 status.burning.name = Cháy 
 status.freezing.name = Đóng băng
@@ -643,9 +670,11 @@ status.electrified.name = Electrified
 status.spore-slowed.name = Spore Slowed
 status.tarred.name = Tarred
 status.overclock.name = Overclock
+status.overdrive.name = Overdrive
 status.shocked.name = Shock
 status.blasted.name = Nổ
 status.unmoving.name = Bất động
+status.boss.name = Guardian
 
 settings.language = Ngôn ngữ
 settings.data = Dữ liệu trò chơi
@@ -794,7 +823,7 @@ bullet.splashdamage = [stat]{0}[lightgray] sát thương diện rộng ~[stat] {
 bullet.incendiary = [stat]cháy
 bullet.homing = [stat]truy đuổi
 bullet.buildingdamage = [stat]{0}%[lightgray] sát thương khối
-bullet.frag = [stat]phá mảnh
+bullet.frags = [stat]phá mảnh
 bullet.lightning = [stat]{0}[lightgray]x tia chớp ~ [stat]{1}[lightgray] sát thương
 bullet.knockback = [stat]{0}[lightgray] bật lùi
 bullet.pierce = [stat]{0}[lightgray]x xuyên giáp
@@ -806,6 +835,7 @@ bullet.reload = [stat]{0}[lightgray]x tốc độ bắn
 unit.blocks = Khối
 unit.blockssquared = Khối²
 unit.powersecond = đơn vị năng lượng/giây
+unit.tilessecond = ô/giây
 unit.liquidsecond = đơn vị chất lỏng/giây
 unit.itemssecond = vật phẩm/giây
 unit.liquidunits = đơn vị chất lỏng
@@ -831,20 +861,19 @@ category.items = Vật phẩm
 category.crafting = Vào/Sản phẩm
 category.function = Chức năng
 category.optional = Cải tiến
+setting.skipcoreanimation.name = Bỏ qua hiệu ứng phóng/đáp căn cứcứ
 setting.landscape.name = Khóa ngang
 setting.shadows.name = Bóng đổ
 setting.blockreplace.name = Tự động đề xuất khối
 setting.linear.name = Lọc tuyến tính
 setting.hints.name = Gợi ý
 setting.logichints.name = Gợi ý Logic
-setting.flow.name = Hiện thị tốc độ chuyền tài nguyên
 setting.backgroundpause.name = Tạm dừng trong nền
 setting.buildautopause.name = Tự động dừng xây dựng
 setting.doubletapmine.name = Nhấn đúp để Đào
 setting.modcrashdisable.name = Tắt các mod khi gặp sự cố trong khởi động
 setting.animatedwater.name = Hiệu ứng nước
 setting.animatedshields.name = Hiệu ứng khiên
-setting.antialias.name = Khử răng cưa[lightgray] (yêu cầu khởi động lại)[]
 setting.playerindicators.name = Hướng người chơi
 setting.indicators.name = Hướng kẻ địch
 setting.autotarget.name = Tự động nhắm mục tiêu
@@ -853,7 +882,8 @@ setting.touchscreen.name = Điều khiển bằng màn hình cảm ứng
 setting.fpscap.name = FPS tối đa
 setting.fpscap.none = Không giới hạn
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Kích thước UI[lightgray] (yêu cầu khởi động lại)[]
+setting.uiscale.name = Kích thước UI
+setting.uiscale.description = Trò chơi sẽ khởi động lại để áp dụng các thay đổi.
 setting.swapdiagonal.name = Đặt luôn theo đường chéo
 setting.difficulty.training = Luyện tập
 setting.difficulty.easy = Dễ
@@ -871,7 +901,9 @@ setting.saveinterval.name = Khoảng thời gian lưu
 setting.seconds = {0} giây
 setting.milliseconds = {0} mili giây
 setting.fullscreen.name = Toàn màn hình
-setting.borderlesswindow.name = Không viền[lightgray] (yêu cầu khởi động lại)
+setting.borderlesswindow.name = Không viền
+setting.borderlesswindow.name.windows = Toàn màng hình (không viền)
+setting.borderlesswindow.description = Trò chơi có thể sẽ khởi động lại để áp dụng các thay đổi
 setting.fps.name = Hiển thị FPS & Ping
 setting.smoothcamera.name = Chế độ mượt mà
 setting.vsync.name = VSync
@@ -994,6 +1026,8 @@ rules.wavetimer = Đếm ngược đợt
 rules.waves = Đợt
 rules.attack = Chế độ tấn công
 rules.buildai = AI Xây dựng
+rules.aitier = Cấp độ AI
+rules.cleanupdeadteams = Xóa công trình của đội bị đánh bại (PvP)
 rules.corecapture = Chiếm căn cứ khi phá hủy
 rules.polygoncoreprotection = Bảo vệ lõi kiểu đa giác.
 rules.enemyCheat = Tài nguyên vô hạn (kẻ địch)
@@ -1012,12 +1046,15 @@ rules.deconstructrefundmultiplier = Hệ số số vật phẩm hoàn lại khi
 rules.waitForWaveToEnd = Đợt chờ hết kẻ địch
 rules.dropzoneradius = Bán kính vùng thả:[lightgray] (ô)
 rules.unitammo = Quân lính cần đạn
+rules.enemyteam = Đội quân địch
+rules.playerteam = Đội người chơi
 rules.title.waves = Đợt
 rules.title.resourcesbuilding = Tài nguyên & Xây dựng
 rules.title.enemy = Kẻ địch
 rules.title.unit = Quân lính
 rules.title.experimental = Thực nghiệm
 rules.title.environment = Môi trường
+rules.title.teams = Đội
 rules.lighting = Ánh sáng
 rules.enemyLights = Đèn địch
 rules.fire = Lửa
@@ -1096,13 +1133,13 @@ unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
 
-block.resupply-point.name = Điểm tiếp tế
 block.parallax.name = Parallax
 block.cliff.name = Vách đá
 block.sand-boulder.name = Tường cát
 block.basalt-boulder.name = Tường đá basalt
 block.grass.name = Cỏ
 block.molten-slag.name = Xỉ nóng chảy
+block.pooled-cryofluid.name = Chất làm lạnh
 block.space.name = Không gian
 block.salt.name = Muối
 block.salt-wall.name = Tường muối
@@ -1136,6 +1173,7 @@ block.core-nucleus.name = Căn cứ: Trung tâm
 block.deep-water.name = Nước sâu
 block.shallow-water.name = Nước
 block.tainted-water.name = Nước nhiểm bẩn
+block.deep-tainted-water.name = Nước nhiểm bẩn sâu
 block.darksand-tainted-water.name = Nước nhiễm bẩn cát đen
 block.tar.name = Dầu
 block.stone.name = Đá
@@ -1263,6 +1301,7 @@ block.plated-conduit.name = Ống dẫn bọc giáp
 block.phase-conduit.name = Ống dẫn Phase
 block.liquid-router.name = Bộ phân phát chất lỏng
 block.liquid-tank.name = Thùng chất lỏng
+block.liquid-container.name = Bình chất lỏng
 block.liquid-junction.name = Giao điểm chất lỏng
 block.bridge-conduit.name = Cầu dẫn chất lỏng
 block.rotary-pump.name = Bơm điện
@@ -1288,7 +1327,6 @@ block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Container
 block.launch-pad.name = Bệ phóng
-block.launch-pad-large.name = Bệ phóng lớn
 block.segment.name = Segment
 block.command-center.name = Trung tâm chỉ huy
 block.ground-factory.name = Nhà máy bộ binh
@@ -1303,17 +1341,23 @@ block.payload-router.name = Bộ định tuyến khối hàng
 block.duct.name = Duct
 block.duct-router.name = Duct Router
 block.duct-bridge.name = Duct Bridge
-block.payload-propulsion-tower.name = Payload Propulsion Tower
+block.payload-propulsion-tower.name = Tháp đẩy khối hàng
 block.payload-void.name = Payload Void
 block.payload-source.name = Payload Source
 block.disassembler.name = Máy phân tách lớn
 block.silicon-crucible.name = Máy nấu Silicon lớn
 block.overdrive-dome.name = Máy tăng tốc lớn
-#experimental, may be removed
-block.block-forge.name = Block Forge
-block.block-loader.name = Block Loader
-block.block-unloader.name = Điểm dỡ hàng
 block.interplanetary-accelerator.name = Máy gia tốc liên hành tinh
+block.constructor.name = Máy chế tạo
+block.constructor.description = Chế tạo các khối có kích thước 2x2 ô.
+block.large-constructor.name = Máy chế tạo lớn
+block.large-constructor.description = Chế tạo các khối có kích thước lên đến 4x4 ô.
+block.deconstructor.name = Máy tháo dỡ
+block.deconstructor.description = Tháo dỡ khối và quân lính, trả lại 100% nguyên liệu.
+block.payload-loader.name = Payload Loader
+block.payload-loader.description = Nạp chất lỏng và vật phẩm vào khối.
+block.payload-unloader.name = Payload Unloader
+block.payload-unloader.description = Lấy chất lỏng và vật phẩm từ khối.
 
 block.switch.name = Công tắc
 block.micro-processor.name = Bộ xử lí nhỏ
@@ -1348,6 +1392,7 @@ hint.placeTurret = Đặt \uf861 [accent]Súng[] để bảo vệ căn cứ củ
 hint.breaking = [accent]Chuột phải[] và kéo để phá vỡ các khối.
 hint.breaking.mobile = Kích hoạt \ue817 [accent]Cây búa[] ở phía dưới cùng bên phải và nhấn để phá vỡ các khối.\n\nGiữ ngón tay của bạn trong một giây và kéo để phá khối trong vùng được chọn.
 hint.blockInfo = Xem thông tin của một khối bằng cách chọn nó trong [accent]menu xây dựng[], Sau đó chọn nút [accent][[?][] ở bên phải.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
 hint.research = Sử dụng nút \ue875 [accent]Nghiên cứu[] để nghiên cứu công nghệ mới.
 hint.research.mobile = Sử dụng nút \ue875 [accent]Nghiên cứu[] trong \ue88c [accent]Menu[] để nghiên cứu công nghệ mới.
 hint.unitControl = Giữ [accent][[L-ctrl][] và [accent]click[] để điều khiển quân lính của bạn hoặc súng.
@@ -1369,6 +1414,7 @@ hint.generator = \uf879 [accent]Máy phát điện đốt cháy[] đốt than v
 hint.guardian = [accent]Boss[] được bọc giáp. Sử dụng loại đạn yếu chẳng hạn như [accent]Đồng[] và [accent]Chì[] là [scarlet]không hiệu quả[].\n\nSử dụng súng tiên tiến hơn hoặc sử dụng \uf835 [accent]Than chì làm đạn [] \uf861Duo/\uf859Salvo đạn dược để hạ gục Boss.
 hint.coreUpgrade = Các căn cứ có thể được nâng cấp bằng cách [accent]đặt căn cứ cấp cao hơn trên chúng[].\n\nĐặt một căn cứ  [accent]Trụ sở[] trên căn cứ  [accent]Cơ sở[]. Đảm bảo không có vật cản gần đó.
 hint.presetLaunch = Khác khu vực đáp [accent] xám[], như [accent]Frozen Forest[], có thể được phóng đến từ bất cứ đâu. Nó không yêu cầu chiếm các khu vực lân cận.\n\n[accent]Các khu vực được đánh số[], chẳng hạn như cái này, là [accent]không bắt buộc[].
+hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
 hint.coreIncinerate = Sau khi căn cứ đầy vật phẩm, bất kì vật phẩm vào thuộc loại đó nhận được sẽ bị [accent]tiêu hủy[].
 hint.coopCampaign = Khi chơi chiến dịch[accent]co-op[], các vật phẩm được sản xuất trong bản đồ hiện tại cũng sẽ được gửi [accent]đến các khu vực của bạn[].\n\nBất kỳ nghiên cứu mới nào được thực hiện đều được lưu lại.
 
@@ -1399,7 +1445,7 @@ liquid.slag.description = Dùng để tách các kim loại, hoặc phun vào k
 liquid.oil.description = Dùng trong sản xuất vật liệu tiên tiến và làm đạn gây cháy.
 liquid.cryofluid.description = Dùng làm chất làm mát trong lò phản ứng, súng và nhà máy.
 
-block.resupply-point.description = Cung cấp đạn đồng cho các quân lính ở gần. Không tương thích với quân lính sử dụng điện.
+block.derelict =  [lightgray]Derelict
 block.armored-conveyor.description = Vận chuyển vật phẩm về phía trước. Không nhận đầu vào từ phía bên cạnh.
 block.illuminator.description = Phát sáng.
 block.message.description = Lưu trữ tin nhắn giao tiếp giữa đồng đội.
@@ -1425,6 +1471,8 @@ block.item-source.description = Tạo ra vật phẩm mãi mãi. Chỉ có trong
 block.item-void.description = Hủy mọi vật phẩm. Chỉ có trong chế độ tự do.
 block.liquid-source.description = Tạo ra chất lỏng mãi mãi. Chỉ có trong chế độ tự do.
 block.liquid-void.description = Loại bỏ mọi chất lỏng. Chỉ có trong chế độ tự do.
+block.payload-source.description = Tạo ra bất kì khối hàng nào. Chỉ có trong chế độ tự do.
+block.payload-void.description = Phá hủy bất kì khối hàng nào. Chỉ có trong chế độ tự do.
 block.copper-wall.description = Bảo vệ các công trình khỏi đạn của kẻ thù.
 block.copper-wall-large.description = Bảo vệ nhiều công trình khỏi đạn của kẻ thù.
 block.titanium-wall.description = Bảo vệ các công trình khỏi đạn của kẻ thù.
@@ -1465,7 +1513,8 @@ block.conduit.description = Đẩy chất lỏng đến trước, dùng với b
 block.pulse-conduit.description = Đẩy chất lỏng đến trước, vận chuyển nhanh và trữ nhiều hơn so với ống tiêu chuẩn.
 block.plated-conduit.description = Đẩy chất lỏng đến trước, không nhận đầu vào ở bên, không bị rò rỉ.
 block.liquid-router.description = Nhận chất lỏng từ một phía và đưa đều ra ba phía còn lại. Có thể trữ một lượng chất lỏng nhất định.
-block.liquid-tank.description = Trữ được nhiều chất lỏng. Đưa đều ra mọi phía như bộ phân nhánh chất lỏng.
+block.liquid-tank.description = Trữ được một lượng lớn chất lỏng. Đưa đều ra mọi phía như bộ phân phát chất lỏng.
+block.liquid-container.description = Lưu trữ một lượng vừa phải chất lỏng. Đưa đều ra mọi phía như bộ phân phát chất lỏng.
 block.liquid-junction.description = Chức năng như cầu cho hai ống nước băng chéo nhau.
 block.bridge-conduit.description = Vận chuyển chất lỏng qua nhiều loại địa hình hoặc công trình.
 block.phase-conduit.description = Vận chuyển chất lỏng qua địa hình hoặc công trình. Phạm vi dài hơn cầu nối, nhưng cần năng lượng.
@@ -1543,6 +1592,8 @@ block.memory-bank.description = Lưu trữ thông tin cho bộ xử lí. Dung l
 block.logic-display.description = Hiển thị đồ họa tùy ý từ bộ xử lí.
 block.large-logic-display.description = Hiển thị đồ họa tùy ý từ bộ xử lí.
 block.interplanetary-accelerator.description = Tòa súng từ trường cỡ lớn. Tăng tốc vật phóng đến vận tốc thoát để di chuyển giữa các hành tinh.
+block.repair-turret.description = Sửa chữa những quân lính bị hư hỏng trong khu vực nhất địnhđịnh. Có thể làm mát để tăng hiệu quả.
+block.payload-propulsion-tower.description = Cơ cấu vận chuyển các khối hàng tầm xa. Bắn khối hàng cho các tháp đẩy khối hàng kháckhác.
 
 unit.dagger.description = Bắn đạn tiêu chuẩn vào tất cả kẻ địch xung quanh.
 unit.mace.description = Phun lửa vào tất cả kẻ địch xung quanh.
@@ -1577,6 +1628,11 @@ unit.omura.description = Bắn đạn từ trường xuyên giáp tầm xa vào
 unit.alpha.description = Bảo vệ căn cứ cơ sở khỏi kẻ thù. Có thể xây dựng.
 unit.beta.description = Bảo vệ căn cứ trụ sở khỏi kẻ thù. Có thể xây dựng.
 unit.gamma.description = Bảo vệ căn cứ trung tâm khỏi kẻ thù. Có thể xây dựng.
+unit.retusa.description = Fires homing torpedoes at nearby enemies. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
 
 lst.read = Đọc một số từ bộ nhớ được liên kết.
 lst.write = Ghi một số vào bộ nhớ được liên kết.
@@ -1591,6 +1647,8 @@ lst.sensor = Lấy dữ liệu từ một khối hoặc quân lính.
 lst.set = Đặt một biến.
 lst.operation = Thực hiện thao tác trên 1-2 biến.
 lst.end = Chuyển đến lệnh đầu tiên.
+lst.wait = Chờ trong khoảng thời gian nhất định.
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
 lst.jump = Chuyển qua lệnh khác nếu điều kiện đúng.
 lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
 lst.unitcontrol = Control the currently bound unit.
@@ -1689,13 +1747,13 @@ sensor.in = The building/unit to sense.
 radar.from = Building to sense from.\nSensor range is limited by building range.
 radar.target = Filter for units to sense.
 radar.and = Additional filters.
-radar.order = Sorting order. 0 to reverse.
+radar.order = Sắp xếp theo thứ tự. đặt giá trị 0 để đảo ngược.
 radar.sort = Metric to sort results by.
 radar.output = Variable to write output unit to.
 
 unitradar.target = Filter for units to sense.
 unitradar.and = Additional filters.
-unitradar.order = Sorting order. 0 to reverse.
+unitradar.order = Sắp xếp theo thứ tự. đặt giá trị 0 để đảo ngược.
 unitradar.sort = Metric to sort results by.
 unitradar.output = Variable to write output unit to.
 
@@ -1706,8 +1764,8 @@ control.shoot = Whether to shoot.
 unitlocate.enemy = Whether to locate enemy buildings.
 unitlocate.found = Whether the object was found.
 unitlocate.building = Output variable for located building.
-unitlocate.outx = Output X coordinate.
+unitlocate.outx = Cho ra tọa độ X.
-unitlocate.outy = Output Y coordinate.
+unitlocate.outy = Cho ra tọa độ Y.
 unitlocate.group = Building group to look for.
 
 lenum.idle = Không di chuyển, nhưng vẫn xây dựng/đào.\nTrạng thái mặc định.
@@ -1721,6 +1779,7 @@ lenum.itemdrop = Thả vật phẩm.
 lenum.itemtake = Lấy vật phẩm từ khối.
 lenum.paydrop = Thả khối hàng hiện tại.
 lenum.paytake = Nhất khối hàng tại vị trí hiện tại.
+lenum.payenter = Enter/land on the payload block the unit is on.
 lenum.flag = Numeric unit flag.
 lenum.mine = Đào tại vị trí.
 lenum.build = Xây công trình.

core/assets/bundles/bundle_zh_CN.properties

@@ -122,7 +122,7 @@ committingchanges = 正在提交更改
 done = 完成
 feature.unsupported = 您的设备不支持此特性。 
 
-mods.initfailed = [red]⚠[]Mindustry的上一次启动失败了，可能是异常的模组导致的。 \n\n为了防止连续崩溃，[red]所有模组都被禁用了。 []\n\n这个功能可以在[accent]设置->游戏->游戏启动崩溃后禁用模组[]里关闭。 
+mods.initfailed = [red]⚠[]Mindustry的上一次启动失败了，可能是异常的模组导致的。 \n\n为了防止连续崩溃，[red]所有模组都被禁用了。 []
 mods = 模组
 mods.none = [lightgray]没有找到模组！
 mods.guide = 模组制作教程
@@ -288,6 +288,7 @@ save.corrupted = 存档损坏或无效！
 empty = < 空 >
 on = 开
 off = 关
+save.search = 搜索已保存的游戏…
 save.autosave = 自动保存：{0}
 save.map = 地图：{0}
 save.wave = 波次：{0}
@@ -379,6 +380,14 @@ editor.ingame = 游戏内编辑
 editor.publish.workshop = 上传到创意工坊
 editor.newmap = 新地图
 editor.center = 居中
+editor.search = 搜索地图…
+editor.filters = 筛选地图
+editor.showAll = 显示默认地图
+editor.filters.mode = 游戏模式：
+editor.filters.type = 地图类型：
+editor.filters.search = 关键词搜索：
+editor.filters.author = 作者
+editor.filters.description = 描述
 workshop = 创意工坊
 waves.title = 波次
 waves.remove = 移除
@@ -412,6 +421,7 @@ wavemode.health = 生命值
 editor.default = [lightgray]<默认>
 details = 详情…
 edit = 编辑…
+variables = 变量
 editor.name = 名称：
 editor.spawn = 生成单位
 editor.removeunit = 移除单位
@@ -593,7 +603,7 @@ sectors.rename = 重命名区块
 sectors.enemybase = [scarlet]敌方基地
 sectors.vulnerable = [scarlet]易受攻击
 sectors.underattack = [scarlet]遭到攻击！[accent]{0}%损毁度
-sectors.survives = [accent]已坚持{0}波
+sectors.survives = [accent]预测可守{0}波
 sectors.go = 进入
 sector.curcapture = 区块已占领
 sector.curlost = 区块已丢失
@@ -635,7 +645,7 @@ sector.coastline.name = 边际海湾
 sector.navalFortress.name = 海军要塞
 
 sector.groundZero.description = 踏上旅程的最佳位置。 这里的敌人威胁很小，但资源也少。 \n\n尽你所能收集铅和铜，出发吧！
-sector.frozenForest.description = 一个靠近山脉的地方。 哪怕是在这里，也有了孢子扩散的痕迹。 \n不过它们无法在低温下长期存活。 \n\n开始运用电力，建造火力发电机并学会使用修理器。 
+sector.frozenForest.description = 一个靠近山脉的地方。 哪怕是在这里，也有了孢子扩散的痕迹。 \n连极寒也无法长久地约束它们。 \n\n开始运用电力，建造火力发电机并学会使用修理器。 
 sector.saltFlats.description = 盐碱荒滩，位于沙漠的边缘地带，几乎没有什么资源。 \n敌人在这里建立了一个资源存储区。 \n\n摧毁他们的核心，片甲不留。 
 sector.craters.description = 这片陨石地带有积水，它也是旧时战争的遗迹。 \n\n夺下该区块，收集沙子来冶炼玻璃。 \n用水泵抽水来加速炮塔和钻头。 
 sector.ruinousShores.description = 穿过荒地就是海滩。 \n这里曾经有一条海岸防线，但现在已所剩无几。 \n一些基础的防御建筑还完好无损，除此之外都变成了废墟。 \n\n继续向外扩张并研究科技。 
@@ -694,7 +704,7 @@ no = 否
 info.title = 详情
 error.title = [scarlet]发生了一个错误
 error.crashtitle = 发生了一个错误
-unit.nobuild = [scarlet]不能建造单位
+unit.nobuild = [scarlet]单位不可建造
 lastaccessed = [lightgray]上次操作：{0}
 block.unknown = [lightgray]？？
 
@@ -1075,7 +1085,7 @@ item.phase-fabric.name = 相位织物
 item.surge-alloy.name = 巨浪合金
 item.spore-pod.name = 孢子荚
 item.sand.name = 沙
-item.blast-compound.name = 炸药
+item.blast-compound.name = 爆炸混合物
 item.pyratite.name = 硫化物
 item.metaglass.name = 钢化玻璃
 item.scrap.name = 废料
@@ -1130,6 +1140,7 @@ block.sand-boulder.name = 砂岩
 block.basalt-boulder.name = 玄武岩巨石
 block.grass.name = 草地
 block.molten-slag.name = 矿渣液
+block.pooled-cryofluid.name = 冷冻液
 block.space.name = 太空
 block.salt.name = 盐碱地
 block.salt-wall.name = 盐墙
@@ -1280,7 +1291,7 @@ block.phase-conveyor.name = 相位传送带桥
 block.bridge-conveyor.name = 传送带桥
 block.plastanium-compressor.name = 塑钢压缩机
 block.pyratite-mixer.name = 硫化物混合器
-block.blast-mixer.name = 炸药混合器
+block.blast-mixer.name = 爆炸物混合器
 block.solar-panel.name = 太阳能板
 block.solar-panel-large.name = 大型太阳能板
 block.oil-extractor.name = 石油钻井
@@ -1291,6 +1302,7 @@ block.plated-conduit.name = 电镀导管
 block.phase-conduit.name = 相位导管桥
 block.liquid-router.name = 液体路由器
 block.liquid-tank.name = 储液罐
+block.liquid-container.name = 储液容器
 block.liquid-junction.name = 液体交叉器
 block.bridge-conduit.name = 导管桥
 block.rotary-pump.name = 回转泵
@@ -1337,10 +1349,16 @@ block.disassembler.name = 解离机
 block.silicon-crucible.name = 热能坩埚
 block.overdrive-dome.name = 超速穹顶投射器
 block.interplanetary-accelerator.name = 行星际加速器
-#experimental, may be removed （仅供测试，行将移除）
+block.constructor.name = 构造器
-block.block-forge.name = 方块建造厂
+block.constructor.description = 制造尺寸不超过2x2方块的建筑。 
-block.block-loader.name = 方块装载机
+block.large-constructor.name = 大型构造器
-block.block-unloader.name = 方块卸载机
+block.large-constructor.description = 制造尺寸不超过4x4方块的建筑。 
+block.deconstructor.name = 解构器
+block.deconstructor.description = 解构建筑与单位，并返还100%的制造成本。 
+block.payload-loader.name = 荷载装载器
+block.payload-loader.description = 将液体和物品装载进方块中。 
+block.payload-unloader.name = 荷载卸载器
+block.payload-unloader.description = 将液体和物品从方块中卸载。 
 
 block.switch.name = 开关
 block.micro-processor.name = 微型处理器
@@ -1418,7 +1436,7 @@ item.silicon.description = 用于太阳能板、 复杂的电气元件或作为
 item.plastanium.description = 用于高级单位、 绝缘材料，或作为分裂性弹药。 
 item.phase-fabric.description = 用于高级电子设备和自修复建筑。 
 item.surge-alloy.description = 用于先进武器和反应防御建筑。 
-item.spore-pod.description = 用于转化成石油、 炸药或作为燃料。 
+item.spore-pod.description = 用于转化成石油、 爆炸混合物或作为燃料。 
 item.spore-pod.details = 孢子。 可能是人工合成的生命形式，释放对其他生物有毒的气体，极具侵略性。 在某些条件下高度易燃。 
 item.blast-compound.description = 用作炸弹或爆炸性弹药。 
 item.pyratite.description = 用于火焰发射类武器和使用燃料的发电设备。 
@@ -1440,7 +1458,7 @@ block.plastanium-compressor.description = 用石油和钛生产塑钢。
 block.phase-weaver.description = 用钍和沙合成相位织物。 
 block.alloy-smelter.description = 将钛、 铅、 硅和铜熔合成巨浪合金。 
 block.cryofluid-mixer.description = 将水和细钛粉混合制成冷冻液。 
-block.blast-mixer.description = 利用硫化物和孢子荚生产炸药。 
+block.blast-mixer.description = 利用硫化物和孢子荚生产爆炸混合物。 
 block.pyratite-mixer.description = 把煤炭、 铅和沙子混合成硫化物。 
 block.melter.description = 将废料熔化成矿渣液。 
 block.separator.description = 将矿渣液分离成矿物成分。 
@@ -1496,7 +1514,8 @@ block.conduit.description = 向前方传输液体。 与泵或者其他导管联
 block.pulse-conduit.description = 向前方传输液体。 比普通导管传输液体更快，且能储存更多液体。 
 block.plated-conduit.description = 向前方传输液体，不接受侧面输入。 不会发生泄露。 
 block.liquid-router.description = 接受一个方向的液体输入，并平均输出到其他3个方向。 可以储存一定量的液体。 
-block.liquid-tank.description = 储存大量液体，并像液体路由器一样朝各个方向输出液体。 
+block.liquid-container.description = 储存可观数量的液体，并像液体路由器一样朝各个方向输出液体。 
+block.liquid-tank.description = 储存大量的液体，并像液体路由器一样朝各个方向输出液体。 
 block.liquid-junction.description = 两条交叉导管的桥梁。 
 block.bridge-conduit.description = 跨越任意地形或建筑物传输液体。 
 block.phase-conduit.description = 跨越任意地形或建筑物传输液体。 比导管桥范围更大，但需要电力。 
@@ -1610,7 +1629,7 @@ unit.omura.description = 向敌人发射远程穿透轨道炮。 可自动生产
 unit.alpha.description = 保护初代核心，可建造建筑。 
 unit.beta.description = 保护次代核心，可建造建筑。 
 unit.gamma.description = 保护终代核心，可建造建筑。 
-unit.retusa.description = 放置水雷，并修复友方单位。 
+unit.retusa.description = 向附近的敌人发射追踪鱼雷，并修复友方单位。 
 unit.oxynoe.description = 向附近的敌人发射火焰束，并修复友方建筑。 具备一台单点防御炮塔，能够防御来袭的子弹。 
 unit.cyerce.description = 向敌人发射追踪集束导弹，并修复友方单位。 
 unit.aegires.description = 产生能量场，使范围内的敌方建筑与单位受到电击，对友方则进行修复。 
@@ -1761,6 +1780,7 @@ lenum.itemdrop = 将携带的物品放入一座建筑
 lenum.itemtake = 从建筑中取出某种物品
 lenum.paydrop = 卸下当前载荷
 lenum.paytake = 从当前位置拾取载荷
+lenum.payenter = 进入/降落到单位下方的荷载方块中
 lenum.flag = 给单位赋予数字形式的标记
 lenum.mine = 从某个位置采集矿物
 lenum.build = 建造建筑

core/assets/bundles/bundle_zh_TW.properties

@@ -122,7 +122,7 @@ committingchanges = 遞交變更
 done = 完成
 feature.unsupported = 您的裝置不支援此功能。
 
-mods.initfailed = [red]⚠[] Mindustry 無法啟動。這可能是因模組造成。\n\n為了避免不斷閃退，[red]所有的模組已被停用。[]\n\n若要取消此設定，可在[accent]設定->遊戲->閃退後停用模組[]關閉設定.
+mods.initfailed = [red]⚠[] Mindustry 無法啟動。這可能是因模組造成。\n\n為了避免不斷閃退，[red]所有的模組已被停用。[]
 mods = 模組
 mods.none = [lightgray]找不到模組!
 mods.guide = 模組指南
@@ -363,6 +363,7 @@ publish.confirm = 您確定要發布嗎？\n\n[lightgray]首先確定您同意 W
 publish.error = 發佈項目時發生問題：{0}
 steam.error = Steam 服務初始化失敗。\n錯誤：{0}
 
+editor.cliffs = 牆轉為懸崖
 editor.brush = 筆刷
 editor.openin = 在編輯器中開啟
 editor.oregen = 礦石生成
@@ -378,6 +379,9 @@ editor.ingame = 在遊戲中編輯
 editor.publish.workshop = 在工作坊上發佈
 editor.newmap = 新地圖
 editor.center = 中心
+editor.search = 尋找地圖...
+editor.filters = 篩選地圖
+editor.showAll = 顯示內建地圖
 workshop = 工作坊
 waves.title = 波次
 waves.remove = 移除
@@ -400,6 +404,8 @@ waves.sort.reverse = 反向排序
 waves.sort.begin = 開始
 waves.sort.health = 血量
 waves.sort.type = 兵種
+waves.units.hide = 全部隱藏
+waves.units.show = 全部顯示
 
 #校正用空行
 wavemode.counts = 數量
@@ -628,6 +634,8 @@ sector.biomassFacility.name = 生物質合成工廠
 sector.windsweptIslands.name = 風之島
 sector.extractionOutpost.name = 萃取哨站
 sector.planetaryTerminal.name = 星際發射站
+sector.coastline.name = 海岸
+sector.navalFortress.name = 海上要塞
 
 sector.groundZero.description = 再次開始的最佳位置。敵人威脅程度低。資源少。\n盡可能地採集鉛與銅。\n繼續前進。
 sector.frozenForest.description = 即使是在如此靠近山脈的地方，孢子也已經擴散了。如此低溫也無法永遠遏止它們。\n\n開始冒險發電。建造火力發電機。並學習使用修理單位。
@@ -1125,6 +1133,7 @@ block.sand-boulder.name = 沙礫巨岩
 block.basalt-boulder.name = 玄武岩巨石
 block.grass.name = 草
 block.molten-slag.name = 熔渣
+block.pooled-cryofluid.name = 冷凍液
 block.space.name = 太空
 block.salt.name = 鹽
 block.salt-wall.name = 鹽牆
@@ -1158,6 +1167,7 @@ block.core-nucleus.name = 核心：核子
 block.deep-water.name = 深水
 block.shallow-water.name = 水
 block.tainted-water.name = 污水
+block.deep-tainted-water.name = 深汙水
 block.darksand-tainted-water.name = 黑沙污水
 block.tar.name = 焦油
 block.stone.name = 石頭
@@ -1390,7 +1400,8 @@ hint.waveFire = 以[accent]水[]裝填的[accent]波浪[]會自動撲滅附近
 hint.generator = \uf879 [accent]燃燒發電機[]消耗煤炭產生能源給相鄰的方塊。\n\n使用 \uf87f [accent]能量節點[]增加電力涵蓋範圍。
 hint.guardian = [accent]頭目[]擁有厚實的裝甲。較弱的彈藥如[accent]銅[]和[accent]鉛[]並[scarlet]沒有效果[].\n\n使用更高等的砲臺或以\uf835 [accent]石墨[]配合\uf861雙砲、\uf859齊射砲摧毀頭目。
 hint.coreUpgrade = 核心可以透過在上面[accent]覆蓋一個更高等級的核心[]來升級。\n\n放置  [accent]核心：基地[] 到  [accent]核心：碎片[] 上. 確保沒有其他障礙物。
-hint.presetLaunch = 灰色的[accent]降落地區[]，例如[accent]冰凍森林[]，可由任何地區發射。這類地區無須由相鄰地區進攻。\n\n[accent]數字編號地區[]，像是這一個，可不是完成戰役的必要條件。
+hint.presetLaunch = 灰色的[accent]降落地區[]，例如[accent]冰凍森林[]，可由任何地區發射。這類地區無須由相鄰地區進攻。\n\n[accent]數字編號地區[]，如同這一個，不是完成戰役的必要條件。
+hint.presetDifficulty = 此地區為[scarlet]高危險等級[]區域。\n[accent]不建議[]在準備好科技和資源以前發射至此區域。
 hint.coreIncinerate = 當任一物品的核心庫存滿了後，後續進入的同種資源會被[accent]銷毀[]。
 hint.coopCampaign = 遊玩[accent]多人合作戰役[]時，同地圖所生產的資源皆會被送入[accent]自己的地區[]。\n\n任何新科技也會單向同步到自己的科技。
 
@@ -1603,7 +1614,7 @@ unit.omura.description = 對敵人發射遠程穿透型砲彈。建造曳光戰
 unit.alpha.description = 抵禦敵軍對核心：碎片的攻擊。建造建築物。
 unit.beta.description = 抵禦敵軍對核心：基地的攻擊。建造建築物。
 unit.gamma.description = 抵禦敵軍對核心：核子的攻擊。建造建築物。
-unit.retusa.description = 布置水雷。修復友方單位。
+unit.retusa.description = 對周遭敵人發射追蹤魚雷。修復友方單位。
 unit.oxynoe.description = 射出帶回復建築的火焰。具小型方陣炮。
 unit.cyerce.description = 發射追蹤集束飛彈。修復友方單位。
 unit.aegires.description = 電擊所有在能量場內的敵方單位、建築。修復友方單位。

core/assets/contributors

@@ -128,3 +128,5 @@ SAMBUYYA
 genNAowl
 TranquillyUnpleasant
 Darkness6030
+hortiSquash
+King-BR

core/src/mindustry/Vars.java

@@ -26,6 +26,7 @@ import mindustry.maps.*;
 import mindustry.mod.*;
 import mindustry.net.*;
 import mindustry.service.*;
+import mindustry.world.*;
 
 import java.io.*;
 import java.nio.charset.*;
@@ -195,6 +196,8 @@ public class Vars implements Loadable{
     public static Fi launchIDFile;
     /** empty map, indicates no current map */
     public static Map emptyMap;
+    /** empty tile for payloads */
+    public static Tile emptyTile;
     /** map file extension */
     public static final String mapExtension = "msav";
     /** save file extension */
@@ -310,6 +313,10 @@ public class Vars implements Loadable{
 
         modDirectory.mkdirs();
 
+        Events.on(ContentInitEvent.class, e -> {
+            emptyTile = new Tile(Short.MAX_VALUE - 20, Short.MAX_VALUE - 20);
+        });
+
         mods.load();
         maps.load();
     }

core/src/mindustry/ai/Pathfinder.java

@@ -54,9 +54,9 @@ public class Pathfinder implements Runnable{
             (PathTile.solid(tile) ? 5 : 0),
 
         //water
-        (team, tile) -> PathTile.solid(tile) || !PathTile.liquid(tile) ? 200 : 2 +
+        (team, tile) -> (PathTile.solid(tile) || !PathTile.liquid(tile) ? 6000 : 1) +
             (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) +
-            (PathTile.deep(tile) ? -1 : 0) +
+            (PathTile.deep(tile) ? 0 : 1) +
             (PathTile.damages(tile) ? 35 : 0)
     );
 

core/src/mindustry/async/PhysicsProcess.java

@@ -38,7 +38,7 @@ public class PhysicsProcess implements AsyncProcess{
 
         //find Unit without bodies and assign them
         for(Unit entity : group){
-            if(entity.type == null) continue;
+            if(entity == null || entity.type == null) continue;
 
             if(entity.physref == null){
                 PhysicsBody body = new PhysicsBody();

core/src/mindustry/content/Blocks.java

@@ -5,6 +5,7 @@ import arc.math.*;
 import arc.struct.*;
 import mindustry.*;
 import mindustry.ctype.*;
+import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -901,7 +902,7 @@ public class Blocks implements ContentList{
         }};
 
         mendProjector = new MendProjector("mend-projector"){{
-            requirements(Category.effect, with(Items.lead, 100, Items.titanium, 25, Items.silicon, 40));
+            requirements(Category.effect, with(Items.lead, 100, Items.titanium, 25, Items.silicon, 40, Items.copper, 50));
             consumes.power(1.5f);
             size = 2;
             reload = 250f;
@@ -1346,7 +1347,7 @@ public class Blocks implements ContentList{
         }};
 
         waterExtractor = new SolidPump("water-extractor"){{
-            requirements(Category.production, with(Items.metaglass, 30, Items.graphite, 30, Items.lead, 30));
+            requirements(Category.production, with(Items.metaglass, 30, Items.graphite, 30, Items.lead, 30, Items.copper, 30));
             result = Liquids.water;
             pumpAmount = 0.11f;
             size = 2;
@@ -1645,7 +1646,7 @@ public class Blocks implements ContentList{
             shots = 4;
             burstSpacing = 5;
             inaccuracy = 10f;
-            range = 235f;
+            range = 240f;
             xRand = 6f;
             size = 2;
             health = 300 * size * size;
@@ -1839,7 +1840,7 @@ public class Blocks implements ContentList{
             size = 4;
             shootCone = 2f;
             shootSound = Sounds.railgun;
-            unitSort = (u, x, y) -> -u.maxHealth + Mathf.dst2(u.x, u.y, x, y) / 6400f;
+            unitSort = UnitSorts.strongest;
 
             coolantMultiplier = 0.4f;
 
@@ -2062,12 +2063,12 @@ public class Blocks implements ContentList{
         //region payloads
 
         payloadConveyor = new PayloadConveyor("payload-conveyor"){{
-            requirements(Category.units, with(Items.graphite, 10, Items.copper, 20));
+            requirements(Category.units, with(Items.graphite, 10, Items.lead, 10));
             canOverdrive = false;
         }};
 
         payloadRouter = new PayloadRouter("payload-router"){{
-            requirements(Category.units, with(Items.graphite, 15, Items.copper, 20));
+            requirements(Category.units, with(Items.graphite, 15, Items.lead, 15));
             canOverdrive = false;
         }};
 
@@ -2163,14 +2164,12 @@ public class Blocks implements ContentList{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
             alwaysUnlocked = true;
-            group = BlockGroup.units;
         }};
 
         payloadVoid = new PayloadVoid("payload-void"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
             alwaysUnlocked = true;
-            group = BlockGroup.units;
         }};
 
         //TODO move

core/src/mindustry/core/NetClient.java

@@ -260,36 +260,13 @@ public class NetClient implements ApplicationListener{
 
             //a command was sent, now get the output
             if(response.type != ResponseType.valid){
-                String text;
+                String text = netServer.invalidHandler.handle(player, response);
-
+                if(text != null){
-                //send usage
-                if(response.type == ResponseType.manyArguments){
-                    text = "[scarlet]Too many arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
-                }else if(response.type == ResponseType.fewArguments){
-                    text = "[scarlet]Too few arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
-                }else{ //unknown command
-                    int minDst = 0;
-                    Command closest = null;
-
-                    for(Command command : netServer.clientCommands.getCommandList()){
-                        int dst = Strings.levenshtein(command.text, response.runCommand);
-                        if(dst < 3 && (closest == null || dst < minDst)){
-                            minDst = dst;
-                            closest = command;
-                        }
-                    }
-
-                    if(closest != null){
-                        text = "[scarlet]Unknown command. Did you mean \"[lightgray]" + closest.text + "[]\"?";
-                    }else{
-                        text = "[scarlet]Unknown command. Check [lightgray]/help[scarlet].";
-                    }
-                }
-
                     player.sendMessage(text);
                 }
             }
         }
+    }
 
     @Remote(called = Loc.client, variants = Variant.one)
     public static void connect(String ip, int port){

core/src/mindustry/core/NetServer.java

@@ -67,6 +67,32 @@ public class NetServer implements ApplicationListener{
     /** Converts a message + NULLABLE player sender into a single string. Override for custom prefixes/suffixes. */
     public ChatFormatter chatFormatter = (player, message) -> player == null ? message : "[coral][[" + player.coloredName() + "[coral]]:[white] " + message;
 
+    /** Handles an incorrect command response. Returns text that will be sent to player. Override for customisation. */
+    public InvalidCommandHandler invalidHandler = (player, response) -> {
+        if(response.type == ResponseType.manyArguments){
+            return "[scarlet]Too many arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
+        }else if(response.type == ResponseType.fewArguments){
+            return "[scarlet]Too few arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
+        }else{ //unknown command
+            int minDst = 0;
+            Command closest = null;
+
+            for(Command command : netServer.clientCommands.getCommandList()){
+                int dst = Strings.levenshtein(command.text, response.runCommand);
+                if(dst < 3 && (closest == null || dst < minDst)){
+                    minDst = dst;
+                    closest = command;
+                }
+            }
+
+            if(closest != null){
+                return "[scarlet]Unknown command. Did you mean \"[lightgray]" + closest.text + "[]\"?";
+            }else{
+                return "[scarlet]Unknown command. Check [lightgray]/help[scarlet].";
+            }
+        }
+    };
+
     private boolean closing = false;
     private Interval timer = new Interval();
 
@@ -275,7 +301,7 @@ public class NetServer implements ApplicationListener{
             int page = args.length > 0 ? Strings.parseInt(args[0]) : 1;
             int pages = Mathf.ceil((float)clientCommands.getCommandList().size / commandsPerPage);
 
-            page --;
+            page--;
 
             if(page >= pages || page < 0){
                 player.sendMessage("[scarlet]'page' must be a number between[orange] 1[] and[orange] " + pages + "[scarlet].");
@@ -724,6 +750,8 @@ public class NetServer implements ApplicationListener{
             return;
         }
 
+        Events.fire(new EventType.AdminRequestEvent(player, other, action));
+
         if(action == AdminAction.wave){
             //no verification is done, so admins can hypothetically spam waves
             //not a real issue, because server owners may want to do just that
@@ -755,6 +783,8 @@ public class NetServer implements ApplicationListener{
 
         player.add();
 
+        Events.fire(new PlayerConnectionConfirmed(player));
+
         if(player.con == null || player.con.hasConnected) return;
 
         player.con.hasConnected = true;
@@ -990,4 +1020,8 @@ public class NetServer implements ApplicationListener{
         /** @return text to be placed before player name */
         String format(@Nullable Player player, String message);
     }
+
+    public interface InvalidCommandHandler{
+        String handle(Player player, CommandResponse response);
+    }
 }

core/src/mindustry/entities/Effect.java

@@ -35,7 +35,7 @@ public class Effect{
     /** Amount added to rotation */
     public float baseRotation;
     /** If true, parent unit is data are followed. */
-    public boolean followParent;
+    public boolean followParent = true;
     /** If this and followParent are true, the effect will offset and rotate with the parent's rotation. */
     public boolean rotWithParent;
 

core/src/mindustry/entities/UnitSorts.java

@@ -0,0 +1,14 @@
+package mindustry.entities;
+
+import arc.math.*;
+import mindustry.entities.Units.*;
+import mindustry.gen.*;
+
+public class UnitSorts{
+    public static Sortf
+
+    closest = Unit::dst2,
+    farthest = (u, x, y) -> -u.dst2(x, y),
+    strongest = (u, x, y) -> -u.maxHealth + Mathf.dst2(u.x, u.y, x, y) / 6400f,
+    weakest = (u, x, y) -> u.maxHealth + Mathf.dst2(u.x, u.y, x, y) / 6400f;
+}

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

@@ -359,8 +359,9 @@ public class BulletType extends Content implements Cloneable{
             //home in on allies if possible
             if(healPercent > 0){
                 target = Units.closestTarget(null, b.x, b.y, homingRange,
-                    e -> e.checkTarget(collidesAir, collidesGround) && e.team != b.team,
+                    e -> e.checkTarget(collidesAir, collidesGround) && e.team != b.team && !b.hasCollided(e.id),
-                    t -> collidesGround && (t.team != b.team || t.damaged()));
+                    t -> collidesGround && (t.team != b.team || t.damaged()) && !b.hasCollided(t.id)
+                );
             }else{
                 target = Units.closestTarget(b.team, b.x, b.y, homingRange, e -> e.checkTarget(collidesAir, collidesGround) && !b.hasCollided(e.id), t -> collidesGround && !b.hasCollided(t.id));
             }

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

@@ -18,7 +18,7 @@ abstract class BlockUnitComp implements Unitc{
 
         //sets up block stats
         maxHealth(tile.block.health);
-        health(tile.health());
+        health(tile.health);
         hitSize(tile.block.size * tilesize * 0.7f);
         set(tile);
     }

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

@@ -291,7 +291,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public byte relativeTo(Building tile){
-        return relativeTo(tile.tile());
+        return relativeTo(tile.tile);
     }
 
     public byte relativeToEdge(Tile other){
@@ -923,6 +923,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         drawTeamTop();
     }
 
+    public void payloadDraw(){
+        draw();
+    }
+
     public void drawTeamTop(){
         if(block.teamRegion.found()){
             if(block.teamRegions[team.id] == block.teamRegion) Draw.color(team.color);
@@ -974,6 +978,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         }
     }
 
+    /** @return whether this building is in a payload */
+    public boolean isPayload(){
+        return tile == emptyTile;
+    }
+
     /**
      * Called when a block is placed over some other blocks. This seq will always have at least one item.
      * Should load some previous state, if necessary. */
@@ -1062,7 +1071,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
                 for(int i = 0; i < Mathf.clamp(amount / 5, 0, 30); i++){
                     Time.run(i / 2f, () -> {
-                        Tile other = world.tile(tileX() + Mathf.range(block.size / 2), tileY() + Mathf.range(block.size / 2));
+                        Tile other = world.tileWorld(x + Mathf.range(block.size * tilesize / 2), y + Mathf.range(block.size * tilesize / 2));
                         if(other != null){
                             Puddles.deposit(other, liquid, splash);
                         }
@@ -1284,8 +1293,19 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return true;
     }
 
+    /** Called right before this building is picked up. */
     public void pickedUp(){
 
+
+    }
+
+    /** Called right after this building is picked up. */
+    public void afterPickedUp(){
+        if(power != null){
+            power.graph = new PowerGraph();
+            power.links.clear();
+            power.status = 0f;
+        }
     }
 
     public void removeFromProximity(){

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

@@ -36,7 +36,7 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
     @Override
     @Replace
     public int pathType(){
-        return type.allowLegStep ? Pathfinder.costGround : Pathfinder.costLegs;
+        return type.allowLegStep ? Pathfinder.costLegs : Pathfinder.costGround;
     }
 
     @Override

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

@@ -24,6 +24,38 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
 
     Seq<Payload> payloads = new Seq<>();
 
+    //uncomment for insanity
+
+    /*
+
+    private transient @Nullable PowerGraph payloadPower;
+
+    @Override
+    public void update(){
+        if(payloadPower != null){
+            payloadPower.clear();
+        }
+
+        //update power graph first, resolve everything
+        for(Payload pay : payloads){
+            if(pay instanceof BuildPayload pb && pb.build.power != null){
+                if(payloadPower == null) payloadPower = new PowerGraph();
+
+                pb.build.power.graph = null;
+                payloadPower.add(pb.build);
+            }
+        }
+
+        if(payloadPower != null){
+            payloadPower.update();
+        }
+
+        for(Payload pay : payloads){
+            pay.set(x, y, rotation);
+            pay.update(true);
+        }
+    }*/
+
     float payloadUsed(){
         return payloads.sumf(p -> p.size() * p.size());
     }
@@ -50,7 +82,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
 
     void pickup(Unit unit){
         unit.remove();
-        payloads.add(new UnitPayload(unit));
+        addPayload(new UnitPayload(unit));
         Fx.unitPickup.at(unit);
         if(Vars.net.client()){
             Vars.netClient.clearRemovedEntity(unit.id);
@@ -61,7 +93,8 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     void pickup(Building tile){
         tile.pickedUp();
         tile.tile.remove();
-        payloads.add(new BuildPayload(tile));
+        tile.afterPickedUp();
+        addPayload(new BuildPayload(tile));
         Fx.unitPickup.at(tile);
         Events.fire(new PickupEvent(self(), tile));
     }

core/src/mindustry/game/EventType.java

@@ -480,7 +480,19 @@ public class EventType{
         }
     }
 
-    /** Called after connecting; when a player receives world data and is ready to play.*/
+    /**
+     * Called after player confirmed it has received world data and is ready to play.
+     * Note that if this is the first world receival, then player.con.hasConnected is false.
+     */
+    public static class PlayerConnectionConfirmed{
+        public final Player player;
+
+        public PlayerConnectionConfirmed(Player player){
+            this.player = player;
+        }
+    }
+
+    /** Called after connecting; when a player receives world data and is ready to play. Fired only once, after initial connection. */
     public static class PlayerJoin{
         public final Player player;
 
@@ -544,4 +556,15 @@ public class EventType{
         }
     }
 
+    public static class AdminRequestEvent{
+        public final Player player;
+        public final @Nullable Player other;
+        public final AdminAction action;
+
+        public AdminRequestEvent(Player player, Player other, AdminAction action){
+            this.player = player;
+            this.other = other;
+            this.action = action;
+        }
+    }
 }

core/src/mindustry/game/Rules.java

@@ -101,6 +101,8 @@ public class Rules{
     public ObjectSet<Block> revealedBlocks = new ObjectSet<>();
     /** Unlocked content names. Only used in multiplayer when the campaign is enabled. */
     public ObjectSet<String> researched = new ObjectSet<>();
+    /** Block containing these items as requirements are hidden. */
+    public ObjectSet<Item> hiddenBuildItems = new ObjectSet<>();
     /** Whether ambient lighting is enabled. */
     public boolean lighting = false;
     /** Whether enemy lighting is visible.

core/src/mindustry/game/Saves.java

@@ -155,6 +155,7 @@ public class Saves{
         SaveSlot slot = new SaveSlot(getNextSlotFile());
         slot.importFile(file);
         slot.setName(file.nameWithoutExtension());
+
         saves.add(slot);
         slot.meta = SaveIO.getMeta(slot.file);
         current = slot;
@@ -330,6 +331,10 @@ public class Saves{
         public void importFile(Fi from) throws IOException{
             try{
                 from.copyTo(file);
+                if(previewFile().exists()){
+                    requestedPreview = false;
+                    previewFile().delete();
+                }
             }catch(Exception e){
                 throw new IOException(e);
             }

core/src/mindustry/game/Waves.java

@@ -285,7 +285,7 @@ public class Waves{
         if(naval){
             species = Structs.filter(UnitType[].class, species, v -> v[0].flying || v[0].naval);
         }else{
-            species = Structs.filter(UnitType[].class, species, v -> v[0].flying && !v[0].naval);
+            species = Structs.filter(UnitType[].class, species, v -> !v[0].naval);
         }
 
         UnitType[][] fspec = species;

core/src/mindustry/graphics/Layer.java

@@ -62,7 +62,7 @@ public class Layer{
     //flying units
     flyingUnit = 115,
 
-    //overlaied UI, like block config guides
+    //overlaid UI, like block config guides
     overlayUI = 120,
 
     //build beam effects

core/src/mindustry/graphics/Pixelator.java

@@ -5,6 +5,7 @@ import arc.graphics.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
+import arc.math.*;
 import arc.util.*;
 
 import static arc.Core.*;
@@ -35,6 +36,8 @@ public class Pixelator implements Disposable{
             w = (int)(Core.camera.width * renderer.landScale() / renderer.getScale());
             h = (int)(Core.camera.height * renderer.landScale() / renderer.getScale());
         }
+        w = Mathf.clamp(w, 2, graphics.getWidth());
+        h = Mathf.clamp(h, 2, graphics.getHeight());
 
         buffer.resize(w, h);
 

core/src/mindustry/graphics/g3d/HexSkyMesh.java

@@ -1,6 +1,7 @@
 package mindustry.graphics.g3d;
 
 import arc.graphics.*;
+import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import arc.util.noise.*;
@@ -42,6 +43,9 @@ public class HexSkyMesh extends PlanetMesh{
 
     @Override
     public void render(PlanetParams params, Mat3D projection, Mat3D transform){
+        //don't waste performance rendering 0-alpha clouds
+        if(Mathf.zero(1f - params.uiAlpha, 0.01f)) return;
+
         preRender(params);
         shader.bind();
         shader.setUniformMatrix4("u_proj", projection.val);

core/src/mindustry/graphics/g3d/PlanetMesh.java

@@ -19,8 +19,7 @@ public abstract class PlanetMesh implements GenericMesh{
 
     public PlanetMesh(){}
 
-    /** Should be overridden to set up any shader parameters such as planet position, normals, etc.
+    /** Should be overridden to set up any shader parameters such as planet position, normals, etc. */
-     * @param params*/
     public void preRender(PlanetParams params){
 
     }

core/src/mindustry/input/InputHandler.java

@@ -696,9 +696,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             });
 
             //flip rotation
-            if(x == (req.rotation % 2 == 0)){
+            req.block.flipRotation(req, x);
-                req.rotation = Mathf.mod(req.rotation + 2, 4);
-            }
         });
     }
 
@@ -1113,7 +1111,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }
 
         Building build = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
-        if(build instanceof ControlBlock cont && cont.canControl() && build.team == player.team()){
+        if(build instanceof ControlBlock cont && cont.canControl() && build.team == player.team() && cont.unit() != player.unit()){
             return cont.unit();
         }
 

core/src/mindustry/mod/ContentParser.java

@@ -20,6 +20,7 @@ import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
+import mindustry.entities.Units.*;
 import mindustry.entities.abilities.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.effect.*;
@@ -61,6 +62,7 @@ public class ContentParser{
             readFields(result, data);
             return result;
         });
+        put(Sortf.class, (type, data) -> field(UnitSorts.class, data));
         put(Interp.class, (type, data) -> field(Interp.class, data));
         put(CacheLayer.class, (type, data) -> field(CacheLayer.class, data));
         put(Attribute.class, (type, data) -> Attribute.get(data.asString()));
@@ -196,6 +198,18 @@ public class ContentParser{
                     }
                 }
 
+                //try to parse env bits
+                if((type == int.class || type == Integer.class) && jsonData.isArray()){
+                    int value = 0;
+                    for(var str : jsonData){
+                        if(!str.isString()) throw new SerializationException("Integer bitfield values must all be strings. Found: " + str);
+                        String field = str.asString();
+                        value |= Reflect.<Integer>get(Env.class, field);
+                    }
+
+                    return (T)(Integer)value;
+                }
+
                 //try to parse "item/amount" syntax
                 if(type == ItemStack.class && jsonData.isString() && jsonData.asString().contains("/")){
                     String[] split = jsonData.asString().split("/");

core/src/mindustry/net/CrashSender.java

@@ -8,6 +8,7 @@ import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
 import mindustry.core.*;
+import mindustry.mod.Mods.*;
 
 import java.io.*;
 import java.text.*;
@@ -27,7 +28,7 @@ public class CrashSender{
         + "Version: " + Version.combined() + (Vars.headless ? " (Server)" : "") + "\n"
         + "OS: " + OS.osName + " x" + (OS.osArchBits) + " (" + OS.osArch + ")\n"
         + "Java Version: " + OS.javaVersion + "\n"
-        + (mods == null ? "<no mod init>" : mods.list().size + " Mods" + (mods.list().isEmpty() ? "" : ": " + mods.list().toString(", ", mod -> mod.name + ":" + mod.meta.version)))
+        + (mods == null ? "<no mod init>" : "Mods: " + (!mods.list().contains(LoadedMod::shouldBeEnabled) ? "none (vanilla)" : mods.list().select(LoadedMod::shouldBeEnabled).toString(", ", mod -> mod.name + ":" + mod.meta.version)))
         + "\n\n" + error;
     }
 

core/src/mindustry/service/GameService.java

@@ -176,7 +176,7 @@ public class GameService{
         });
 
         Events.on(UnitControlEvent.class, e -> {
-            if(e.unit instanceof BlockUnitc && ((BlockUnitc)e.unit).tile().block == Blocks.router){
+            if(e.unit instanceof BlockUnitc unit && unit.tile().block == Blocks.router){
                 becomeRouter.complete();
             }
         });

core/src/mindustry/type/UnitType.java

@@ -141,8 +141,7 @@ public class UnitType extends UnlockableContent{
     public TextureRegion[] wreckRegions;
 
     protected float buildTime = -1f;
-    protected @Nullable ItemStack[] cachedRequirements;
+    protected @Nullable ItemStack[] totalRequirements, cachedRequirements, firstRequirements;
-    protected @Nullable ItemStack[] totalRequirements;
 
     public UnitType(String name){
         super(name);
@@ -307,6 +306,12 @@ public class UnitType extends UnlockableContent{
             stats.add(Stat.payloadCapacity, (payloadCapacity / (tilesize * tilesize)), StatUnit.blocksSquared);
         }
 
+        var reqs = getFirstRequirements();
+
+        if(reqs != null){
+            stats.add(Stat.buildCost, StatValues.items(reqs));
+        }
+
         if(weapons.any()){
             stats.add(Stat.weapons, StatValues.weapons(this, weapons));
         }
@@ -547,6 +552,13 @@ public class UnitType extends UnlockableContent{
         return null;
     }
 
+    public @Nullable ItemStack[] getFirstRequirements(){
+        if(firstRequirements == null){
+            firstRequirements = getRequirements(null, null);
+        }
+        return firstRequirements;
+    }
+
     @Override
     public ItemStack[] researchRequirements(){
         if(cachedRequirements != null){

core/src/mindustry/type/Weapon.java

@@ -97,6 +97,8 @@ public class Weapon implements Cloneable{
     public boolean parentizeEffects;
     /** internal value used for alternation - do not change! */
     public int otherSide = -1;
+    /** draw Z offset relative to the default value */
+    public float layerOffset = 0f;
     /** sound used for shooting */
     public Sound shootSound = Sounds.pew;
     /** sound used for weapons that have a delay */
@@ -155,12 +157,16 @@ public class Weapon implements Cloneable{
             Draw.rect(outlineRegion,
             wx, wy,
             outlineRegion.width * Draw.scl * -Mathf.sign(flipSprite),
-            region.height * Draw.scl,
+            outlineRegion.height * Draw.scl,
             weaponRotation);
         }
     }
     
     public void draw(Unit unit, WeaponMount mount){
+        //apply layer offset, roll it back at the end
+        float z = Draw.z();
+        Draw.z(z + layerOffset);
+
         float
         rotation = unit.rotation - 90,
         weaponRotation  = rotation + (rotate ? mount.rotation : 0),
@@ -171,12 +177,8 @@ public class Weapon implements Cloneable{
             Drawf.shadow(wx, wy, shadow);
         }
 
-        if(outlineRegion.found() && top){
+        if(top){
-            Draw.rect(outlineRegion,
+            drawOutline(unit, mount);
-            wx, wy,
-            outlineRegion.width * Draw.scl * -Mathf.sign(flipSprite),
-            region.height * Draw.scl,
-            weaponRotation);
         }
 
         Draw.rect(region,
@@ -196,6 +198,8 @@ public class Weapon implements Cloneable{
             Draw.blend();
             Draw.color();
         }
+
+        Draw.z(z);
     }
 
     public void update(Unit unit, WeaponMount mount){

core/src/mindustry/ui/Menus.java

@@ -31,11 +31,13 @@ public class Menus{
 
     @Remote(targets = Loc.both, called = Loc.both)
     public static void menuChoose(@Nullable Player player, int menuId, int option){
-        if(player != null && menuId >= 0 && menuId < menuListeners.size){
+        if(player != null){
             Events.fire(new MenuOptionChooseEvent(player, menuId, option));
+            if(menuId >= 0 && menuId < menuListeners.size){
                 menuListeners.get(menuId).get(player, option);
             }
         }
+    }
 
     @Remote(variants = Variant.both, unreliable = true)
     public static void setHudText(String message){

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

@@ -259,15 +259,6 @@ public class FileChooser extends BaseDialog{
         Core.settings.put("lastDirectory", directory.absolutePath());
     }
 
-    private String shorten(String string){
-        int max = 30;
-        if(string.length() <= max){
-            return string;
-        }else{
-            return string.substring(0, max - 3).concat("...");
-        }
-    }
-
     public class FileHistory{
         private Seq<Fi> history = new Seq<>();
         private int index;
@@ -305,19 +296,5 @@ public class FileChooser extends BaseDialog{
         public boolean canBack(){
             return !(index == 1) && index > 0;
         }
-
-        void print(){
-
-            System.out.println("\n\n\n\n\n\n");
-            int i = 0;
-            for(Fi file : history){
-                i++;
-                if(index == i){
-                    System.out.println("[[" + file.toString() + "]]");
-                }else{
-                    System.out.println("--" + file.toString() + "--");
-                }
-            }
-        }
     }
 }

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

@@ -365,7 +365,8 @@ public class JoinDialog extends BaseDialog{
 
         global.clear();
         global.background(null);
-        for(ServerGroup group : defaultServers){
+        for(int i = 0; i < defaultServers.size; i ++){
+            ServerGroup group = defaultServers.get((i + defaultServers.size/2) % defaultServers.size);
             boolean hidden = group.hidden();
             if(hidden && !showHidden){
                 continue;

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

@@ -8,7 +8,9 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.core.GameState.*;
+import mindustry.game.*;
 import mindustry.game.Saves.*;
 import mindustry.gen.*;
 import mindustry.io.*;
@@ -20,8 +22,12 @@ import java.io.*;
 import static mindustry.Vars.*;
 
 public class LoadDialog extends BaseDialog{
-    ScrollPane pane;
     Table slots;
+    String searchString;
+    Gamemode filteredMode;
+    TextField searchField;
+    ScrollPane pane;
+    BaseDialog dialog;
 
     public LoadDialog(){
         this("@loadgame");
@@ -43,9 +49,38 @@ public class LoadDialog extends BaseDialog{
 
         slots = new Table();
         pane = new ScrollPane(slots);
+
+        rebuild();
+
+        Table search = new Table();
+        search.image(Icon.zoom);
+        searchField = search.field("", t -> {
+            searchString = t.length() > 0 ? t.toLowerCase() : null;
+            rebuild();
+        }).maxTextLength(50).growX().get();
+        searchField.setMessageText("@save.search");
+        for(Gamemode mode : Gamemode.all){
+            TextureRegionDrawable icon = Vars.ui.getIcon("mode" + Strings.capitalize(mode.name()));
+            boolean sandbox = mode == Gamemode.sandbox;
+            if(Core.atlas.isFound(icon.getRegion()) || sandbox){
+                search.button(sandbox ? Icon.terrain : icon, Styles.emptytogglei, () -> {
+                    filteredMode = filteredMode == mode ? null : mode;
+                    rebuild();
+                }).size(60f).checked(b -> filteredMode == mode).tooltip("@mode." + mode.name() + ".name");
+            }
+        }
+
         pane.setFadeScrollBars(false);
         pane.setScrollingDisabled(true, false);
 
+        cont.add(search).growX();
+        cont.row();
+        cont.add(pane).growY();
+    }
+
+    public void rebuild(){
+
+        slots.clear();
         slots.marginRight(24).marginLeft(20f);
 
         Time.runTask(2f, () -> Core.scene.setScrollFocus(pane));
@@ -58,7 +93,11 @@ public class LoadDialog extends BaseDialog{
         boolean any = false;
 
         for(SaveSlot slot : array){
-            if(slot.isHidden()) continue;
+            if(slot.isHidden()
+            || (searchString != null && !Strings.stripColors(slot.getName()).toLowerCase().contains(searchString))
+            || (filteredMode != null && filteredMode != slot.mode())){
+                continue;
+            }
 
             any = true;
 
@@ -82,14 +121,14 @@ public class LoadDialog extends BaseDialog{
                     t.button(Icon.trash, Styles.emptyi, () -> {
                         ui.showConfirm("@confirm", "@save.delete.confirm", () -> {
                             slot.delete();
-                            setup();
+                            rebuild();
                         });
                     }).right();
 
                     t.button(Icon.pencil, Styles.emptyi, () -> {
                         ui.showTextInput("@save.rename", "@save.rename.text", slot.getName(), text -> {
                             slot.setName(text);
-                            setup();
+                            rebuild();
                         });
                     }).right();
 
@@ -141,10 +180,8 @@ public class LoadDialog extends BaseDialog{
         }
 
         if(!any){
-            slots.button("@save.none", () -> {}).disabled(true).fillX().margin(20f).minWidth(340f).height(80f).pad(4f);
+            slots.add("@save.none");
         }
-
-        cont.add(pane);
     }
 
     public void addSetup(){
@@ -154,7 +191,7 @@ public class LoadDialog extends BaseDialog{
                 if(SaveIO.isSaveValid(file)){
                     try{
                         control.saves.importSave(file);
-                        setup();
+                        rebuild();
                     }catch(IOException e){
                         e.printStackTrace();
                         ui.showException("@save.import.fail", e);
@@ -193,4 +230,15 @@ public class LoadDialog extends BaseDialog{
             }
         });
     }
+
+    @Override
+    public Dialog show(){
+        super.show();
+
+        if(Core.app.isDesktop() && searchField != null){
+            Core.scene.setKeyboardFocus(searchField);
+        }
+
+        return this;
+    }
 }

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

@@ -25,7 +25,10 @@ public class MapsDialog extends BaseDialog{
     private Table mapTable = new Table();
     private TextField searchField;
 
-    private boolean showAll = Core.settings.getBool("editorShowAllMaps", true);
+    private boolean showBuiltIn = Core.settings.getBool("editorshowbuiltinmaps", true);
+    private boolean showCustom = Core.settings.getBool("editorshowcustommaps", true);
+    private boolean searchAuthor = Core.settings.getBool("editorsearchauthor", false);
+    private boolean searchDescription = Core.settings.getBool("editorsearchdescription", false);
 
     public MapsDialog(){
         super("@maps");
@@ -87,7 +90,7 @@ public class MapsDialog extends BaseDialog{
                         String name = map.tags.get("name", () -> {
                             String result = "unknown";
                             int number = 0;
-                            while(maps.byName(result + number++) != null);
+                            while(maps.byName(result + number++) != null) ;
                             return result + number;
                         });
 
@@ -153,14 +156,21 @@ public class MapsDialog extends BaseDialog{
 
         int i = 0;
 
-        Seq<Map> mapList = showAll ? Vars.maps.all() : Vars.maps.customMaps();
+        Seq<Map> mapList = showCustom ?
+            showBuiltIn ? maps.all() : maps.customMaps() :
+            showBuiltIn ? maps.defaultMaps() : null;
+
+        if(mapList != null){
             for(Map map : mapList){
 
                 boolean invalid = false;
                 for(Gamemode mode : modes){
                     invalid |= !mode.valid(map);
                 }
-            if(invalid || (searchString != null && !Strings.stripColors(map.name()).toLowerCase().contains(searchString))){
+                if(invalid || (searchString != null
+                    && !Strings.stripColors(map.name()).toLowerCase().contains(searchString)
+                    && (!searchAuthor || !Strings.stripColors(map.author()).toLowerCase().contains(searchString))
+                    && (!searchDescription || !Strings.stripColors(map.description()).toLowerCase().contains(searchString)))){
                     continue;
                 }
 
@@ -183,6 +193,7 @@ public class MapsDialog extends BaseDialog{
 
                 i++;
             }
+        }
 
         if(noMapsShown){
             mapTable.add("@maps.none");
@@ -192,30 +203,57 @@ public class MapsDialog extends BaseDialog{
     void showMapFilters(){
         dialog = new BaseDialog("@editor.filters");
         dialog.addCloseButton();
-        dialog.setFillParent(false);
+        dialog.cont.table(menu -> {
-        dialog.cont.table(Tex.button, t -> {
+            menu.add("@editor.filters.mode").width(150f).left();
-            int i = 0;
+            menu.table(t -> {
                 for(Gamemode mode : Gamemode.all){
                     TextureRegionDrawable icon = Vars.ui.getIcon("mode" + Strings.capitalize(mode.name()));
                     if(Core.atlas.isFound(icon.getRegion())){
-                    t.button(mode.name(), icon, Styles.clearTogglet, () -> {
+                        t.button(icon, Styles.emptytogglei, () -> {
                             if(modes.contains(mode)){
                                 modes.remove(mode);
                             }else{
                                 modes.add(mode);
                             }
                             rebuildMaps();
-                    }).size(150f, 60f).marginLeft(6f).checked(modes.contains(mode));
+                        }).size(60f).checked(modes.contains(mode)).tooltip("@mode." + mode.name() + ".name");
-                    if(++i % 3 == 0) t.row();
                     }
                 }
-            t.row();
+            }).padBottom(10f);
-            t.button("@editor.showAll", Styles.clearTogglet, () -> {
+            menu.row();
-                showAll = !showAll;
+
-                Core.settings.put("editorShowAllMaps", showAll);
+            menu.add("@editor.filters.type").width(150f).left();
+            menu.table(Tex.button, t -> {
+                t.button("@custom", Styles.clearTogglet, () -> {
+                    showCustom = !showCustom;
+                    Core.settings.put("editorshowcustommaps", showCustom);
                     Core.settings.forceSave();
                     rebuildMaps();
-            }).checked(b -> showAll).colspan(3).growX().height(40f);
+                }).size(150f, 60f).checked(showCustom);
+                t.button("@builtin", Styles.clearTogglet, () -> {
+                    showBuiltIn = !showBuiltIn;
+                    Core.settings.put("editorshowbuiltinmaps", showBuiltIn);
+                    Core.settings.forceSave();
+                    rebuildMaps();
+                }).size(150f, 60f).checked(showBuiltIn);
+            }).padBottom(10f);
+            menu.row();
+
+            menu.add("@editor.filters.search").width(150f).left();
+            menu.table(Tex.button, t -> {
+                t.button("@editor.filters.author", Styles.clearTogglet, () -> {
+                    searchAuthor = !searchAuthor;
+                    Core.settings.put("editorsearchauthor", searchAuthor);
+                    Core.settings.forceSave();
+                    rebuildMaps();
+                }).size(150f, 60f).checked(searchAuthor);
+                t.button("@editor.filters.description", Styles.clearTogglet, () -> {
+                    searchDescription = !searchDescription;
+                    Core.settings.put("editorsearchdescription", searchDescription);
+                    Core.settings.forceSave();
+                    rebuildMaps();
+                }).size(150f, 60f).checked(searchDescription);
+            });
         });
 
         dialog.show();

core/src/mindustry/ui/fragments/ChatFragment.java

@@ -257,6 +257,12 @@ public class ChatFragment extends Table{
         return shown;
     }
 
+    /** @deprecated prefixes are ignored now, just add raw messages */
+    @Deprecated
+    public void addMessage(String pointless, String message){
+        addMessage(message);
+    }
+
     public void addMessage(String message){
         if(message == null) return;
         messages.insert(0, message);

core/src/mindustry/ui/fragments/PlacementFragment.java

@@ -98,7 +98,7 @@ public class PlacementFragment extends Fragment{
     boolean gridUpdate(InputHandler input){
         scrollPositions.put(currentCategory, blockPane.getScrollY());
 
-        if(Core.input.keyTap(Binding.pick) && player.isBuilder()){ //mouse eyedropper select
+        if(Core.input.keyTap(Binding.pick) && player.isBuilder() && !Core.scene.hasDialog()){ //mouse eyedropper select
             var build = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
             Block tryRecipe = build == null ? null : build instanceof ConstructBuild c ? c.current : build.block;
             Object tryConfig = build == null || !build.block.copyConfig ? null : build.config();
@@ -445,7 +445,7 @@ public class PlacementFragment extends Fragment{
     }
 
     boolean unlocked(Block block){
-        return block.unlockedNow() && block.placeablePlayer;
+        return block.unlockedNow() && block.placeablePlayer && (state.rules.hiddenBuildItems.isEmpty() || !Structs.contains(block.requirements, i -> state.rules.hiddenBuildItems.contains(i.item)));
     }
 
     boolean hasInfoBox(){

core/src/mindustry/ui/fragments/PlayerListFragment.java

@@ -1,10 +1,12 @@
 package mindustry.ui.fragments;
 
 import arc.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.*;
+import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
@@ -115,6 +117,23 @@ public class PlayerListFragment extends Fragment{
 
             button.image(Icon.admin).visible(() -> user.admin && !(!user.isLocal() && net.server())).padRight(5).get().updateVisibility();
 
+            var style = new ImageButtonStyle(){{
+                down = Styles.none;
+                up = Styles.none;
+                imageCheckedColor = Pal.accent;
+                imageDownColor = Pal.accent;
+                imageUpColor = Color.white;
+                imageOverColor = Color.lightGray;
+            }};
+
+            var ustyle = new ImageButtonStyle(){{
+                down = Styles.none;
+                up = Styles.none;
+                imageDownColor = Pal.accent;
+                imageUpColor = Color.white;
+                imageOverColor = Color.lightGray;
+            }};
+
             if((net.server() || player.admin) && !user.isLocal() && (!user.admin || net.server())){
                 button.add().growY();
 
@@ -123,35 +142,41 @@ public class PlayerListFragment extends Fragment{
                 button.table(t -> {
                     t.defaults().size(bs);
 
-                    t.button(Icon.hammer, Styles.clearPartiali,
+                    t.button(Icon.hammer, ustyle,
                     () -> ui.showConfirm("@confirm", Core.bundle.format("confirmban",  user.name()), () -> Call.adminRequest(user, AdminAction.ban)));
-                    t.button(Icon.cancel, Styles.clearPartiali,
+                    t.button(Icon.cancel, ustyle,
                     () -> ui.showConfirm("@confirm", Core.bundle.format("confirmkick",  user.name()), () -> Call.adminRequest(user, AdminAction.kick)));
 
                     t.row();
 
-                    t.button(Icon.admin, Styles.clearTogglePartiali, () -> {
+                    t.button(Icon.admin, style, () -> {
                         if(net.client()) return;
 
                         String id = user.uuid();
 
-                        if(netServer.admins.isAdmin(id, connection.address)){
+                        if(user.admin){
-                            ui.showConfirm("@confirm", Core.bundle.format("confirmunadmin",  user.name()), () -> netServer.admins.unAdminPlayer(id));
+                            ui.showConfirm("@confirm", Core.bundle.format("confirmunadmin",  user.name()), () -> {
+                                netServer.admins.unAdminPlayer(id);
+                                user.admin = false;
+                            });
                         }else{
-                            ui.showConfirm("@confirm", Core.bundle.format("confirmadmin",  user.name()), () -> netServer.admins.adminPlayer(id, user.usid()));
+                            ui.showConfirm("@confirm", Core.bundle.format("confirmadmin",  user.name()), () -> {
+                                netServer.admins.adminPlayer(id, user.usid());
+                                user.admin = true;
+                            });
                         }
                     }).update(b -> b.setChecked(user.admin))
                         .disabled(b -> net.client())
                         .touchable(() -> net.client() ? Touchable.disabled : Touchable.enabled)
                         .checked(user.admin);
 
-                    t.button(Icon.zoom, Styles.clearPartiali, () -> Call.adminRequest(user, AdminAction.trace));
+                    t.button(Icon.zoom, ustyle, () -> Call.adminRequest(user, AdminAction.trace));
 
                 }).padRight(12).size(bs + 10f, bs);
             }else if(!user.isLocal() && !user.admin && net.client() && Groups.player.size() >= 3 && player.team() == user.team()){ //votekick
                 button.add().growY();
 
-                button.button(Icon.hammer, Styles.clearPartiali,
+                button.button(Icon.hammer, ustyle,
                 () -> {
                     ui.showConfirm("@confirm", Core.bundle.format("confirmvotekick",  user.name()), () -> {
                         Call.sendChatMessage("/votekick " + user.name());

core/src/mindustry/world/Block.java

@@ -120,6 +120,8 @@ public class Block extends UnlockableContent{
     public boolean autoResetEnabled = true;
     /** if true, the block stops updating when disabled */
     public boolean noUpdateDisabled = false;
+    /** if true, this block updates when a payload of a unit. Currently unused! */
+    public boolean updateInUnits = true;
     /** Whether to use this block's color in the minimap. Only used for overlays. */
     public boolean useColor = true;
     /** item that drops from this block, used for drills */
@@ -152,7 +154,7 @@ public class Block extends UnlockableContent{
     public boolean alwaysReplace = false;
     /** if false, this block can never be replaced. */
     public boolean replaceable = true;
-    /** The block group. Unless {@link #canReplace} is overriden, blocks in the same group can replace each other. */
+    /** The block group. Unless {@link #canReplace} is overridden, blocks in the same group can replace each other. */
     public BlockGroup group = BlockGroup.none;
     /** List of block flags. Used for AI indexing. */
     public EnumSet<BlockFlag> flags = EnumSet.of();
@@ -263,7 +265,10 @@ public class Block extends UnlockableContent{
     public boolean quickRotate = true;
     /** Main subclass. Non-anonymous. */
     public @Nullable Class<?> subclass;
+    /** Determines if this block gets a higher unloader priority. */
+    public boolean highUnloadPriority = false;
 
+    public float selectScroll; //scroll position for certain blocks
     public Prov<Building> buildType = null; //initialized later
     public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>();
 
@@ -984,4 +989,9 @@ public class Block extends UnlockableContent{
         packer.add(PageType.editor, name + "-icon-editor", editorBase);
     }
 
+    public void flipRotation(BuildPlan req, boolean x){
+        if(x == (req.rotation % 2 == 0)){
+            req.rotation = Mathf.mod(req.rotation + 2, 4);
+        }
+    }
 }

core/src/mindustry/world/blocks/ItemSelection.java

@@ -5,20 +5,29 @@ import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
+import arc.util.*;
 import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
 public class ItemSelection{
-    private static float scrollPos = 0f;
 
     public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer){
         buildTable(table, items, holder, consumer, true);
     }
 
+    public static <T extends UnlockableContent> void buildTable(Block block, Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer){
+        buildTable(block, table, items, holder, consumer, true);
+    }
+
     public static <T extends UnlockableContent> void buildTable(Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, boolean closeSelect){
+        buildTable(null, table, items, holder, consumer, closeSelect);
+    }
+    
+    public static <T extends UnlockableContent> void buildTable(@Nullable Block block, Table table, Seq<T> items, Prov<T> holder, Cons<T> consumer, boolean closeSelect){
 
         ButtonGroup<ImageButton> group = new ButtonGroup<>();
         group.setMinCheckCount(0);
@@ -52,10 +61,13 @@ public class ItemSelection{
 
         ScrollPane pane = new ScrollPane(cont, Styles.smallPane);
         pane.setScrollingDisabled(true, false);
-        pane.setScrollYForce(scrollPos);
+
+        if(block != null){
+            pane.setScrollYForce(block.selectScroll);
             pane.update(() -> {
-            scrollPos = pane.getScrollY();
+                block.selectScroll = pane.getScrollY();
             });
+        }
 
         pane.setOverscroll(false, false);
         table.add(pane).maxHeight(Scl.scl(40 * 5));

core/src/mindustry/world/blocks/defense/ForceProjector.java

@@ -122,6 +122,12 @@ public class ForceProjector extends Block{
             super.onRemoved();
         }
 
+        @Override
+        public void pickedUp(){
+            super.pickedUp();
+            radscl = warmup = 0f;
+        }
+
         @Override
         public void updateTile(){
             boolean phaseValid = consumes.get(ConsumeType.item).valid(this);

core/src/mindustry/world/blocks/defense/OverdriveProjector.java

@@ -109,7 +109,7 @@ public class OverdriveProjector extends Block{
                 float realRange = range + phaseHeat * phaseRangeBoost;
 
                 charge = 0f;
-                indexer.eachBlock(this, realRange, other -> true, other -> other.applyBoost(realBoost(), reload + 1f));
+                indexer.eachBlock(this, realRange, other -> other.block.canOverdrive, other -> other.applyBoost(realBoost(), reload + 1f));
             }
 
             if(timer(timerUse, useTime) && efficiency() > 0 && consValid()){

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

@@ -31,6 +31,7 @@ public class BaseTurret extends Block{
         priority = TargetPriority.turret;
         group = BlockGroup.turrets;
         flags = EnumSet.of(BlockFlag.turret);
+        updateInUnits = false;
     }
 
     @Override

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

@@ -106,7 +106,7 @@ public class LaserTurret extends PowerTurret{
 
         @Override
         protected void bullet(BulletType type, float angle){
-            bullet = type.create(tile.build, team, x + tr.x, y + tr.y, angle);
+            bullet = type.create(this, team, x + tr.x, y + tr.y, angle);
             bulletLife = shootDuration;
         }
 

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

@@ -4,6 +4,7 @@ import arc.graphics.g2d.*;
 import arc.struct.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.core.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
@@ -90,9 +91,7 @@ public class LiquidTurret extends Turret{
 
         @Override
         public void updateTile(){
-            if(unit != null){
             unit.ammo(unit.type().ammoCapacity * liquids.currentAmount() / liquidCapacity);
-            }
 
             super.updateTile();
         }
@@ -100,13 +99,14 @@ public class LiquidTurret extends Turret{
         @Override
         protected void findTarget(){
             if(extinguish && liquids.current().canExtinguish()){
+                int tx = World.toTile(x), ty = World.toTile(y);
                 Fire result = null;
                 float mindst = 0f;
                 int tr = (int)(range / tilesize);
                 for(int x = -tr; x <= tr; x++){
                     for(int y = -tr; y <= tr; y++){
-                        Tile other = world.tile(x + tile.x, y + tile.y);
+                        Tile other = world.tile(x + tx, y + ty);
-                        var fire = Fires.get(x + tile.x, y + tile.y);
+                        var fire = Fires.get(x + tx, y + ty);
                         float dst = fire == null ? 0 : dst2(fire);
                         //do not extinguish fires on other team blocks
                         if(other != null && fire != null && Fires.has(other.x, other.y) && dst <= range * range && (result == null || dst < mindst) && (other.build == null || other.team() == team)){

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

@@ -31,9 +31,7 @@ public class PowerTurret extends Turret{
 
         @Override
         public void updateTile(){
-            if(unit != null){
             unit.ammo(power.status * unit.type().ammoCapacity);
-            }
 
             super.updateTile();
         }

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

@@ -76,7 +76,7 @@ public class Turret extends ReloadTurret{
     public Effect chargeBeginEffect = Fx.none;
     public Sound chargeSound = Sounds.none;
 
-    public Sortf unitSort = Unit::dst2;
+    public Sortf unitSort = UnitSorts.closest;
 
     protected Vec2 tr = new Vec2();
     protected Vec2 tr2 = new Vec2();
@@ -149,15 +149,9 @@ public class Turret extends ReloadTurret{
         public boolean logicShooting = false;
         public @Nullable Posc target;
         public Vec2 targetPos = new Vec2();
-        public @Nullable BlockUnitc unit;
+        public BlockUnitc unit = (BlockUnitc)UnitTypes.block.create(team);
         public boolean wasShooting, charging;
 
-        @Override
-        public void created(){
-            unit = (BlockUnitc)UnitTypes.block.create(team);
-            unit.tile(this);
-        }
-
         @Override
         public boolean canControl(){
             return playerControllable;
@@ -165,7 +159,7 @@ public class Turret extends ReloadTurret{
 
         @Override
         public void control(LAccess type, double p1, double p2, double p3, double p4){
-            if(type == LAccess.shoot && (unit == null || !unit.isPlayer())){
+            if(type == LAccess.shoot && !unit.isPlayer()){
                 targetPos.set(World.unconv((float)p1), World.unconv((float)p2));
                 logicControlTime = logicControlCooldown;
                 logicShooting = !Mathf.zero(p3);
@@ -203,15 +197,14 @@ public class Turret extends ReloadTurret{
         }
 
         public boolean isShooting(){
-            return (isControlled() ? (unit != null && unit.isShooting()) : logicControlled() ? logicShooting : target != null);
+            return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : target != null);
         }
 
         @Override
         public Unit unit(){
-            if(unit == null){
+            //make sure stats are correct
-                unit = (BlockUnitc)UnitTypes.block.create(team);
             unit.tile(this);
-            }
+            unit.team(team);
             return (Unit)unit;
         }
 
@@ -267,12 +260,9 @@ public class Turret extends ReloadTurret{
             recoil = Mathf.lerpDelta(recoil, 0f, restitution);
             heat = Mathf.lerpDelta(heat, 0f, cooldown);
 
-            if(unit != null){
+            unit.tile(this);
-                unit.health(health);
             unit.rotation(rotation);
             unit.team(team);
-                unit.set(x, y);
-            }
 
             if(logicControlTime > 0){
                 logicControlTime -= Time.delta;
@@ -338,7 +328,7 @@ public class Turret extends ReloadTurret{
             if(targetAir && !targetGround){
                 target = Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded(), unitSort);
             }else{
-                target = Units.bestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> true, unitSort);
+                target = Units.bestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> targetGround, unitSort);
 
                 if(target == null && canHeal()){
                     target = Units.findAllyTile(team, x, y, range, b -> b.damaged() && b != this);
@@ -405,7 +395,7 @@ public class Turret extends ReloadTurret{
 
                 for(int i = 0; i < chargeEffects; i++){
                     Time.run(Mathf.random(chargeMaxDelay), () -> {
-                        if(!isValid()) return;
+                        if(dead) return;
                         tr.trns(rotation, shootLength);
                         chargeEffect.at(x + tr.x, y + tr.y, rotation);
                     });
@@ -414,7 +404,7 @@ public class Turret extends ReloadTurret{
                 charging = true;
 
                 Time.run(chargeTime, () -> {
-                    if(!isValid()) return;
+                    if(dead) return;
                     tr.trns(rotation, shootLength);
                     recoil = recoilAmount;
                     heat = 1f;
@@ -428,7 +418,7 @@ public class Turret extends ReloadTurret{
                 for(int i = 0; i < shots; i++){
                     int ii = i;
                     Time.run(burstSpacing * i, () -> {
-                        if(!isValid() || !hasAmmo()) return;
+                        if(dead || !hasAmmo()) return;
 
                         recoil = recoilAmount;
 
@@ -488,7 +478,7 @@ public class Turret extends ReloadTurret{
         }
 
         protected void ejectEffects(){
-            if(!isValid()) return;
+            if(dead) return;
 
             //alternate sides when using a double turret
             float scl = (shots == 2 && alternate && shotCounter % 2 == 1 ? -1f : 1f);

core/src/mindustry/world/blocks/distribution/Conveyor.java

@@ -132,7 +132,7 @@ public class Conveyor extends Block implements Autotiler{
         public float minitem = 1;
 
         public int blendbits, blending;
-        public int blendsclx, blendscly;
+        public int blendsclx = 1, blendscly = 1;
 
         public float clogHeat = 0f;
 
@@ -163,12 +163,17 @@ public class Conveyor extends Block implements Autotiler{
                 tr2.trns(rotation * 90, -tilesize / 2f, xs[i] * tilesize / 2f);
 
                 Draw.rect(item.fullIcon,
-                    (tile.x * tilesize + tr1.x * ys[i] + tr2.x),
+                    (x + tr1.x * ys[i] + tr2.x),
-                    (tile.y * tilesize + tr1.y * ys[i] + tr2.y),
+                    (y + tr1.y * ys[i] + tr2.y),
                     itemSize, itemSize);
             }
         }
 
+        @Override
+        public void payloadDraw(){
+            Draw.rect(block.fullIcon,x, y);
+        }
+
         @Override
         public void drawCracks(){
             Draw.z(Layer.block - 0.15f);

core/src/mindustry/world/blocks/distribution/ItemBridge.java

@@ -184,6 +184,11 @@ public class ItemBridge extends Block{
         public boolean wasMoved, moved;
         public float transportCounter;
 
+        @Override
+        public void pickedUp(){
+            link = -1;
+        }
+
         @Override
         public void playerPlaced(Object config){
             super.playerPlaced(config);

core/src/mindustry/world/blocks/distribution/MassDriver.java

@@ -165,7 +165,7 @@ public class MassDriver extends Block{
                 }
 
                 //align to shooter rotation
-                rotation = Angles.moveToward(rotation, tile.angleTo(currentShooter()), rotateSpeed * efficiency());
+                rotation = Angles.moveToward(rotation, angleTo(currentShooter()), rotateSpeed * efficiency());
             }else if(state == DriverState.shooting){
                 //if there's nothing to shoot at OR someone wants to shoot at this thing, bail
                 if(!hasLink || (!waitingShooters.isEmpty() && (itemCapacity - items.total() >= minDistribute))){
@@ -173,7 +173,7 @@ public class MassDriver extends Block{
                     return;
                 }
 
-                float targetRotation = tile.angleTo(link);
+                float targetRotation = angleTo(link);
 
                 if(
                 items.total() >= minDistribute && //must shoot minimum amount of items

core/src/mindustry/world/blocks/distribution/PayloadConveyor.java

@@ -126,6 +126,10 @@ public class PayloadConveyor extends Block{
         public void updateTile(){
             if(!enabled) return;
 
+            if(item != null){
+                item.update(false);
+            }
+
             lastInterp = curInterp;
             curInterp = fract();
             //rollover skip
@@ -231,6 +235,11 @@ public class PayloadConveyor extends Block{
             }
         }
 
+        @Override
+        public void payloadDraw(){
+            Draw.rect(block.fullIcon,x, y);
+        }
+
         public float time(){
             return Time.time;
         }

core/src/mindustry/world/blocks/distribution/Sorter.java

@@ -124,7 +124,7 @@ public class Sorter extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> sortItem, this::configure);
+            ItemSelection.buildTable(Sorter.this, table, content.items(), () -> sortItem, this::configure);
         }
 
         @Override

core/src/mindustry/world/blocks/distribution/StackConveyor.java

@@ -42,6 +42,7 @@ public class StackConveyor extends Block implements Autotiler{
         hasItems = true;
         itemCapacity = 10;
         conveyorPlacement = true;
+        highUnloadPriority = true;
 
         ambientSound = Sounds.conveyor;
         ambientSoundVolume = 0.004f;
@@ -312,7 +313,7 @@ public class StackConveyor extends Block implements Autotiler{
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            if(this == source) return true; //player threw items
+            if(this == source) return items.total() < itemCapacity && (!items.any() || items.has(item)); //player threw items
             if(cooldown > recharge - 1f) return false; //still cooling down
             return !((state != stateLoad) //not a loading dock
             ||  (items.any() && !items.has(item)) //incompatible items

core/src/mindustry/world/blocks/liquid/Conduit.java

@@ -97,7 +97,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
 
     public class ConduitBuild extends LiquidBuild implements ChainedBuilding{
         public float smoothLiquid;
-        public int blendbits, xscl, yscl, blending;
+        public int blendbits, xscl = 1, yscl = 1, blending;
         public boolean capped;
 
         @Override

core/src/mindustry/world/blocks/logic/MessageBlock.java

@@ -119,7 +119,7 @@ public class MessageBlock extends Block{
                         dialog.hide();
                     }).size(130f, 60f);
                     dialog.update(() -> {
-                        if(tile.block() != MessageBlock.this){
+                        if(tile.build != this){
                             dialog.hide();
                         }
                     });

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

@@ -78,6 +78,7 @@ public abstract class BlockProducer extends PayloadBlock{
 
         @Override
         public void updateTile(){
+            super.updateTile();
             var recipe = recipe();
             boolean produce = recipe != null && consValid() && payload == null;
 

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

@@ -1,6 +1,7 @@
 package mindustry.world.blocks.payloads;
 
 import arc.graphics.g2d.*;
+import arc.math.*;
 import arc.util.io.*;
 import mindustry.game.*;
 import mindustry.gen.*;
@@ -15,6 +16,7 @@ public class BuildPayload implements Payload{
 
     public BuildPayload(Block block, Team team){
         this.build = block.newBuilding().create(block, team);
+        this.build.tile = emptyTile;
     }
 
     public BuildPayload(Building build){
@@ -34,6 +36,14 @@ public class BuildPayload implements Payload{
         build.dropped();
     }
 
+    @Override
+    public void update(boolean inUnit){
+        if(inUnit && !build.block.updateInUnits) return;
+
+        build.tile = emptyTile;
+        build.update();
+    }
+
     @Override
     public ItemStack[] requirements(){
         return build.block.requirements;
@@ -80,7 +90,12 @@ public class BuildPayload implements Payload{
     @Override
     public void draw(){
         drawShadow(1f);
-        Draw.rect(build.block.fullIcon, build.x, build.y);
+        float prevZ = Draw.z();
+        Draw.zTransform(z -> z >= Layer.flyingUnitLow ? z : 0.0011f + Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f));
+        build.tile = emptyTile;
+        build.payloadDraw();
+        Draw.zTransform();
+        Draw.z(prevZ);
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import arc.scene.ui.layout.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.storage.*;
@@ -54,7 +55,18 @@ public class Constructor extends BlockProducer{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.blocks().select(Constructor.this::canProduce), () -> recipe, this::configure);
+            ItemSelection.buildTable(Constructor.this, table, content.blocks().select(Constructor.this::canProduce), () -> recipe, this::configure);
+        }
+
+        @Override
+        public boolean onConfigureTileTapped(Building other){
+            if(this == other){
+                deselect();
+                configure(null);
+                return false;
+            }
+
+            return true;
         }
 
         @Override

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

@@ -36,6 +36,10 @@ public interface Payload extends Position{
     /** @return the time taken to build this payload. */
     float buildTime();
 
+    /** update this payload if it is a block
+     * @param inUnit whether this payload is in a unit */
+    default void update(boolean inUnit){}
+
     /** @return whether this payload was dumped. */
     default boolean dump(){
         return false;
@@ -94,6 +98,7 @@ public interface Payload extends Position{
             BuildPayload payload = new BuildPayload(block, Team.derelict);
             byte version = read.b();
             payload.build.readAll(read, version);
+            payload.build.tile = emptyTile;
             return (T)payload;
         }else if(type == payloadUnit){
             byte id = read.b();

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

@@ -135,6 +135,13 @@ public class PayloadBlock extends Block{
             if(payload != null && !carried) payload.dump();
         }
 
+        @Override
+        public void updateTile(){
+            if(payload != null){
+                payload.update(false);
+            }
+        }
+
         public boolean blends(int direction){
             return PayloadBlock.blends(this, direction);
         }

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

@@ -103,6 +103,7 @@ public class PayloadDeconstructor extends PayloadBlock{
 
         @Override
         public void updateTile(){
+            super.updateTile();
             if(items.total() > 0){
                 for(int i = 0; i < dumpRate; i++){
                     dumpAccumulate();

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

@@ -3,6 +3,7 @@ package mindustry.world.blocks.payloads;
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.util.*;
+import arc.util.io.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -58,6 +59,7 @@ public class PayloadLoader extends PayloadBlock{
     }
 
     public class PayloadLoaderBuild extends PayloadBlockBuild<BuildPayload>{
+        public boolean exporting = false;
 
         @Override
         public boolean acceptPayload(Building source, Payload payload){
@@ -68,6 +70,12 @@ public class PayloadLoader extends PayloadBlock{
                 build.build.block().hasLiquids && build.block().liquidCapacity >= 10f);
         }
 
+        @Override
+        public void handlePayload(Building source, Payload payload){
+            super.handlePayload(source, payload);
+            exporting = false;
+        }
+
         @Override
         public boolean acceptItem(Building source, Item item){
             return items.total() < itemCapacity;
@@ -103,6 +111,7 @@ public class PayloadLoader extends PayloadBlock{
 
         @Override
         public void updateTile(){
+            super.updateTile();
             if(shouldExport()){
                 moveOutPayload();
             }else if(moveInPayload()){
@@ -120,6 +129,9 @@ public class PayloadLoader extends PayloadBlock{
                                         payload.build.handleItem(payload.build, item);
                                         items.remove(item, 1);
                                         break;
+                                    }else if(payload.block().separateItemCapacity || payload.block().consumes.consumesItem(item)){
+                                        exporting = true;
+                                        break;
                                     }
                                 }
                             }
@@ -147,11 +159,28 @@ public class PayloadLoader extends PayloadBlock{
 
         public boolean shouldExport(){
             return payload != null && (
-                (payload.block().hasLiquids && payload.build.liquids.total() >= payload.block().liquidCapacity - 0.001f) ||
+                exporting ||
-                (payload.block().hasItems &&
+                (payload.block().hasLiquids && liquids.total() >= 0.1f && payload.build.liquids.total() >= payload.block().liquidCapacity - 0.001f) ||
-                    payload.block().separateItemCapacity ?
+                (payload.block().hasItems && items.any() && payload.block().separateItemCapacity && content.items().contains(i -> payload.build.items.get(i) >= payload.block().itemCapacity)));
-                        content.items().contains(i -> payload.build.items.get(i) >= payload.block().itemCapacity) :
+        }
-                        payload.build.items.total() >= payload.block().itemCapacity));
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.bool(exporting);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                exporting = read.bool();
+            }
         }
     }
 }

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

@@ -143,6 +143,7 @@ public class PayloadMassDriver extends PayloadBlock{
 
         @Override
         public void updateTile(){
+            super.updateTile();
             Building link = world.build(this.link);
             boolean hasLink = linkValid();
 
@@ -233,7 +234,7 @@ public class PayloadMassDriver extends PayloadBlock{
                 }
 
                 //align to shooter rotation
-                turretRotation = Angles.moveToward(turretRotation, tile.angleTo(currentShooter()), rotateSpeed * efficiency());
+                turretRotation = Angles.moveToward(turretRotation, angleTo(currentShooter()), rotateSpeed * efficiency());
             }else if(state == shooting){
                 //if there's nothing to shoot at OR someone wants to shoot at this thing, bail
                 if(!hasLink || (!waitingShooters.isEmpty() && payload == null)){
@@ -241,7 +242,7 @@ public class PayloadMassDriver extends PayloadBlock{
                     return;
                 }
 
-                float targetRotation = tile.angleTo(link);
+                float targetRotation = angleTo(link);
                 boolean movedOut = false;
 
                 payRotation = Angles.moveToward(payRotation, turretRotation, payloadRotateSpeed * delta());

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

@@ -85,12 +85,23 @@ public class PayloadSource extends PayloadBlock{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table,
+            ItemSelection.buildTable(PayloadSource.this, table,
                 content.blocks().select(PayloadSource.this::canProduce).<UnlockableContent>as()
                 .and(content.units().select(PayloadSource.this::canProduce).as()),
             () -> (UnlockableContent)config(), this::configure);
         }
 
+        @Override
+        public boolean onConfigureTileTapped(Building other){
+            if(this == other){
+                deselect();
+                configure(null);
+                return false;
+            }
+
+            return true;
+        }
+
         @Override
         public Object config(){
             return unit == null ? block : unit;
@@ -103,6 +114,7 @@ public class PayloadSource extends PayloadBlock{
 
         @Override
         public void updateTile(){
+            super.updateTile();
             if(payload == null){
                 scl = 0f;
                 if(unit != null){

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

@@ -36,6 +36,7 @@ public class PayloadUnloader extends PayloadLoader{
 
         @Override
         public void updateTile(){
+            super.updateTile();
             if(shouldExport()){
                 //one-use, disposable block
                 if(payload.block().instantDeconstruct){

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

@@ -55,6 +55,7 @@ public class PayloadVoid extends PayloadBlock{
 
         @Override
         public void updateTile(){
+            super.updateTile();
             if(moveInPayload(false) && cons.valid()){
                 payload = null;
                 incinerateEffect.at(this);

core/src/mindustry/world/blocks/power/ImpactReactor.java

@@ -141,7 +141,7 @@ public class ImpactReactor extends PowerGenerator{
 
             if(warmup < 0.3f || !state.rules.reactorExplosions) return;
 
-            Sounds.explosionbig.at(tile);
+            Sounds.explosionbig.at(this);
 
             Damage.damage(x, y, explosionRadius * tilesize, explosionDamage * 4);
 

core/src/mindustry/world/blocks/power/NuclearReactor.java

@@ -49,6 +49,7 @@ public class NuclearReactor extends PowerGenerator{
 
     public NuclearReactor(String name){
         super(name);
+        updateInUnits = false;
         itemCapacity = 30;
         liquidCapacity = 30;
         hasItems = true;
@@ -76,6 +77,7 @@ public class NuclearReactor extends PowerGenerator{
 
     public class NuclearReactorBuild extends GeneratorBuild{
         public float heat;
+        public float flash;
 
         @Override
         public void updateTile(){
@@ -130,13 +132,14 @@ public class NuclearReactor extends PowerGenerator{
         public void onDestroyed(){
             super.onDestroyed();
 
-            Sounds.explosionbig.at(tile);
+            Sounds.explosionbig.at(this);
 
             int fuel = items.get(consumes.<ConsumeItems>get(ConsumeType.item).items[0].item);
 
             if((fuel < 5 && heat < 0.5f) || !state.rules.reactorExplosions) return;
 
             Effect.shake(6f, 16f, x, y);
+            // * ((float)fuel / itemCapacity) to scale based on fullness
             Damage.damage(x, y, explosionRadius * tilesize, explosionDamage * 4);
 
             explodeEffect.at(x, y);
@@ -160,10 +163,9 @@ public class NuclearReactor extends PowerGenerator{
             Draw.rect(topRegion, x, y);
 
             if(heat > flashThreshold){
-                float flash = 1f + ((heat - flashThreshold) / (1f - flashThreshold)) * 5.4f;
+                flash += (1f + ((heat - flashThreshold) / (1f - flashThreshold)) * 5.4f) * Time.delta;
-                flash += flash * Time.delta;
                 Draw.color(Color.red, Color.yellow, Mathf.absin(flash, 9f, 1f));
-                Draw.alpha(0.6f);
+                Draw.alpha(0.3f);
                 Draw.rect(lightsRegion, x, y);
             }
 

core/src/mindustry/world/blocks/power/PowerDiode.java

@@ -56,7 +56,7 @@ public class PowerDiode extends Block{
         public void updateTile(){
             super.updateTile();
 
-            if(front() == null || back() == null || !back().block.hasPower || !front().block.hasPower || back().team != front().team) return;
+            if(tile == null || front() == null || back() == null || !back().block.hasPower || !front().block.hasPower || back().team != front().team) return;
 
             PowerGraph backGraph = back().power.graph;
             PowerGraph frontGraph = front().power.graph;

core/src/mindustry/world/blocks/power/PowerGraph.java

@@ -280,6 +280,13 @@ public class PowerGraph{
         }
     }
 
+    public void clear(){
+        all.clear();
+        producers.clear();
+        consumers.clear();
+        batteries.clear();
+    }
+
     public void reflow(Building tile){
         queue.clear();
         queue.addLast(tile);

core/src/mindustry/world/blocks/power/PowerNode.java

@@ -444,7 +444,7 @@ public class PowerNode extends PowerBlock{
         public void draw(){
             super.draw();
 
-            if(Mathf.zero(Renderer.laserOpacity)) return;
+            if(Mathf.zero(Renderer.laserOpacity) || isPayload()) return;
 
             Draw.z(Layer.power);
             setupColor(power.graph.getSatisfaction());

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

@@ -52,6 +52,11 @@ public class AttributeCrafter extends GenericCrafter{
             return baseEfficiency + Math.min(maxBoost, boostScale * attrsum) + attribute.env();
         }
 
+        @Override
+        public void pickedUp(){
+            attrsum = 0f;
+        }
+
         @Override
         public void onProximityUpdate(){
             super.onProximityUpdate();

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

@@ -243,6 +243,11 @@ public class Drill extends Block{
             }
         }
 
+        @Override
+        public void pickedUp(){
+            dominantItem = null;
+        }
+
         @Override
         public void onProximityUpdate(){
             super.onProximityUpdate();

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

@@ -91,6 +91,11 @@ public class Pump extends LiquidBlock{
             Drawf.liquid(liquidRegion, x, y, liquids.currentAmount() / liquidCapacity, liquids.current().color);
         }
 
+        @Override
+        public void pickedUp(){
+            amount = 0f;
+        }
+
         @Override
         public void onProximityUpdate(){
             super.onProximityUpdate();

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

@@ -95,6 +95,11 @@ public class SolidPump extends Pump{
         @Override
         public void drawCracks(){}
 
+        @Override
+        public void pickedUp(){
+            boost = validTiles = 0f;
+        }
+
         @Override
         public void draw(){
             Draw.rect(region, x, y);

core/src/mindustry/world/blocks/sandbox/ItemSource.java

@@ -73,7 +73,7 @@ public class ItemSource extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> outputItem, this::configure);
+            ItemSelection.buildTable(ItemSource.this, table, content.items(), () -> outputItem, this::configure);
         }
 
         @Override

core/src/mindustry/world/blocks/sandbox/LiquidSource.java

@@ -73,7 +73,7 @@ public class LiquidSource extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.liquids(), () -> source, this::configure);
+            ItemSelection.buildTable(LiquidSource.this, table, content.liquids(), () -> source, this::configure);
         }
 
         @Override

core/src/mindustry/world/blocks/storage/StorageBlock.java

@@ -25,6 +25,7 @@ public class StorageBlock extends Block{
         flags = EnumSet.of(BlockFlag.storage);
         allowResupply = true;
         envEnabled = Env.any;
+        highUnloadPriority = true;
     }
 
     @Override

core/src/mindustry/world/blocks/storage/Unloader.java

@@ -3,6 +3,7 @@ package mindustry.world.blocks.storage;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.entities.units.*;
@@ -54,44 +55,122 @@ public class Unloader extends Block{
     public class UnloaderBuild extends Building{
         public float unloadTimer = 0f;
         public Item sortItem = null;
-        public Building dumpingTo;
         public int offset = 0;
-        public int[] rotations;
+        public int rotations = 0;
+        public Seq<ContainerStat> possibleBlocks = new Seq<>();
+
+        public class ContainerStat{
+            Building building;
+            float loadFactor;
+            boolean canLoad;
+            boolean canUnload;
+        }
 
         @Override
         public void updateTile(){
-            if((unloadTimer += delta()) >= speed){
+            if(((unloadTimer += delta()) < speed) || (proximity.size < 2)) return;
+            Item item = null;
             boolean any = false;
-                if(rotations == null || rotations.length != proximity.size){
+            int itemslength = content.items().size;
-                    rotations = new int[proximity.size];
+
+            //initialize possibleBlocks only if the new size is bigger than the previous, to avoid unnecessary allocations
+            if(possibleBlocks.size != proximity.size){
+                int tmp = possibleBlocks.size;
+                possibleBlocks.setSize(proximity.size);
+                for(int i = tmp; i < proximity.size; i++){
+                    possibleBlocks.set(i, new ContainerStat());
+                }
             }
 
-                for(int i = 0; i < proximity.size; i++){
+            if(sortItem != null){
-                    int pos = (offset + i) % proximity.size;
+                item = sortItem;
-                    var other = proximity.get(pos);
 
-                    if(other.interactable(team) && other.block.unloadable && other.canUnload() && other.block.hasItems
+                for(int j = 0; j < proximity.size; j++){
-                    && ((sortItem == null && other.items.total() > 0) || (sortItem != null && other.items.has(sortItem)))){
+                    int pos = (offset + j) % proximity.size;
-                        //make sure the item can't be dumped back into this block
+                    var other = proximity.get(j);
-                        dumpingTo = other;
+                    boolean interactable = other.interactable(team);
 
-                        //get item to be taken
+                    //set the stats of all buildings in possibleBlocks
-                        Item item = sortItem == null ? other.items.takeIndex(rotations[pos]) : sortItem;
+                    ContainerStat pb = possibleBlocks.get(pos);
+                    pb.building = other;
+                    pb.canUnload = interactable && other.canUnload() && other.items != null && other.items.has(sortItem);
+                    pb.canLoad = interactable && !(other.block instanceof StorageBlock) && other.acceptItem(this, sortItem);
+                }
+            }else{
+                //select the next item for nulloaders
+                //inspired of nextIndex() but for all proximity at once, and also way more powerful
+                for(int i = 0; i < itemslength; i++){
+                    int total = (rotations + i + 1) % itemslength;
+                    boolean hasProvider = false;
+                    boolean hasReceiver = false;
+                    boolean isDistinct = false;
+                    Item possibleItem = content.item(total);
 
-                        //remove item if it's dumped correctly
+                    for(int j = 0; j < proximity.size; j++){
-                        if(put(item)){
+                        int pos = (offset + j) % proximity.size;
-                            other.items.remove(item, 1);
+                        var other = proximity.get(j);
+                        boolean interactable = other.interactable(team);
+
+                        //set the stats of all buildings in possibleBlocks while we are at it
+                        ContainerStat pb = possibleBlocks.get(pos);
+                        pb.building = other;
+                        pb.canUnload = interactable && other.canUnload() && other.items != null && other.items.has(possibleItem);
+                        pb.canLoad = interactable && !(other.block instanceof StorageBlock) && other.acceptItem(this, possibleItem);
+
+                        //the part handling framerate issues and slow conveyor belts, to avoid skipping items
+                        if(hasProvider && pb.canLoad) isDistinct = true;
+                        if(hasReceiver && pb.canUnload) isDistinct = true;
+                        hasProvider = hasProvider || pb.canUnload;
+                        hasReceiver = hasReceiver || pb.canLoad;
+                    }
+                    if(isDistinct){
+                        item = possibleItem;
+                        break;
+                    }
+                }
+            }
+
+            if(item != null){
+                //only compute the load factor if a transfer is possible
+                for(int pos = 0; pos < proximity.size; pos++){
+                    ContainerStat pb = possibleBlocks.get(pos);
+                    var other = pb.building;
+                    pb.loadFactor = (other.getMaximumAccepted(item) == 0) || (other.items == null) ? 0 : other.items.get(item) / (float)other.getMaximumAccepted(item);
+                }
+
+                //sort so it gives full priority to blocks that can give but not receive (stackConveyors and Storage), and then by load
+                possibleBlocks.sort(Structs.comps(
+                    Structs.comparingBool(e -> e.building.block.highUnloadPriority),
+                    Structs.comparingFloat(e -> e.loadFactor)
+                ));
+
+                ContainerStat dumpingFrom = null;
+                ContainerStat dumpingTo = null;
+
+                //choose the building to accept the item
+                for(int i = 0; i < possibleBlocks.size; i++){
+                    if(possibleBlocks.get(i).canLoad){
+                        dumpingTo = possibleBlocks.get(i);
+                        break;
+                    }
+                }
+
+                //choose the building to give the item
+                for(int i = possibleBlocks.size - 1; i >= 0; i--){
+                    if(possibleBlocks.get(i).canUnload){
+                        dumpingFrom = possibleBlocks.get(i);
+                        break;
+                    }
+                }
+
+                //trade the items
+                if(dumpingFrom != null && dumpingTo != null && (dumpingFrom.loadFactor != dumpingTo.loadFactor || dumpingFrom.building.block.highUnloadPriority)){
+                    dumpingTo.building.handleItem(this, item);
+                    dumpingFrom.building.removeStack(item, 1);
                     any = true;
-
-                            if(sortItem == null){
-                                rotations[pos] = item.id + 1;
                 }
 
-                            other.itemTaken(item);
+                if(sortItem == null) rotations = item.id;
-                        }else if(sortItem == null){
-                            rotations[pos] = other.items.nextIndex(rotations[pos]);
-                        }
-                    }
             }
 
             if(any){
@@ -101,11 +180,10 @@ public class Unloader extends Block{
             }
 
             if(proximity.size > 0){
-                    offset ++;
+                offset++;
                 offset %= proximity.size;
             }
         }
-        }
 
         @Override
         public void draw(){
@@ -118,7 +196,7 @@ public class Unloader extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> sortItem, this::configure);
+            ItemSelection.buildTable(Unloader.this, table, content.items(), () -> sortItem, this::configure);
         }
 
         @Override
@@ -132,11 +210,6 @@ public class Unloader extends Block{
             return true;
         }
 
-        @Override
-        public boolean canDump(Building to, Item item){
-            return !(to.block instanceof StorageBlock) && to != dumpingTo;
-        }
-
         @Override
         public Item config(){
             return sortItem;

core/src/mindustry/world/blocks/units/CommandCenter.java

@@ -97,9 +97,9 @@ public class CommandCenter extends Block{
             float size = 6f;
 
             Draw.color(bottomColor);
-            Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy() - 1, size, size);
+            Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), x, y - 1, size, size);
             Draw.color(topColor == null ? team.color : topColor);
-            Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy(), size, size);
+            Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), x, y, size, size);
             Draw.color();
         }
 

core/src/mindustry/world/blocks/units/Reconstructor.java

@@ -231,7 +231,7 @@ public class Reconstructor extends UnitBlock{
 
         @Override
         public boolean shouldConsume(){
-            return constructing();
+            return constructing() && enabled;
         }
 
         public UnitType unit(){

core/src/mindustry/world/blocks/units/RepairPoint.java

@@ -176,7 +176,7 @@ public class RepairPoint extends Block{
                 multiplier = liq.valid(this) ? 1f + liquids.current().heatCapacity * coolantMultiplier : 1f;
             }
 
-            if(target != null && (target.dead() || target.dst(tile) - target.hitSize/2f > repairRadius || target.health() >= target.maxHealth())){
+            if(target != null && (target.dead() || target.dst(this) - target.hitSize/2f > repairRadius || target.health() >= target.maxHealth())){
                 target = null;
             }
 

core/src/mindustry/world/blocks/units/UnitFactory.java

@@ -160,12 +160,23 @@ public class UnitFactory extends UnitBlock{
             Seq<UnitType> units = Seq.with(plans).map(u -> u.unit).filter(u -> u.unlockedNow() && !u.isBanned());
 
             if(units.any()){
-                ItemSelection.buildTable(table, units, () -> currentPlan == -1 ? null : plans.get(currentPlan).unit, unit -> configure(plans.indexOf(u -> u.unit == unit)));
+                ItemSelection.buildTable(UnitFactory.this, table, units, () -> currentPlan == -1 ? null : plans.get(currentPlan).unit, unit -> configure(plans.indexOf(u -> u.unit == unit)));
             }else{
                 table.table(Styles.black3, t -> t.add("@none").color(Color.lightGray));
             }
         }
 
+        @Override
+        public boolean onConfigureTileTapped(Building other){
+            if(this == other){
+                deselect();
+                configure(null);
+                return false;
+            }
+
+            return true;
+        }
+
         @Override
         public boolean acceptPayload(Building source, Payload payload){
             return false;