Crash fix

# Conflicts:
#	core/assets/bundles/bundle.properties

build.gradle

@@ -176,30 +176,7 @@ project(":core"){
         generateLocales()
     }
 
-    task cleanGen{
-        doFirst{
-            delete{
-                delete "../core/src/io/anuke/mindustry/gen/"
-            }
-        }
-    }
-
-    task copyGen{
-        doLast{
-            copy{
-                from("../core/build/generated/sources/annotationProcessor/java/main/io/anuke/mindustry/gen"){
-                    include "**/*.java"
-                }
-
-                into "../core/src/io/anuke/mindustry/gen"
-            }
-        }
-    }
-
     dependencies{
-        compileJava.dependsOn(cleanGen)
-        compileJava.finalizedBy(copyGen)
-
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
         compile arcModule("extensions:arcnet")

core/assets/bundles/bundle.properties

@@ -1,11 +1,11 @@
 credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]
 credits = Credits
 contributors = Translators and Contributors
-discord = Join the mindustry discord!
+discord = Join the Mindustry Discord!
-link.discord.description = The official Mindustry discord chatroom
+link.discord.description = The official Mindustry Discord chatroom
 link.github.description = Game source code
 link.dev-builds.description = Unstable development builds
-link.trello.description = Official trello board for planned features
+link.trello.description = Official Trello board for planned features
 link.itch.io.description = itch.io page with PC downloads and web version
 link.google-play.description = Google Play store listing
 link.wiki.description = Official Mindustry wiki
@@ -376,6 +376,7 @@ blocks.drillspeed = Base Drill Speed
 blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
+blocks.buildtime = Build Time
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
@@ -447,7 +448,7 @@ setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Save Interval
 setting.seconds = {0} Seconds
 setting.fullscreen.name = Fullscreen
-setting.borderless.name = Borderless Window
+setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart)
 setting.fps.name = Show FPS
 setting.vsync.name = VSync
 setting.lasers.name = Show Power Lasers
@@ -677,7 +678,6 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 4
 block.metal-floor-damaged.name = Metal Floor Damaged
-block.creeptree.name = Creeptree
 block.dark-panel-1.name = Dark Panel 1
 block.dark-panel-2.name = Dark Panel 2
 block.dark-panel-3.name = Dark Panel 3
@@ -736,7 +736,7 @@ block.pneumatic-drill.name = Pneumatic Drill
 block.laser-drill.name = Laser Drill
 block.water-extractor.name = Water Extractor
 block.cultivator.name = Cultivator
-block.dart-mech-pad.name = Dart Mech Pad
+block.dart-mech-pad.name = Alpha Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad

core/assets/bundles/bundle_cs.properties

@@ -11,6 +11,7 @@ link.google-play.description = Google Play store
 link.wiki.description = Oficiální Mindustry wiki
 linkfail = Nepodařilo se otevřít odkaz!\nURL byla zkopírována do schránky.
 screenshot = Snímek obrazovky uložen {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Konec hry
 gameover.pvp = [accent] {0}[] Tým Vyhrál!
 highscore = [accent]Nový Rekord!
@@ -154,6 +155,7 @@ confirm = Potvrdit
 delete = Smazat
 ok = OK
 open = Otevřít
+customize = Customize
 cancel = Zrušit
 openlink = Otevřít Odkaz
 copylink = Zkopírovat Odkaz
@@ -170,6 +172,7 @@ loading = [accent]Načítám...
 saving = [accent]Ukládám...
 wave = [accent]Vlna {0}
 wave.waiting = [LIGHT_GRAY]Vlna za {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]Čekám...
 waiting.players = Čekání na hráče...
 wave.enemies = [LIGHT_GRAY]{0} Nepřátel zbývá
@@ -312,12 +315,15 @@ error.mapnotfound = Soubor mapy nebyl nalezen!
 error.io = Network I/O error.
 error.any = neznámá chyba sítě.
 zone.groundZero.name = Ground Zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Jazyk
 settings.reset = nastavit výchozí
 settings.rebind = Přenastavit
@@ -442,6 +448,8 @@ setting.mutemusic.name = Ztišit hudbu
 setting.sfxvol.name = SFX hlasitost
 setting.mutesound.name = Ztišit zvuky
 setting.crashreport.name = Poslat anonymní spis o zhroucení hry
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Přenastavit klávesy
 category.general.name = Všeobecné
 category.view.name = Pohled
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = Přiblížení-podržení
 keybind.zoom.name = přiblížení
 keybind.menu.name = Hlavní nabídka
 keybind.pause.name = pauza
+keybind.minimap.name = Minimap
 keybind.dash.name = Sprint
 keybind.chat.name = Chat
 keybind.player_list.name = Seznam hráčů
@@ -482,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = Sandbox
 mode.sandbox.description = Nekonečné zdroje a žádný čas pro vlny nepřátel.
-mode.freebuild.name = Freebuild
-mode.freebuild.description = Limitované zdroje a žádný čas pro vlny nepřátel.
 mode.pvp.name = PvP
 mode.pvp.description = Bojuj proti ostatním hráčům v lokální síti.
 mode.attack.name = Útok
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Předměty
 content.liquid.name = Tekutiny
 content.unit.name = jednotky
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viskozita: {0}
 liquid.temperature = [LIGHT_GRAY]Teplota: {0}
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -597,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -678,6 +708,7 @@ block.melter.name = Tavírna
 block.incinerator.name = Spalovna
 block.spore-press.name = Spore Press
 block.separator.name = Separátor
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Energetický uzel
 block.power-node-large.name = Velký energetický uzel
 block.surge-tower.name = Surge Tower
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Pneumatický vrt
 block.laser-drill.name = Laserový vrt
 block.water-extractor.name = Vodní extraktor
 block.cultivator.name = Kultivátor
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Plošina pro Delta Mech
 block.javelin-ship-pad.name = Plošina pro Oštěp Mech
 block.trident-ship-pad.name = Plošina pro loď Trojzubec

core/assets/bundles/bundle_de.properties

@@ -11,6 +11,7 @@ link.google-play.description = Google Play Store Seite
 link.wiki.description = Offizelles Mindustry Wiki
 linkfail = Fehler beim Öffnen des Links!\nDie URL wurde in die Zwischenablage kopiert.
 screenshot = Screenshot saved to {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Der Kern wurde zerstört.
 gameover.pvp = Das[accent] {0}[] Team ist siegreich!
 highscore = [YELLOW] Neuer Highscore!
@@ -154,6 +155,7 @@ confirm = Bestätigen
 delete = Löschen
 ok = OK
 open = Öffnen
+customize = Customize
 cancel = Abbruch
 openlink = Link öffnen
 copylink = Kopiere Link
@@ -170,6 +172,7 @@ loading = [accent]Wird geladen ...
 saving = [accent]Speichere...
 wave = [accent]Welle {0}
 wave.waiting = Welle in {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = Warten...
 waiting.players = Warte auf Spieler...
 wave.enemies = [LIGHT_GRAY]{0} Gegner verbleiben
@@ -312,12 +315,15 @@ error.mapnotfound = Kartendatei nicht gefunden!
 error.io = Network I/O error.
 error.any = Unbekannter Netzwerkfehler.
 zone.groundZero.name = Ground Zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Sprache
 settings.reset = Auf Standard zurücksetzen
 settings.rebind = Zuweisen
@@ -337,8 +343,6 @@ info.title = [accent]Info
 error.title = [crimson] Ein Fehler ist aufgetreten
 error.crashtitle = Ein Fehler ist aufgetreten!
 blocks.input = Input
-blocks.inputliquid = Input Flüssigkeiten
-blocks.liquiduse = Flüssigkeitenverbrauch
 blocks.output = Output
 blocks.booster = Booster
 block.unknown = [LIGHT_GRAY]???
@@ -444,6 +448,8 @@ setting.mutemusic.name = Musik stummschalten
 setting.sfxvol.name = Audioeffekt-Lautstärke
 setting.mutesound.name = Audioeffekte stummschalten
 setting.crashreport.name = Anonyme Absturzberichte senden
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Tasten zuweisen
 category.general.name = Allgemein
 category.view.name = Ansicht
@@ -468,6 +474,7 @@ keybind.zoom_hold.name = Zoom halten
 keybind.zoom.name = Zoomen
 keybind.menu.name = Menü
 keybind.pause.name = Pause
+keybind.minimap.name = Minimap
 keybind.dash.name = Bindestrich
 keybind.chat.name = Chat
 keybind.player_list.name = Spielerliste
@@ -484,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = Der normale Modus. Ressourcen sind limitiert und Wellen kommen automatisch.
 mode.sandbox.name = Sandkasten
 mode.sandbox.description = Unendliche Ressourcen und kein Timer für Wellen.
-mode.freebuild.name = Freier Bau
-mode.freebuild.description = Begrenzte Ressourcen und kein Timer für Wellen.
 mode.pvp.name = PvP
 mode.pvp.description = Kämpfe gegen andere Spieler local.
 mode.attack.name = Attack
@@ -495,16 +500,27 @@ rules.infiniteresources = Unbegrenzte Ressourcen
 rules.wavetimer = Wellen Timer
 rules.waves = Wellen
 rules.enemyCheat = Unbegrenzte Ressourcen für KI
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Materialien
 content.liquid.name = Flüssigkeiten
 content.unit.name = Einheiten
@@ -591,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viskosität: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatur: {0}
 block.grass.name = Gras
 block.salt.name = Salz
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sandstein
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -599,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moos
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -644,6 +664,14 @@ block.metal-floor-2.name = Metallboden 2
 block.metal-floor-3.name = Metallboden 3
 block.metal-floor-5.name = Metallboden 5
 block.metal-floor-damaged.name = Metallboden Beschädigt
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -680,6 +708,7 @@ block.melter.name = Schmelzer
 block.incinerator.name = Verbrennungsanlage
 block.spore-press.name = Spore Press
 block.separator.name = Separierer
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Stromknoten
 block.power-node-large.name = Großer Stromknoten
 block.surge-tower.name = Surge Tower
@@ -694,7 +723,7 @@ block.pneumatic-drill.name = Pneumatischer Bohrer
 block.laser-drill.name = Laser-Bohrer
 block.water-extractor.name = Wasser-Extraktor
 block.cultivator.name = Kultivierer
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad

core/assets/bundles/bundle_es.properties

@@ -11,6 +11,7 @@ link.google-play.description = Ficha en la Google Play Store
 link.wiki.description = Wiki oficial de Mindustry
 linkfail = ¡Error al abrir el enlace!\nLa URL ha sido copiada a su portapapeles.
 screenshot = Screenshot saved to {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Tu núcleo ha sido destruido.
 gameover.pvp = ¡El equipo[accent] {0}[] ha ganado!
 highscore = [accent]¡Nueva mejor puntuación!
@@ -154,6 +155,7 @@ confirm = Confirmar
 delete = Borrar
 ok = OK
 open = Abrir
+customize = Customize
 cancel = Cancelar
 openlink = Abrir Enlace
 copylink = Copiar Enlace
@@ -170,6 +172,7 @@ loading = [accent]Cargando...
 saving = [accent]Guardando...
 wave = [accent]Horda {0}
 wave.waiting = Horda en {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = Esperando...
 waiting.players = Esperando jugadores...
 wave.enemies = [LIGHT_GRAY]{0} Enemigos Restantes
@@ -312,12 +315,15 @@ error.mapnotfound = ¡Archivo de mapa no encontrado!
 error.io = Network I/O error.
 error.any = Error de red desconocido.
 zone.groundZero.name = Ground Zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Lenguaje
 settings.reset = Reiniciar por los de defecto
 settings.rebind = Reasignar
@@ -442,6 +448,8 @@ setting.mutemusic.name = Silenciar Musica
 setting.sfxvol.name = Volumen de los efectos de sonido
 setting.mutesound.name = Silenciar Sonido
 setting.crashreport.name = Enviar informes de fallos anónimos
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Reasignar Teclas
 category.general.name = General
 category.view.name = Visión
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = Mantener Zoom
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pausa
+keybind.minimap.name = Minimap
 keybind.dash.name = Correr
 keybind.chat.name = Chat
 keybind.player_list.name = Lista de jugadores
@@ -482,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = sandbox
 mode.sandbox.description = Recursos ilimitados y sin temporizador para las hordas.
-mode.freebuild.name = construcción libre
-mode.freebuild.description = recursos limitados y no hay temporizador para las hordas.
 mode.pvp.name = PvP
 mode.pvp.description = Pelea contra otros jugadores localmente.
 mode.attack.name = Attack
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Objetos
 content.liquid.name = Líquidos
 content.unit.name = Unidades
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viscosidad: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -597,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -678,6 +708,7 @@ block.melter.name = Fundidor
 block.incinerator.name = Incinerador
 block.spore-press.name = Spore Press
 block.separator.name = Separador
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Nodo de Energía
 block.power-node-large.name = Nodo de Energía Grande
 block.surge-tower.name = Surge Tower
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Taladro neumático
 block.laser-drill.name = Taladro Laser
 block.water-extractor.name = Extractor de Agua
 block.cultivator.name = Cultivador
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Pad de mecanoide Delta
 block.javelin-ship-pad.name = Pad de nave Jabalina
 block.trident-ship-pad.name = Pad de nave Tridente

core/assets/bundles/bundle_fr.properties

@@ -11,6 +11,7 @@ link.google-play.description = Accès à la version android du Google Play Store
 link.wiki.description = Wiki officiel de mindustry .
 linkfail = Erreur lors de l'ouverture du lien !\nL'URL a été copié avec succès.
 screenshot = Capture d'écran sauvegardée à {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Partie terminée.
 gameover.pvp = L'équipe [accent] {0}[] a gagnée !
 highscore = [YELLOW]Nouveau meilleur score!
@@ -154,6 +155,7 @@ confirm = Confirmer
 delete = Supprimer
 ok = OK
 open = Ouverture
+customize = Customize
 cancel = Annuler
 openlink = Ouvrir le lien
 copylink = Copier le lien
@@ -170,6 +172,7 @@ loading = [accent]Chargement...
 saving = [accent]Sauvegarde...
 wave = [accent]Vague {0}
 wave.waiting = [LIGHT_GRAY]Vague dans {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]En attente...
 waiting.players = En attente de joueurs...
 wave.enemies = [LIGHT_GRAY]{0} Ennemis restants
@@ -312,12 +315,15 @@ error.mapnotfound = Fichier de la carte introuvable!
 error.io = Erreur de Réseau (I/O)
 error.any = Erreur réseau inconnue.
 zone.groundZero.name = Première Bataille
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = Les Cratères
 zone.frozenForest.name = Forêt Glaciale
 zone.ruinousShores.name = Rives en Ruine
 zone.stainedMountains.name = Montagnes Tâchetées
 zone.desolateRift.name = Fissure abandonnée
 zone.nuclearComplex.name = Complexe nucléaire
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Langage
 settings.reset = Valeur par défaut.
 settings.rebind = Réatttribuer
@@ -336,17 +342,14 @@ no = Non
 info.title = Info
 error.title = [crimson]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
-bar.drillspeed = Vitesse de forage: {0}/s
+blocks.input = Input
-bar.efficiency = Efficacité: {0}%
+blocks.output = Output
+blocks.booster = Booster
 block.unknown = [LIGHT_GRAY]???
-blocks.blockinfo = Info sur le bloc
-bar.powerbalance = Énergie: {0}
-bar.poweroutput = Énergie en sortie: {0}
 blocks.powercapacity = Capacité d'énergie
 blocks.powershot = Énergie/Tir
 blocks.targetsair = Cible les unités aériennes
 blocks.targetsground = Cible les unités terrestres
-bar.items = Objets: {0}
 blocks.itemsmoved = Vitesse de Déplacement
 blocks.launchtime = Temps entre chaque lancement
 blocks.shootrange = Portée
@@ -357,42 +360,30 @@ blocks.poweruse = Énergie utilisée
 blocks.powerdamage = Énergie/Dégâts
 blocks.itemcapacity = Stockage
 blocks.basepowergeneration = Génération d'énergie minimale
-blocks.powertransferspeed = Vitesse de transfert d'énergie
+blocks.productiontime = Production Time
-blocks.craftspeed = Vitesse de production
 blocks.repairtime = Temps pour la Réparation Totale du Bloc
+blocks.speedincrease = Speed Increase
 blocks.range = Portée
-blocks.inputliquid = Liquide requis
-blocks.inputliquidaux = Liquide optionnel
-blocks.inputitem = Objets en entrée
-blocks.inputitems = Objets utilisés
-blocks.outputitem = Objet produit
 blocks.drilltier = Forable
 blocks.drillspeed = Vitesse de forage de base
+blocks.boosteffect = Boost Effect
 blocks.maxunits = Nombre d'unité actives maximal
-blocks.liquidoutput = Liquide en sortie
-blocks.liquidoutputspeed = Vitesse de production de liquide
-blocks.liquiduse = Quantité de liquide utilisée
-blocks.coolant = Liquide de refroidissement
-bar.liquid = Liquide
-blocks.coolantuse = Quantité de liquide de refroidissement utilisée
-blocks.inputliquidfuel = Carburant liquide
-blocks.liquidfueluse = Quantité de carburant liquide utilisé
-blocks.boostitem = Objets boosters
-blocks.boostliquid = Liquides boosters
 blocks.health = Santé
+blocks.inaccuracy = Précision
+blocks.shots = Tir
+blocks.reload = Tirs/Seconde
+blocks.ammo = Munitions
+bar.drillspeed = Vitesse de forage: {0}/s
+bar.efficiency = Efficacité: {0}%
+bar.powerbalance = Énergie: {0}
+bar.poweramount = Power: {0}
+bar.poweroutput = Énergie en sortie: {0}
+bar.items = Objets: {0}
+bar.liquid = Liquide
 bar.heat = Chaleur
 bar.power = Énergie
 bar.progress = Progression de la construction
 bar.spawned = Unités: {0}/{1}
-blocks.power.satisfaction = Énergie minimum nécessaire
-blocks.inaccuracy = Précision
-blocks.shots = Tir
-blocks.reload = Tirs/Seconde
-blocks.inputfuel = Carburant
-blocks.fuelburntime = Durée du carburant
-blocks.inputcapacity = Capacité d'entrée
-blocks.outputcapacity = Capacité de production
-blocks.ammo = Munitions
 bullet.damage = [stat]{0}[lightgray] dmg
 bullet.splashdamage = [stat]{0}[lightgray] dmg de zone ~[stat] {1}[lightgray] tuiles
 bullet.incendiary = [stat]incendiaire
@@ -426,6 +417,7 @@ category.optional = Améliorations optionnelles
 setting.landscape.name = Verrouiller la rotation en mode paysage
 setting.shadows.name = Ombres
 setting.animatedwater.name = Eau animée
+setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[LIGHT_GRAY] (demande le redémarrage de l'appareil)[]
 setting.indicators.name = Indicateurs pour les alliés
 setting.autotarget.name = Visée automatique
@@ -449,12 +441,15 @@ setting.borderless.name = Fenêtre sans contour
 setting.fps.name = Afficher FPS
 setting.vsync.name = VSync
 setting.lasers.name = Afficher les rayons des lasers
+setting.pixelate.name = Pixelate[LIGHT_GRAY] (disables animations)
 setting.minimap.name = Montrer la minimap
 setting.musicvol.name = Volume de la musique
 setting.mutemusic.name = Couper la musique
 setting.sfxvol.name = Volume des SFX
 setting.mutesound.name = Couper les SFX
 setting.crashreport.name = Envoyer un rapport de crash anonyme
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Paramétrer les touches
 category.general.name = Général
 category.view.name = Voir
@@ -479,6 +474,7 @@ keybind.zoom_hold.name = maintenir le zoom
 keybind.zoom.name = zoom
 keybind.menu.name = menu
 keybind.pause.name = Pause
+keybind.minimap.name = Minimap
 keybind.dash.name = Courir
 keybind.chat.name = chat
 keybind.player_list.name = Liste des joueurs
@@ -495,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = bac à sable
 mode.sandbox.description = Ressources infinies et pas de timer pour les vagues.
-mode.freebuild.name = construction libre
-mode.freebuild.description = Ressources limitées et pas de timer pour les vagues.
 mode.pvp.name = JcJ
 mode.pvp.description = Battez-vous contre d'autres joueurs en local.
 mode.attack.name = Attack
@@ -506,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Objets
 content.liquid.name = Liquides
 content.unit.name = Unités
@@ -602,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
 liquid.temperature = [LIGHT_GRAY]Température: {0}
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -610,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -655,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -691,6 +708,7 @@ block.melter.name = Four à Fusion
 block.incinerator.name = Incinérateur
 block.spore-press.name = Spore Press
 block.separator.name = Séparateur
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Transmetteur énergétique
 block.power-node-large.name = Gros transmetteur énergétique
 block.surge-tower.name = Surge Tower
@@ -705,7 +723,7 @@ block.pneumatic-drill.name = Foreuse à vérin
 block.laser-drill.name = Foreuse Laser
 block.water-extractor.name = Extracteur d'eau
 block.cultivator.name = Cultivateur
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Reconstructeur de mécha "Delta"
 block.javelin-ship-pad.name = Reconstructeur de vaisseau "Javelin"
 block.trident-ship-pad.name = Reconstructeur de vaisseau "Trident"

core/assets/bundles/bundle_fr_BE.properties

@@ -11,6 +11,7 @@ link.google-play.description = Page Google Play du jeu
 link.wiki.description = Wiki officiel de Mindustry
 linkfail = L'ouverture du lien a échoué!\nL'URL a été copiée dans votre presse-papier.
 screenshot = Capture d'écran enregistrée sur {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Le base a été détruit.
 gameover.pvp = L'équipe[accent] {0}[] a gagnée !
 highscore = [accent]Nouveau meilleur score !
@@ -154,6 +155,7 @@ confirm = Confirmer
 delete = Supprimer
 ok = OK
 open = Ouvrir
+customize = Customize
 cancel = Annuler
 openlink = Ouvrir le lien
 copylink = Copier le lien
@@ -170,6 +172,7 @@ loading = [accent]Chargement...
 saving = [accent]Sauvegarde...
 wave = [accent]Vague {0}
 wave.waiting = [LIGHT_GRAY]Prochaine vague dans {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]En attente...
 waiting.players = En attente de joueurs ...
 wave.enemies = [LIGHT_GRAY]{0} Ennemis restants
@@ -312,12 +315,15 @@ error.mapnotfound = Fichier de carte introuvable !
 error.io = Network I/O error.
 error.any = Erreur réseau inconnue.
 zone.groundZero.name = Première Bataille
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = Les Cratères
 zone.frozenForest.name = Forêt Glaciale
 zone.ruinousShores.name = Rives en Ruine
 zone.stainedMountains.name = Montagnes Tâchetées
 zone.desolateRift.name = Fissure abandonnée
 zone.nuclearComplex.name = Complexe nucléaire
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Langage
 settings.reset = Valeur par défaut.
 settings.rebind = Réatttribuer
@@ -442,6 +448,8 @@ setting.mutemusic.name = Couper la musique
 setting.sfxvol.name = Volume des SFX
 setting.mutesound.name = Couper les SFX
 setting.crashreport.name = Envoyer des rapports d'incident anonymement.
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Paramétrer les touches
 category.general.name = Général
 category.view.name = Voir
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = Tenir le zoom
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pause
+keybind.minimap.name = Minimap
 keybind.dash.name = Sprint
 keybind.chat.name = Tchat
 keybind.player_list.name = Liste des joueurs
@@ -482,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = Le mode normal. Ressources limitées et vagues automatiques.
 mode.sandbox.name = Bac à sable
 mode.sandbox.description = Ressources infinies et pas de compte à rebours pour les vagues.
-mode.freebuild.name = Construction libre
-mode.freebuild.description = Ressources limitées et pas de compte à rebours pour les vagues.
 mode.pvp.name = PvP
 mode.pvp.description = Lutter contre d'autres joueurs pour gagner !
 mode.attack.name = Attaque
@@ -493,16 +500,27 @@ rules.infiniteresources = Ressources infinies
 rules.wavetimer = Temps de vague
 rules.waves = Vague
 rules.enemyCheat = Ressources infinies pour l'IA
-rules.pvp = PvP
 rules.unitdrops = Uniter Drops
 rules.unitbuildspeedmultiplier = Multiplicateur de vitesse de création d'unités
 rules.unithealthmultiplier = Multiplicateur de la santé des unités
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Multiplicateur des dégâts du joueur
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Rayon de non-construction autour de la base ennemi:[LIGHT_GRAY] (tuiles)
 rules.respawntime = Temps de réapparition:[LIGHT_GRAY] (sec)
 rules.wavespacing = Espacement des vagues:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Multiplicateur de coût de construction
 rules.buildspeedmultiplier = Multiplicateur de vitesse de construction
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Objets
 content.liquid.name = Liquides
 content.unit.name = Unités
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
 liquid.temperature = [LIGHT_GRAY]Température: {0}
 block.grass.name = Herbe
 block.salt.name = Sel
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Roche de sableuse
 block.spore-pine.name = Pin sporifère
 block.sporerocks.name = Roche sporifère
@@ -597,6 +618,7 @@ block.snowrock.name = Roche enneigée
 block.shale.name = Schiste
 block.shale-boulder.name = Rocher de schiste
 block.moss.name = Mousse
+block.shrubs.name = Shrubs
 block.spore-moss.name = Mousse sporifère
 block.shalerocks.name = Roche de schiste
 block.scrap-wall.name = Mur de ferraille
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Sol métallique 2
 block.metal-floor-3.name = Sol métallique 3
 block.metal-floor-5.name = Sol métallique 5
 block.metal-floor-damaged.name = Sol métallique endommagé
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Roche d'igna
 block.hotrock.name = Roche chaude
 block.magmarock.name = Roche de magma
@@ -678,6 +708,7 @@ block.melter.name = Four à Fusion
 block.incinerator.name = Incinérateur
 block.spore-press.name = Spore presse
 block.separator.name = Séparateur
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Transmetteur énergétique
 block.power-node-large.name = Grand transmetteur énergétique
 block.surge-tower.name = Tour de surtension
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Foreuse à vérin
 block.laser-drill.name = Foreuse Laser
 block.water-extractor.name = Extracteur d'eau
 block.cultivator.name = Cultivateur
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad

core/assets/bundles/bundle_in_ID.properties

@@ -11,6 +11,7 @@ link.google-play.description = Google Play store
 link.wiki.description = wiki resmi Mindustry
 linkfail = Gagal membuka link!\nURL telah disalin ke papan salin.
 screenshot = Screenshot saved to {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Intinya hancur.
 gameover.pvp = Tim [accent] {0}[] menang!
 highscore = [YELLOW]Rekor baru!
@@ -154,6 +155,7 @@ confirm = Konfirmasi
 delete = Hapus
 ok = OK
 open = Buka
+customize = Customize
 cancel = Batal
 openlink = Buka tautan
 copylink = Copy Link
@@ -170,6 +172,7 @@ loading = [accent]Memuat...
 saving = [accent]Saving...
 wave = [accent]Gelombang {0}
 wave.waiting = Gelombang dimulai {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = Menunggu...
 waiting.players = Waiting for players...
 wave.enemies = [LIGHT_GRAY]{0} Enemies Remaining
@@ -312,12 +315,15 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unkown network error.
 zone.groundZero.name = Ground Zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Bahasa
 settings.reset = Atur ulang ke Default
 settings.rebind = Rebind
@@ -442,6 +448,8 @@ setting.mutemusic.name = Bisukan Musik
 setting.sfxvol.name = Volume Suara
 setting.mutesound.name = Bisukan Suara
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Rebind Keys
 category.general.name = General
 category.view.name = View
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = perbesar_tahan
 keybind.zoom.name = perbesar
 keybind.menu.name = menu
 keybind.pause.name = jeda
+keybind.minimap.name = Minimap
 keybind.dash.name = berlari
 keybind.chat.name = chat
 keybind.player_list.name = player_list
@@ -482,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = sandbox
 mode.sandbox.description = infinite resources and no timer for waves.
-mode.freebuild.name = freebuild
-mode.freebuild.description = limited resources and no timer for waves.
 mode.pvp.name = PvP
 mode.pvp.description = fight against other players locally.
 mode.attack.name = Attack
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -597,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -678,6 +708,7 @@ block.melter.name = Melter
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
 block.separator.name = Separator
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Power Node
 block.power-node-large.name = Large Power Node
 block.surge-tower.name = Surge Tower
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Pneumatic Drill
 block.laser-drill.name = Laser Drill
 block.water-extractor.name = Water Extractor
 block.cultivator.name = Cultivator
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad

core/assets/bundles/bundle_it.properties

@@ -11,6 +11,7 @@ link.google-play.description = Elenco di Google Play Store
 link.wiki.description = wiki ufficiale di Mindustry
 linkfail = Impossibile aprire il link! L'URL è stato copiato nella tua bacheca.
 screenshot = Screenshot saved to {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Il nucleo è stato distrutto.
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [YELLOW]Nuovo record!
@@ -154,6 +155,7 @@ confirm = Conferma
 delete = Elimina
 ok = OK
 open = Apri
+customize = Customize
 cancel = Annulla
 openlink = Apri Link
 copylink = Copia link
@@ -170,6 +172,7 @@ loading = [accent]Caricamento in corso ...
 saving = [accent]Salvando  . . .
 wave = [accent]Ondata {0}
 wave.waiting = Ondata in {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = In attesa...
 waiting.players = Waiting for players...
 wave.enemies = [LIGHT_GRAY]{0} Enemies Remaining
@@ -312,12 +315,15 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unkown network error.
 zone.groundZero.name = Ground Zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Lingua
 settings.reset = Resetta Alle Impostazioni Predefinite
 settings.rebind = Reimposta
@@ -442,6 +448,8 @@ setting.mutemusic.name = Silenzia musica
 setting.sfxvol.name = Volume SFX
 setting.mutesound.name = Togli suoni
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Configurazione Tasti
 category.general.name = Generale
 category.view.name = Visualizzazione
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = zoom_hold
 keybind.zoom.name = zoom
 keybind.menu.name = menu
 keybind.pause.name = pausa
+keybind.minimap.name = Minimap
 keybind.dash.name = Scatto
 keybind.chat.name = Chat
 keybind.player_list.name = lista_giocatori
@@ -482,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = Sandbox
 mode.sandbox.description = risorse infinite e nessun timer per le ondate.
-mode.freebuild.name = freebuild
-mode.freebuild.description = risorse limitate e nessun timer per le ondate.
 mode.pvp.name = PvP
 mode.pvp.description = fight against other players locally.
 mode.attack.name = Attack
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Oggetti
 content.liquid.name = Liquidi
 content.unit.name = Units
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viscosità: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -597,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -678,6 +708,7 @@ block.melter.name = Fonditore
 block.incinerator.name = Inceneritore
 block.spore-press.name = Spore Press
 block.separator.name = Separatore
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Snodo energetico
 block.power-node-large.name = Snodo energetico grande
 block.surge-tower.name = Surge Tower
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Trapano pneumatico
 block.laser-drill.name = Estrattore laser
 block.water-extractor.name = Estrattore d'acqua
 block.cultivator.name = Coltivatore
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad

core/assets/bundles/bundle_ja.properties

@@ -11,6 +11,7 @@ link.google-play.description = Google Playのストア
 link.wiki.description = 公式 Mindustry Wiki
 linkfail = リンクを開けませんでした!\nURLをクリップボードにコピーしました。
 screenshot = スクリーンショットを {0} に保存しました。
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = ゲームオーバー
 gameover.pvp = [accent] {0}[] チームの勝利!
 highscore = [accent]ハイスコアを記録!
@@ -154,6 +155,7 @@ confirm = 確認
 delete = 削除
 ok = OK
 open = 開く
+customize = Customize
 cancel = キャンセル
 openlink = リンクを開く
 copylink = リンクをコピー
@@ -170,6 +172,7 @@ loading = [accent]読み込み中...
 saving = [accent]保存中...
 wave = [accent]ウェーブ {0}
 wave.waiting = [LIGHT_GRAY]次のウェーブまで {0} 秒
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]待機中...
 waiting.players = プレイヤーを待っています...
 wave.enemies = [LIGHT_GRAY]残り {0} 体
@@ -312,12 +315,15 @@ error.mapnotfound = マップファイルが見つかりません!
 error.io = ネットワークエラーです。
 error.any = 不明なネットワークエラーです。
 zone.groundZero.name = グラウンド · ゼロ
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = ザ · クレーター
 zone.frozenForest.name = フローズン · フォレスト
 zone.ruinousShores.name = ルーイナス · ショアーズ
 zone.stainedMountains.name = ステインド · マウンテン
 zone.desolateRift.name = ディサレット · リフト
 zone.nuclearComplex.name = ニュークリア · プロダクション · コンプレックス
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = 言語
 settings.reset = デフォルトにリセット
 settings.rebind = 再設定
@@ -442,6 +448,8 @@ setting.mutemusic.name = 音楽をミュート
 setting.sfxvol.name = 効果音 音量
 setting.mutesound.name = 効果音をミュート
 setting.crashreport.name = 匿名でクラッシュレポートを送信する
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = キーバインド
 category.general.name = 一般
 category.view.name = 表示
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = ズーム長押し
 keybind.zoom.name = ズーム
 keybind.menu.name = メニュー
 keybind.pause.name = ポーズ
+keybind.minimap.name = Minimap
 keybind.dash.name = ダッシュ
 keybind.chat.name = チャット
 keybind.player_list.name = プレイヤーリスト
@@ -482,8 +491,6 @@ mode.survival.name = サバイバル
 mode.survival.description = 通常のモードです。 限られた資源で自動的にウェーブが進行します。
 mode.sandbox.name = サンドボックス
 mode.sandbox.description = 無限の資源でウェーブを自由に進行できます。
-mode.freebuild.name = フリービルド
-mode.freebuild.description = 限られた資源の中でウェーブを自由に進行できます。
 mode.pvp.name = PvP
 mode.pvp.description = ローカル内で他のプレイヤーと戦います。
 mode.attack.name = アタック
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = アイテム
 content.liquid.name = 液体
 content.unit.name = ユニット
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]粘度: {0}
 liquid.temperature = [LIGHT_GRAY]温度: {0}
 block.grass.name = 草
 block.salt.name = 岩塩氷河
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = 砂岩
 block.spore-pine.name = 胞子の松の木
 block.sporerocks.name = 胞子の岩
@@ -597,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = 泥板岩
 block.shale-boulder.name = 泥板岩の丸石
 block.moss.name = コケ
+block.shrubs.name = Shrubs
 block.spore-moss.name = 胞子のコケ
 block.shalerocks.name = 泥板岩の岩
 block.scrap-wall.name = スクラップの壁
@@ -642,6 +664,14 @@ block.metal-floor-2.name = 金属製の地面 2
 block.metal-floor-3.name = 金属製の地面 3
 block.metal-floor-5.name = 金属製の地面 5
 block.metal-floor-damaged.name = 破壊された金属製の地面
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = イグナロック
 block.hotrock.name = ホットロック
 block.magmarock.name = マグマロック
@@ -678,6 +708,7 @@ block.melter.name = 融合機
 block.incinerator.name = 焼却炉
 block.spore-press.name = 胞子圧縮機
 block.separator.name = 分離機
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = 電源ノード
 block.power-node-large.name = 大型電源ノード
 block.surge-tower.name = サージタワー
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = 空気圧ドリル
 block.laser-drill.name = レーザードリル
 block.water-extractor.name = ウォーターポンプ
 block.cultivator.name = 培養機
-block.alpha-dart-mech-pad.name = アルファパッド
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = デルタパッド
 block.javelin-ship-pad.name = ジャベリンパッド
 block.trident-ship-pad.name = トライデントパッド

core/assets/bundles/bundle_ko.properties

@@ -324,7 +324,6 @@ zone.desolateRift.name = 황량한 강
 zone.nuclearComplex.name = 핵 생산 단지
 zone.overgrowth.name = 과성장 지역
 zone.tarFields.name = 타르 지역
-
 settings.language = 언어
 settings.reset = 설정 초기화
 settings.rebind = 키 재설정
@@ -374,7 +373,7 @@ blocks.inaccuracy = 오차각
 blocks.shots = 발포 횟수
 blocks.reload = 재장전
 blocks.ammo = 탄약
-bar.outputspeed = 채광 속도: {0}/s
+bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = 효율성: {0}%
 bar.powerbalance = 전력: {0}/s
 bar.poweramount = 전력: {0}
@@ -492,8 +491,6 @@ mode.survival.name = 생존
 mode.survival.description = 이것은 일반 모드입니다. 제한된 자원을 가지고 자동으로 다음 단계가 시작됩니다.
 mode.sandbox.name = 샌드박스
 mode.sandbox.description = 무한한 자원을 가지고 자유롭게 다음 단계를 시작할 수 있습니다.
-mode.freebuild.name = 자유 건축
-mode.freebuild.description = 제한된 자원을 가지고 다음 단계를 시작할 수 있습니다.
 mode.pvp.name = PvP
 mode.pvp.description = 실제 플레이어와 PvP를 합니다.
 mode.attack.name = 공격
@@ -610,7 +607,7 @@ liquid.viscosity = [LIGHT_GRAY]점도: {0}
 liquid.temperature = [LIGHT_GRAY]온도: {0}
 block.grass.name = 잔디
 block.salt.name = 소금
-block.saltrocks = 소금 바위
+block.saltrocks.name = Salt Rocks
 block.pebbles.name = 조약돌
 block.tendrils.name = 텐드릴
 block.sandrocks.name = 모래 바위

core/assets/bundles/bundle_nl.properties

@@ -11,6 +11,7 @@ link.google-play.description = Google Play store vermelding
 link.wiki.description = Officiële Mindustry wiki
 linkfail = Kan link niet openen!\nDe URL is gekopieerd naar je klembord
 screenshot = Schermafbeeling opgeslagen in {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Game Over
 gameover.pvp = het[accent] {0}[] team heeft gewonnen!
 highscore = [accent]Nieuw topscore!
@@ -154,6 +155,7 @@ confirm = Confirm
 delete = Delete
 ok = OK
 open = Open
+customize = Customize
 cancel = Cancel
 openlink = Open Link
 copylink = Copy Link
@@ -170,6 +172,7 @@ loading = [accent]Loading...
 saving = [accent]Saving...
 wave = [accent]Wave {0}
 wave.waiting = [LIGHT_GRAY]Wave in {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]Waiting...
 waiting.players = Waiting for players...
 wave.enemies = [LIGHT_GRAY]{0} Enemies Remaining
@@ -312,12 +315,15 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unknown network error.
 zone.groundZero.name = Ground Zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Language
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
@@ -442,6 +448,8 @@ setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Rebind Keys
 category.general.name = General
 category.view.name = View
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = Zoom Hold
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pause
+keybind.minimap.name = Minimap
 keybind.dash.name = Dash
 keybind.chat.name = Chat
 keybind.player_list.name = Player list
@@ -482,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = Sandbox
 mode.sandbox.description = Infinite resources and no timer for waves.
-mode.freebuild.name = Freebuild
-mode.freebuild.description = Limited resources and no timer for waves.
 mode.pvp.name = PvP
 mode.pvp.description = Fight against other players locally.
 mode.attack.name = Attack
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -597,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -678,6 +708,7 @@ block.melter.name = Melter
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
 block.separator.name = Separator
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Power Node
 block.power-node-large.name = Large Power Node
 block.surge-tower.name = Surge Tower
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Pneumatic Drill
 block.laser-drill.name = Laser Drill
 block.water-extractor.name = Water Extractor
 block.cultivator.name = Cultivator
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad

core/assets/bundles/bundle_nl_BE.properties

@@ -15,7 +15,6 @@ screenshot.invalid = Kaart te groot, mogelijks te weinig geheugen voor een scree
 gameover = Game Over
 gameover.pvp = Het[accent] {0}[] team heeft gewonnen!
 highscore = [accent]Nieuw record!
-
 stat.wave = Je overleefde tot aanvalsgolf: [accent]{0}[].
 stat.enemiesDestroyed = Vijanden vernietigd:[accent] {0}
 stat.built = Gebouwen gebouwd:[accent] {0}
@@ -23,10 +22,8 @@ stat.destroyed = Gebouwen vernietigd:[accent] {0}
 stat.deconstructed = Gebouwen afgebroken:[accent] {0}
 stat.delivered = Gronstoffen meegenomen:
 stat.rank = Eindresultaat: [accent]{0}
-
 placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\n\n[scarlet]DO IT.
 removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\n\n[scarlet]DO IT.
-
 launcheditems = [accent]Meegenomen grondstoffen
 map.delete = Ben je zeker dat je de kaart "[accent]{0}[]" wilt verwijderen?
 level.highscore = Beste score: [accent]{0}
@@ -85,7 +82,6 @@ hosts.discovering = LAN games worden gezocht
 server.refreshing = De server wordt herladen
 hosts.none = [lightgray]Geen games op je lokale netwerk gevonden.
 host.invalid = [scarlet]Kan niet verbinden met de host (server).
-
 trace = Zoeken speler
 trace.playername = Naam speler: [accent]{0}
 trace.ip = IP: [accent]{0}
@@ -106,7 +102,6 @@ server.add = Voeg server toe
 server.delete = Ben je zeker dat je deze sever wil verwijderen?
 server.hostname = Host: {0}
 server.edit = Bewerk Server
-
 server.outdated = [crimson]Verouderde Server![]
 server.outdated.client = [crimson]Verouderde Client![]
 server.version = [lightgray]Versie: {0} {1}
@@ -126,7 +121,6 @@ server.port = Poort:
 server.addressinuse = Dit adres wordt al gebruikt!
 server.invalidport = Ongeldige poort!
 server.error = [crimson]Error hosting server: [accent]{0}
-
 save.old = Deze save word niet meer ondersteund\n\n[LIGHT_GRAY]Terugwaardse compatibiliteit zal geïmplementeerd worden in de volledige 4.0 versie 
 save.new = Nieuwe save
 save.overwrite = Ben je zeker dat je deze save\nwil overschrijven?
@@ -145,7 +139,6 @@ save.newslot = Save naam:
 save.rename = Naam wijzigen
 save.rename.text = Nieuwe naam:
 selectslot = Selecteer een save.
-
 slot = [accent]Slot {0}
 save.corrupted = [accent]Save file corrupted or invalid!\nIf you have just updated your game, this is probably a change in the save format and [scarlet]not[] a bug.
 empty = <empty>
@@ -162,6 +155,7 @@ confirm = Confirm
 delete = Delete
 ok = OK
 open = Open
+customize = Customize
 cancel = Cancel
 openlink = Open Link
 copylink = Copy Link
@@ -178,6 +172,7 @@ loading = [accent]Loading...
 saving = [accent]Saving...
 wave = [accent]Wave {0}
 wave.waiting = [LIGHT_GRAY]Wave in {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]Waiting...
 waiting.players = Waiting for players...
 wave.enemies = [LIGHT_GRAY]{0} Enemies Remaining
@@ -289,7 +284,6 @@ tutorial = Tutorial
 editor = Editor
 mapeditor = Map Editor
 donate = Donate
-
 abandon = Abandon
 abandon.text = This zone and all its resources will be lost to the enemy.
 locked = Locked
@@ -311,7 +305,6 @@ zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
 zone.resources = Resources Detected:
 add = Add...
 boss.health = Boss Health
-
 connectfail = [crimson]Failed to connect to server:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
 error.invalidaddress = Invalid address.
@@ -321,7 +314,6 @@ error.alreadyconnected = Already connected.
 error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unknown network error.
-
 zone.groundZero.name = Ground Zero
 zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
@@ -330,7 +322,8 @@ zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
-
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Language
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
@@ -380,7 +373,6 @@ blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
 blocks.ammo = Ammo
-
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}/s
@@ -392,7 +384,6 @@ bar.heat = Heat
 bar.power = Power
 bar.progress = Build Progress
 bar.spawned = Units: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] damage
 bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary
@@ -404,7 +395,6 @@ bullet.freezing = [stat]freezing
 bullet.tarred = [stat]tarred
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
 bullet.reload = [stat]{0}[lightgray]x fire rate
-
 unit.blocks = blocks
 unit.powersecond = power units/second
 unit.liquidsecond = liquid units/second
@@ -484,6 +474,7 @@ keybind.zoom_hold.name = Zoom Hold
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pause
+keybind.minimap.name = Minimap
 keybind.dash.name = Dash
 keybind.chat.name = Chat
 keybind.player_list.name = Player list
@@ -500,19 +491,15 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = Sandbox
 mode.sandbox.description = Infinite resources and no timer for waves.
-mode.freebuild.name = Freebuild
-mode.freebuild.description = Limited resources and no timer for waves.
 mode.pvp.name = PvP
 mode.pvp.description = Fight against other players locally.
 mode.attack.name = Attack
 mode.attack.description = No waves, with the goal to destroy the enemy base.
 mode.custom = Custom Rules
-
 rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI (Red Team) Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
@@ -524,7 +511,16 @@ rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
-
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
@@ -609,11 +605,11 @@ mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
-
 block.grass.name = Grass
 block.salt.name = Salt
 block.saltrocks.name = Salt Rocks
 block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -622,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -726,7 +723,7 @@ block.pneumatic-drill.name = Pneumatic Drill
 block.laser-drill.name = Laser Drill
 block.water-extractor.name = Water Extractor
 block.cultivator.name = Cultivator
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad
@@ -919,7 +916,6 @@ block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
 block.ghoul-factory.description = Produces heavy carpet bombers.
 block.dagger-factory.description = Produces basic ground units.
 block.titan-factory.description = Produces advanced, armored ground units.
-
 block.fortress-factory.description = Produces heavy artillery ground units.
 block.revenant-factory.description = Produces heavy laser air units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.

core/assets/bundles/bundle_pl.properties

@@ -15,7 +15,6 @@ screenshot.invalid = Zrzut ekranu jest zbyt duży. Najprawdopodobniej brakuje mi
 gameover = Rdzeń został zniszczony.
 gameover.pvp = Zwyciężyła drużyna [accent]{0}[]!
 highscore = [YELLOW] Nowy rekord!
-
 stat.wave = Fale powstrzymane:[accent] {0}
 stat.enemiesDestroyed = Przeciwnicy zniszczeni:[accent] {0}
 stat.built = Budynki zbudowane:[accent] {0}
@@ -23,10 +22,8 @@ stat.destroyed = Budynki zniszczone:[accent] {0}
 stat.deconstructed = Budynki zrekonstruowane:[accent] {0}
 stat.delivered = Surowce wystrzelone:
 stat.rank = Final Rank: [accent]{0}
-
 placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
 removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
-
 launcheditems = [accent]Wystrzelone przedmioty
 map.delete = Jesteś pewny, że chcesz usunąć "[accent]{0}[]"?
 level.highscore = Rekord: [accent]{0}
@@ -158,6 +155,7 @@ confirm = Potwierdź
 delete = Usuń
 ok = Ok
 open = Otwórz
+customize = Customize
 cancel = Anuluj
 openlink = Otwórz link
 copylink = Kopiuj link
@@ -174,6 +172,7 @@ loading = [accent]Ładowanie...
 saving = [accent]Zapisywanie...
 wave = [accent]Fala {0}
 wave.waiting = Fala za {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]Oczekiwanie...
 waiting.players = Oczekiwanie na graczy...
 wave.enemies = Pozostało [LIGHT_GRAY]{0} wrogów
@@ -279,13 +278,6 @@ save = Zapisz
 fps = FPS: {0}
 tps = TPS: {0}
 ping = Ping: {0}ms
-																					 
-				   
-				   
-			   
-					  
-			   
-
 language.restart = Uruchom grę ponownie, aby ustawiony język zaczął funkcjonować.
 settings = Ustawienia
 tutorial = Poradnik
@@ -313,7 +305,6 @@ zone.config.complete = Fala {0} osiągnięta:\nKonfiguracja ładunku odblokowana
 zone.resources = Wykryte Zasoby:
 add = Dodaj...
 boss.health = Boss Health
-
 connectfail = [crimson]Nie można połączyć się z serwerem:\n\n[accent]{0}
 error.unreachable = Serwer niedostępny.\nCzy adres jest wpisany poprawnie?
 error.invalidaddress = Niepoprawny adres.
@@ -323,7 +314,6 @@ error.alreadyconnected = Jesteś już połączony.
 error.mapnotfound = Plik mapy nie został znaleziony!
 error.io = Błąd siecowy I/O.
 error.any = Nieznany błąd sieci.
-
 zone.groundZero.name = Wybuch Lądowy
 zone.desertWastes.name = Desert Wastes
 zone.craters.name = Kratery
@@ -332,7 +322,8 @@ zone.ruinousShores.name = Zniszczone Przybrzerza
 zone.stainedMountains.name = Zabarwione Góry
 zone.desolateRift.name = Ponura Szczelina
 zone.nuclearComplex.name = Centrum Wyrobu Jądrowego
-
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Język
 settings.reset = Przywróć domyślne
 settings.rebind = Zmień
@@ -382,7 +373,6 @@ blocks.inaccuracy = Niedokładność
 blocks.shots = Strzały
 blocks.reload = Strzałów/sekundę
 blocks.ammo = Amunicja
-
 bar.drillspeed = Prędkość wiertła: {0}/s
 bar.efficiency = Efektywność: {0}%
 bar.powerbalance = Moc: {0}
@@ -484,6 +474,7 @@ keybind.zoom_hold.name = Inicjator przybliżania
 keybind.zoom.name = Przybliżanie
 keybind.menu.name = Menu
 keybind.pause.name = Pauza
+keybind.minimap.name = Minimap
 keybind.dash.name = Przyspieszenie
 keybind.chat.name = Czat
 keybind.player_list.name = Lista graczy
@@ -500,19 +491,15 @@ mode.survival.name = Przeżycie
 mode.survival.description = Zwykły tryb. Limitowane surowce i fale przeciwników.
 mode.sandbox.name = Piaskownica
 mode.sandbox.description = Nieskończone surowce i fale bez odliczania. Dla przedszkolaków!
-mode.freebuild.name = Budowanie
-mode.freebuild.description = Normalne surowce i fale bez odliczania.
 mode.pvp.name = PvP
 mode.pvp.description = Walcz przeciwko innym graczom.
 mode.attack.name = Atak
 mode.attack.description = Brak fal, celem jest zniszczenie bazy przeciwnika.
 mode.custom = Własny tryb
-
 rules.infiniteresources = Nieskończone zasoby
 rules.wavetimer = Zegar fal
 rules.waves = Fale
 rules.enemyCheat = Nieskończone zasoby komputera-przeciwnika (czerwonego zespołu)
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
@@ -524,7 +511,16 @@ rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
-
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Przedmioty
 content.liquid.name = Płyny
 content.unit.name = Jednostki
@@ -609,9 +605,11 @@ mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Wytrzymałość na przegrzewanie: {0}
 liquid.viscosity = [LIGHT_GRAY]Lepkość: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
-
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -620,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -665,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -716,7 +723,7 @@ block.pneumatic-drill.name = Wiertło Pneumatyczne
 block.laser-drill.name = Wiertło Laserowe
 block.water-extractor.name = Ekstraktor Wody
 block.cultivator.name = Spluchniacz
-block.alpha-dart-mech-pad.name = Lądowisko Alpha-Strzałka
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Lądowisko Mecha Delta
 block.javelin-ship-pad.name = Lądowisko Statku Oszczep
 block.trident-ship-pad.name = Lądowisko Statku Trójząb
@@ -909,7 +916,6 @@ block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
 block.ghoul-factory.description = Produces heavy carpet bombers.
 block.dagger-factory.description = Produces basic ground units.
 block.titan-factory.description = Produces advanced, armored ground units.
-
 block.fortress-factory.description = Produces heavy artillery ground units.
 block.revenant-factory.description = Produces heavy laser air units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.

core/assets/bundles/bundle_pt_BR.properties

@@ -11,6 +11,7 @@ link.google-play.description = Listamento do google play store
 link.wiki.description = Wiki oficial do Mindustry
 linkfail = Falha ao abrir o link\nO Url foi copiado
 screenshot = Screenshot salvo para {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = O núcleo foi destruído.
 gameover.pvp = O time[accent] {0}[] É vitorioso!
 highscore = [YELLOW]Novo recorde!
@@ -154,6 +155,7 @@ confirm = Confirmar
 delete = Excluir
 ok = OK
 open = Abrir
+customize = Customize
 cancel = Cancelar
 openlink = Abrir Link
 copylink = Copiar link
@@ -170,6 +172,7 @@ loading = [accent]Carregando...
 saving = [accent]Salvando...
 wave = [accent]Horda {0}
 wave.waiting = Horda em {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = Aguardando...
 waiting.players = Esperando por jogadores...
 wave.enemies = [LIGHT_GRAY]{0} Enimigos Restantes
@@ -312,12 +315,15 @@ error.mapnotfound = Arquivo de mapa não encontrado!
 error.io = Erro I/O de internet.
 error.any = Erro de rede desconhecido.
 zone.groundZero.name = Marco zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = As crateras
 zone.frozenForest.name = Floresta congelada
 zone.ruinousShores.name = Costas Ruinosas
 zone.stainedMountains.name = Montanhas manchadas
 zone.desolateRift.name = Fenda desolada
 zone.nuclearComplex.name = Complexo de construção nuclear
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Linguagem
 settings.reset = Restaurar Padrões
 settings.rebind = Religar
@@ -442,6 +448,8 @@ setting.mutemusic.name = Desligar Música
 setting.sfxvol.name = Volume de Efeitos
 setting.mutesound.name = Desligar Som
 setting.crashreport.name = Enviar denuncias de crash anonimas
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Refazer teclas
 category.general.name = Geral
 category.view.name = Ver
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = segurar_zoom
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pausar
+keybind.minimap.name = Minimap
 keybind.dash.name = Correr
 keybind.chat.name = Conversa
 keybind.player_list.name = Lista_de_jogadores
@@ -482,8 +491,6 @@ mode.survival.name = Sobrevivencia
 mode.survival.description = O modo normal. Recursos limitados E Ondas automaticass.
 mode.sandbox.name = Caixa de areia
 mode.sandbox.description = Recursos infinitos E sem tempo para Ataques.
-mode.freebuild.name = construção \nlivre
-mode.freebuild.description = recursos limitados e Sem tempo para Ataques.
 mode.pvp.name = PvP
 mode.pvp.description = Lutar contra outros jogadores locais.
 mode.attack.name = Ataque
@@ -493,16 +500,27 @@ rules.infiniteresources = Recursos infinitos
 rules.wavetimer = Tempo de onda
 rules.waves = Ondas
 rules.enemyCheat = Recursos de IA Infinitos
-rules.pvp = JvJ
 rules.unitdrops = Unidade droppa
 rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de unidade
 rules.unithealthmultiplier = Multiplicador de vida de unidade
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Raio de "Não-criação" de core inimigo:[LIGHT_GRAY] (tiles)
 rules.respawntime = Tempo de renascimento:[LIGHT_GRAY] (sec)
 rules.wavespacing = Espaço entre waves:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Multiplicador de custo de construção
 rules.buildspeedmultiplier = Multiplicador de velocidade de construção
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Itens
 content.liquid.name = Liquidos
 content.unit.name = Unidades
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viscosidade: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
 block.grass.name = Grama
 block.salt.name = Sal
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Pedras de areia
 block.spore-pine.name = Pinheiro de esporo
 block.sporerocks.name = Pedras de esporo
@@ -597,6 +618,7 @@ block.snowrock.name = Pedra de gelo
 block.shale.name = Xisto
 block.shale-boulder.name = Pedra de xisto
 block.moss.name = Musgo
+block.shrubs.name = Shrubs
 block.spore-moss.name = Musgo de esporos
 block.shalerocks.name = Pedas de xisto
 block.scrap-wall.name = Parede de sucata
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Chão de metal 2
 block.metal-floor-3.name = Chão de metal 3
 block.metal-floor-5.name = Chão de metal 5
 block.metal-floor-damaged.name = Chão de metal danificado
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Rocha igna
 block.hotrock.name = Rocha quente
 block.magmarock.name = Rocha de magma
@@ -678,6 +708,7 @@ block.melter.name = Aparelho de fusão
 block.incinerator.name = Incinerador
 block.spore-press.name = Prensa de Esporo
 block.separator.name = Separador
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Célula de energia
 block.power-node-large.name = Célula de energia Grande
 block.surge-tower.name = Torre de surto
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Mineradora Pneumatica
 block.laser-drill.name = Broca a Laser
 block.water-extractor.name = Extrator de Agua
 block.cultivator.name = Cultivador
-block.alpha-dart-mech-pad.name = Pod de meca Alpha dardo
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Controle do mech Delta
 block.javelin-ship-pad.name = Controle do mech Javelin
 block.trident-ship-pad.name = Controle do mech Tridente

core/assets/bundles/bundle_ru.properties

@@ -322,7 +322,8 @@ zone.ruinousShores.name = Разрушенные Берега
 zone.stainedMountains.name = Окрашенные горы
 zone.desolateRift.name = Пустынный Разлом
 zone.nuclearComplex.name = Ядерный Производственный Комплекс
-zone.saltFlats.name = Солончаки
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Язык
 settings.reset = Сбросить по умолчанию
 settings.rebind = Смена
@@ -360,11 +361,9 @@ blocks.powerdamage = Энергия/урон
 blocks.itemcapacity = Вместимость предметов
 blocks.basepowergeneration = Базовая генерация энергии
 blocks.productiontime = Время производства
-blocks.craftspeed = Скорость производства
 blocks.repairtime = Время полной регенерации
 blocks.speedincrease = Увеличение скорости
 blocks.range = Радиус действия
-blocks.inputliquid = Прием жидкости
 blocks.drilltier = Добывает
 blocks.drillspeed = Базовая скорость бурения
 blocks.boosteffect = Ускоряющий эффект
@@ -424,7 +423,6 @@ setting.indicators.name = Показывать в сторону союзник
 setting.autotarget.name = Авто-стрельба
 setting.fpscap.name = Макс. FPS
 setting.fpscap.none = Неограниченный
-minimap = Мини-карта
 setting.fpscap.text = {0} FPS
 setting.swapdiagonal.name = Всегда Диагональное Размещение
 setting.difficulty.training = обучение
@@ -476,6 +474,7 @@ keybind.zoom_hold.name = Управление масштабом
 keybind.zoom.name = Приблизить/Отдалить
 keybind.menu.name = Меню
 keybind.pause.name = Пауза
+keybind.minimap.name = Minimap
 keybind.dash.name = Мчаться
 keybind.chat.name = Чат
 keybind.player_list.name = Список игроков
@@ -724,7 +723,7 @@ block.pneumatic-drill.name = Пневматический бур
 block.laser-drill.name = Лазерный бур
 block.water-extractor.name = Гидроконденсатор
 block.cultivator.name = Культиватор
-block.alpha-dart-mech-pad.name = Реконструктор мехов "Альфа-Дротик"
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Реконструктор "Дельта"
 block.javelin-ship-pad.name = Реконструктор "Джавелин"
 block.trident-ship-pad.name = Реконструктор "Трезубeц"

core/assets/bundles/bundle_tk.properties

@@ -11,6 +11,7 @@ link.google-play.description = Google Play magaza sayfasi
 link.wiki.description = Orjinal Mindustry Bilgilendirme Sayfasi
 linkfail = Link Acilamadi!\nLink sizin icin kopyalandi.
 screenshot = Screenshot saved to {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Cekirdegin yok edildi.
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]Yeni Yuksek skor!
@@ -154,6 +155,7 @@ confirm = Onayla
 delete = Sil
 ok = Tamam
 open = Ac
+customize = Customize
 cancel = iptal
 openlink = Linki ac
 copylink = Linki kopyala
@@ -170,6 +172,7 @@ loading = [accent]Yukleniyor...
 saving = [accent]Kaydediliyor...
 wave = [accent]Dalga {0}
 wave.waiting = Dalganin baslamasina: {0}
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = Bekleniyor...
 waiting.players = Waiting for players...
 wave.enemies = [LIGHT_GRAY]{0} Enemies Remaining
@@ -312,12 +315,15 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unkown network error.
 zone.groundZero.name = Ground Zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Dil
 settings.reset = ilk ayarlara geri al
 settings.rebind = Geri al
@@ -442,6 +448,8 @@ setting.mutemusic.name = Sesi kapat
 setting.sfxvol.name = Ses seviyesi
 setting.mutesound.name = Sesi kapat
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Tuslari ayarla
 category.general.name = General
 category.view.name = Goster
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = Yaklasma basili tutmasi
 keybind.zoom.name = Yaklas
 keybind.menu.name = Menu
 keybind.pause.name = Durdur
+keybind.minimap.name = Minimap
 keybind.dash.name = Kos
 keybind.chat.name = konus
 keybind.player_list.name = Oyuncu listesi
@@ -482,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = Serbest
 mode.sandbox.description = Sonsuz esyalar ve Dalga suresi yok
-mode.freebuild.name = Yapi Yapma
-mode.freebuild.description = Sinirli esyalar ama dalga suresi yok.
 mode.pvp.name = PvP
 mode.pvp.description = fight against other players locally.
 mode.attack.name = Attack
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Esyalar
 content.liquid.name = Sivilar
 content.unit.name = Units
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Yari sivilik: {0}
 liquid.temperature = [LIGHT_GRAY]isi: {0}
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -597,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -678,6 +708,7 @@ block.melter.name = eritici
 block.incinerator.name = isi firini
 block.spore-press.name = Spore Press
 block.separator.name = separator
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Guc Dugumu
 block.power-node-large.name = buyuk Guc Dugumu
 block.surge-tower.name = Surge Tower
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Pneumatik Kazici
 block.laser-drill.name = Lazer kazici
 block.water-extractor.name = su ayiricisi
 block.cultivator.name = ekici
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad

core/assets/bundles/bundle_tr.properties

@@ -11,6 +11,7 @@ link.google-play.description = Google Play mağaza sayfası
 link.wiki.description = Resmi Mindustry Wikipedi'si
 linkfail = Bağlantı açılamadı! URL, yazı tahtanıza kopyalandı.
 screenshot = Screenshot saved to {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = Çekirdek yok edildi.
 gameover.pvp = [accent] {0}[] takimi kazandi !
 highscore = [SARI] Yeni yüksek puan!
@@ -154,6 +155,7 @@ confirm = Onayla
 delete = Sil
 ok = Tamam
 open = Açık
+customize = Customize
 cancel = İptal
 openlink = Linki aç
 copylink = Bağlantıyı kopyala
@@ -170,6 +172,7 @@ loading = [Vurgu] Yükleniyor ...
 saving = [accent]Saving...
 wave = [turuncu] Dalga {0}
 wave.waiting = {0} içinde dalga
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = Bekleniyor
 waiting.players = Waiting for players...
 wave.enemies = [LIGHT_GRAY]{0} Enemies Remaining
@@ -312,12 +315,15 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unkown network error.
 zone.groundZero.name = Ground Zero
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
 zone.stainedMountains.name = Stained Mountains
 zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Dil
 settings.reset = Varsayılanlara Dön
 settings.rebind = Rebind
@@ -442,6 +448,8 @@ setting.mutemusic.name = Müziği Kapat
 setting.sfxvol.name = SFX Hacmi
 setting.mutesound.name = Sesi kapat
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = Tuşları yeniden ayarla
 category.general.name = General
 category.view.name = View
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = tut ve büyüt
 keybind.zoom.name = Yakınlaştır
 keybind.menu.name = menü
 keybind.pause.name = duraklatma
+keybind.minimap.name = Minimap
 keybind.dash.name = tire
 keybind.chat.name = Sohbet
 keybind.player_list.name = oyuncu listesi
@@ -482,8 +491,6 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.
 mode.sandbox.name = Limitsiz Oynama
 mode.sandbox.description = sonsuz kaynaklar ve dalgalar için zamanlayıcı yok.
-mode.freebuild.name = Özgür Oynama
-mode.freebuild.description = sınırlı kaynaklar ve dalgalar için zamanlayıcı yok.
 mode.pvp.name = PvP
 mode.pvp.description = fight against other players locally.
 mode.attack.name = Attack
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
 block.grass.name = Grass
 block.salt.name = Salt
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = Sand Rocks
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
@@ -597,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
@@ -642,6 +664,14 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
@@ -678,6 +708,7 @@ block.melter.name = Melter
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
 block.separator.name = Separator
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Power Node
 block.power-node-large.name = Large Power Node
 block.surge-tower.name = Surge Tower
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = Pneumatic Drill
 block.laser-drill.name = Laser Drill
 block.water-extractor.name = Water Extractor
 block.cultivator.name = Cultivator
-block.alpha-dart-mech-pad.name = Alpha-Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Delta Mech Pad
 block.javelin-ship-pad.name = Javelin Ship Pad
 block.trident-ship-pad.name = Trident Ship Pad

core/assets/bundles/bundle_uk_UA.properties

@@ -41,7 +41,7 @@ addplayers = Дод/Видалити гравців
 customgame = Користувальницька гра
 newgame = Нова гра
 none = <нічого>
-minimap = Minimap
+minimap = Міні-мапа
 close = Закрити
 quit = Вийти
 maps = Мапи
@@ -154,6 +154,7 @@ warning = Попередження
 confirm = Підтвердження
 delete = Видалити
 ok = ОК
+open = Open
 customize = Налаштувати
 cancel = Скасувати
 openlink = Відкрити посилання
@@ -297,7 +298,7 @@ launch.unable = [scarlet]ЗАПУСК неможливий.[] {0} Ворог.
 launch.confirm = Це видалить всі ресурси у Вашому ядрі.\nВи не зможете повернутися до цієї бази.
 uncover = Розкрити
 configure = Вивантаження
-configure.locked = [LIGHT_GRAY]Розблокувати можливість вивантаження ресурсів:\Хвиля {0}.
+configure.locked = [LIGHT_GRAY]Розблокувати можливість вивантаження ресурсів:Хвиля {0}.
 zone.unlocked = [LIGHT_GRAY]{0} розблоковано
 zone.requirement.complete = {0}-та хвиля досягено:\nвимоги до зони "{1}" виконані.
 zone.config.complete = {0} хвиль досягнено. :\nРозблоковано можливість вивантаження.
@@ -321,7 +322,8 @@ zone.ruinousShores.name = Зруйновані Берега
 zone.stainedMountains.name = Пофарбовані гори
 zone.desolateRift.name = Пустельний Розлом
 zone.nuclearComplex.name = Ядерний Виробничий Комплекс
-zone.saltFlats.name = Солончаки
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = Мова
 settings.reset = Скинути за замовчуванням
 settings.rebind = Зміна
@@ -358,12 +360,10 @@ blocks.poweruse = Енергії використовує
 blocks.powerdamage = Енергія/урон
 blocks.itemcapacity = Місткість предметів
 blocks.basepowergeneration = Базова генерація енергії
-blocks.craftspeed = Швидкість виробництва
 blocks.productiontime = Час виробництва
 blocks.repairtime = Час повного відновлення блоку
 blocks.speedincrease = Збільшення швидкості
 blocks.range = Радіус дії
-blocks.inputliquid = Прийом рідини
 blocks.drilltier = Видобуває
 blocks.drillspeed = Базова швидкість буріння
 blocks.boosteffect = Прискорювальний ефект
@@ -423,7 +423,6 @@ setting.indicators.name = Показувати у сторону ворогів
 setting.autotarget.name = Авто-стрільба
 setting.fpscap.name = Макс. FPS
 setting.fpscap.none = Необмежений
-minimap = Міні-мапа
 setting.fpscap.text = {0} FPS
 setting.swapdiagonal.name = Завжди Діагональне Розміщення
 setting.difficulty.training = навчання
@@ -475,6 +474,7 @@ keybind.zoom_hold.name = Удержание зума
 keybind.zoom.name = Приблизить
 keybind.menu.name = Меню
 keybind.pause.name = Пауза
+keybind.minimap.name = Minimap
 keybind.dash.name = Мчати
 keybind.chat.name = Чат
 keybind.player_list.name = Список гравців
@@ -723,7 +723,7 @@ block.pneumatic-drill.name = Пневматичний дриль
 block.laser-drill.name = Лазерний дриль
 block.water-extractor.name = Гідроконденсатор
 block.cultivator.name = Культиватор
-block.alpha-dart-mech-pad.name = Реконструктор "Альфа-Дротик"
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = Реконструктор "Дельта"
 block.javelin-ship-pad.name = Реконструктор "Джавелін"
 block.trident-ship-pad.name = Реконструктор "Тризуб"

core/assets/bundles/bundle_zh_CN.properties

@@ -11,6 +11,7 @@ link.google-play.description = 从谷歌商店获取安卓版
 link.wiki.description = 官方 Mindustry 维基
 linkfail = 打开链接失败！\nURL 已经复制到剪贴板。
 screenshot = 荧幕截图已放在 {0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = 你的核心被摧毁了！
 gameover.pvp = [accent] {0}[] 队获胜!
 highscore = [accent]新纪录！
@@ -154,6 +155,7 @@ confirm = 确认
 delete = 删除
 ok = 好的
 open = 打开
+customize = Customize
 cancel = 取消
 openlink = 打开链接
 copylink = 复制链接
@@ -170,8 +172,9 @@ loading = [accent]正在加载...
 saving = [accent]正在保存...
 wave = [accent]波次 {0}
 wave.waiting = [LIGHT_GRAY]下一波将在{0}秒后到来
-waiting.players = 等待玩家中……
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]正在等待...
+waiting.players = 等待玩家中……
 wave.enemies = [LIGHT_GRAY]剩余 {0} 个敌人
 wave.enemy = [LIGHT_GRAY]剩余 {0} 个敌人
 loadimage = 加载图片
@@ -312,12 +315,15 @@ error.mapnotfound = 找不到地图文件!
 error.io = 网络 I/O 错误。
 error.any = 未知网络错误。
 zone.groundZero.name = 零号地区
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = 陨石地带
 zone.frozenForest.name = 冰冻森林
 zone.ruinousShores.name = 毁灭海岸
 zone.stainedMountains.name = 绵延群山
 zone.desolateRift.name = 荒芜裂谷
 zone.nuclearComplex.name = 核能生产
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = 语言
 settings.reset = 恢复默认
 settings.rebind = 重新绑定
@@ -354,27 +360,15 @@ blocks.poweruse = 能量使用
 blocks.powerdamage = 功率/损伤
 blocks.itemcapacity = 物品容量
 blocks.basepowergeneration = 基础能源输出
-blocks.powertransferspeed = 能量传输
-blocks.craftspeed = 生产速度
 blocks.productiontime = 生产时间
 blocks.repairtime = 方块完全修复时间
 blocks.speedincrease = 提速
 blocks.range = 范围
-blocks.inputliquid = 液体输入
-blocks.inputliquidaux = 辅助液体
-blocks.inputitem = 物品输入
-blocks.inputitems = 物品输入
-blocks.outputitem = 物品输出
 blocks.drilltier = 可钻探矿物
 blocks.drillspeed = 基础钻探速度
 blocks.boosteffect = 加成影响
 blocks.maxunits = 最大单位数量
 blocks.health = 生命值
-blocks.heat = 热量
-blocks.power = 电力
-blocks.progress = 制造进度
-blocks.spawned = 单位数量：{0}/{1}
-blocks.power.satisfaction = 电力输入
 blocks.inaccuracy = 误差
 blocks.shots = 发射数
 blocks.reload = 重新装弹
@@ -423,6 +417,7 @@ category.optional = 可选的增强物品
 setting.landscape.name = 锁定横屏
 setting.shadows.name = 影子
 setting.animatedwater.name = 流动的水
+setting.animatedshields.name = Animated Shields
 setting.antialias.name = 抗锯齿[LIGHT_GRAY] (需要重新启动)[]
 setting.indicators.name = 队友指示器
 setting.autotarget.name = 自动发射
@@ -453,6 +448,8 @@ setting.mutemusic.name = 静音
 setting.sfxvol.name = 音效音量
 setting.mutesound.name = 静音
 setting.crashreport.name = 发送匿名崩溃报告
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = 重新绑定按键
 category.general.name = 普通
 category.view.name = 查看
@@ -477,6 +474,7 @@ keybind.zoom_hold.name = 保持缩放
 keybind.zoom.name = 缩放
 keybind.menu.name = 菜单
 keybind.pause.name = 暂停
+keybind.minimap.name = Minimap
 keybind.dash.name = 冲刺
 keybind.chat.name = 聊天
 keybind.player_list.name = 玩家列表
@@ -493,8 +491,6 @@ mode.survival.name = 生存
 mode.survival.description = 正常的游戏模式,有限的资源和自动波次。
 mode.sandbox.name = 沙盒
 mode.sandbox.description = 无限的资源，不会自动生成敌人。
-mode.freebuild.name = 自由建造
-mode.freebuild.description = 有限的资源，不会自动生成敌人。
 mode.pvp.name = PvP
 mode.pvp.description = 和本地玩家对战.
 mode.attack.name = 攻击
@@ -504,13 +500,27 @@ rules.infiniteresources = 无限资源
 rules.wavetimer = 波次计时器
 rules.waves = 波次
 rules.enemyCheat = AI无限资源
-rules.pvp = PvP
 rules.unitdrops = 敌人出生点
+rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
+rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
+rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = 敌对核心非建设区半径：[LIGHT_GRAY](格)
 rules.respawntime = 重生时间：[LIGHT_GRAY](秒)
 rules.wavespacing = 波次间隔时间：[LIGHT_GRAY](秒)
 rules.buildcostmultiplier = 建设花费倍数
 rules.buildspeedmultiplier = 建设时间倍数
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = 物品
 content.liquid.name = 液体
 content.unit.name = 部队
@@ -597,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]粘度：{0}
 liquid.temperature = [LIGHT_GRAY]温度：{0}
 block.grass.name = 草地
 block.salt.name = 盐碱地
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = 沙岩块
 block.spore-pine.name = 孢子树
 block.sporerocks.name = 孢子岩石
@@ -605,6 +618,7 @@ block.snowrock.name = 雪岩石
 block.shale.name = 页岩地
 block.shale-boulder.name = 页岩巨石
 block.moss.name = 苔藓地
+block.shrubs.name = Shrubs
 block.spore-moss.name = 孢子苔藓地
 block.shalerocks.name = 页岩岩石
 block.scrap-wall.name = 废墙
@@ -650,11 +664,18 @@ block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Metal Floor Damaged
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
 block.cliffs.name = Cliffs
-
 block.copper-wall.name = 铜墙
 block.copper-wall-large.name = 大型铜墙
 block.titanium-wall.name = 钛墙
@@ -687,6 +708,7 @@ block.melter.name = 熔炉
 block.incinerator.name = 焚化炉
 block.spore-press.name = 孢子压缩机
 block.separator.name = 分离机
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = 能量节点
 block.power-node-large.name = 大型能量节点
 block.surge-tower.name = 远程输电塔
@@ -701,7 +723,7 @@ block.pneumatic-drill.name = 气动钻头
 block.laser-drill.name = 激光钻头
 block.water-extractor.name = 抽水机
 block.cultivator.name = 耕种机
-block.alpha-dart-mech-pad.name = 阿尔法-飞镖 机甲平台
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = 德尔塔 机甲平台
 block.javelin-ship-pad.name = 标枪 机甲平台
 block.trident-ship-pad.name = 三叉戟 机甲平台

core/assets/bundles/bundle_zh_TW.properties

@@ -11,6 +11,7 @@ link.google-play.description = Google Play 商店頁面
 link.wiki.description = 官方 Mindustry 維基
 linkfail = 無法打開連結！\n我們已將該網址複製到您的剪貼簿。
 screenshot = 截圖保存到{0}
+screenshot.invalid = Map too large, potentially not enough memory for screenshot.
 gameover = 遊戲結束
 gameover.pvp = [accent]{0}[]隊獲勝！
 highscore = [accent]新的高分紀錄！
@@ -154,6 +155,7 @@ confirm = 確認
 delete = 刪除
 ok = 確定
 open = 開啟
+customize = Customize
 cancel = 取消
 openlink = 開啟連結
 copylink = 複製連結
@@ -170,6 +172,7 @@ loading = [accent]載入中……
 saving = [accent]儲存中……
 wave = [accent]第{0}波
 wave.waiting = 將於{0}秒後抵達
+wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = 等待中……
 waiting.players = 等待玩家中……
 wave.enemies = [LIGHT_GRAY]剩下{0}敵人
@@ -312,12 +315,15 @@ error.mapnotfound = 找不到地圖！
 error.io = 網絡輸入輸出錯誤。
 error.any = 未知網絡錯誤。
 zone.groundZero.name = 歸零地
+zone.desertWastes.name = Desert Wastes
 zone.craters.name = 隕石坑
 zone.frozenForest.name = 冰凍森林
 zone.ruinousShores.name = 毀滅性的海岸
 zone.stainedMountains.name = 染山
 zone.desolateRift.name = 荒涼的裂痕
 zone.nuclearComplex.name = 核生產綜合體
+zone.overgrowth.name = Overgrowth
+zone.tarFields.name = Tar Fields
 settings.language = 語言
 settings.reset = 重設為預設設定
 settings.rebind = 重新綁定
@@ -442,6 +448,8 @@ setting.mutemusic.name = 靜音
 setting.sfxvol.name = 音效音量
 setting.mutesound.name = 靜音
 setting.crashreport.name = 發送匿名崩潰報告
+setting.chatopacity.name = Chat Opacity
+setting.playerchat.name = Display In-Game Chat
 keybind.title = 重新綁定按鍵
 category.general.name = 一般
 category.view.name = 查看
@@ -466,6 +474,7 @@ keybind.zoom_hold.name = 按住縮放
 keybind.zoom.name = 縮放
 keybind.menu.name = 主選單
 keybind.pause.name = 暫停遊戲
+keybind.minimap.name = Minimap
 keybind.dash.name = 衝刺
 keybind.chat.name = 聊天
 keybind.player_list.name = 玩家列表
@@ -482,8 +491,6 @@ mode.survival.name = 生存
 mode.survival.description = 一般模式。有限的資源與自動來襲的波次。
 mode.sandbox.name = 沙盒
 mode.sandbox.description = 無限的資源，與不倒數計時的波次。
-mode.freebuild.name = 自由建造
-mode.freebuild.description = 有限的資源，與不倒數計時的波次。
 mode.pvp.name = 對戰
 mode.pvp.description = 和其他玩家鬥爭。
 mode.attack.name = 攻擊
@@ -493,16 +500,27 @@ rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.enemyCheat = Infinite AI Resources
-rules.pvp = PvP
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
+rules.playerhealthmultiplier = Player Health Multiplier
 rules.playerdamagemultiplier = Player Damage Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
 rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.waitForWaveToEnd = Waves wait for enemies
+rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.respawns = Max respawns per wave
+rules.limitedRespawns = Limit Respawns
+rules.title.waves = Waves
+rules.title.respawns = Respawns
+rules.title.resourcesbuilding = Resources & Building
+rules.title.player = Players
+rules.title.enemy = Enemies
+rules.title.unit = Units
 content.item.name = 物品
 content.liquid.name = 液體
 content.unit.name = 機組
@@ -589,6 +607,9 @@ liquid.viscosity = [LIGHT_GRAY]粘性：{0}
 liquid.temperature = [LIGHT_GRAY]温度：{0}
 block.grass.name = 草
 block.salt.name = 鹽
+block.saltrocks.name = Salt Rocks
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
 block.sandrocks.name = 沙岩
 block.spore-pine.name = 孢子鬆
 block.sporerocks.name = 孢子岩
@@ -597,6 +618,7 @@ block.snowrock.name = 雪巖
 block.shale.name = 頁岩
 block.shale-boulder.name = 頁岩巨石
 block.moss.name = 苔蘚
+block.shrubs.name = Shrubs
 block.spore-moss.name = 孢子苔蘚
 block.shalerocks.name = 頁岩岩石
 block.scrap-wall.name = 廢牆
@@ -642,6 +664,14 @@ block.metal-floor-2.name = 金屬地板二
 block.metal-floor-3.name = 金屬地板三
 block.metal-floor-5.name = 金屬地板五
 block.metal-floor-damaged.name = 金屬地板損壞
+block.creeptree.name = Creeptree
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
 block.ignarock.name = 火成岩
 block.hotrock.name = 熱岩
 block.magmarock.name = 岩漿岩
@@ -678,6 +708,7 @@ block.melter.name = 熔爐
 block.incinerator.name = 焚化爐
 block.spore-press.name = 孢子壓縮機
 block.separator.name = 分離機
+block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = 能量節點
 block.power-node-large.name = 大型能量節點
 block.surge-tower.name = 波動塔
@@ -692,7 +723,7 @@ block.pneumatic-drill.name = 氣動鑽頭
 block.laser-drill.name = 激光鑽頭
 block.water-extractor.name = 水提取器
 block.cultivator.name = 耕種機
-block.alpha-dart-mech-pad.name = 阿爾法鏢船機甲墊
+block.dart-mech-pad.name = Dart Mech Pad
 block.delta-mech-pad.name = 德爾塔機甲墊
 block.javelin-ship-pad.name = 標槍機甲墊
 block.trident-ship-pad.name = 三叉船墊

core/src/io/anuke/mindustry/content/Blocks.java

@@ -899,7 +899,7 @@ public class Blocks implements ContentList{
         itemBridge = new BufferedItemBridge("bridge-conveyor"){{
             requirements(Category.distribution, ItemStack.with(Items.lead, 8, Items.copper, 8));
             range = 4;
-            speed = 60f;
+            speed = 70f;
             bufferCapacity = 15;
         }};
 
@@ -1104,7 +1104,7 @@ public class Blocks implements ContentList{
             size = 4;
             health = 900;
             powerProduction = 110f;
-            itemDuration = 40f;
+            itemDuration = 60f;
             consumes.power(25f);
             consumes.item(Items.blastCompound);
             consumes.liquid(Liquids.cryofluid, 0.26f);
@@ -1644,7 +1644,7 @@ public class Blocks implements ContentList{
 
         dartPad = new MechPad("dart-mech-pad"){{
             requirements(Category.upgrade, ItemStack.with(Items.lead, 200, Items.graphite, 100, Items.copper, 150));
-            mech = Mechs.dart;
+            mech = Mechs.alpha;
             size = 2;
             consumes.powerBuffered(50f);
         }};

core/src/io/anuke/mindustry/content/Bullets.java

@@ -632,7 +632,6 @@ public class Bullets implements ContentList{
         }};
 
         oilShot = new LiquidBulletType(Liquids.oil){{
-            speed = 2f;
             drag = 0.03f;
         }};
 

core/src/io/anuke/mindustry/content/Mechs.java

@@ -359,6 +359,6 @@ public class Mechs implements ContentList{
             }
         };
 
-        starter = alpha;
+        starter = dart;
     }
 }

core/src/io/anuke/mindustry/entities/effect/Fire.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.effect;
 
-import io.anuke.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
 import io.anuke.arc.collection.IntMap;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
@@ -74,11 +72,6 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{
         }
     }
 
-    @Remote(called = Loc.server)
-    public static void onFireRemoved(int fireid){
-        fireGroup.removeByID(fireid);
-    }
-
     @Override
     public float lifetime(){
         return lifetime;
@@ -94,18 +87,17 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{
             Effects.effect(Fx.fireSmoke, x + Mathf.range(4f), y + Mathf.range(4f));
         }
 
-        if(Net.client()){
-            return;
-        }
-
         time = Mathf.clamp(time + Time.delta(), 0, lifetime());
 
         if(time >= lifetime() || tile == null){
-            Call.onFireRemoved(getID());
             remove();
             return;
         }
 
+        if(Net.client()){
+            return;
+        }
+
         TileEntity entity = tile.target().entity;
         boolean damage = entity != null;
 

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -265,7 +265,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
 
     @Override
     public float drawSize(){
-        return isLocal ? Float.MAX_VALUE : 40;
+        return isLocal ? Float.MAX_VALUE : 40 + placeDistance;
     }
 
     @Override

core/src/io/anuke/mindustry/entities/type/TileEntity.java

@@ -259,12 +259,6 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
 
     @Override
     public void update(){
-        //TODO better smoke effect, this one is awful
-        /*if(health != 0 && health < block.health && !(block instanceof Wall) &&
-        Mathf.chance(0.009f * Time.delta() * (1f - health / block.health))){
-            Effects.effect(Fx.smoke, x + Mathf.range(4), y + Mathf.range(4));
-        }*/
-
         timeScaleDuration -= Time.delta();
         if(timeScaleDuration <= 0f || !block.canOverdrive){
             timeScale = 1f;

core/src/io/anuke/mindustry/game/Saves.java

@@ -224,7 +224,7 @@ public class Saves{
         }
 
         public Zone getZone(){
-            return content.getByID(ContentType.zone, meta.rules.zone);
+            return meta == null || meta.rules == null ? null : content.getByID(ContentType.zone, meta.rules.zone);
         }
 
         public int getBuild(){

core/src/io/anuke/mindustry/game/Version.java

@@ -19,8 +19,12 @@ public class Version{
     public static int build = 0;
     /** Revision number. Used for hotfixes. Does not affect server compatibility. */
     public static int revision = 0;
+    /** Whether version loading is enabled. */
+    public static boolean enabled = true;
 
     public static void init(){
+        if(!enabled) return;
+
         try{
             FileHandle file = Core.files.internal("version.properties");
 

core/src/io/anuke/mindustry/graphics/BlockRenderer.java

@@ -79,11 +79,12 @@ public class BlockRenderer implements Disposable{
                     Tile tile = world.rawTile(x, y);
                     int edgeBlend = 2;
                     float rot = tile.getRotation();
+                    boolean fillable = (tile.block().solid && tile.block().fillsTile && !tile.block().synthetic());
                     int edgeDst = Math.min(x, Math.min(y, Math.min(Math.abs(x - (world.width() - 1)), Math.abs(y - (world.height() - 1)))));
                     if(edgeDst <= edgeBlend){
-                        rot = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), rot);
+                        rot = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), fillable ? rot : 0);
                     }
-                    if(rot > 0 && ((tile.block().solid && tile.block().fillsTile && !tile.block().synthetic()) || edgeDst <= edgeBlend)){
+                    if(rot > 0 && (fillable || edgeDst <= edgeBlend)){
                         Draw.color(0f, 0f, 0f, Math.min((rot + 0.5f) / 4f, 1f));
                         Fill.rect(tile.x + 0.5f, tile.y + 0.5f, 1, 1);
                     }

core/src/io/anuke/mindustry/input/MobileInput.java

@@ -590,7 +590,6 @@ public class MobileInput extends InputHandler implements GestureListener{
 
     @Override
     public void update(){
-        clampCamera();
         if(state.is(State.menu) || player.isDead()){
             selection.clear();
             removals.clear();
@@ -730,17 +729,6 @@ public class MobileInput extends InputHandler implements GestureListener{
         return true;
     }
 
-    void clampCamera(){
-        if(player.isDead()) return;
-
-        Vector2 v = Core.camera.position;
-        //change to 1/2 to clamp to viewport
-        float scaling = 1f;
-
-        v.x = clerp(v.x, player.x - Core.camera.width*scaling, player.x + Core.camera.width*scaling);
-        v.y = clerp(v.y, player.y - Core.camera.height*scaling, player.y + Core.camera.height*scaling);
-    }
-
     float clerp(float value, float min, float max){
         final float alpha = 0.07f;
         return value < min ? Mathf.lerpDelta(value, min, alpha) : value > max ? Mathf.lerpDelta(value, max, alpha) : value;

core/src/io/anuke/mindustry/io/BundleLoader.java

@@ -57,7 +57,6 @@ public class BundleLoader{
 
             Locale locale = getLocale();
             Locale.setDefault(locale);
-            if(!headless) Log.info("Got locale: {0}", locale);
             Core.bundle = I18NBundle.createBundle(handle, locale);
         }
 

core/src/io/anuke/mindustry/io/MapIO.java

@@ -37,6 +37,7 @@ public class MapIO{
     private static void initBlocks(){
         if(missingBlocks != null) return;
 
+        //only for legacy maps
         missingBlocks = ObjectMap.of(
             "stained-stone", Blocks.shale,
             "stained-stone-red", Blocks.shale,

core/src/io/anuke/mindustry/io/SaveFileVersion.java

@@ -1,6 +1,7 @@
 package io.anuke.mindustry.io;
 
 import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.ObjectMap;
 import io.anuke.arc.util.Pack;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.entities.Entities;
@@ -19,6 +20,9 @@ import static io.anuke.mindustry.Vars.world;
 
 public abstract class SaveFileVersion{
     public final int version;
+    private final ObjectMap<String, String> fallback = ObjectMap.of(
+        "alpha-dart-mech-pad", "dart-mech-pad"
+    );
 
     public SaveFileVersion(int version){
         this.version = version;
@@ -219,7 +223,7 @@ public abstract class SaveFileVersion{
 
             for(int j = 0; j < total; j++){
                 String name = stream.readUTF();
-                map[type.ordinal()][j] = content.getByName(type, name);
+                map[type.ordinal()][j] = content.getByName(type, fallback.get(name, name));
             }
         }
 

core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java

@@ -183,7 +183,7 @@ public abstract class BasicGenerator extends RandomGenerator{
         Tile end = tiles[endX][endY];
         GridBits closed = new GridBits(width, height);
         IntFloatMap costs = new IntFloatMap();
-        PriorityQueue<Tile> queue = new PriorityQueue<>((a, b) -> Float.compare(costs.get(a.pos(), 0f) + dh.cost(a.x, a.y, end.x, end.y), costs.get(b.pos(), 0f) + dh.cost(b.x, b.y, end.x, end.y)));
+        PriorityQueue<Tile> queue = new PriorityQueue<>(tiles.length * tiles[0].length / 2, (a, b) -> Float.compare(costs.get(a.pos(), 0f) + dh.cost(a.x, a.y, end.x, end.y), costs.get(b.pos(), 0f) + dh.cost(b.x, b.y, end.x, end.y)));
         queue.add(start);
         boolean found = false;
         while(!queue.isEmpty()){

core/src/io/anuke/mindustry/type/Item.java

@@ -30,7 +30,7 @@ public class Item extends UnlockableContent implements Comparable<Item>{
      * base material cost of this item, used for calculating place times
      * 1 cost = 1 tick added to build time
      */
-    public float cost = 3f;
+    public float cost = 1f;
     /** If true, item is always unlocked. */
     public boolean alwaysUnlocked = false;
 

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

@@ -190,10 +190,16 @@ public class SettingsMenuDialog extends SettingsDialog{
                 }
             });
 
+            graphics.checkPref("borderlesswindow", false, b -> Core.graphics.setUndecorated(b));
+
             Core.graphics.setVSync(Core.settings.getBool("vsync"));
             if(Core.settings.getBool("fullscreen")){
                 Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode());
             }
+
+            if(Core.settings.getBool("borderlesswindow")){
+                Core.graphics.setUndecorated(true);
+            }
         }else{
             graphics.checkPref("landscape", false, b -> {
                 if(b){

core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java

@@ -45,7 +45,9 @@ public class TechTreeDialog extends FloatingDialog{
             checkNodes(root);
             treeLayout();
         });
+
         hidden(ui.deploy::setup);
+
         addCloseButton();
 
         buttons.addImageTextButton("$database", "icon-database", 14 * 2, () -> {
@@ -200,7 +202,7 @@ public class TechTreeDialog extends FloatingDialog{
 
             if(mobile){
                 tapped(() -> {
-                    Element e = hit(Core.input.mouseX(), Core.input.mouseY(), true);
+                    Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
                     if(e == this){
                         hoverNode = null;
                         rebuild();

core/src/io/anuke/mindustry/world/Block.java

@@ -409,6 +409,7 @@ public class Block extends BlockStorage{
     public void setStats(){
         stats.add(BlockStat.size, "{0}x{0}", size);
         stats.add(BlockStat.health, health, StatUnit.none);
+        stats.add(BlockStat.buildTime, buildCost / 60, StatUnit.seconds);
 
         consumes.display(stats);
 

core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java

@@ -72,7 +72,7 @@ public class Junction extends Block{
         if(entity == null || relative == -1 || entity.buffers[relative].full())
             return false;
         Tile to = tile.getNearby(relative);
-        return to != null;
+        return to != null && to.target().block().hasItems;
     }
 
     @Override

core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java

@@ -43,8 +43,8 @@ public class LiquidJunction extends LiquidBlock{
         dir = (dir + 4) % 4;
         Tile to = tile.getNearby(dir).target();
 
-        if(to.block().hasLiquids && to.block().acceptLiquid(to, tile, liquid, Math.min(to.block().liquidCapacity - to.entity.liquids.get(liquid) - 0.00001f, amount))){
+        if(to.block().hasLiquids && to.block().acceptLiquid(to, tile, liquid, amount)){
-            to.block().handleLiquid(to, tile, liquid, Math.min(to.block().liquidCapacity - to.entity.liquids.get(liquid) - 0.00001f, amount));
+            to.block().handleLiquid(to, tile, liquid, amount);
         }
     }
 
@@ -55,6 +55,6 @@ public class LiquidJunction extends LiquidBlock{
         Tile to = dest.getNearby(dir);
         if(to == null) return false;
         to = to.target();
-        return to != null && to.entity != null && to.block().hasLiquids && to.block().acceptLiquid(to, dest, liquid, Math.min(to.block().liquidCapacity - to.entity.liquids.get(liquid) - 0.00001f, amount));
+        return to != null && to.entity != null && to.block().hasLiquids && to.block().acceptLiquid(to, dest, liquid, amount);
     }
 }

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

@@ -76,7 +76,7 @@ public class ImpactReactor extends PowerGenerator{
     public void update(Tile tile){
         FusionReactorEntity entity = tile.entity();
 
-        if(entity.cons.valid()){
+        if(entity.cons.valid() && entity.power.satisfaction >= 0.99f){
             entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, warmupSpeed);
             if(Mathf.isEqual(entity.warmup, 1f, 0.001f)){
                 entity.warmup = 1f;

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

@@ -180,8 +180,6 @@ public class Drill extends Block{
             itemArray.sort((item1, item2) -> {
                 int type = Boolean.compare(item1.type == ItemType.material, item2.type == ItemType.material);
                 if(type != 0) return type;
-                int count = Integer.compare(oreCount.get(item1, 0), oreCount.get(item2, 0));
-                if(count != 0) return count;
                 return Integer.compare(item1.id, item2.id);
             });
 
@@ -260,6 +258,10 @@ public class Drill extends Block{
         return new DrillEntity();
     }
 
+    public int tier(){
+        return tier;
+    }
+
     public Item getDrop(Tile tile){
         return tile.drop();
     }

core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java

@@ -135,6 +135,14 @@ public class GenericCrafter extends Block{
         return itemCapacity;
     }
 
+    public Item outputItem(){
+        return outputItem == null ? null : outputItem.item;
+    }
+
+    public Liquid outputLiquid(){
+        return outputLiquid == null ? null : outputLiquid.liquid;
+    }
+
     public static class GenericCrafterEntity extends TileEntity{
         public float progress;
         public float totalProgress;

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

@@ -51,9 +51,13 @@ public class LiquidSource extends Block{
     public void update(Tile tile){
         LiquidSourceEntity entity = tile.entity();
 
+        if(entity.source == null){
+            tile.entity.liquids.clear();
+        }else{
             tile.entity.liquids.add(entity.source, liquidCapacity);
             tryDumpLiquid(tile, entity.source);
         }
+    }
 
     @Override
     public void draw(Tile tile){
@@ -61,10 +65,12 @@ public class LiquidSource extends Block{
 
         LiquidSourceEntity entity = tile.entity();
 
+        if(entity.source != null){
             Draw.color(entity.source.color);
             Draw.rect("blank", tile.worldx(), tile.worldy(), 4f, 4f);
             Draw.color();
         }
+    }
 
     @Override
     public void buildTable(Tile tile, Table table){
@@ -73,17 +79,19 @@ public class LiquidSource extends Block{
         Array<Liquid> items = content.liquids();
 
         ButtonGroup<ImageButton> group = new ButtonGroup<>();
+        group.setMinCheckCount(0);
         Table cont = new Table();
 
         for(int i = 0; i < items.size; i++){
             final int f = i;
-            ImageButton button = cont.addImageButton("clear", "clear-toggle", 24, () -> {
+            ImageButton button = cont.addImageButton("clear", "clear-toggle", 24, () -> control.input().frag.config.hideConfig()).size(38).group(group).get();
-                Call.setLiquidSourceLiquid(null, tile, items.get(f));
+            button.changed(() -> {
+                Call.setLiquidSourceLiquid(null, tile, button.isChecked() ? items.get(f) : null);
                 control.input().frag.config.hideConfig();
                 lastLiquid = items.get(f);
-            }).size(38).group(group).get();
+            });
             button.getStyle().imageUp = new TextureRegionDrawable(items.get(i).iconRegion);
-            button.setChecked(entity.source.id == f);
+            button.setChecked(entity.source == items.get(i));
 
             if(i % 4 == 3){
                 cont.row();
@@ -105,16 +113,17 @@ public class LiquidSource extends Block{
     }
 
     class LiquidSourceEntity extends TileEntity{
-        public Liquid source = Liquids.water;
+        public Liquid source = null;
 
         @Override
         public void writeConfig(DataOutput stream) throws IOException{
-            stream.writeByte(source.id);
+            stream.writeByte(source == null ? -1 : source.id);
         }
 
         @Override
         public void readConfig(DataInput stream) throws IOException{
-            source = content.liquid(stream.readByte());
+            byte id = stream.readByte();
+            source = id == -1 ? null : content.liquid(id);
         }
     }
 }

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

@@ -25,11 +25,6 @@ import io.anuke.mindustry.world.meta.*;
 import java.io.*;
 
 public class UnitFactory extends Block{
-    //for attack mode
-    protected float gracePeriodMultiplier = 15f;
-    protected float speedupTime = 60f * 60f * 20;
-    protected float maxSpeedup = 2f;
-
     protected UnitType type;
     protected float produceTime = 1000f;
     protected float launchVelocity = 0f;
@@ -164,25 +159,15 @@ public class UnitFactory extends Block{
             entity.warmup += entity.delta();
         }
 
-        if(!tile.isEnemyCheat()){
         //player-made spawners have default behavior
-            if(entity.cons.valid()){
+        if(entity.cons.valid() || tile.isEnemyCheat()){
-                entity.time += entity.delta() * entity.speedScl * Vars.state.rules.unitBuildSpeedMultiplier;
+            entity.time += entity.delta() * entity.speedScl * Vars.state.rules.unitBuildSpeedMultiplier * entity.power.satisfaction;
             entity.buildTime += entity.delta() * entity.power.satisfaction * Vars.state.rules.unitBuildSpeedMultiplier;
             entity.speedScl = Mathf.lerpDelta(entity.speedScl, 1f, 0.05f);
         }else{
             entity.speedScl = Mathf.lerpDelta(entity.speedScl, 0f, 0.05f);
         }
-            //check if grace period had passed
+
-        }else if(entity.warmup > produceTime * gracePeriodMultiplier){
-            float speedMultiplier = Math.min(0.1f + (entity.warmup - produceTime * gracePeriodMultiplier) / speedupTime, maxSpeedup);
-            entity.time += entity.delta() * entity.speedScl;
-            //otherwise, it's an enemy, cheat by not requiring resources
-            entity.buildTime += entity.delta() * speedMultiplier;
-            entity.speedScl = Mathf.lerpDelta(entity.speedScl, 1f, 0.05f);
-        }else{
-            entity.speedScl = Mathf.lerpDelta(entity.speedScl, 0f, 0.05f);
-        }
 
         if(entity.buildTime >= produceTime){
             entity.buildTime = 0f;
@@ -214,6 +199,7 @@ public class UnitFactory extends Block{
         float buildTime;
         float time;
         float speedScl;
+        //TODO remove next breaking release
         float warmup; //only for enemy spawners
         int spawned;
 

core/src/io/anuke/mindustry/world/consumers/ConsumePower.java

@@ -47,7 +47,7 @@ public class ConsumePower extends Consume{
         if(isBuffered){
             return true;
         }else{
-            return entity.power.satisfaction >= 0.9999f;
+            return entity.power.satisfaction > 0f;
         }
     }
 

core/src/io/anuke/mindustry/world/meta/BlockStat.java

@@ -8,6 +8,7 @@ import java.util.Locale;
 public enum BlockStat{
     health(StatCategory.general),
     size(StatCategory.general),
+    buildTime(StatCategory.general),
 
     itemCapacity(StatCategory.items),
     itemsMoved(StatCategory.items),

core/src/io/anuke/mindustry/world/meta/StatCategory.java

@@ -1,5 +1,7 @@
 package io.anuke.mindustry.world.meta;
 
+import io.anuke.arc.Core;
+
 /** A specific category for a stat. */
 public enum StatCategory{
     general,
@@ -8,5 +10,9 @@ public enum StatCategory{
     items,
     crafting,
     shooting,
-    optional,
+    optional;
+
+    public String localized(){
+        return Core.bundle.get("category." + name());
+    }
 }

core/src/io/anuke/mindustry/world/modules/LiquidModule.java

@@ -3,6 +3,7 @@ package io.anuke.mindustry.world.modules;
 import io.anuke.mindustry.type.Liquid;
 
 import java.io.*;
+import java.util.Arrays;
 
 import static io.anuke.mindustry.Vars.content;
 
@@ -38,6 +39,11 @@ public class LiquidModule extends BlockModule{
         return liquids[liquid.id];
     }
 
+    public void clear(){
+        total = 0;
+        Arrays.fill(liquids, 0);
+    }
+
     public void add(Liquid liquid, float amount){
         liquids[liquid.id] += amount;
         total += amount;