Merge branch 'master' into master

core/assets/bundles/bundle.properties

@@ -22,6 +22,7 @@ load.map = Maps
 load.image = Images
 load.content = Content
 load.system = System
+load.mod = Mods
 
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
@@ -32,6 +33,7 @@ stat.delivered = Resources Launched:
 stat.rank = Final Rank: [accent]{0}
 
 launcheditems = [accent]Launched Items
+launchinfo = [unlaunched][[LAUNCH] your core to obtain the items indicated in blue.
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
 level.select = Level Select
@@ -64,6 +66,22 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alpha = [accent](Alpha)
+mods = Mods
+mods.none = [LIGHT_GRAY]No mods found!
+mods.guide = Modding Guide
+mod.enabled = [lightgray]Enabled
+mod.disabled = [scarlet]Disabled
+mod.disable = Disable
+mod.enable = Enable
+mod.requiresrestart = The game will now close to apply the mod changes.
+mod.reloadrequired = [scarlet]Reload Required
+mod.import = Import Mod
+mod.remove.confirm = This mod will be deleted.
+mod.author = [LIGHT_GRAY]Author:[] {0}
+mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}
+
 about.button = About
 name = Name:
 noname = Pick a[accent] player name[] first.
@@ -164,7 +182,7 @@ save.rename.text = New name:
 selectslot = Select a save.
 slot = [accent]Slot {0}
 editmessage = Edit Message
-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.
+save.corrupted = Save file corrupted or invalid!
 empty = <empty>
 on = On
 off = Off
@@ -178,6 +196,7 @@ warning = Warning.
 confirm = Confirm
 delete = Delete
 view.workshop = View In Workshop
+workshop.listing = Edit Workshop Listing
 ok = OK
 open = Open
 customize = Customize Rules
@@ -195,6 +214,7 @@ classic.export.text = [accent]Mindustry[] has just had a major update.\nClassic
 quit.confirm = Are you sure you want to quit?
 quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Loading...
+reloading = [accent]Reloading Mods...
 saving = [accent]Saving...
 wave = [accent]Wave {0}
 wave.waiting = [lightgray]Wave in {0}
@@ -215,7 +235,12 @@ map.nospawn.pvp = This map does not have any enemy cores for player to spawn int
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
 map.publish.error = Error publishing map: {0}
+map.update = Update Map
+map.load.error = Error fetching workshop details: {0}
+map.missing = This map has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked from the map.
 map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+map.menu = Select what you would like to do with this map.
+map.changelog = Changelog (optional):
 eula = Steam EULA
 map.publish = Map published.
 map.publishing = [accent]Publishing map...
@@ -440,8 +465,6 @@ settings.graphics = Graphics
 settings.cleardata = Clear Game Data...
 settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone!
 settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
-settings.clearunlocks = Clear Unlocks
-settings.clearall = Clear All
 paused = [accent]< Paused >
 yes = Yes
 no = No
@@ -573,6 +596,7 @@ setting.savecreate.name = Auto-Create Saves
 setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display Player Bubble Chat
+public.confirm = Do you want to make your game public?\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
 uiscale.cancel = Cancel & Exit
 setting.bloom.name = Bloom
@@ -608,6 +632,7 @@ keybind.chat.name = Chat
 keybind.player_list.name = Player list
 keybind.console.name = Console
 keybind.rotate.name = Rotate
+keybind.rotateplaced.name = Rotate Existing (Hold)
 keybind.toggle_menus.name = Toggle menus
 keybind.chat_history_prev.name = Chat history prev
 keybind.chat_history_next.name = Chat history next
@@ -619,6 +644,7 @@ mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.\n[gray]Requires enemy spawns in the map to play.
 mode.sandbox.name = Sandbox
 mode.sandbox.description = Infinite resources and no timer for waves.
+mode.editor.name = Editor
 mode.pvp.name = PvP
 mode.pvp.description = Fight against other players locally.\n[gray]Requires at least 2 differently-colored cores in the map to play.
 mode.attack.name = Attack
@@ -803,7 +829,7 @@ block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
 block.armored-conveyor.name = Armored Conveyor
-block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyor belts.
 block.junction.name = Junction
 block.router.name = Router
 block.distributor.name = Distributor
@@ -925,11 +951,11 @@ unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
 tutorial.next = [lightgray]<Tap to continue>
-tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
-tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building, and[accent] Hold Ctrl while scrolling[] to zoom in and out.
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse [[WASD] to move.\n[accent] Hold [[Ctrl] while scrolling[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
+tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building.
 tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
 tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
-tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\n\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core.
+tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\nUse the scrollwheel to rotate blocks before placing them.\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core.
 tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core.
 tutorial.turret = Once an item enters your core, it can be used for building.\nKeep in mind that not all items can be used for building.\nItems that are not used for building, such as[accent] coal[] or[accent] scrap[], cannot be put into the core.\nDefensive structures must be built to repel the[lightgray] enemy[].\nBuild a[accent] duo turret[] near your base.
 tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill near the turret.\nLead conveyors into the turret to supply it with copper.\n\n[accent]Ammo delivered: 0/1
@@ -943,7 +969,7 @@ tutorial.withdraw = In some situations, taking items directly from blocks is nec
 tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves.[accent] Click[] to shoot.\nBuild more turrets and drills. Mine more copper.
 tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
-tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese resources can then be used to research new technology.\n\n[accent]Press the launch button.
+tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese obtained resources can then be used to research new technology.\n\n[accent]Press the launch button.
 
 item.copper.description = The most basic structural material. Used extensively in all types of blocks.
 item.lead.description = A basic starter material. Used extensively in electronics and liquid transportation blocks.
@@ -1069,7 +1095,7 @@ block.core-foundation.description = The second version of the core. Better armor
 block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
 block.vault.description = Stores a large amount of items of each type. An unloader block can be used to retrieve items from the vault.
 block.container.description = Stores a small amount of items of each type. An unloader block can be used to retrieve items from the container.
-block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping.
+block.unloader.description = Unloads items from any nearby non-transportation block. The type of item to be unloaded can be changed by tapping.
 block.launch-pad.description = Launches batches of items without any need for a core launch.
 block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
 block.duo.description = A small, cheap turret. Useful against ground units.
@@ -1086,7 +1112,7 @@ block.ripple.description = An extremely powerful artillery turret. Shoots cluste
 block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to patrol, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
+block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
 block.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produces Spirit structural repair drones.
 block.phantom-factory.description = Produces advanced construction drones.

core/assets/bundles/bundle_cs.properties

@@ -4,7 +4,7 @@ contributors = Překladatelé a Sponzoři
 discord = Připoj se k Mindustry na Discordu!
 link.discord.description = Oficiální Mindustry chatroom na Discordu!
 link.github.description = Zdrojový kód hry
-link.changelog.description = List of update changes
+link.changelog.description = Seznam úprav
 link.dev-builds.description = Nestabilní verze vývoje hry
 link.trello.description = Oficiální Trello board pro plánované funkce 
 link.itch.io.description = itch.io stránka pro stažení PC nebo webové verze
@@ -12,80 +12,93 @@ 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.
+screenshot.invalid = Mapa je moc velká, nemusí být dost paměti pro snímek obrazovky.
 gameover = Konec hry
 gameover.pvp = [accent] {0}[] Tým Vyhrál!
-highscore = [accent]Nový Rekord!
-load.sound = Sounds
-load.map = Maps
-load.image = Images
-load.content = Content
+highscore = [accent]Nový rekord!
+load.sound = Zvuky
+load.map = Mapy
+load.image = Obrázky
+load.content = Obsah
 load.system = System
-stat.wave = Waves Defeated:[accent] {0}
-stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
-stat.built = Buildings Built:[accent] {0}
-stat.destroyed = Buildings Destroyed:[accent] {0}
-stat.deconstructed = Buildings Deconstructed:[accent] {0}
-stat.delivered = Resources Launched:
-stat.rank = Final Rank: [accent]{0}
-launcheditems = [accent]Launched Items
+stat.wave = Vln poraženo:[accent] {0}
+stat.enemiesDestroyed = Nepřátel zničeno:[accent] {0}
+stat.built = Budov postaveno:[accent] {0}
+stat.destroyed = Budov zničeno:[accent] {0}
+stat.deconstructed = Budov rozebráno:[accent] {0}
+stat.delivered = Materiálu odesláno:
+stat.rank = Závěrečné hodnocení: [accent]{0}
+launcheditems = [accent]Odeslané předměty
 map.delete = Jsi si jistý že chceš smazat mapu "[accent]{0}[]"?
 level.highscore = Nejvyšší skóre: [accent]{0}
 level.select = Výběr levelu
 level.mode = Herní mód:
 showagain = Znovu neukazovat !
 coreattack = < Jádro je pod útokem! >
-nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
-database = Core Database
+nearpoint = [[ [scarlet]IHNED OPUSŤTE PROSTOR VÝSADKŮ[] ]\nNebezpečí okamžité smrti
+database = Databáze objektů
 savegame = Uložit hru
 loadgame = Načíst hru
 joingame = Připojit se ke hře
 addplayers = Přidat/Odebrat hráče
 customgame = Vlastní hra
-newgame = New Game
-none = <none>
-minimap = Minimap
+newgame = Nová hra
+none = <žádný>
+minimap = Minimapa
 close = Zavřít
-website = Website
+website = Web. stránky
 quit = Ukončit
+save.quit = Save & Quit
 maps = Mapy
+maps.browse = Browse Maps
 continue = Pokračovat
 maps.none = [LIGHT_GRAY]Žádné mapy nebyly nalezeny!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = O hře
-name = Name:
+name = Jméno:
 noname = Nejdřív si vyber[accent] herní jméno[].
 filename = Jméno složky:
 unlocked = Nový blok odemknut!
-completed = [accent]Completed
-techtree = Tech Tree
-research.list = [LIGHT_GRAY]Research:
-research = Research
-researched = [LIGHT_GRAY]{0} researched.
+completed = [accent]Dokončeno
+techtree = Technologie
+research.list = [LIGHT_GRAY]Výzkum:
+research = Zkoumej
+researched = [LIGHT_GRAY]{0} vyzkoumán(o).
 players = {0} hráčů online
 players.single = {0} hráč online
 server.closing = [accent]Zavírám server...
 server.kicked.kick = Byl jsi vykopnut ze serveru!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server je zavřený.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Zastaralý klient hry! Aktualizuj si hru!
 server.kicked.serverOutdated = Zastaralý server! Řekni hostiteli o aktualizaci!
 server.kicked.banned = Jsi zabanován na tomto serveru.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Před nedávnem jsi byl vykopnut.\nPočkej než se znovu připojíš.
 server.kicked.nameInUse = Někdo se stejným jménem\nje aktuálně na serveru.
 server.kicked.nameEmpty = Tvé jméno je neplatné.
 server.kicked.idInUse = Již jsi na tomhle serveru připojen! Připojování se dvěma účty není povoleno.
 server.kicked.customClient = Tento server nepodporuje vlastní verze hry. Stáhni si oficiální verzi.
-server.kicked.gameover = Game over!
-server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
+server.kicked.gameover = Konec hry!
+server.versions = Verze klienta:[accent] {0}[]\nVerze serveru:[accent] {1}[]
 host.info = [accent]hostitel[] hostuje server na portu [scarlet]6567[]. \nKdokoliv na stejné [LIGHT_GRAY]wifi nebo místní síti[] by měl vidět server ve svém listu serverů.\n\nJestli chcete aby se uživatelé připojovali odkudkoliv pomocí IP, [accent]přesměrování portů[] je nutné.\n\n[LIGHT_GRAY]Poznámka: Jestli někdo má problém s připojením ke své LAN hře, ujistěte se že má Mindustry povolený přístup k místní síti v nastavení Firewallu.
 join.info = Tady můžeš vložit [accent]IP serveru[] ke kterému se chceš připojit, nebo objevit [accent]Servery Místní sítě[] ke kterým se chceš připojit.\nLAN i Multiplayer jsou podporovány.\n\n[LIGHT_GRAY]Poznámka: Není žádný globální seznam serverů; Pokud se budeš chtít připojit k někomu pomocí IP, budeš jí muset znát od hostitele.
 hostserver = Hostovat hru
+invitefriends = Invite Friends
 hostserver.mobile = Hostovat\nHru
 host = Hostitel
 hosting = [accent]Otevírám server...
 hosts.refresh = Obnovit
 hosts.discovering = Hledám hry LAN
+hosts.discovering.any = Discovering games
 server.refreshing = Obnovuji servery
 hosts.none = [lightgray]Žádné místní hry nebyly nalezeny!
 host.invalid = [scarlet]Nejde se připojit k hostiteli.
@@ -109,13 +122,18 @@ server.version = [lightgray]Verze: {0} {1}
 server.custombuild = [yellow]Vlastní verze
 confirmban = Jsi si jistý že chceš zabanovat tohoto hráče?
 confirmkick = Jsi si jistý že chceš vykopnout tohoto hráče?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Jsi si jistý že chceš odbanovat tohoto hráče
 confirmadmin = Jsi si jistý že chceš tohoto hráče pasovat na admina?
 confirmunadmin = Jsi si jistý že chceš odebrat práva tomuto hráči?
 joingame.title = Připojit se ke hře
 joingame.ip = Adresa:
 disconnect = Odpojen.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Chyba načtení dat světa!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Připojuji se...
 connecting.data = [accent]Načítám data světa...
 server.port = Port:
@@ -141,6 +159,7 @@ save.rename = Přejmenovat
 save.rename.text = Nové jméno:
 selectslot = Vyber uložení.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 save.corrupted = [accent]Uložení je poškozené nebo neplatné\nPokud jsi právě aktualizoval svou hru, je to možná změnou formátu pro ukládání a [scarlet]NE[] chyba hry.
 empty = <Prázný>
 on = On
@@ -148,33 +167,34 @@ off = Off
 save.autosave = Automatické uložení: {0}
 save.map = Mapa: {0}
 save.wave = Vlna {0}
-save.difficulty = Obtížnost: {0}
+save.mode = Gamemode: {0}
 save.date = Naposledy uloženo: {0}
 save.playtime = Herní čas: {0}
-warning = Warning.
+warning = Varování.
 confirm = Potvrdit
 delete = Smazat
+view.workshop = View In Workshop
 ok = OK
 open = Otevřít
-customize = Customize
+customize = Přizpůsobit
 cancel = Zrušit
 openlink = Otevřít Odkaz
 copylink = Zkopírovat Odkaz
 back = Zpět
-data.export = Export Data
-data.import = Import Data
-data.exported = Data exported.
-data.invalid = This isn't valid game data.
-data.import.confirm = Importing external data will erase[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
-classic.export = Export Classic Data
+data.export = Exportuj Data
+data.import = Importuj Data
+data.exported = Data exportována.
+data.invalid = Neplatná herní data.
+data.import.confirm = Import externích dat smaže[scarlet] všechna[] vaše současná herní data.\n[accent]To nelze vrátit zpět![]\n\nPo importu data se hra ukončí.
+classic.export = Exportovat klasická data
 classic.export.text = [accent]Mindustry[] has just had a major update.\nClassic (v3.5 build 40) save or map data has been detected. Would you like to export these saves to your phone's home folder, for use in the Mindustry Classic app?
 quit.confirm = Jsi si jistý že chceš ukončit ?
-quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
+quit.confirm.tutorial = Jste si vážně jist?\nTutoriál se dá znovu spustit v[accent] Nastavení->Hra->Spusť Tutoriál.[]
 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
+wave.waveInProgress = [LIGHT_GRAY]Vlna v pohybu
 waiting = [LIGHT_GRAY]Čekám...
 waiting.players = Čekání na hráče...
 wave.enemies = [LIGHT_GRAY]{0} Nepřátel zbývá
@@ -186,10 +206,15 @@ custom = Vlastní
 builtin = Zabudovaný
 map.delete.confirm = Jsi si jistý žechceš tuto mapu smazat? tato akce je nevratná!
 map.random = [accent]Náhodná mapa
-map.nospawn = Tato mapa nemá žádná jádra pro hráče ke spawnutí! přidej[ROYAL] blue[] jádro na tuto mapu v editoru.
-map.nospawn.pvp = Tato mapa nemá žádné nepřátelské jádra pro hráče ke spawnutí! přidej[SCARLET] red[] jádro na tuto mapu v editoru.
-map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn = Tato mapa nemá žádné jádro pro hráče ke spawnutí! Přidej v editoru do této mapy[ROYAL] modré[] jádro.
+map.nospawn.pvp = Tato mapa nemá žádné nepřátelské jádro pro druhého hráče! Přidej v editoru do této mapy[SCARLET] červené[] jádro.
+map.nospawn.attack = Tato mapa nemá žádná nepřátelská jádra ke zničení! Přidej v editoru do této mapy [SCARLET] červené[] jádro.
 map.invalid = Chyba v načítání mapy: poškozený nebo neplatný soubor mapy.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Štětec
 editor.openin = Otevřít v editoru.
 editor.oregen = Generovat nerostné zdroje.
@@ -197,11 +222,14 @@ editor.oregen.info = Generování nerostných zdrojů:
 editor.mapinfo = Informace o mapě
 editor.author = Autor:
 editor.description = Popis:
-editor.waves = Waves:
-editor.rules = Rules:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
+editor.waves = Vln:
+editor.rules = Pravidla:
 editor.generation = Generation:
 editor.ingame = Edit In-Game
-editor.newmap = New Map
+editor.publish.workshop = Publish On Workshop
+editor.newmap = Nová mapa
+workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
 waves.never = <never>
@@ -218,6 +246,7 @@ waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]<Default>
+details = Details...
 edit = Edit...
 editor.name = Jméno:
 editor.spawn = Spawn Unit
@@ -227,6 +256,7 @@ editor.errorload = Error loading file:\n[accent]{0}
 editor.errorsave = Error saving file:\n[accent]{0}
 editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined.
 editor.update = Update
@@ -259,6 +289,7 @@ editor.resizemap = Změnit velikost mapy
 editor.mapname = Jméno mapy:
 editor.overwrite = [accent]Varování!\nToto přepíše již existující mapu.
 editor.overwrite.confirm = [scarlet]Varování![] Mapa s tímto jménem již existuje. Jsi si jistý že ji chceš přepsat?
+editor.exists = A map with this name already exists.
 editor.selectmap = Vyber mapu k načtení:
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Reach wave {0}\nto configure loadout.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
@@ -434,6 +466,7 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Životy
 blocks.buildtime = Build Time
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Nepřesnost/výchylka
 blocks.shots = Střely
 blocks.reload = Střely za sekundu
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Indikátor pro spojence
 setting.autotarget.name = Automaticky zaměřuje
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = žádný
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = SFX hlasitost
 setting.mutesound.name = Ztišit zvuky
 setting.crashreport.name = Poslat anonymní spis o zhroucení hry
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display In-Game Chat
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -530,8 +567,8 @@ category.general.name = Všeobecné
 category.view.name = Pohled
 category.multiplayer.name = Multiplayer
 command.attack = Útok
+command.rally = Rally
 command.retreat = Ústup
-command.patrol = Hlídkovat
 keybind.gridMode.name = Výběr bloků
 keybind.gridModeShift.name = Výběr kategorie
 keybind.press = Stiskni klívesu...
@@ -747,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Dopravník
 block.titanium-conveyor.name = Titániový dopravník
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Křižovatka
 block.router.name = Směrovač
 block.distributor.name = Distributor
 block.sorter.name = Dělička
+block.message.name = Message
 block.overflow-gate.name = Brána přetečení
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Tkalcovna pro fázovou tkaninu
@@ -868,7 +908,7 @@ unit.lich.name = Lich
 unit.reaper.name = Reaper
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
-tutorial.drill = Manuální zěžba je neefektivní.\n[accent]Vrty []budou těžit automaticky.\npolož jeden na měděnou rudu.
+tutorial.drill = Manuální těžba je neefektivní.\n[accent]Vrty []budou těžit automaticky.\npolož jeden na měděnou rudu.
 tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
 tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]Dopravníky[] jsou zapotřebí k dopravě materiálu k jádru.\nVytvoř řadu dopravníku od vrtu až k jádru.
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = Rychlý, udeř a uteč stíhací letoun.
 unit.ghoul.description = Těžký, kobercový bombardér.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Redukuje písek s vysoce čistým koksem za účelem výroby křemíku.
@@ -959,7 +1000,7 @@ block.surge-wall-large.description = Nejsilnější defenzivní blok.\nMá malou
 block.door.description = Malé dveře, které se dají otevřít nebo zavřít kliknutím na ně.\nKdyž otevřené nepřátelé mohou střílet a dostat se skrz.
 block.door-large.description = Velké dveře, které se dají otevřít nebo zavřít kliknutím na ně.\nKdyž otevřené nepřátelé mohou střílet a dostat se skrz.\nZabírá více polí.
 block.mender.description = Periodically repairs blocks in its vicinity. Keeps defenses repaired in-between waves.\nOptionally uses silicon to boost range and efficiency.
-block.mend-projector.description = Kontinuálně léčí bloky ve poli svého působení.
+block.mend-projector.description = Kontinuálně léčí bloky v poli svého působení.
 block.overdrive-projector.description = Zrychluje funkce blízkých struktůr jako jsou vrty a dopravníky.
 block.force-projector.description = Vytvoří okolo sebe šestihrané silové pole, chrání jednotky a budovy uvnitř sebe vůči střelám.
 block.shock-mine.description = Působí poškození nepřátelským jednotkám při sešlápnutí. Skoro neviditelné nepřáteli.
@@ -973,7 +1014,7 @@ block.router.description = Příijmá předměty z jednoho směru a posílá je
 block.distributor.description = Pokročilý směrovač, který z libovolného počtu vstupů vytvoří libovolný počet výstupu a rozdělí přísun předmětů rovnoměrně do každého z nich, obdoba Multiplexeru a Demultiplexeru.
 block.overflow-gate.description = Kombinace distributoru a děličky která má výstup do leva nebo do prava jen pokud je přední strana zablokovaná.
 block.mass-driver.description = Ultimátní blok přepravy předmětů. Sbírá několik druhů předmětů a vystřelí je k dalšímu hromadnému distributoru přes veliké vzdálenosti.
-block.mechanical-pump.description = Levná pumpa s pomalým tokem, ale nevyžaduje nergii k provozu.
+block.mechanical-pump.description = Levná pumpa s pomalým tokem, ale nevyžaduje energii k provozu.
 block.rotary-pump.description = Pokročilá pumpa která, zdvojnásobuje přísun tekutin za použití energie.
 block.thermal-pump.description = Ultimátní pumpa. Trojnásobně rychlejší než mechanická pumpa a jediná pumpa která dokáže pracovat s lávou.
 block.conduit.description = Základní blok přepravy tekutin. Funguje jako dopravník, ale na tekutiny, chápeš ne ? Užívá se s extraktory, pumpami nebo jiným potrubím.
@@ -998,7 +1039,7 @@ block.solar-panel-large.description = Poskytuje mnohem lepší zdroj energie ne
 block.thorium-reactor.description = Generuje obrovské množství energie z radioaktivního thoria. Vyžaduje konstantní chlazení. Způsobí velikou explozi je-li zásobován nedostatečným množstvím chlazení. Výstup energie závisí na plnosti obsahu generátoru, základní generování energie se aktivuje při poloviční kapacitě.
 block.impact-reactor.description = An advanced generator, capable of creating massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
 block.mechanical-drill.description = Levný vrt. Při položení na vhodné pole, natrvalo a pomalu produkuje materiál na který byl položen.
-block.pneumatic-drill.description = Vylepšený vrt, který je rychlejší a je schopen zpracovat trdší materiály za pomocí tlaku.
+block.pneumatic-drill.description = Vylepšený vrt, který je rychlejší a je schopen zpracovat tvrdší materiály za pomocí tlaku.
 block.laser-drill.description = Dovoluje vrtat ještě rychleji díky laserové technologii, požaduje energii k provozu. Dodatečně, dokáže vrtat žíly radioaktivního thoria.
 block.blast-drill.description = Ultimátní vrt, vyžaduje velké množství energie k provozu.
 block.water-extractor.description = Extrahuje vodu ze země. Vhodný k použití když se v oblasti nenachází zdroj vody.

core/assets/bundles/bundle_de.properties

@@ -48,9 +48,18 @@ minimap = Minimap
 close = Schließen
 website = Website
 quit = Verlassen
+save.quit = Save & Quit
 maps = Karten
+maps.browse = Browse Maps
 continue = Weiter
 maps.none = [LIGHT_GRAY]Keine Karten gefunden!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Info
 name = Name:
 noname = Wähle zuerst einen[accent] Spielernamen[].
@@ -65,12 +74,14 @@ players = {0} Spieler online
 players.single = {0} Spieler online
 server.closing = [accent]Schließe den Server ...
 server.kicked.kick = Du wurdest vom Server gekickt!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server geschlossen.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Veralteter Client! Aktualisiere dein Spiel!
 server.kicked.serverOutdated = Veralteter Server! Bitte den Host um ein Update!
 server.kicked.banned = Du wurdest vom Server verbannt.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Du wurdest gerade gekickt.\nWarte bevor du dich wieder verbindest.
 server.kicked.nameInUse = Es ist bereits ein Spieler \nmit diesem Namen auf dem Server.
 server.kicked.nameEmpty = Dein Name muss mindestens einen Buchstaben oder eine Zahl enthalten.
@@ -81,11 +92,13 @@ server.versions = Deine Version:[accent] {0}[]\nServerversion:[accent] {1}[]
 host.info = Der [accent]host[]-Knopf startet einen Server auf den Ports [scarlet]6567[] und [scarlet]6568.[]\nJeder im gleichen [LIGHT_GRAY]W-Lan oder lokalem Netzwerk[] sollte deinen Server in seiner Server Liste sehen können.\n\nWenn du Leuten die Verbindung über IP ermöglichen willst, benötigst du [accent]Port-Forwarding[].\n\n[LIGHT_GRAY]Hinweis: Falls es Probleme mit der Verbindung im Netzwerk gibt, stell sicher, dass Mindustry in deinen Firewall Einstellungen Zugriff auf das lokale Netzwerk hat.
 join.info = Hier kannst du eine [accent]Server-IP[] eingeben um dich zu verbinden oder Server im [accent]lokalem Netzwerk[] entdecken und dich mit ihnen verbinden.\nSowohl Spielen über das lokale Netzwerk als auch Spielen über das Internet werden unterstützt.\n\n[LIGHT_GRAY]Hinweis: Es gibt keine globale Server Liste; Wenn du dich mit jemand per IP verbinden willst musst du den Host nach seiner IP fragen.
 hostserver = Server hosten
+invitefriends = Invite Friends
 hostserver.mobile = Host\nSpiel
 host = Host
 hosting = [accent] Server wird geöffnet ...
 hosts.refresh = Aktualisieren
 hosts.discovering = Suche nach LAN-Spielen
+hosts.discovering.any = Discovering games
 server.refreshing = Server wird aktualisiert
 hosts.none = [lightgray] Keine LAN-Spiele gefunden!
 host.invalid = [scarlet] Kann keine Verbindung zum Host herstellen.
@@ -109,13 +122,18 @@ server.version = [lightgray]Version: {0}
 server.custombuild = [yellow]Benutzerdefinierter Build
 confirmban = Bist du sicher, dass du diesen Spieler verbannen möchtest?
 confirmkick = Bist du sicher, dass du diesen Spieler kicken willst?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Bist du sicher, dass du die Verbannung des Spielers rückgängig machen willst?
 confirmadmin = Bist du sicher, dass du diesen Spieler zu einem Admin machen möchtest?
 confirmunadmin = Bis du sicher, dass dieser Spieler kein Admin mehr sein soll?
 joingame.title = Spiel beitreten
 joingame.ip = IP:
 disconnect = Verbindung unterbrochen.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Fehler beim Laden der Welt!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent] Verbinde...
 connecting.data = [accent] Welt wird geladen...
 server.port = Port:
@@ -141,6 +159,7 @@ save.rename = Umbenennen
 save.rename.text = Neuer Name
 selectslot = Wähle einen Spielstand
 slot = [accent] Platz {0}
+editmessage = Edit Message
 save.corrupted = [accent] Datei beschädigt oder ungültig!
 empty = <leer>
 on = An
@@ -148,12 +167,13 @@ off = Aus
 save.autosave = Automatisches Speichern: {0}
 save.map = Karte: {0}
 save.wave = Welle: {0}
-save.difficulty = Schwierigkeitsgrad: {0}
+save.mode = Gamemode: {0}
 save.date = Zuletzt gespeichert: {0}
 save.playtime = Spielzeit: {0}
 warning = Warnung.
 confirm = Bestätigen
 delete = Löschen
+view.workshop = View In Workshop
 ok = OK
 open = Öffnen
 customize = Anpassen
@@ -190,6 +210,11 @@ map.nospawn = Diese Karte hat keine Kerne in denen die Spieler beginnen können!
 map.nospawn.pvp = Diese Karte hat keine gegnerischen Kerne wo Gegner starten könnten! Füge über den Editor [SCARLET] rote[] Kerne zu dieser Karte hinzu.
 map.nospawn.attack = Diese Karte hat keine gengnerischen Kerne, die Spieler angreifen können! Füge über den Editor [SCARLET] rote[] Kerne zu dieser Karte hinzu.
 map.invalid = Fehler beim Laden der Karte: Beschädigtes oder ungültige Karten Datei.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Pinsel
 editor.openin = Öffne im Editor
 editor.oregen = Erze generieren
@@ -197,11 +222,14 @@ editor.oregen.info = Erze generiert:
 editor.mapinfo = Karten Info
 editor.author = Autor:
 editor.description = Beschreibung:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Wellen:
 editor.rules = Regeln:
 editor.generation = Generator:
 editor.ingame = Im Spiel Bearbeiten
+editor.publish.workshop = Publish On Workshop
 editor.newmap = Neue Karte
+workshop = Workshop
 waves.title = Wellen
 waves.remove = Entfernen
 waves.never = <nie>
@@ -218,6 +246,7 @@ waves.invalid = Ungültige Wellen in der Zwischenablage.
 waves.copied = Wellen kopiert.
 waves.none = Keine Gegner definiert.\nInfo: Leere Wellen Entwürfe werden automatisch mit dem Standard-Entwurf ersetzt.
 editor.default = [LIGHT_GRAY]<Standard>
+details = Details...
 edit = Bearbeiten...
 editor.name = Name:
 editor.spawn = Spawn Bereich
@@ -227,6 +256,7 @@ editor.errorload = Fehler beim Laden der Datei:\n[accent]{0}
 editor.errorsave = Fehler beim Speichern der Datei:\n[accent]{0}
 editor.errorimage = Das ist ein Bild, keine Karte. Wechsel nicht den Dateityp und erwarte, dass es funktioniert.\n\nWenn du eine alte Karte importieren möchtest, benutze den 'Importiere Terrain Bild' Knopf in dem Editor.
 editor.errorlegacy = Diese Karte ist zu alt und benutzt ein veraltetes Karten Format, das nicht mehr unterstützt wird.
+editor.errornot = This is not a map file.
 editor.errorheader = Diese Karte ist entweder nicht gültig oder beschädigt.
 editor.errorname = Karte hat keinen Namen.
 editor.update = Aktualisieren
@@ -259,6 +289,7 @@ editor.resizemap = Größe der Karte ändern
 editor.mapname = Karten Name
 editor.overwrite = [accent] Warnung! Dies überschreibt eine vorhandene Karte.
 editor.overwrite.confirm = [scarlet]Warnung![] Eine Karte mit diesem Namen existiert bereits. Bist du sicher, dass du sie überschreiben willst?
+editor.exists = A map with this name already exists.
 editor.selectmap = Wähle eine Karte zum Laden:
 toolmode.replace = Ersetzen
 toolmode.replace.description = Zeichnet nur auf festen Blöcken.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Freischalten
 configure = Startitems festlegen
 configure.locked = [LIGHT_GRAY]Erreiche Welle {0}\n, um Startitems festlegen zu können.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} freigeschaltet.
 zone.requirement.complete = Welle {0} erreicht:\n{1} Anforderungen der Zone erfüllt.
 zone.config.complete = Welle {0} erreicht:\nFestlegen von Startitems freigeschaltet.
@@ -434,6 +466,7 @@ blocks.boosteffect = Verstärkungseffekt
 blocks.maxunits = Max aktive Einheiten
 blocks.health = Lebenspunkte
 blocks.buildtime = Baudauer
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Ungenauigkeit
 blocks.shots = Schüsse
 blocks.reload = Schüsse/Sekunde
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Bohrgeschwindigkeit: {0}/s
 bar.efficiency = Effizienz: {0}%
 bar.powerbalance = Strom: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Strom: {0}
 bar.poweroutput = Strom Output: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Flüssigkeit
 bar.heat = Hitze
 bar.power = Strom
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (Neustart erforderlich)[]
 setting.indicators.name = Verbündeten-Indikatoren
 setting.autotarget.name = Auto-Zielauswahl
 setting.keyboard.name = Maus+Tastatur Steuerung
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = kein
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = Audioeffekt-Lautstärke
 setting.mutesound.name = Audioeffekte stummschalten
 setting.crashreport.name = Anonyme Absturzberichte senden
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Deckkraft
 setting.playerchat.name = Chat im Spiel anzeigen
 uiscale.reset = UI-Skalierung wurde geändert.\nDrücke "OK", um diese Skalierung zu bestätigen.\n[scarlet]Zurückkehren und Beenden in[accent] {0}[] Einstellungen...
@@ -530,8 +567,8 @@ category.general.name = Allgemein
 category.view.name = Ansicht
 category.multiplayer.name = Mehrspieler
 command.attack = Angreifen
+command.rally = Rally
 command.retreat = Rückzug
-command.patrol = Patrouillieren
 keybind.gridMode.name = Block Auswahl
 keybind.gridModeShift.name = Kategorie auswählen
 keybind.press = Drücke eine Taste...
@@ -747,10 +784,13 @@ block.hail.name = Streuer
 block.lancer.name = Lanzer
 block.conveyor.name = Förderband
 block.titanium-conveyor.name = Titan-Förderband
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Kreuzung
 block.router.name = Verteiler
 block.distributor.name = Großer Verteiler
 block.sorter.name = Sortierer
+block.message.name = Message
 block.overflow-gate.name = Überlauftor
 block.silicon-smelter.name = Silizium-Schmelzer
 block.phase-weaver.name = Phasenweber
@@ -866,26 +906,26 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.next = [lightgray]<Tap to continue>
-tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
-tutorial.drill = Manuelles Abbauen von Ressourcen ist ineffizient.\n[accent]Bohrer[] können automatisch abbauen.\n Platziere einen auf einem Kupfer Vorkommen.
-tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
-tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
-tutorial.conveyor = [accent]Transportbänder[] werden dazu benutzt Materialien zum Kern zu transportieren.\n Erstelle eine Reihe von Transportbändern zum Kern.
-tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
+tutorial.next = [lightgray]<Tippen um fortzufahren>
+tutorial.intro = Du befindest dich im[scarlet] Mindustry-Tutorial.[]\nBeginne, indem du[accent] Kupfer abbaust[]. Tippe dazu auf ein Kupfervorkommen in der Nähe deiner Basis.\n\n[accent]{0}/{1} Kupfer
+tutorial.drill = Manuelles Abbauen ist ineffizient.\n[accent]Bohrer []können automatisch abbauen.\nTippe auf den Bohrer Tab unten rechts.\nWähle den[accent] Mechanischen Bohrer[].\nPlatziere ihn durch Tippen auf ein Kupfervorkommen.\nMit einem [accent]Rechtsklick[] brichst du den Bau ab.
+tutorial.drill.mobile = Manuelles Abbauen ist ineffizient.\n[accent]Bohrer []können automatisch abbauen.\nTippe auf den Bohrer Tab unten rechts.\nWähle den[accent] Mechanischen Bohrer[].\nPlatziere ihn durch Tippen auf ein Kupfervorkommen, dann klicke auf das[accent] Häkchen[] unten um deine Auswahl zu bestätigen.\nKlicke auf den[accent] X-Button[] um den Bau abzubrechen.
+tutorial.blockinfo = Jeder Block hat unterschiedliche Eigenschaften. Jeder Bohrer kann immer nur ein bestimmtes Material abbauen.\nFür Infos und Stats eines Blocks wähle einen Block im Baumenü aus und [accent] klicke auf den "?"-Button.[]\n\n[accent]Schau dir jetzt die Stats des Mechanischen Bohrers an.[]
+tutorial.conveyor = Mit [accent]Förderbändern[] werden Materialien zum Kern transportiert.\nReihe mehrere Förderbänder aneinander bis zum Kern.
+tutorial.conveyor.mobile = Mit [accent]Förderbändern[] werden Materialien zum Kern transportiert.\nReihe mehrere Förderbänder aneinander bis zum Kern.\n[accent] Zum Bau in einer Reihe lasse deinen Finger für einige Sekunden gedrückt[] und ziehe ihn in eine beliebige Richtung.\n\n[accent]{0}/{1} Förderbänder in Reihe erstellt\n[accent]0/1 Ressourcen transportiert.
 tutorial.turret = Verteidigungsgebäude müssen gebaut werden um[LIGHT_GRAY] Gegner[] abzuwehren.\nBaue einen Duo Geschützturm in die Nähe deiner Basis.
 tutorial.drillturret = Duo Geschütztürme benötigen[accent] Kupfermunition, []um schießen zu können.\nPlatziere neben das Geschütz einen Bohrer, um ihn mit Kupfer zu versorgen.
-tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
-tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
-tutorial.unpause = Now press space again to unpause.
-tutorial.unpause.mobile = Now press it again to unpause.
-tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
-tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
-tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
-tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
-tutorial.waves = Der [LIGHT_GRAY] Gegner[] greift an.\n\nVerteidige deinen Kern 2 Wellen lang. Bau mehr Türme.
-tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
-tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese resources can then be used to research new technology.\n\n[accent]Press the launch button.
+tutorial.pause = Du kannst das Spiel jederzeit [accent]pausieren.[]\nIn einer Pause kannst du den Bau weiterer Gebäude in Auftrag geben.\n\n[accent]Drücke die Leertaste um zu pausieren.
+tutorial.pause.mobile = Du kannst das Spiel jederzeit [accent]pausieren.[]\nIn einer Pause kannst du den Bau weiterer Gebäude in Auftrag geben.\n\n[accent]Drücke diesen Button oben links um zu pausieren.
+tutorial.unpause = Drücke die Leertaste erneut um das Spiel fortzusetzen.
+tutorial.unpause.mobile = Drücke ihn erneut um das Spiel fortzusetzen.
+tutorial.breaking = Oft kommt es vor, dass Blöcke zerstört werden müssen.\n[accent]Halte die rechte Maustaste gedrückt[] während du eine Fläche auswählst. Dadurch werden alle Blöcke darin zerstört.[]\n\n[accent]Zerstöre alle Schrott-Blöcke links neben deinem Kern mithilfe der Flächenauswahl.
+tutorial.breaking.mobile = Oft kommt es vor, dass Blöcke zerstört werden müssen.\n[accent]Wähle den Abbau-Modus[], dann wähle einen Block um ihn zu zerstören.\nZerstöre eine Fläche indem du deinen Finger einige Sekunden gedrückt hältst[] und in eine beliebige Richtung ziehst.\nTippe auf das Häkchen um den Rückbau zu bestätigen.\n\n[accent]Zerstöre all Schrott-Blöcke links des Kerns mithilfe der Flächenauswahl.
+tutorial.withdraw = Einige Situationen erfordern, dass Materialien direkt aus den Blöcken aufgenommen werden.\nUm dies zu tun, [accent]tippe auf einen Block[] mit Materialien dann [accent]tippe auf das Material[] in diesem Block.\nUm mehrere Materialien zu entnehmen [accent]tippe darauf und halte die Maustaste gedrückt[].\n\n[accent]Entnimm etwas Kupfer vom Kern.[]
+tutorial.deposit = Materialien können in Blöcke abgelegt werden, indem du sie dorthin ziehst.\n\n[accent]Lege das Kupfer zurück in den Kern.[]
+tutorial.waves = Der [LIGHT_GRAY]Gegner[] greift an.\n\nVerteidige deinen Kern 2 Wellen lang. Baue mehr Türme.
+tutorial.waves.mobile = Der[lightgray] Gegner[] greift an.\n\nVerteidige deinen Kern 2 Wellen lang. Dein Schiff feuert automatisch auf Gegner.\nBaue mehr Geschütztürme und Bohrer. Baue mehr Kupfer ab.
+tutorial.launch = Sobald du eine bestimmte Welle erreicht hast, kannst du die [accent]Mission abschließen[]. Dadurch lässt du deine Basis zurück[accent] und überträgst alle Ressourcen in deinen Kern.[]\nDiese Ressourcen können zur Erforschung neuer Technologien eingesetzt werden.\n\n[accent]Drücke nun den Abschluss-Button.
 item.copper.description = Ein nützliches Material. Wird in allen Arten von Blöcken verwendet.
 item.lead.description = Ein grundlegendes Material. Häufig in Elektronik und Flüssigkeits-Transport-Blöcken verwendet.
 item.metaglass.description = Eine extrem harte Glasmischung. Wird zur Verteilung und Lagerung von Flüssigkeiten benutzt.
@@ -925,6 +965,7 @@ unit.eruptor.description = Ein schwerer Mech, der Strukturen abbaut. Feuert eine
 unit.wraith.description = Eine schneller Abfangjäger.
 unit.ghoul.description = Ein schwerer Flächenbomber.
 unit.revenant.description = Eine schwere, schwebende Raketengruppe.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Komprimiert Kohlestücke zu reinen Graphitplatten.
 block.multi-press.description = Eine aktualisierte Version der Graphitpresse. Setzt Wasser und Strom ein, um Kohle schnell und effizient zu verarbeiten.
 block.silicon-smelter.description = Reduziert Sand mit hochreinem Kohlenstoff, um Silizium zu produzieren.
@@ -973,7 +1014,7 @@ block.router.description = Akzeptiert Materialien aus einer Richtung und leitet
 block.distributor.description = Ein weiterentwickelter Verteiler, der Materialien in bis zu sieben Richtungen gleichmäßig verteilt.
 block.overflow-gate.description = Ein Verteiler, der nur Materialien nach links oder rechts ausgibt, falls der Weg gerade aus blockiert ist.
 block.mass-driver.description = Ultimativer Transportblock. Sammelt mehrere Materialien und schießt sie zu einem verbundenen Massenbeschleuniger über eine große Reichweite.
-block.mechanical-pump.description = Eine günstige, langsame Pumpe, die keine Strom benötigt.
+block.mechanical-pump.description = Eine günstige, langsame Pumpe, die keinen Strom benötigt.
 block.rotary-pump.description = Eine fortgeschrittene Pumpe, die mithilfe von Strom doppelt so schnell pumpt.
 block.thermal-pump.description = Die ultimative Pumpe, dreimal so schnell wie eine mechanische Pumpe und die einzige Pumpe, die Lava fördern kann.
 block.conduit.description = Standard Flüssigkeits-Transportblock. Funktioniert wie ein Förderband, nur für Flüssigkeiten. Wird am Besten mit Extraktoren, Pumpen oder anderen Kanälen benutzt.

core/assets/bundles/bundle_es.properties

@@ -48,9 +48,18 @@ minimap = Minimapa
 close = Cerrar
 website = Sitio web
 quit = Salir
+save.quit = Save & Quit
 maps = Mapas
+maps.browse = Browse Maps
 continue = Continuar
 maps.none = [LIGHT_GRAY]¡No se han encontrado mapas!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Acerca de
 name = Nombre:
 noname = Elige un[accent] nombre de jugador[] primero.
@@ -65,12 +74,14 @@ players = {0} jugadores online
 players.single = {0} jugador online
 server.closing = [accent]Cerrando servidor...
 server.kicked.kick = ¡Has sido expulsado del servidor!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = El servidor ha cerrado.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = ¡Cliente desactualizado! ¡Actualiza tu juego!
 server.kicked.serverOutdated = ¡Servidor desactualizado! ¡Pídele al anfitrión que lo actualice!
 server.kicked.banned = Has sido baneado del servidor.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Has sido expulsado recientemente.\nEspera para poder conectarte de nuevo.
 server.kicked.nameInUse = Ya hay alguien con ese\nnombre en el servidor.
 server.kicked.nameEmpty = Tu nombre debe por lo menos contener un carácter o número.
@@ -81,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nVersión del servidor:[accent] {1
 host.info = El botón [accent]host[] hostea un servidor en el puerto [scarlet]6567[]. \nCualquier persona en la misma [LIGHT_GRAY]wifi o red local[] debería poder ver tu servidor en la lista de servidores.\n\nSi quieres que cualquier persona se pueda conectar de cualquier lugar por IP, la [accent]asignación de puertos[] es requerida.\n\n[LIGHT_GRAY]Nota: Si alguien experimenta problemas conectándose a tu partida LAN, asegúrate de permitir a Mindustry acceso a tu red local mediante la configuración de tu firewall.
 join.info = Aquí, puedes escribir la [accent]IP de un server[] para conectarte, o descubrir servidores de [accent]red local[] para conectarte.\nLAN y WAN es soportado para jugar en multijugador.\n\n[LIGHT_GRAY]Nota: No hay una lista automática global de servidores; si quieres conectarte por IP, tendrás que preguntarle al anfitrión por la IP.
 hostserver = Hostear Servidor
+invitefriends = Invite Friends
 hostserver.mobile = Hostear\nJuego
 host = Hostear
 hosting = [accent]Abriendo servidor...
 hosts.refresh = Actualizar
 hosts.discovering = Descubrir partidas LAN
+hosts.discovering.any = Discovering games
 server.refreshing = Actualizando servidor...
 hosts.none = [lightgray]¡No se han encontrado partidas LAN!
 host.invalid = [scarlet]No se ha podido conectar al anfitrión.
@@ -109,13 +122,18 @@ server.version = [lightgray]Versión: {0}
 server.custombuild = [yellow]Versión personalizada
 confirmban = ¿Estás seguro de querer banear este jugador?
 confirmkick = ¿Estás seguro de querer expulsar este jugador?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = ¿Estás seguro de querer desbanear este jugador?
 confirmadmin = ¿Estás seguro de querer hacer administrador a este jugador?
 confirmunadmin = ¿Estás seguro de querer quitar los permisos de administrador a este jugador?
 joingame.title = Unirse a la partida
 joingame.ip = IP:
 disconnect = Desconectado.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = ¡Se ha fallado la carga de datos del mundo!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Conectando...
 connecting.data = [accent]Cargando datos del mundo...
 server.port = Puerto:
@@ -141,6 +159,7 @@ save.rename = Renombrar
 save.rename.text = Nuevo nombre:
 selectslot = Selecciona un Punto de Guardado.
 slot = [accent]Casilla {0}
+editmessage = Edit Message
 save.corrupted = [accent]¡El punto de guardado está corrupto o es inválido!\nSi acabas de actualizar el juego, esto debe ser probablemente un cambio en el formato de guardado y[scarlet] no[] un error.
 empty = <vacío>
 on = Encendido
@@ -148,12 +167,13 @@ off = Apagado
 save.autosave = Autoguardado: {0}
 save.map = Mapa: {0}
 save.wave = Oleada {0}
-save.difficulty = Dificultad: {0}
+save.mode = Gamemode: {0}
 save.date = Última vez guardado: {0}
 save.playtime = Tiempo de juego: {0}
 warning = Aviso.
 confirm = Confirmar
 delete = Borrar
+view.workshop = View In Workshop
 ok = OK
 open = Abrir
 customize = Personalizar
@@ -190,6 +210,11 @@ map.nospawn = ¡Este mapa no tiene ningún núcleo en el cual pueda aparecer el
 map.nospawn.pvp = ¡Este mapa no tiene ningún núcleo enemigo para que aparezca el jugador! Añade un núcleo[SCARLET] red[] a este mapa en el editor.
 map.nospawn.attack = ¡Este mapa no tiene núcleos para que el jugador ataque! Añade núcleos[SCARLET] red[] a este mapa en el editor.
 map.invalid = Error cargando el mapa: archivo corrupto o inválido.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Pincel
 editor.openin = Abrir en el Editor
 editor.oregen = Generación de Minerales
@@ -197,11 +222,14 @@ editor.oregen.info = Generación de Minerales:
 editor.mapinfo = Info del Mapa
 editor.author = Autor:
 editor.description = Descripción:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Oleadas:
 editor.rules = Normas:
 editor.generation = Generación:
 editor.ingame = Editar dentro del juego
+editor.publish.workshop = Publish On Workshop
 editor.newmap = Nuevo Mapa
+workshop = Workshop
 waves.title = Oleadas
 waves.remove = Borrar
 waves.never = <nunca>
@@ -218,6 +246,7 @@ waves.invalid = Oleadas inválidaas en el portapapeles.
 waves.copied = Oleadas copiadas.
 waves.none = No hay enemigos definidos.\nNótese que las listas de oleadas vacías se sustituirán por la lista por defecto.
 editor.default = [LIGHT_GRAY]<Por defecto>
+details = Details...
 edit = Editar...
 editor.name = Nombre:
 editor.spawn = Spawn Unit
@@ -227,6 +256,7 @@ editor.errorload = Error cargando el archivo:\n[accent]{0}
 editor.errorsave = Error guardando el archivo:\n[accent]{0}
 editor.errorimage = Eso es una imagen, no un mapa. No cambies las extensiones del archivo esperando que funcione.\nSi quieres importar un mapa viejo, usa el botón de 'import legacy map' en el editor.
 editor.errorlegacy = Este mapa es demasiado viejo y usa un formato de mapa que ya no es soportado.
+editor.errornot = This is not a map file.
 editor.errorheader = Este mapa es inválido o está corrupto.
 editor.errorname = El mapa no tiene un nombre definido.
 editor.update = Actualizar
@@ -259,6 +289,7 @@ editor.resizemap = Cambiar Tamaño del Mapa
 editor.mapname = Nombre del Mapa:
 editor.overwrite = [accent]¡Advertencia!\nEsto sobrescribe un mapa ya existente.
 editor.overwrite.confirm = [scarlet]¡Advertencia![] Un mapa con ese nombre ya existe. ¿Estás seguro de querer sobrescribirlo?
+editor.exists = A map with this name already exists.
 editor.selectmap = Selecciona un mapa para cargar:
 toolmode.replace = Sustituir
 toolmode.replace.description = Solo dibuja en bloques sólidos.
@@ -338,6 +369,7 @@ launch.skip.confirm = Si saltas la oleada ahora, no podrás lanzar recursos hast
 uncover = Descubrir
 configure = Configurar carga inicial
 configure.locked = [LIGHT_GRAY]Alcanza la oleada {0}\npara configurar la carga inicial.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} desbloqueado.
 zone.requirement.complete = Oleada {0} alcanzada:\nrequerimientos de la zona {1} cumplidos.
 zone.config.complete = Oleada {0} alcanzada:\nconfiguración de carga inicial desbloqueada.
@@ -434,6 +466,7 @@ blocks.boosteffect = Efecto del Potenciador
 blocks.maxunits = Máximo de Unidades Activas
 blocks.health = Vida
 blocks.buildtime = Tiempo de construcción
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Imprecisión
 blocks.shots = Disparos
 blocks.reload = Recarga
@@ -442,9 +475,11 @@ bar.drilltierreq = Se requiere un mejor taladro.
 bar.drillspeed = Velocidad del Taladro: {0}/s
 bar.efficiency = Eficiencia: {0}%
 bar.powerbalance = Energía: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Energía: {0}
 bar.poweroutput = Salida de Energía: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Líquido
 bar.heat = Calor
 bar.power = Energía
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Indicadores de Aliados
 setting.autotarget.name = Auto apuntado
 setting.keyboard.name = Controles de Ratón+Teclado
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Máx FPS
 setting.fpscap.none = Nada
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = Volumen de los efectos de sonido
 setting.mutesound.name = Silenciar Sonido
 setting.crashreport.name = Enviar informes de fallos anónimos
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Opacidad del Chat
 setting.playerchat.name = Display In-Game Chat
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
@@ -530,8 +567,8 @@ category.general.name = General
 category.view.name = Visión
 category.multiplayer.name = Multijugador
 command.attack = Atacar
+command.rally = Rally
 command.retreat = Retirarse
-command.patrol = Patrullar
 keybind.gridMode.name = Selección de Bloque
 keybind.gridModeShift.name = Selección de Categoría
 keybind.press = Presiona una tecla...
@@ -609,7 +646,7 @@ item.coal.name = Carbón
 item.graphite.name = Grafito
 item.titanium.name = Titanio
 item.thorium.name = Torio
-item.silicon.name = Silicona
+item.silicon.name = Silicio
 item.plastanium.name = Plastanio
 item.phase-fabric.name = Tejido de fase
 item.surge-alloy.name = Aleación Eléctrica
@@ -747,12 +784,15 @@ block.hail.name = Granizo
 block.lancer.name = Lancero
 block.conveyor.name = Cinta Transportadora
 block.titanium-conveyor.name = Cinta Transportadora de Titanio
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Cruce
 block.router.name = Enrutador
 block.distributor.name = Distribuidor
 block.sorter.name = Clasificador
+block.message.name = Message
 block.overflow-gate.name = Compuerta de Desborde
-block.silicon-smelter.name = Horno para Silicona
+block.silicon-smelter.name = Horno para Silicio
 block.phase-weaver.name = Tejedor de Fase
 block.pulverizer.name = Pulverizador
 block.cryofluidmixer.name = Mezclador de Criogénicos
@@ -925,13 +965,14 @@ unit.eruptor.description = Un mecanoide pesado diseñado para destruir estructur
 unit.wraith.description = Una unidad interceptora rápida.
 unit.ghoul.description = Una unidad bombardera pesada. Usa compuesto explosivo o pirotita como munición.
 unit.revenant.description = Una unidad aérea pesada con misiles.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Comprime carbón en piezas de grafito puro.
 block.multi-press.description = Una versión mejorada de la prensa de grafito. Utiliza agua y energía para procesar carbón rápida y eficientemente.
-block.silicon-smelter.description = Reduce arena con coque de alta pureza para producir silicona.
+block.silicon-smelter.description = Reduce la arena con carbón puro. Produce silicio.
 block.kiln.description = Funde arena y plomo en metacristal. Requiere cantidades pequeñas de energía.
 block.plastanium-compressor.description = Produce plastanio con aceite y titanio.
 block.phase-weaver.description = Produce tejido de fase del torio radioactivo y altas cantidades de arena.
-block.alloy-smelter.description = Produce "surge alloy" con titanio, plomo, silicona y cobre.
+block.alloy-smelter.description = Produce "surge alloy" con titanio, plomo, silicio y cobre.
 block.cryofluidmixer.description = Combina agua y titanio en líquido criogénico, que es mucho más eficiente para enfriar.
 block.blast-mixer.description = Usa aceite para transformar pirotita en un objeto menos inflamable pero más explosivo: compuesto explosivo.
 block.pyratite-mixer.description = Mezcla carbón, plomo y arena en pirotita altamente inflamable.
@@ -958,7 +999,7 @@ block.surge-wall.description = El bloque defensivo más fuerte.\nTiene una peque
 block.surge-wall-large.description = El bloque defensivo más fuerte.\nTiene una pequeña probabilidad de disparar rayos al atacante.\nOcupa múltiplies casillas.
 block.door.description = Una puerta pequeña que puede ser abierta y cerrada tocándola.\nSi está abirta, los enemigos pueden moverse y disparar a través de ella.
 block.door-large.description = Una puerta grande que puede ser abierta y cerrada tocándola.\nSi está abirta, los enemigos pueden moverse y disparar a través de ella.\nOcupa múltiples casillas.
-block.mender.description = Repara bloques cercanos periódicamente. Mantiene a las defensas reparadas entre oleadas.Puede usar silicona opcionalmente para mejorar el alcance y la eficiencia.
+block.mender.description = Repara bloques cercanos periódicamente. Mantiene a las defensas reparadas entre oleadas. Puede usar silicio opcionalmente para mejorar el alcance y la eficiencia.
 block.mend-projector.description = Regenera edificios cercanos periódcamente.
 block.overdrive-projector.description = Aumenta la velocidad de edificios cercanos como taladros y transportadores.
 block.force-projector.description = Crea un área de fuerza hexagonal alrededor de él, protegiendo edificios y unidades dentro de él del daño de las balas.

core/assets/bundles/bundle_et.properties

@@ -48,9 +48,18 @@ minimap = Kaart
 close = Sule
 website = Website
 quit = Lahku
+save.quit = Save & Quit
 maps = Maailmad
+maps.browse = Browse Maps
 continue = Jätka
 maps.none = [LIGHT_GRAY]Ühtegi maailma ei leitud!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Info
 name = Nimi:
 noname = Valige[accent] nimi[] kõigepealt.
@@ -65,12 +74,14 @@ players = {0} mängijat mängus
 players.single = {0} mängija mängus
 server.closing = [accent]Serveri sulgemine...
 server.kicked.kick = Sind visati serverist välja!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server suletud.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Aegunud versioon! Uuenda oma mängu!
 server.kicked.serverOutdated = Aegunud server! Palu omanikul serverit uuendada!
 server.kicked.banned = Sul on keeld seal mängida.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Sind visati hiljuti välja.\nOota natuke enne uuesti proovimist.
 server.kicked.nameInUse = Keegi sellise nimega\non juba seal serveris.
 server.kicked.nameEmpty = Sinu valitud nimi ei sobi.
@@ -81,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = [accent]Hosti[] nupp avab serveri pordil [scarlet]6567[]. \nIgaüks samas [LIGHT_GRAY]wifis või kohtvõrgus[] peaks nägema sinu serverit enda serverite nimekirjas.\n\nKui sa tahad, et inimesed saaksid kõikjalt IP aadressi abil liituda, [accent]portide edasisuunamine[] on vajalik.\n\n[LIGHT_GRAY]Märkus: Kui kellelgi on probleeme sinu LAN-mänguga liitumisel, siis tee kindlaks, et sul on Mindustry lubatud oma kohtvõrgus tulemüüri seadetes.
 join.info = Siin saad lisada [accent]serveri IP aadressi[] millega liituda, või leida [accent]kohtvõrgu[] servereid millega liituda.\nNii LAN kui ka WAN mitmikmängu toetatakse.\n\n[LIGHT_GRAY]Märkus: Ei ole olemas automaatset üldist serverite listi; kui sa tahad kellegagi liituda IP-aadressiga on sul vaja omaniku IP-aadressi.
 hostserver = Hosti Mäng
+invitefriends = Invite Friends
 hostserver.mobile = Hosti\nMäng
 host = Hosti
 hosting = [accent]Serveri avamine...
 hosts.refresh = Värskenda
 hosts.discovering = LAN mängude otsimine
+hosts.discovering.any = Discovering games
 server.refreshing = Serveri värskendamine
 hosts.none = [lightgray]Kohalikke mänge ei leitud!
 host.invalid = [scarlet]Serveriga ei saa ühendust.
@@ -109,13 +122,18 @@ server.version = [lightgray]Versioon: {0} {1}
 server.custombuild = [yellow]Kohandatud Versioon
 confirmban = Oled kindel, et soovid mängjale anda keelu siin mängida?
 confirmkick = Oled kindel, et soovid mängijat välja visata?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Oled kindel, et soovid sellel mängijal siin uuesti lubada mängida?
 confirmadmin = Oled kindel, et soovid mängijale adminstraatori õigused anda?
 confirmunadmin = Oled kindel, et soovid mängijalt adminstraatori õigused ära võtta?
 joingame.title = Liitu Mänguga
 joingame.ip = Aadress:
 disconnect = Lahti ühendatud.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Ebaõnnestus maailma andmeid alla laadida!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Ühendamine...
 connecting.data = [accent]Laen maailma andmeid alla...
 server.port = Port:
@@ -141,6 +159,7 @@ save.rename = Nimeta ümber
 save.rename.text = Uus nimi:
 selectslot = Vali salvestus.
 slot = [accent]Koht {0}
+editmessage = Edit Message
 save.corrupted = [accent]See salvestus on ära rikutud!\nKui sa just uuendasid mängu, siis on probleem tõenäoliselt kasutatavate salvestuste formaadi muutus ja [scarlet]mitte[] koodi viga. 
 empty = <tühi>
 on = Sees
@@ -148,12 +167,13 @@ off = Väljas
 save.autosave = Automaatne salvestamine: {0}
 save.map = Maailm: {0}
 save.wave = Raund {0}
-save.difficulty = Raskusaste: {0}
+save.mode = Gamemode: {0}
 save.date = Viimati Salvestatud: {0}
 save.playtime = Mänguaeg: {0}
 warning = Hoiatus.
 confirm = Kinnita
 delete = Kustuta
+view.workshop = View In Workshop
 ok = OK
 open = Ava
 customize = Kohanda
@@ -190,6 +210,11 @@ map.nospawn = This map does not have any cores for the player to spawn in! Add a
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-blue[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Brush
 editor.openin = Open In Editor
 editor.oregen = Ore Generation
@@ -197,11 +222,14 @@ editor.oregen.info = Ore Generation:
 editor.mapinfo = Maailma Info
 editor.author = Autor:
 editor.description = Kirjeldus:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Raundid:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.ingame = Edit In-Game
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = Raundid
 waves.remove = Eemalda
 waves.never = <never>
@@ -218,6 +246,7 @@ waves.invalid = Invalid waves in clipboard.
 waves.copied = Raundid kopeeritud.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]<Default>
+details = Details...
 edit = Muuda...
 editor.name = Nimi:
 editor.spawn = Spawn Unit
@@ -227,6 +256,7 @@ editor.errorload = Error loading file:\n[accent]{0}
 editor.errorsave = Error saving file:\n[accent]{0}
 editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Maailma nime pole täpsustatud.
 editor.update = Uuenda
@@ -259,6 +289,7 @@ editor.resizemap = Resize Map
 editor.mapname = Map Name:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
 editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
+editor.exists = A map with this name already exists.
 editor.selectmap = Select a map to load:
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Unlock configuring loadout: Wave {0}.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
@@ -434,6 +466,7 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}/s
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Vedelik
 bar.heat = Kuumus
 bar.power = Energia
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display In-Game Chat
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
@@ -530,8 +567,8 @@ category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
 command.attack = Ründa
+command.rally = Rally
 command.retreat = Põgene
-command.patrol = Patrol
 keybind.gridMode.name = Block Select
 keybind.gridModeShift.name = Category Select
 keybind.press = Vajuta klahvi...
@@ -747,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Junction
 block.router.name = Router
 block.distributor.name = Distributor
 block.sorter.name = Sorter
+block.message.name = Message
 block.overflow-gate.name = Overflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.ghoul.description = A heavy carpet bomber.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.

core/assets/bundles/bundle_eu.properties

@@ -16,13 +16,11 @@ screenshot.invalid = Mapa handiegia, baliteke pantaila-argazkirako memoria nahik
 gameover = Partida amaitu da
 gameover.pvp = [accent] {0}[] taldeak irabazi du!
 highscore = [accent]Marka berria!
-
 load.sound = Soinuak
 load.map = Mapak
 load.image = Irudiak
 load.content = Edukia
 load.system = Sistema
-
 stat.wave = Garaitutako boladak:[accent] {0}
 stat.enemiesDestroyed = Suntsitutako etsaiak:[accent] {0}
 stat.built = Eraikitako eraikinak:[accent] {0}
@@ -30,7 +28,6 @@ stat.destroyed = Suntsitutako eraikinak:[accent] {0}
 stat.deconstructed = Deseraikitako eraikinak:[accent] {0}
 stat.delivered = Egotzitako baliabideak:
 stat.rank = Azken graduazioa: [accent]{0}
-
 launcheditems = [accent]Egotzitako baliabideak
 map.delete = Ziur al zaude "[accent]{0}[]" mapa ezabatu nahi duzula?
 level.highscore = Marka: [accent]{0}
@@ -51,9 +48,18 @@ minimap = Mapatxoa
 close = Itxi
 website = Webgunea
 quit = Irten
+save.quit = Save & Quit
 maps = Mapak
+maps.browse = Browse Maps
 continue = Jarraitu
 maps.none = [lightgray]Ez da maparik aurkitu!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Honi buruz
 name = Izena:
 noname = Hautatu[accent] jokalari-izena[] aurretik.
@@ -68,12 +74,14 @@ players = {0} jokalari konektatuta
 players.single = Jokalari {0} konektatuta
 server.closing = [accent]Zerbitzaria ixten...
 server.kicked.kick = Zerbitzaritik kanporatu zaituzte!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Zerbitzaria itxita.
 server.kicked.vote = Botoen bidez kanporatu zaituzte. Agur.
 server.kicked.clientOutdated = Bezero zaharkitua! Eguneratu zure jolasa!
 server.kicked.serverOutdated = Zerbitzari zaharkitua! Eskatu ostalariari eguneratzeko!
 server.kicked.banned = Zerbitzari honetan debekatuta zaude.
 server.kicked.typeMismatch = Zerbitzari hau ez da zure konpilazio motarekin bateragarria.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Duela gutxi kanporatu zaituzte.\nItxaron berriro konektatzeko.
 server.kicked.nameInUse = Badago izen bereko beste norbait\nzerbitzari honetan jada.
 server.kicked.nameEmpty = Aukeratu duzun izena baliogabea da.
@@ -84,11 +92,13 @@ server.versions = Zure bertsioa:[accent] {0}[]\nZerbitzariaren bertsioa:[accent]
 host.info = [accent]Ostalaria[] botoiak zerbitzari bat abiatzen du [scarlet]6567[] atakan.\n[lightgray]wifi edo sare lokal[] berean dagoen edonor zure zerbitzaria ikusi ahal beharko luke.\n\nJendea edonondik IP-a erabilita konektatu ahal izatea nahi baduzu, [accent]ataka birbidaltzea[] ezinbestekoa da.\n\n[lightgray]Oharra: Inork zure sare lokalean partidara elkartzeko arazoak baditu, egiaztatu Mindustry-k baimena duela sare lokalera elkartzeko suebakiaren ezarpenetan. Kontuan izan sare publiko batzuk ez dutela zerbitzarien bilaketa baimentzen.
 join.info = Hemen, konektatzeko [accent]zerbitzari baten IP-a[] sartu dezakezu konektatzeko, edo [accent]sare lokaleko[] zerbitzariak bilatu.\nLAN zein WAN sareetan onartzen dira hainbat jokalarien partidak .\n\n[lightgray]Oharra: Ez dago zerbitzarien zerrenda global automatikorik, beste inorekin IP bidez konektatu nahi baduzu, ostalariari bere IP helbidea eskatu beharko diozu.
 hostserver = Ostatatu hainbat jokalarien partida
+invitefriends = Invite Friends
 hostserver.mobile = Ostatatu\npartida
 host = Ostatatu
 hosting = [accent]Zerbitzaria irekitzen...
 hosts.refresh = Freskatu
 hosts.discovering = LAN partidak bilatzen
+hosts.discovering.any = Discovering games
 server.refreshing = Zerbitzaria freskatzen
 hosts.none = [lightgray]Ez da partida lokalik aurkitu!
 host.invalid = [scarlet]Ezin da ostalarira konektatu.
@@ -112,6 +122,7 @@ server.version = [gray]v{0} {1}
 server.custombuild = [yellow]Konpilazio pertsonalizatua
 confirmban = Ziur jokalari hau debekatu nahi duzula?
 confirmkick = Ziur jokalari hau kanporatu nahi duzula?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Ziur jokalari hau debekatzeari utzi nahi nahi diozula?
 confirmadmin = Ziur jokalari hau admin bihurtu nahi duzula?
 confirmunadmin = Ziur jokalari honi admin eskubidea kendu nahi diozula?
@@ -122,6 +133,7 @@ disconnect.error = Konexio errorea.
 disconnect.closed = Konexioa itxita.
 disconnect.timeout = Denbor-muga agortuta.
 disconnect.data = Huts egin du munduaren datuak eskuratzean!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Konektatzen...
 connecting.data = [accent]Munduaren datuak kargatzen...
 server.port = Ataka:
@@ -147,6 +159,7 @@ save.rename = Aldatu izena
 save.rename.text = Gordetako partida berria:
 selectslot = Hautatu gordetako partida bat.
 slot = [accent]{0}. tartea
+editmessage = Edit Message
 save.corrupted = [accent]Gordetako partidaren fitxategia hondatuta dago edo baliogabea da!\nBerriki eguneratu baduzu jolasa, gordetzeko formatuan aldaketaren bat izan daiteke eta [scarlet]ez[] akats bat.
 empty = <hutsik>
 on = Piztuta
@@ -154,12 +167,13 @@ off = Itzalita
 save.autosave = Gordetze automatikoa: {0}
 save.map = Mapa: {0}
 save.wave = {0}. bolada
-save.difficulty = Zailtasuna: {0}
+save.mode = Gamemode: {0}
 save.date = Azkenekoz gordeta: {0}
 save.playtime = Jolastua: {0}
 warning = Abisua.
 confirm = Baieztatu
 delete = Ezabatu
+view.workshop = View In Workshop
 ok = Ados
 open = Ireki
 customize = Aldatu arauak
@@ -196,6 +210,11 @@ map.nospawn = Mapa honek ez du muinik jokalaria sortu dadin! Gehitu muin [accent
 map.nospawn.pvp = Mapa honek ez du etsaien muinik jokalaria sortu dadin! Gehitu [SCARLET]laranja ez den[] muinen bat edo batzuk mapa honi editorean.
 map.nospawn.attack = Mapa honek ez du etsaien muinik jokalariak eraso dezan! Gehitu muin [SCARLET]gorriak[] mapa honi editorean.
 map.invalid = Errorea mapa kargatzean: Mapa-fitxategi baliogabe edo hondatua.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Brotxa
 editor.openin = Ireki editorean
 editor.oregen = Mea sorrera
@@ -203,11 +222,14 @@ editor.oregen.info = Mea sorrera:
 editor.mapinfo = Mapa info
 editor.author = Egilea:
 editor.description = Deskripzioa:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Boladak:
 editor.rules = Arauak:
 editor.generation = Sorrarazi:
 editor.ingame = Editatu jolasean
+editor.publish.workshop = Publish On Workshop
 editor.newmap = Mapa berria
+workshop = Workshop
 waves.title = Boladak
 waves.remove = Kendu
 waves.never = <beti>
@@ -224,6 +246,7 @@ waves.invalid = Bolada baliogabeak arbelean.
 waves.copied = Boladak kopiatuta.
 waves.none = Ez da etsairik zehaztu.\nKontuan izan bolada hutsak lehenetsitako diseinuarekin ordeztuko direla.
 editor.default = [lightgray]<Lehenetsia>
+details = Details...
 edit = Editatu...
 editor.name = Izena:
 editor.spawn = Sortu unitatea
@@ -233,6 +256,7 @@ editor.errorload = Errorea fitxategia kargatzen:\n[accent]{0}
 editor.errorsave = Errorea fitxategia gordetzen:\n[accent]{0}
 editor.errorimage = Hori irudi bat da, ez mapa bat. Ez aldatu luzapena funtzionatuko duelakoan.\n\nMapa zahar bat inportatu nahi baduzu, erabili 'inportatu mapa zaharra' botoia editorean.
 editor.errorlegacy = Mapa hau zaharregia da, eta jada onartzen ez den formatu zahar bat darabil.
+editor.errornot = This is not a map file.
 editor.errorheader = Mapa hau hondatuta dago edo baliogabea da.
 editor.errorname = Mapak ez du zehaztutako izenik. Gordetako partida bat kargatzen saiatu zara?
 editor.update = Eguneratu
@@ -265,8 +289,8 @@ editor.resizemap = Aldatu maparen neurria
 editor.mapname = Maparen izena:
 editor.overwrite = [accent]Abisua!\nHonek badagoen mapa bat gainidatziko du.
 editor.overwrite.confirm = [scarlet]Abisua![] Badago izen bereko beste mapa bat. Ziur gainidatzi nahi duzula?
+editor.exists = A map with this name already exists.
 editor.selectmap = Hautatu mapa kargatzeko:
-
 toolmode.replace = Ordeztu
 toolmode.replace.description = Marraztu bloke zurrunak bakarrik.
 toolmode.replaceall = Ordeztu denak
@@ -281,7 +305,6 @@ toolmode.fillteams = Bete taldeak
 toolmode.fillteams.description = Bete taldeak blokeen ordez.
 toolmode.drawteams = Marraztu taldeak
 toolmode.drawteams.description = Marraztu taldeak blokeen ordez.
-
 filters.empty = [lightgray]Iragazkirik ez! Gehitu bat beheko botoiarekin.
 filter.distort = Distortsioa
 filter.noise = Orbana
@@ -313,7 +336,6 @@ filter.option.floor2 = Bigarren zorua
 filter.option.threshold2 = Bigarren atalasea
 filter.option.radius = Erradioa
 filter.option.percentile = Pertzentila
-
 width = Zabalera:
 height = Altuera:
 menu = Menua
@@ -331,7 +353,6 @@ tutorial.retake = Berriro hasi tutoriala
 editor = Editorea
 mapeditor = Mapen editorea
 donate = Dohaintza
-
 abandon = Abandonatu
 abandon.text = Eremu hau eta bere baliabide guztiak etsaiaren esku geratuko dira.
 locked = Blokeatuta
@@ -348,6 +369,7 @@ launch.skip.confirm = Orain ez eginez gero, geroagoko beste bolada batera itxaro
 uncover = Estalgabetu
 configure = Konfiguratu zuzkidura
 configure.locked = [lightgray]Zuzkiduraren konfigurazioa desblokeatzeko: {0} bolada.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} desblokeatuta.
 zone.requirement.complete = {0}. boladara iritsia:\n{1} Eremuaren betebeharra beteta.
 zone.config.complete = {0}. boladara iritsia:\nZuzkiduraren konfigurazioa desblokeatuta.
@@ -357,7 +379,6 @@ zone.objective.survival = Biziraupena
 zone.objective.attack = Suntsitu etsaiaren muina
 add = Gehitu
 boss.health = Nagusiaren osasuna
-
 connectfail = [crimson]Konexio errorea:\n\n[accent]{0}
 error.unreachable = Zerbitzaria eskuraezin.\nHelbidea ondo idatzita dago?
 error.invalidaddress = Helbide baliogabea.
@@ -368,7 +389,6 @@ error.mapnotfound = Ez da mapa-fitxategia aurkitu!
 error.io = Sareko irteera/sarrera errorea.
 error.any = Sareko errore ezezaguna.
 error.bloom = Ezin izan da distira hasieratu.\nAgian zure gailuak ez du onartzen.
-
 zone.groundZero.name = Zero eremua
 zone.desertWastes.name = Basamortuak
 zone.craters.name = Kraterrak
@@ -383,7 +403,6 @@ zone.saltFlats.name = Gatz zelaiak
 zone.impact0078.name = 0078 talka
 zone.crags.name = Harkaitzak
 zone.fungalPass.name = Onddo mendatea
-
 zone.groundZero.description = Berriro hasteko kokaleku egokiena.\nBaliabide gutxi daude baina etsaien mehatxua ere txikia da.\nEskuratu ahal beste berun eta kobre.\nSegi aurrera.
 zone.frozenForest.description = Hemen ere, mendietatik hurbil, esporak sakabanatu dira. Tenperatura hotzek ez dituzte betirako geldiaraziko.\n\nHasi energia eskuratzeko abentura. Eraiki errekuntza sorgailuak. Ikasi konpontzaileak erabiltzen.
 zone.desertWastes.description = Basamortu hauen zabalak dira, ezustekoak, eta abandonaturiko sektore estrukturekin marratuak.\nBadago ikatza eskualde honetan. Erre energiarako, edo grafitoa sintetizatzeko.\n\n[lightgray]Ezin da lurreratze tokia bermatu.
@@ -398,7 +417,6 @@ zone.nuclearComplex.description = Torioa ekoiztu eta prozesatzeko instalazio ohi
 zone.fungalPass.description = Mendi garaiak eta esporez jositako behe lautaden arteko transizio eremua. Etsaien araketa-base txiki bat dago hemen.\nSuntsitu ezazu.\nErabili Daga eta Ibilkari unitateak. Akabatu bi muinak.
 zone.impact0078.description = <jarri deskripzioa hemen>
 zone.crags.description = <jarri deskripzioa hemen>
-
 settings.language = Hizkuntza
 settings.data = Jolasaren datuak
 settings.reset = Berrezarri lehenespenak
@@ -448,24 +466,25 @@ blocks.boosteffect = Indartze-efektua
 blocks.maxunits = Gehieneko unitate aktiboak
 blocks.health = Osasuna
 blocks.buildtime = Eraikitze-denbora
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Zehazgabetasuna
 blocks.shots = Tiroak
 blocks.reload = Tiroak/segundoko
 blocks.ammo = Munizioa
-
 bar.drilltierreq = Zulagailu hobea behar da
 bar.drillspeed = Ustiatze-abiadura: {0}/s
 bar.efficiency = Eraginkortasuna: {0}%
 bar.powerbalance = Energia: {0}/s
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Energia: {0}
 bar.poweroutput = Energia irteera: {0}
 bar.items = Elementuak: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Likidoa
 bar.heat = Beroa
 bar.power = Energia
 bar.progress = Eraikitze egoera
 bar.spawned = Unitateak: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] kalte
 bullet.splashdamage = [stat]{0}[lightgray] ingurune-kaltea ~[stat] {1}[lightgray] lauza
 bullet.incendiary = [stat]su-eragilea
@@ -477,7 +496,6 @@ bullet.freezing = [stat]hozkirri
 bullet.tarred = [stat]mundrunduta
 bullet.multiplier = [stat]{0}[lightgray]x munizio-biderkatzailea
 bullet.reload = [stat]{0}[lightgray]x tiro tasa
-
 unit.blocks = bloke
 unit.powersecond = energia unitate/segundoko
 unit.liquidsecond = likido unitate/segundoko
@@ -486,7 +504,7 @@ unit.liquidunits = likido unitate
 unit.powerunits = energia unitate
 unit.degrees = grado
 unit.seconds = segundo
-unit.persecond =/seg
+unit.persecond = /seg
 unit.timesspeed = x abiadura
 unit.percent = %
 unit.items = elementu
@@ -506,6 +524,7 @@ setting.antialias.name = Antialias[lightgray] (berrabiarazi behar da)[]
 setting.indicators.name = Etsai/Aliatu adierazleak
 setting.autotarget.name = Punteria automatikoa
 setting.keyboard.name = Sagu+Teklatu kontrolak
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = Bat ere ez
 setting.fpscap.text = {0} FPS
@@ -536,6 +555,7 @@ setting.sfxvol.name = Efektuen bolumena
 setting.mutesound.name = Isilarazi soinua
 setting.crashreport.name = Bidali kraskatze txosten automatikoak
 setting.savecreate.name = Gorde automatikoki
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Txataren opakotasuna
 setting.playerchat.name = Erakutsi jolas barneko txata
 uiscale.reset = Interfazearen eskala aldatu da.\nSakatu "Ados" eskala hau berresteko.\n[scarlet][accent] {0}[] segundo atzera egin eta irteteko...
@@ -547,8 +567,8 @@ category.general.name = Orokorra
 category.view.name = Bistaratzea
 category.multiplayer.name = Hainbat jokalari
 command.attack = Eraso
+command.rally = Rally
 command.retreat = Erretreta
-command.patrol = Patruila
 keybind.gridMode.name = Bloke-hautua
 keybind.gridModeShift.name = Kategoria-hautua
 keybind.press = Sakatu tekla bat...
@@ -589,7 +609,6 @@ mode.pvp.description = Borrokatu beste jokalari batzuk lokalean.\n[gray]Gutxiene
 mode.attack.name = Erasoa
 mode.attack.description = Suntsitu etsaiaren basea. Boladarik ez.\n[gray]Kono gorria behar da mapan jolasteko.
 mode.custom = Arau pertsonalizatuak
-
 rules.infiniteresources = Baliabide amaigabeak
 rules.wavetimer = Boladen denboragailua
 rules.waves = Boladak
@@ -616,7 +635,6 @@ rules.title.resourcesbuilding = Baliabideak eta eraikuntza
 rules.title.player = Jokalariak
 rules.title.enemy = Etsaiak
 rules.title.unit = Unitateak
-
 content.item.name = Solidoak
 content.liquid.name = Likidoak
 content.unit.name = Unitateak
@@ -678,7 +696,6 @@ mech.buildspeed = [lightgray]Eraikitze abiadura: {0}%
 liquid.heatcapacity = [lightgray]Bero edukiera: {0}
 liquid.viscosity = [lightgray]Likatasuna: {0}
 liquid.temperature = [lightgray]Tenperatura: {0}
-
 block.sand-boulder.name = Hondar harkaitza
 block.grass.name = Belarra
 block.salt.name = Gatza
@@ -767,10 +784,13 @@ block.hail.name = Txingor
 block.lancer.name = Lantzari
 block.conveyor.name = Garraio-zinta
 block.titanium-conveyor.name = Titaniozko garraio-zinta
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Lotunea
 block.router.name = Bideratzailea
 block.distributor.name = Banatzailea
 block.sorter.name = Antolatzailea
+block.message.name = Message
 block.overflow-gate.name = Gainezkatze atea
 block.silicon-smelter.name = Silizio galdategia
 block.phase-weaver.name = Fase ehulea
@@ -906,8 +926,6 @@ tutorial.deposit = Baliabideak blokeren batean sartzeko, arrastatu zure ontzitik
 tutorial.waves = [lightgray]Etsaia[] dator.\n\nBabestu muina 2 boladetan zehar. [accent]Egin klik[] tirokatzeko.\nEraiki dorre eta zulagailu gehiago. Ustiatu kobre gehiago.
 tutorial.waves.mobile = [lightgray]Etsaia[] daor.\n\nBabestu muina 2 boladatan. Zure ontziak automatikoki tirokatuko ditu etsaiak.\nEraiki dorre eta zulagailu gehiago. Ustiatu kobre gehiago.
 tutorial.launch = Bolada zehatz batera heltzean, [accent]muina egotzi[] dezakezu, zure defentsak atzean utziz [accent]eta muineko baliabide guztiak eskuratuz.[]\nBaliabide hauek teknologia berriak ikertzeko erabili daitezke.\n\n[accent]Sakatu egotzi botoia.
-
-
 item.copper.description = Egiturazko material oinarrizkoena. Asko erabilia bloke mota guztietarako.
 item.lead.description = Hastapeneko oinarrizko materiala. Bloke elektronikoak eta likidoen garraiorako blokeetan asko erabilia.
 item.metaglass.description = Beirazko konposatu izugarri sendoa. Asko erabilia likidoen garraio eta biltegiratzerako.
@@ -947,6 +965,7 @@ unit.eruptor.description = Estrukturak behera botatzeko diseinatutako meka astun
 unit.wraith.description = Jo eta iheseko unitate harrapari azkarra. Energia sorgailuak ditu xede.
 unit.ghoul.description = Azal bonbaketari astuna. Etsaiaren estrukturak urratzen ditu, azpiegitura kritikoa xede duela.
 unit.revenant.description = Misil planeatzailedun tramankulu astuna.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Ikatz puskak zanpatzen ditu grafito hutsezko xaflak sortuz.
 block.multi-press.description = Grafito prentsaren bertsio hobetu bat. Ura eta energia behar ditu ikatza azkar eta eraginkorki prozesatzeko.
 block.silicon-smelter.description = Hondarra eta ikatz hutsa txikitzen ditu silizioa sortzeko.

core/assets/bundles/bundle_fr.properties

@@ -16,13 +16,11 @@ screenshot.invalid = La carte est trop large, il n'y a potentiellement pas assez
 gameover = Game over
 gameover.pvp = L'équipe [accent] {0}[] a gagnée !
 highscore = [accent]Nouveau meilleur score!
-
 load.sound = Sons
 load.map = Cartes
 load.image = Images
 load.content = Contenus
 load.system = Système
-
 stat.wave = Vagues vaincues:[accent] {0}
 stat.enemiesDestroyed = Ennemis détruits:[accent] {0}
 stat.built = Bâtiments construits:[accent] {0}
@@ -30,7 +28,6 @@ stat.destroyed = Bâtiments détruits:[accent] {0}
 stat.deconstructed = Bâtiments déconstruits:[accent] {0}
 stat.delivered = Ressources transférées:
 stat.rank = Rang Final: [accent]{0}
-
 launcheditems = [accent]Ressources transférées
 map.delete = Êtes-vous sûr de vouloir supprimer cette carte "[accent]{0}[]"?
 level.highscore = Meilleur score: [accent]{0}
@@ -51,6 +48,7 @@ minimap = Minimap
 close = Fermer
 website = Site Web
 quit = Quitter
+save.quit = Save & Quit
 maps = Cartes
 maps.browse = Parcourir les Cartes
 continue = Continuer
@@ -62,7 +60,6 @@ uploadingcontent = Publication du Contenu
 uploadingpreviewfile = Publication du Fichier d'Aperçu
 committingchanges = Validation des Modifications
 done = Fait
-
 about.button = À propos
 name = Nom:
 noname = Commencer par choisir un[accent] nom de joueur[].
@@ -95,6 +92,7 @@ server.versions = Votre version:[accent] {0}[]\nLa version du serveur:[accent] {
 host.info = Le bouton [accent]Héberger[] héberge un serveur sur le port [scarlet]6567[]. \nN'importe qui sur le même [lightgray]wifi ou réseau local []devrait voir votre serveur sur leur liste des serveurs.\n\nSi vous voulez que les gens puissent s'y connecter de partout à l'aide de votre IP, [accent]le transfert de port (port forwarding)[] est requis.\n\n[lightgray]Note: Si quelqu'un a des problèmes de connexion à votre partie LAN, vérifiez que vous avez autorisé l'accès à Mindustry sur votre réseau local dans les paramètres de votre pare-feu.
 join.info = Ici vous pouvez entrez [accent]l'adresse IP d'un serveur []pour s'y connecter, ou découvrir un serveur en [accent]réseau local[].\nLe multijoueur en LAN ainsi qu'en WAN est supporté.\n\n[lightgray]Note: Il n'y a pas de liste de serveurs globaux automatiques; Si vous voulez vous connectez à quelqu'un par IP, il faudra d'abord demander à l'hébergeur leur IP.
 hostserver = Héberger une partie
+invitefriends = Inviter des Amis
 hostserver.mobile = Héberger\nune partie
 host = Héberger
 hosting = [accent]Préparation du serveur...
@@ -124,6 +122,7 @@ server.version = [lightgray]Version: {0} {1}
 server.custombuild = [yellow]Version personnalisée
 confirmban = Souhaitez vous vraiment bannir ce joueur?
 confirmkick = Souhaitez vous vraiment expulser ce joueur?
+confirmvotekick = Voulez vous vraiment voter l'expulsion de ce joueur?
 confirmunban = Souhaitez vous vraiment réintégrer ce joueur ?
 confirmadmin = Souhaitez vous vraiment rendre ce joueur administrateur?
 confirmunadmin = Souhaitez vous vraiment enlever le statut d'administrateur à ce joueur?
@@ -134,6 +133,7 @@ disconnect.error = Erreur de connexion.
 disconnect.closed = Connexion fermée.
 disconnect.timeout = Délai de connexion expiré.
 disconnect.data = Les données du monde n'ont pas pu être chargées!
+cantconnect = Impossible de rejoindre ([accent]{0}[]).
 connecting = [accent]Connexion...
 connecting.data = [accent]Chargement de la partie...
 server.port = Port:
@@ -159,6 +159,7 @@ save.rename = Renommer
 save.rename.text = Nouveau nom:
 selectslot = Choisissez une sauvegarde.
 slot = [accent]Emplacement {0}
+editmessage = Modifier le Message
 save.corrupted = [accent]Sauvegarde corrompue ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]pas[] à un bug.
 empty = <vide>
 on = Activé
@@ -172,6 +173,7 @@ save.playtime = Temps de jeu: {0}
 warning = Avertissement.
 confirm = Confirmer
 delete = Supprimer
+view.workshop = Voir dans le Workshop
 ok = OK
 open = Ouverture
 customize = Personaliser
@@ -209,6 +211,8 @@ map.nospawn.pvp = Cette carte n'a pas de base ennemies pour qu'un joueur ennemi
 map.nospawn.attack = Cette carte n'a aucune base ennemie à attaquer! Veuillez ajouter une base[SCARLET] rouge[] sur cette carte dans l'éditeur.
 map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
 map.publish.error = Erreur de Publication de la Carte: {0}
+map.publish.confirm = Êtes-vous sûr de vouloir publier cette carte?\n\n[lightgray]Assurez-vous d’accepter d’abord les CGU du Workshop, sinon vos cartes ne seront pas affichées!
+eula = CGU de Steam
 map.publish = Carte publiée.
 map.publishing = [accent]Publication de la carte...
 editor.brush = Pinceau
@@ -218,6 +222,7 @@ editor.oregen.info = Génération de minerais:
 editor.mapinfo = Infos Carte
 editor.author = Auteur:
 editor.description = Description:
+editor.nodescription = Une carte doit avoir une description d'au moins 4 caractères pour pouvoir être publiée.
 editor.waves = Vagues:
 editor.rules = Règles:
 editor.generation = Génération:
@@ -284,8 +289,8 @@ editor.resizemap = Redimensionner\nla carte
 editor.mapname = Nom de la carte:
 editor.overwrite = [accent]Attention!\nCeci écrase une carte existante.
 editor.overwrite.confirm = [scarlet]Attention![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir l'écraser?
+editor.exists = Une carte avec ce nom existe déjà.
 editor.selectmap = Sélectionnez une carte:
-
 toolmode.replace = Remplacer
 toolmode.replace.description = Dessiner seulement sur les blocs solides.
 toolmode.replaceall = Tout remplacer
@@ -300,7 +305,6 @@ toolmode.fillteams = Remplire les équipes
 toolmode.fillteams.description = Rempli les équipes au lieu des blocs.
 toolmode.drawteams = Dessiner les équipes
 toolmode.drawteams.description = Dessine les équipes au lieu de blocs.
-
 filters.empty = [lightgray]Aucun filtre! Ajoutez-en un avec les boutons ci-dessous.
 filter.distort = Déformation
 filter.noise = Bruit
@@ -332,7 +336,6 @@ filter.option.floor2 = Sol secondaire
 filter.option.threshold2 = Seuil secondaire
 filter.option.radius = Rayon
 filter.option.percentile = Centile
-
 width = Largeur:
 height = Hauteur:
 menu = Menu
@@ -350,7 +353,6 @@ tutorial.retake = Re-Take Tutorial
 editor = Éditeur
 mapeditor = Éditeur de carte
 donate = Faire un\ndon
-
 abandon = Abandonner
 abandon.text = Cette zone et toutes ses ressources vont être perdues.
 locked = Verrouillé
@@ -377,7 +379,6 @@ zone.objective.survival = Survivre
 zone.objective.attack = Détruire le noyau ennemi
 add = Ajouter...
 boss.health = Santé du Boss
-
 connectfail = [crimson]Échec de la connexion au serveur :\n\n[accent]{0}
 error.unreachable = Serveur injoignable.\nL'adresse IP est correcte?
 error.invalidaddress = Adresse invalide.
@@ -388,7 +389,6 @@ error.mapnotfound = Carte introuvable!
 error.io = Erreur de Réseau (I/O)
 error.any = Erreur réseau inconnue
 error.bloom = Echec de l'initialisation du flou lumineux.\nVotre appareil peux ne pas le supporter.
-
 zone.groundZero.name = Première Bataille
 zone.desertWastes.name = Désert Sauvage
 zone.craters.name = Les Cratères
@@ -403,7 +403,6 @@ zone.saltFlats.name = Marais Salants
 zone.impact0078.name = Impact 0078
 zone.crags.name = Rochers
 zone.fungalPass.name = Passe Fongique
-
 zone.groundZero.description = L'emplacement optimal pour débuter. Faible menace ennemie. Peu de ressources. \nRecueillez autant de plomb et de cuivre que possible.\nRien d'autre à signaler.
 zone.frozenForest.description = Même ici, plus près des montagnes, les spores se sont propagées. Les températures glaciales ne pourront pas les contenir pour toujours.\n\nFamiliarisez vous avec l'Énergie. Construisez des générateurs a combustion. Aprenez a utiliser les réparateurs.
 zone.desertWastes.description = Cette étendue désertique est immense, imprévisibles. On y croise des structures abandonnées.\nLe charbon est présent dans la région. Brulez-le pour générer de l'Énergie ou synthétisez-le en graphite.\n\n[lightgray]Ce lieu d'atterisage est imprévisible.
@@ -418,7 +417,6 @@ zone.nuclearComplex.description = Une ancienne installation de production et tra
 zone.fungalPass.description = Une zone de transition entre les hautes montagnes et les basses régions infestées de spores. Une petite base de reconnaissance ennemie s'y trouve.\nDétruisez la.\nUtilisez les unités Poignard et Rampeurs. Détruisez les deux noyaux.
 zone.impact0078.description = <insérer une description ici>
 zone.crags.description = <insérer une description ici>
-
 settings.language = Langue
 settings.data = Données du Jeu
 settings.reset = Valeurs par Défaut.
@@ -473,20 +471,20 @@ blocks.inaccuracy = Imprécision
 blocks.shots = Tirs
 blocks.reload = Tirs/Seconde
 blocks.ammo = Munitions
-
 bar.drilltierreq = Foreuse Ameliorée Requise
 bar.drillspeed = Vitesse de forage: {0}/s
 bar.efficiency = Efficacité: {0}%
 bar.powerbalance = Énergie: {0}/s
+bar.powerstored = Stocké: {0}/{1}
 bar.poweramount = Énergie: {0}
 bar.poweroutput = Énergie Produite: {0}
 bar.items = Objets: {0}
+bar.capacity = Capacité: {0}
 bar.liquid = Liquide
 bar.heat = Chaleur
 bar.power = Énergie
 bar.progress = Progression de la construction
 bar.spawned = Unités: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] dégâts
 bullet.splashdamage = [stat]{0}[lightgray] dégâts de zone ~[stat] {1}[lightgray] blocs
 bullet.incendiary = [stat]incendiaire
@@ -498,7 +496,6 @@ bullet.freezing = [stat]gel
 bullet.tarred = [stat]goudronné
 bullet.multiplier = [stat]{0}[lightgray]x multiplicateur de munitions
 bullet.reload = [stat]{0}[lightgray]x vitesse de tir
-
 unit.blocks = blocs
 unit.powersecond = énergie/seconde
 unit.liquidsecond = unité de liquide/seconde
@@ -527,6 +524,7 @@ setting.antialias.name = Antialias[lightgray] (redémarrage du jeu nécéssaire)
 setting.indicators.name = Indicateurs Alliés/Ennemis
 setting.autotarget.name = Visée automatique
 setting.keyboard.name = Controles Sourie+Clavier
+setting.touchscreen.name = Commandes d'Écran Tactile
 setting.fpscap.name = FPS Max
 setting.fpscap.none = Aucun
 setting.fpscap.text = {0} FPS
@@ -569,8 +567,8 @@ category.general.name = Général
 category.view.name = Voir
 category.multiplayer.name = Multijoueur
 command.attack = Attaque
+command.rally = Rassembler
 command.retreat = Retraite
-command.patrol = Patrouille
 keybind.gridMode.name = Sélection des blocs
 keybind.gridModeShift.name = Sélection des catégories
 keybind.press = Appuyer sur une touche...
@@ -611,7 +609,6 @@ mode.pvp.description = Battez-vous contre d'autres joueurs en local.\n[gray]Requ
 mode.attack.name = Attaque
 mode.attack.description = Pas de vagues, le but étant de détruire la base ennemie.\n[gray]Requiert un noyaux rouge dans la map pour y jouer.
 mode.custom = Règles personnalisées
-
 rules.infiniteresources = Ressources infinies
 rules.wavetimer = Minuterie pour les vagues
 rules.waves = Vagues
@@ -638,7 +635,6 @@ rules.title.resourcesbuilding = Ressources & Construction
 rules.title.player = Joueurs
 rules.title.enemy = Ennemis
 rules.title.unit = Unités
-
 content.item.name = Objets
 content.liquid.name = Liquides
 content.unit.name = Unités
@@ -700,7 +696,6 @@ mech.buildspeed = [LIGHT_GRAY]Vitesse de Construction: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Capacité Thermique: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
 liquid.temperature = [LIGHT_GRAY]Température: {0}
-
 block.sand-boulder.name = Bloc de Sable
 block.grass.name = Herbe
 block.salt.name = Sel
@@ -789,10 +784,13 @@ block.hail.name = Grêle
 block.lancer.name = Lancier
 block.conveyor.name = Convoyeur
 block.titanium-conveyor.name = Convoyeur en Titane
+block.armored-conveyor.name = Convoyeur Cuirassé
+block.armored-conveyor.description = Déplace les objets à la même vitesse que les convoyeurs en titane, mais est plus résistant. Seulement d'autres convoyeurs peuvent faire rentrer des ressources par ses cotés.
 block.junction.name = Jonction
 block.router.name = Routeur
 block.distributor.name = Distributeur
 block.sorter.name = Trieur
+block.message.name = Message
 block.overflow-gate.name = Barrière de Débordement
 block.silicon-smelter.name = Fonderie de Silicone
 block.phase-weaver.name = Tisseur à Phase
@@ -876,7 +874,7 @@ block.surge-wall.name = Mur Superchargé
 block.surge-wall-large.name = Grand mur Superchargé
 block.cyclone.name = Cyclone
 block.fuse.name = Fusible
-block.shock-mine.name = Mine Terreur
+block.shock-mine.name = Mine à Chocs
 block.overdrive-projector.name = Projecteur Surmultiplicateur
 block.force-projector.name = Champ de Force
 block.arc.name = Arc
@@ -887,10 +885,10 @@ block.container.name = Conteneur
 block.launch-pad.name = Plateforme de Lancement
 block.launch-pad-large.name = Grande Plateforme de Lancement
 team.blue.name = bleu
-team.crux.name = red
-team.sharded.name = orange
+team.crux.name = rouge
+team.sharded.name = éclaté
 team.orange.name = orange
-team.derelict.name = derelict
+team.derelict.name = abandonné
 team.green.name = vert
 team.purple.name = violet
 unit.spirit.name = Drone Spirituel Réparateur
@@ -928,8 +926,6 @@ tutorial.deposit = Déposez des ressources dans des blocs en les faisant glisser
 tutorial.waves = L'[lightgray] ennemi[] approche.\n\nDefend le noyau pendant 2 vagues.[accent] Clique[] pour tirer.\nConstruisez plus de tourelles et de foreuses. Minez plus de cuivre.
 tutorial.waves.mobile = L'[lightgray] ennemi[] approche.\n\nDefend le noyau pendant 2 vagues. Votre vaisseau tirera automatiquement sur les ennemis.\nConstruisez plus de tourelles et de foreuses. Minez plus de cuivre.
 tutorial.launch = Une fois que vous aurez atteind une vague spécifique, vous aurez la possibilité de[accent] faire décoler le noyau[], abandonant vos défenses mais en [accent]sécurisant toutes les ressources de votre noyau.[]\nCes ressources peuvent ensuite être utilisées pour rechercher de nouvelles technologies.\n\n[accent]Appuyez sur le bouton de lancement.
-
-
 item.copper.description = Le matériau structurel de base. Utilisé intensivement dans tout les blocs.
 item.lead.description = Un matériau de départ. Utilisé intensivement en électronique et dans les blocs de trasports de liquides.
 item.metaglass.description = Un composé de vitre super-résistant. Utilisé largement pour le transport et le stockage de liquides.
@@ -969,6 +965,7 @@ unit.eruptor.description = Une unité lourde conçue pour détruire les structur
 unit.wraith.description = Une unité d'interception rapide et de frappe. Cible les générateurs d'énergie.
 unit.ghoul.description = Un bombardier lourd de saturation. Déchire a travert les structures ennemies, ciblant les infrastructures critiques.
 unit.revenant.description = Un arsenal de missiles lourd et planant.
+block.message.description = Enregistre un message. Utilisé pour la communication entre alliés.
 block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite pur.
 block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
 block.silicon-smelter.description = Réduit le sable avec du charbon pur. Produit du silicone.

core/assets/bundles/bundle_fr_BE.properties

@@ -6,7 +6,7 @@ link.discord.description = Le discord officiel de Mindustry
 link.github.description = Code source du jeu
 link.changelog.description = Liste des mises à jour
 link.dev-builds.description = Versions instables de développement
-link.trello.description =Trello officiel pour les fonctionnalités planifiées.
+link.trello.description = Trello officiel pour les fonctionnalités planifiées.
 link.itch.io.description = Site itch.io avec les versions téléchargeables pour ordinateur.
 link.google-play.description = Page Google Play du jeu
 link.wiki.description = Wiki officiel de Mindustry
@@ -48,9 +48,18 @@ minimap = Minimap
 close = Fermer
 website = Website
 quit = Quitter
+save.quit = Save & Quit
 maps = Cartes
+maps.browse = Browse Maps
 continue = Continue
 maps.none = [LIGHT_GRAY]Aucune carte trouvée!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = À propos
 name = Nom:
 noname = Choisissez d'abord [accent]un pseudo[].
@@ -65,28 +74,31 @@ players = {0} joueurs
 players.single = {0} joueur
 server.closing = [accent]Fermeture du serveur ...
 server.kicked.kick = Vous avez été expulsé du serveur !
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Serveur fermé.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Client dépassé! Mettez à jour votre jeu !
 server.kicked.serverOutdated = Serveur dépassé! Demandez à l'hôte de le mettre à jour !
 server.kicked.banned = Vous êtes banni de ce serveur.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = Ce serveur est complet. Attendez qu'une place ce libére.
 server.kicked.recentKick = Vous avez été expulsé récemment.\nAttendez avant de vous connecter à nouveau.
 server.kicked.nameInUse = Il y a déjà quelqu'un avec ce nom\nsur ce serveur.
 server.kicked.nameEmpty = Votre nom doit contenir au moins une lettre ou un chiffre.
 server.kicked.idInUse = Vous êtes déjà sur ce serveur ! Se connecter avec deux comptes n'est pas permis !
 server.kicked.customClient = Ce serveur ne supporte pas les versions personnalisées (Custom builds). Télécharger une version officielle.
 server.kicked.gameover = Vous avez perdu !
-server.kicked.playerLimit = Ce serveur est complet. Attendez qu'une place ce libére.
 server.versions = Votre version:[accent] {0}[]\nVersion du serveur:[accent] {1}[]
 host.info = Le bouton [accent]héberger[] héberge un serveur sur les ports [scarlet]6567[] et [scarlet]6568.[]\nN'importe qui sur le même [LIGHT_GRAY]réseau wifi ou local[] devrait pouvoir voir votre serveur dans sa liste de serveurs.\n\nSi vous voulez que les gens puissent se connecter de n'importe où grâce à l'IP, [accent]rediriger les ports[] est requis.\n\n[LIGHT_GRAY]Note:Si quelqu'un éprouve des difficultés à se connecter à votre partie LAN, assurez-vous que vous avez autorisé Mindustry à accéder à votre réseau local dans les paramètres de votre pare-feu.
 join.info = Ici, vous pouvez entrer l' [accent]IP d'un serveur[] pour s'y connecter, ou découvrir les serveurs[accent]sur votre réseau local[] pour s'y connecter.\nLes parties multijoueur LAN et WAN sont toutes deux supportées.\n\n[LIGHT_GRAY]Note: Aucune liste globale des serveurs n'est génerée automatiquement: si vous voulez vous connecter à un serveur par IP, vous devrez demander l'IP à l'hébergeur.
 hostserver = Héberger un serveur
+invitefriends = Invite Friends
 hostserver.mobile = Héberger\nUne partie
 host = Héberger
 hosting = [accent]Ouverture du serveur ...
 hosts.refresh = Actualiser
 hosts.discovering = Recherche de parties en LAN
+hosts.discovering.any = Discovering games
 server.refreshing = Actualisation du serveur
 hosts.none = [lightgray]Aucun jeu en LAN trouvé !
 host.invalid = [scarlet]Impossible de se\nconnecter à l'hôte.
@@ -110,13 +122,18 @@ server.version = [lightgray]Version: {0} {1}
 server.custombuild = [accent]Version personnalisée
 confirmban = Êtes-vous sûr de vouloir bannir ce joueur ?
 confirmkick = Êtes-vous sûr de vouloir expulser ce joueur?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Êtes-vous sûr de vouloir annuler le ban de ce joueur ?
 confirmadmin = Êtes-vous sûr de vouloir faire de ce joueur un administrateur ?
 confirmunadmin = Êtes-vous sûr de vouloir supprimer le statut d'administrateur de ce joueur ?
 joingame.title = Rejoindre une partie
 joingame.ip = IP:
 disconnect = Déconnecté.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Les données du monde n'ont pas pu être chargées !
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connexion...
 connecting.data = [accent]Chargement des données du monde...
 server.port = Port:
@@ -142,6 +159,7 @@ save.rename = Renommer
 save.rename.text = Nouveau nom:
 selectslot = Sélectionnez une sauvegarde.
 slot = [accent]Emplacement {0}
+editmessage = Edit Message
 save.corrupted = [accent]Fichier de sauvegarde corrompu ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]non[] un bug.
 empty = <vide>
 on = Allumer
@@ -155,6 +173,7 @@ save.playtime = Temps de jeu: {0}
 warning = Avertissement.
 confirm = Confirmer
 delete = Supprimer
+view.workshop = View In Workshop
 ok = OK
 open = Ouvrir
 customize = Personnaliser
@@ -191,6 +210,11 @@ map.nospawn = Cette carte ne possède pas de base pour que le joueur puisse appa
 map.nospawn.pvp = Cette carte ne contient aucune base ennemi dans lequel le joueur apparaît!\nAjoutez des bases [SCARLET]rouge[] à cette carte dans l'éditeur.
 map.nospawn.attack = Cette carte ne contient aucune base ennemi à attaquer! Ajoutez des bases [SCARLET]rouge[] à cette carte dans l'éditeur.
 map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Pinceau
 editor.openin = Ouvrir dans l'éditeur
 editor.oregen = Génération des minerais
@@ -198,11 +222,14 @@ editor.oregen.info = Génération de minerais:
 editor.mapinfo = Infos sur la carte
 editor.author = Auteur:
 editor.description = Description:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Vagues:
 editor.rules = Règles:
 editor.generation = Generation:
 editor.ingame = Modifier en jeu
+editor.publish.workshop = Publish On Workshop
 editor.newmap = Nouvelle carte
+workshop = Workshop
 waves.title = Vagues
 waves.remove = Retirer
 waves.never = <jamais>
@@ -219,6 +246,7 @@ waves.invalid = Vagues invalides dans le Presse-papiers.
 waves.copied = Vagues copiées.
 waves.none = Aucun ennemi défini.\nNotez que les dispositions vides seront automatiquement remplacées par la dispositions par défaut.
 editor.default = [LIGHT_GRAY]<Par défaut>
+details = Details...
 edit = Modifier...
 editor.name = Nom:
 editor.spawn = Ajouter une unité
@@ -228,6 +256,7 @@ editor.errorload = Erreur lors du chargement du fichier:\n[accent]{0}
 editor.errorsave = Erreur lors de la sauvegarde du fichier:\n[accent]{0}
 editor.errorimage = C’est une image, pas une carte.\n\nSi vous souhaitez importer une carte 3.5/build 40, utilisez le bouton "Importer une carte héritée" dans l’éditeur.
 editor.errorlegacy = Cette carte est trop ancienne et utilise un format de carte qui n'est plus pris en charge.
+editor.errornot = Ce n'est pas un fichier de carte.
 editor.errorheader = Ce fichier de carte n'est pas valide ou corrompu.
 editor.errorname = La carte n'a pas de nom !
 editor.update = Mettre à jour
@@ -236,7 +265,6 @@ editor.apply = Appliquer
 editor.generate = Générer
 editor.resize = Redimensionner
 editor.loadmap = Charger une carte
-editor.errornot = Ce n'est pas un fichier de carte.
 editor.savemap = Sauvegarder une carte
 editor.saved = Sauvegardé !
 editor.save.noname = Votre carte ne possède pas de nom ! Ajouter en un dans le menu 'Infos sur la carte'.
@@ -261,6 +289,7 @@ editor.resizemap = Redimensionner\nla carte
 editor.mapname = Nom de la carte:
 editor.overwrite = [accent]Attention!\nCela écrasera une carte existante.
 editor.overwrite.confirm = [scarlet]Attention ![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir la réécrire?
+editor.exists = A map with this name already exists.
 editor.selectmap = Sélectionnez une carte à charger:
 toolmode.replace = Remplacer
 toolmode.replace.description = Dessine uniquement sur des blocs pleins.
@@ -340,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Découvrir
 configure = Configurer le transfert des ressources.
 configure.locked = [LIGHT_GRAY]Atteigner la vague {0}\npour configurer le transfert des ressources.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} Débloquée.
 zone.requirement.complete = Vague {0} atteinte:\n{1} Exigences de la zone complétées
 zone.config.complete = Vague {0} atteinte:\nConfiguration du transfert débloquée.
@@ -445,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Vitesse de forage: {0}/s
 bar.efficiency = Efficacité: {0}%
 bar.powerbalance = Énergie: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Énergie: {0}
 bar.poweroutput = Énergie en sortie: {0}
 bar.items = Objets: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquide
 bar.heat = Chaleur
 bar.power = Énergie
@@ -492,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (demande le redémarrage de l'app
 setting.indicators.name = Indicateurs d'alliés
 setting.autotarget.name = Visée automatique
 setting.keyboard.name = Contrôles Souris + Clavier
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = Vide
 setting.fpscap.text = {0} FPS
@@ -522,6 +555,7 @@ setting.sfxvol.name = Volume des SFX
 setting.mutesound.name = Couper les SFX
 setting.crashreport.name = Envoyer des rapports d'incident anonymement.
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Opacité du tchat
 setting.playerchat.name = Afficher le tchat en jeu
 uiscale.reset = L'échelle de l'interface a été modifiée.\nAppuyez sur "OK" pour confirmer cette échelle.\n[scarlet]Revenir et sortir en[accent] {0}[] réglages...
@@ -533,8 +567,8 @@ category.general.name = Général
 category.view.name = Voir
 category.multiplayer.name = Multijoueur
 command.attack = Attaquer
+command.rally = Rally
 command.retreat = Retraite
-command.patrol = Patrouiller
 keybind.gridMode.name = Sélectionnez le bloc
 keybind.gridModeShift.name = Sélection de la catégorie
 keybind.press = Appuyez sur une touche ...
@@ -750,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Transporteur
 block.titanium-conveyor.name = Transporteur en titane
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Junction
 block.router.name = Routeur
 block.distributor.name = [accent]Distributeur[]
 block.sorter.name = Trieur
+block.message.name = Message
 block.overflow-gate.name = Barrière de Débordement
 block.silicon-smelter.name = Fonderie de silicone
 block.phase-weaver.name = Tisseur à phase
@@ -928,6 +965,7 @@ unit.eruptor.description = Un mech lourd conçu pour abattre des structures. Tir
 unit.wraith.description = Une unité volante rapide harcelant les ennemis. Utilise du plomb comme munitions.
 unit.ghoul.description = Un bombardier lourd. Utilise de la pyratite ou des explosifs comme munitions.
 unit.revenant.description = Un arsenal de missiles lourd et planant.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite.
 block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
 block.silicon-smelter.description = Réduit le sable avec du coke* très pur afin de produire du silicium. (*Coke produit à partir de charbon:REF)

core/assets/bundles/bundle_in_ID.properties

@@ -48,9 +48,18 @@ minimap = Peta Kecil
 close = Tutup
 website = Website
 quit = Keluar
+save.quit = Save & Quit
 maps = Maps
+maps.browse = Browse Maps
 continue = Lanjutkan
 maps.none = [LIGHT_GRAY]Tidak ketemu peta!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Tentang
 name = Nama:
 noname = Pilih[accent] nama pemain[] dahulu.
@@ -65,12 +74,14 @@ players = {0} pemain aktif
 players.single = {0} pemain aktif
 server.closing = [accent]Menutup server...
 server.kicked.kick = Anda telah dikeluarkan dari server!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server ditutup.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Client kadaluarsa! perbarui permainan Anda!
 server.kicked.serverOutdated = Server kadaluarsa! Tanya host untuk diperbarui!
 server.kicked.banned = Anda telah dilarang untuk memasuki server ini.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Anda baru saja dikeluarkan dari server ini.\nTunggu sebelum masuk lagi.
 server.kicked.nameInUse = Sudah ada pemain dengan nama itu \ndi server ini.
 server.kicked.nameEmpty = Nama yang dipilih tidak valid.
@@ -81,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = Tombol [accent]host[] akan membuat server sementara di port [scarlet]6567[]. \nSemua orang yang memiliki [LIGHT_GRAY]Wi-Fi atau jaringan lokal[] akan bisa melihat server anda di daftar server mereka.\n\nJika Anda ingin pemain dari mana saja memasuki servermu dengan IP, [accent]port forwarding[] dibutuhkan.\n\n[LIGHT_GRAY]Diingat: Jika seseorang mengalami masalah memasuki permainan LAN mu, pastikan Anda telah mengizinkan Mindustry akses ke jaringan lokalmu di pengaturan firewall.
 join.info = Disini, Anda bisa memasuki [accent]server IP[], atau menemukan [accent]server lokal[] untuk bermain bersama.\nLAN dan WAN mendukung permainan bersama.\n\n[LIGHT_GRAY]Diingat: Tidak ada daftar server global; jika anda ingin bergabung dengan seseorang memakai IP, Anda perlu menanyakan host tentang IP mereka.
 hostserver = Host Permainan
+invitefriends = Invite Friends
 hostserver.mobile = Host\nPermainan
 host = Host
 hosting = [accent]Membuka server...
 hosts.refresh = Muat Ulang
 hosts.discovering = Mencari permainan LAN 
+hosts.discovering.any = Discovering games
 server.refreshing = Memuat ulang server
 hosts.none = [lightgray]Tidak ditemukan game lokal!
 host.invalid = [scarlet]Tidak bisa menyambung dengan host.
@@ -109,13 +122,18 @@ server.version = [lightgray]Versi: {0} {1}
 server.custombuild = [yellow]Bentuk Modifikasi
 confirmban = Anda yakin ingin melarang pemain ini untuk masuk lagi?
 confirmkick = Anda yakin ingin mengeluarkan pemain ini?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Anda yakin ingin mengizinkan pemain ini untuk masuk lagi?
 confirmadmin = Anda yakin ingin membuat pemain ini sebagai admin?
 confirmunadmin = Anda yakin ingin menghapus status admin dari pemain ini?
 joingame.title = Bermain Bersama
 joingame.ip = Alamat:
 disconnect = Terputus.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Gagal memuat data server!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Memasuki...
 connecting.data = [accent]Memuat data server...
 server.port = Port:
@@ -141,6 +159,7 @@ save.rename = Ganti nama
 save.rename.text = Nama baru:
 selectslot = Pilih simpanan.
 slot = [accent]Tempat {0}
+editmessage = Edit Message
 save.corrupted = [accent]File simpanan rusak atau tidak valid!\nJika Anda baru saja memperbarui permainannya, ini karena perubahan di format penyimpanan dan [scarlet]bukan[] sebuah bug.
 empty = <kosong>
 on = Aktif
@@ -148,12 +167,13 @@ off = Nonaktif
 save.autosave = Auto simpan: {0}
 save.map = Peta: {0}
 save.wave = Gelombang {0}
-save.difficulty = Tingkat Kesulitan: {0}
+save.mode = Gamemode: {0}
 save.date = Simpanan Terakhir: {0}
 save.playtime = Waktu Bermain: {0}
 warning = Peringatan.
 confirm = Konfirmasi
 delete = Hapus
+view.workshop = View In Workshop
 ok = OK
 open = Buka
 customize = Modifikasi
@@ -190,6 +210,11 @@ map.nospawn = Peta ini tidak memiliki inti agar pemain bisa muncul! Tambahkan in
 map.nospawn.pvp = Peta ini tidak memiliki inti agar pemain lawan bisa muncul! Tambahkan inti[SCARLET] selain biru[] kedalam peta di penyunting.
 map.nospawn.attack = Peta ini tidak memiliki inti musuh agar pemain bisa menyerang! Tambahkan inti[SCARLET] merah[] kedalam peta di penyunting.
 map.invalid = Error memuat peta: rusak atau file peta tidak valid.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Kuas
 editor.openin = Buka di Penyunting
 editor.oregen = Generasi Sumber Daya
@@ -197,11 +222,14 @@ editor.oregen.info = Generasi Sumber Daya:
 editor.mapinfo = Info Peta
 editor.author = Pencipta:
 editor.description = Deskripsi:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Gelombang:
 editor.rules = Peraturan:
 editor.generation = Generation:
 editor.ingame = Sunting Dalam Permainan
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = Gelombang
 waves.remove = Hapus
 waves.never = <tidak pernah>
@@ -218,6 +246,7 @@ waves.invalid = Gelombang tidak valid di papan klip.
 waves.copied = Gelombang tersalin.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]<Standar>
+details = Details...
 edit = Sunting...
 editor.name = Nama:
 editor.spawn = Munculkan Unit
@@ -227,6 +256,7 @@ editor.errorload = Error memuat file:\n[accent]{0}
 editor.errorsave = Error menyimpan file:\n[accent]{0}
 editor.errorimage = Itu gambar biasa, bukan peta. Jangan merubah ekstensi dan megharapkan akan berhasil.\n\nJika anda ingin mengimpor peta "Legacy", gunakan tombol 'impor peta legacy ' di penyunting.
 editor.errorlegacy = Peta ini terlalu tua, dan memakai format peta "legacy" yang tidak didukung lagi.
+editor.errornot = This is not a map file.
 editor.errorheader = File peta ini bisa jadi tidak valid atau rusak rusak.
 editor.errorname = Peta tidak ada nama.
 editor.update = Perbaruan 
@@ -259,6 +289,7 @@ editor.resizemap = Ubah Ukuran Peta
 editor.mapname = Nama Peta:
 editor.overwrite = [accent]Peringatan!\nIni menindih peta yang telah ada.
 editor.overwrite.confirm = [scarlet]Peringatan![] Peta dengan nama ini sudah ada. Yakin ingin menindihnya?
+editor.exists = A map with this name already exists.
 editor.selectmap = Pilih peta untuk dimuat:
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Buka
 configure = Konfigurasi Muatan
 configure.locked = [LIGHT_GRAY]Buka konfigurasi muatan: Gelombang {0}.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} terbuka.
 zone.requirement.complete = Gelombang {0} terselesaikan:\nPersyaratan zona {1} tercapai.
 zone.config.complete = Gelombang {0} terselesaikan:\nkonfigurasi muatan terbuka.
@@ -434,6 +466,7 @@ blocks.boosteffect = Efek Boost
 blocks.maxunits = Maks Unit Aktif
 blocks.health = Darah
 blocks.buildtime = Waktu Pembuatan
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Jarak Melenceng
 blocks.shots = Tembakan
 blocks.reload = Tembakan/Detik
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Kecepatan Bor: {0}/s
 bar.efficiency = Daya Guna: {0}%
 bar.powerbalance = Tenaga: {0}/s
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Tenaga: {0}
 bar.poweroutput = Pengeluaran Tenaga: {0}
 bar.items = Item: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Zat Cair
 bar.heat = Panas
 bar.power = Tenaga
@@ -489,6 +524,7 @@ setting.antialias.name = Antialiasi[LIGHT_GRAY] (membutuhkan restart)[]
 setting.indicators.name = Indikasi Musuh/Teman Lain
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Maks FPS
 setting.fpscap.none = Tidak Ada
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = Volume SFX
 setting.mutesound.name = Diamkan Suara
 setting.crashreport.name = Laporkan Masalah
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Jelas-Beningnya Chat
 setting.playerchat.name = Tunjukkan Chat dalam Permainan
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -530,8 +567,8 @@ category.general.name = Umum
 category.view.name = Melihat
 category.multiplayer.name = Bermain Bersama
 command.attack = Serang
+command.rally = Rally
 command.retreat = Mundur
-command.patrol = Patroli
 keybind.gridMode.name = Pilih Blok
 keybind.gridModeShift.name = Pilih Kategori
 keybind.press = Tekan kunci...
@@ -747,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Pengantar
 block.titanium-conveyor.name = Pengantar Berbahan Titanium
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Simpangan
 block.router.name = Pengarah
 block.distributor.name = Distributor
 block.sorter.name = Penyortir
+block.message.name = Message
 block.overflow-gate.name = Gerbang Meluap
 block.silicon-smelter.name = Pelebur Silikon
 block.phase-weaver.name = Pengrajut Phase 
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = Unit tabrak-lari yang cepat.
 unit.ghoul.description = Pengebom kelas berat.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Mengubah pasir dengan batu bara untuk memproduksi silikon.

core/assets/bundles/bundle_it.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Mappa troppo grossa, probabilmente non c'è abbastanza memo
 gameover = Il nucleo è stato distrutto.
 gameover.pvp = La squadra [accent] {0}[] ha vinto!
 highscore = [YELLOW]Nuovo record!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Ondate sconfitte:[accent] {0}
 stat.enemiesDestroyed = Nemici distrutti:[accent] {0}
 stat.built = Costruzioni erette:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Costruzioni distrutte:[accent] {0}
 stat.deconstructed = Costruzioni smontate:[accent] {0}
 stat.delivered = Riorse lanciate:
 stat.rank = Livello finale: [accent]{0}
-placeline = Hai appena selezionato un blocco.\nOra puoi[accent] piazzarne una linea[] eseguendo[accent] una lunga pressione[] e poi trascinando in ogni direzione.\nProva!
-removearea = Hai appena selezionato la modalità distruzione.\nOra puoi[accent] rimuovere blocchi in una certa zona [] eseguendo[accent] una lunga pressione[] e poi trascinando in ogni direzione.\nProva!
 launcheditems = [accent]Oggetti lanciati
 map.delete = Sei sicuro di voler eliminare questa mappa"[accent]{0}[]"?
 level.highscore = Miglior punteggio: [accent]{0}
@@ -32,7 +35,7 @@ level.select = Selezione del livello
 level.mode = Modalità di gioco:
 showagain = non mostrare più
 coreattack = < Il nucleo è sotto attacco! >
-nearpoint = [[ [scarlet]LACIA LA ZONA NEMICA IMMEDIATAMENTE[] ]\nautodistruzione imminente
+nearpoint = [[ [scarlet]LASCIA LA ZONA NEMICA IMMEDIATAMENTE[] ]\nautodistruzione imminente
 database = Database nucleo
 savegame = Salva
 loadgame = Carica
@@ -41,13 +44,22 @@ addplayers = Aggiungi/rimuovi giocatori
 customgame = Gioco personalizzato
 newgame = Nuova partita
 none = <Niente . . . >
-minimap = Minimapa
+minimap = Minimappa
 close = Chiuso
 website = Website
 quit = Esci
+save.quit = Save & Quit
 maps = Mappe
+maps.browse = Browse Maps
 continue = Continua
 maps.none = [LIGHT_GRAY]Nessuna mappa trovata!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Info
 name = Nome:
 noname = Scegli un [accent] nome[] prima di unirti.
@@ -62,10 +74,14 @@ players = {0} giocatori online
 players.single = {0} giocatori online
 server.closing = [accent]Chiusura server ...
 server.kicked.kick = Sei stato cacciato dal server!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server chiuso.
+server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Versione del client obsoleta! Aggiorna il tuo gioco!
 server.kicked.serverOutdated = Server obsoleto! Chiedi all'host di aggiornare!
 server.kicked.banned = Sei bannato da questo server.
+server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Sei stato cacciato di recente.\nAspetta prima di riconnetterti.
 server.kicked.nameInUse = C'è già qualcuno con il tuo nome\nsu questo server.
 server.kicked.nameEmpty = Il tuo nome deve contenere almeno un carattere.
@@ -76,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = Il pulsante [accent]hos [] ospita un server sulle porte [scarlet]6567[] e [scarlet]656.[] Chiunque sulla stessa [LIGHT_GRAY]connessione wifi o rete locale[] dovrebbe essere in grado di vedere il proprio server nel proprio elenco server.\n\n Se vuoi che le persone siano in grado di connettersi ovunque tramite IP, è richiesto il [accent]port forwarding[]. \n\n[LIGHT_GRAY]Nota: se qualcuno sta riscontrando problemi durante la connessione al gioco LAN, assicurati di aver consentito a Mindustry di accedere alla rete locale nelle impostazioni del firewall.
 join.info = Qui è possibile inserire un [accent]IP del server[] a cui connettersi, o scoprire [accent]un server sulla rete locale[] disponibile.\n Sono supportati sia il multiplayer LAN che WAN. \n\n[LIGHT_GRAY]Nota: non esiste un elenco di server globali automatici; se si desidera connettersi a qualcuno tramite IP, è necessario chiedere all'host il proprio IP.
 hostserver = Host Server
+invitefriends = Invite Friends
 hostserver.mobile = Host\nServer
 host = Host
 hosting = [accent] Apertura del server ...
 hosts.refresh = Aggiorna
 hosts.discovering = Ricerca partite LAN
+hosts.discovering.any = Discovering games
 server.refreshing = Aggiornamento del server
 hosts.none = [lightgray]Nessuna partita LAN trovata!
 host.invalid = [scarlet]Impossibile connettersi all'host.
@@ -103,14 +121,19 @@ server.outdated.client = [crimson]Client obsoleto![]
 server.version = [lightgray]Versione: {0}
 server.custombuild = [yellow] Costruzione personalizzata
 confirmban = Sei sicuro di voler bandire questo giocatore?
-confirmkick = Are you sure you want to kick this player?
+confirmkick = Sei sicuro di voler espellere questo giocatore?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Sei sicuro di voler riammettere questo giocatore?
 confirmadmin = Sei sicuro di voler rendere questo giocatore un amministratore?
 confirmunadmin = Sei sicuro di voler rimuovere lo stato di amministratore da questo giocatore?
 joingame.title = Unisciti alla Partita
 joingame.ip = IP:
 disconnect = Disconnesso.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Il mondo non si vuole caricare, mi dispiace!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connessione in corso ...
 connecting.data = [accent]Caricamento dei dati del mondo ...
 server.port = Porta:
@@ -123,7 +146,7 @@ save.overwrite = Sei sicuro di voler sovrascrivere questo salvataggio?
 overwrite = Sovrascrivi
 save.none = Nessun salvataggio trovato!
 saveload = [Accent]Salvataggio ...
-savefail = Salvataggio del gioco non riuscito!
+savefail = [crimson]Salvataggio del gioco NON riuscito!
 save.delete.confirm = Sei sicuro di voler eliminare questo salvataggio?
 save.delete = Elimina
 save.export = Esporta Salvataggio
@@ -136,6 +159,7 @@ save.rename = Rinomina
 save.rename.text = Nuovo nome:
 selectslot = Seleziona un salvataggio.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 save.corrupted = [orang]Salvataggio corrotto o non valido!
 empty = <Vuoto>
 on = On
@@ -143,27 +167,33 @@ off = Off
 save.autosave = Salvataggio automatico: {0}
 save.map = Mappa: {0}
 save.wave = Ondata: {0}
-save.difficulty = Difficoltà: {0}
+save.mode = Gamemode: {0}
 save.date = Ultimo salvataggio: {0}
 save.playtime = Tempo di gioco: {0}
-warning = Warning.
+warning = Attenzione
 confirm = Conferma
 delete = Elimina
+view.workshop = View In Workshop
 ok = OK
 open = Apri
-customize = Customize
+customize = Personalizza
 cancel = Annulla
 openlink = Apri Link
 copylink = Copia link
 back = Indietro
+data.export = Esporta Salvataggio
+data.import = Importa Salvataggio
+data.exported = Data exported.
+data.invalid = This isn't valid game data.
+data.import.confirm = Importing external data will erase[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
 classic.export = Esporta dati classici
 classic.export.text = [accent]Mindustry[] ha appena rilasciato un aggiornamento importante.\nSalvataggio Classic (v3.5 build 40) o dati delle mappe è stato ritrovato. Vorresti esportare questi salvatagggi sul tuo telefono per usarli nella Mindustry Classic app?
 quit.confirm = Sei sicuro di voler uscire?
 quit.confirm.tutorial = Sei sicuro di sapere cosa stai facendo? Il tutorial può essere ripetuto in[accent] Impostazioni->Gioco->Ripeti il tutorial.[]
 loading = [accent]Caricamento in corso ...
-saving = [accent]Salvando  . . .
+saving = [accent]Salvando ...
 wave = [accent]Ondata {0}
-wave.waiting = Ondata in {0}
+wave.waiting = Ondata tra {0}
 wave.waveInProgress = [LIGHT_GRAY]Ondata in corso...
 waiting = In attesa...
 waiting.players = Aspettando giocatori...
@@ -174,12 +204,17 @@ saveimage = Salva Immagine
 unknown = Sconosciuto
 custom = Personalizzato
 builtin = Incluso
-map.delete.confirm = Sei sicuro di voler eliminare questa mappa? Non potrai tornare indietro!
+map.delete.confirm = Sei sicuro di voler eliminare questa mappa? L'operazione è irreversibile!
 map.random = [accent]Mappa casuale
-map.nospawn = Questa mappa non possiede un nucleo dove spawnare! Aggiungine uno nell'editor.
+map.nospawn = Questa mappa non possiede un nucleo in cui spawnare! Aggiungine uno nell'editor.
 map.nospawn.pvp = Questa mappa non ha un nucleo nemico! Aggiungi un [SCARLET]nucleo rosso[] nell'editor per poter giocare.
 map.nospawn.attack = Questa mappa non ha un nucleo nemico! Aggiungi un [SCARLET]nucleo rosso[] nell'editor per poter giocare.
 map.invalid = Errore nel caricamento della mappa: file mappa corrotto o non valido.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Pennello
 editor.openin = Apri nell'editor
 editor.oregen = Generazione dei minerali
@@ -187,14 +222,17 @@ editor.oregen.info = Generazione dei minerali:
 editor.mapinfo = Informazioni mappa
 editor.author = Autore:
 editor.description = Descrizione:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Ondate:
 editor.rules = Regole:
 editor.generation = Generazione:
 editor.ingame = Modifica in gioco
+editor.publish.workshop = Publish On Workshop
 editor.newmap = Nuova mappa
+workshop = Workshop
 waves.title = Ondate
 waves.remove = Rimuovi
-waves.never = <mai>
+waves.never = mai
 waves.every = sempre
 waves.waves = ondata/e
 waves.perspawn = per spawn
@@ -208,6 +246,7 @@ waves.invalid = Onde dagli appunti non valide.
 waves.copied = Onde copiate.
 waves.none = Nessun nemico definiti.\n Nota che le disposizioni di ondate vuote verranno automaticamente rimpiazzate con la disposizione predefinita.
 editor.default = [LIGHT_GRAY]<Predefinito>
+details = Details...
 edit = Modifica...
 editor.name = Nome:
 editor.spawn = Piazza un'unità
@@ -216,7 +255,8 @@ editor.teams = Squadre
 editor.errorload = Errore nel caricamento di:\n[accent]{0}
 editor.errorsave = Errore nel salvataggio di:\n[accent]{0}
 editor.errorimage = Quella è un'immagine, non una mappa. Non cambiare estensioni sperando che funzioni.\n\n Se vuoi importare una mappa vecchia clicca su "importa una mappa vecchia" nell'editor.
-editor.errorlegacy = La mappa è troppo vecchia e usa un formato che non è più supportato.
+editor.errorlegacy = La mappa è troppo vecchia ed usa un formato che non è più supportato.
+editor.errornot = This is not a map file.
 editor.errorheader = Questo file della mappa è invalido o corrotto.
 editor.errorname = Questa mappa è senza nome.
 editor.update = Aggiorna
@@ -229,7 +269,7 @@ editor.savemap = Salva\nla mappa
 editor.saved = Salvato!
 editor.save.noname = La tua mappa non ha un nome! Impostane uno nelle informazioni della mappa.
 editor.save.overwrite = La tua mappa sovrascrive quelle incluse! Imposta un nome diverso nelle informazioni della mappa.
-editor.import.exists = [scarlet]Impossibile importare:[] esiste già una mappa chiamata '{0}' che non può essere svrascritta!
+editor.import.exists = [scarlet]Impossibile importare:[] esiste già una mappa chiamata '{0}' che non può essere sovrascritta!
 editor.import = Importando...
 editor.importmap = Importa mappa
 editor.importmap.description = Importa mappa preesistente
@@ -249,6 +289,7 @@ editor.resizemap = Ridimensiona la mappa
 editor.mapname = Nome Mappa:
 editor.overwrite = [Accent]Attenzione!\nQuesto sovrascrive una mappa esistente.
 editor.overwrite.confirm = [scarlet]Attenzione![] Una mappa con questo nome esiste già. Sei sicuro di volerla sovrascrivere?
+editor.exists = A map with this name already exists.
 editor.selectmap = Seleziona una mappa da caricare:
 toolmode.replace = Rimpiazzare
 toolmode.replace.description = Disegna solo su blocchi solidi.
@@ -264,7 +305,7 @@ toolmode.fillteams = Riempi squadre
 toolmode.fillteams.description = Riempe squadre al posto di blocchi
 toolmode.drawteams = Disegna squadre
 toolmode.drawteams.description = Disegna squadre al posto di blocchi
-filters.empty = [LIGHT_GRAY]Nessun filtro! Aggiungi uno cliccando il tasto sotto.
+filters.empty = [LIGHT_GRAY]Nessun filtro! Aggiungine uno cliccando il tasto sotto.
 filter.distort = Modifica
 filter.noise = Interferenza
 filter.median = Mediana
@@ -273,7 +314,7 @@ filter.blend = Miscela
 filter.defaultores = Minerali predefiniti
 filter.ore = Minerali
 filter.rivernoise = Interferenze a fiume
-filter.mirror = Specchia
+filter.mirror = Rifletti
 filter.clear = Resetta il filtro
 filter.option.ignore = Ignora
 filter.scatter = Dispersione
@@ -322,15 +363,16 @@ bestwave = [LIGHT_GRAY]Migliore: {0}
 launch = Decollare
 launch.title = Decollo riuscito!
 launch.next = [LIGHT_GRAY]Nuova opportunità all'ondata {0}
-launch.unable2 = [scarlet]Decollo FALLITO![]
+launch.unable2 = [scarlet]IMPOSSIBILE DECOLLARE![]
 launch.confirm = Questo trasporterà tutte le risorse nel tuo nucleo.\nNon riuscirai a ritornare in questa base.
-launch.skip.confirm = Se salti adesso non riuscirai a decollare fino alle onde sucessive
-uncover = Svlare
-configure = Configura l'equipaggio
+launch.skip.confirm = Se salti adesso non riuscirai a decollare fino alle ondate successive
+uncover = Svelare
+configure = Configura l'equipaggiamento
 configure.locked = [LIGHT_GRAY]Arriva all'ondata {0}\nper configurare l'equipaggiamento.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} sbloccata.
 zone.requirement.complete = Ondata {0} raggiunta:\n{1} requisiti di zona soddisfatti.
-zone.config.complete = Ondata {0} reached:\nLoadout config unlocked.
+zone.config.complete = Ondata {0} raggiunta:\nEquipaggiamento personalizzato sbloccato.
 zone.resources = Risorse trovate:
 zone.objective = [lightgray]Obiettivo: [accent]{0}
 zone.objective.survival = Sopravvivere
@@ -346,7 +388,7 @@ error.alreadyconnected = Già connesso.
 error.mapnotfound = Mappa non trovata
 error.io = Errore I/O di rete.
 error.any = Errore di rete sconosciuto.
-error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.bloom = Errore dell'avvio del bloom.\nIl tuo dispositivo potrebbe non supportarlo.
 zone.groundZero.name = Terreno Zero
 zone.desertWastes.name = Rifiuti Desertici
 zone.craters.name = Crateri
@@ -362,20 +404,21 @@ zone.impact0078.name = Impatto 0078
 zone.crags.name = Dirupi
 zone.fungalPass.name = Passaggio Fungoso
 zone.groundZero.description = La posizione ottimale per cominciare. Bassa minaccia nemica. Poche risorse.\nRaccogli quanto più piombo e rame possibile.\nProcedi.
-zone.frozenForest.description = Anche qui, più vicino alle montagne, le spore si sono diffuse. Le temperature rigide non possono contenerle per sempre.\n Inizia la scoperta dell'energia. Costruisci generatori di combustione. Impara a usare i riparatori.
-zone.desertWastes.description = Questi rifiuti sono vasti, imprevedibili e attraversati da strutture settoriali abbandonate.\n\nIl carbone è presente nella regione. Bruciatelo per ottenere energia o sintetizzate la grafite.\n\n[lightgray]Questa posizione di atterraggio non può essere garantita.
+zone.frozenForest.description = Anche qui, più vicino alle montagne, le spore si sono diffuse. Le temperature rigide non possono contenerle per sempre.\n Inizia la scoperta dell'energia. Costruisci generatori a combustione. Impara a usare i riparatori.
+zone.desertWastes.description = Questi rifiuti sono vasti, imprevedibili ed attraversati da strutture settoriali abbandonate.\n\nIl carbone è presente nella regione. Bruciatelo per ottenere energia o sintetizzate la grafite.\n\n[lightgray]Questa posizione di atterraggio non può essere garantita.
 zone.saltFlats.description = Alle periferie del deserto si trovano le saline. Poche risorse possono essere trovate in questa posizione.\n\nIl nemico ha eretto un complesso di archiviazione delle risorse qui. Sradicare il loro nucleo. Non lasciare nulla in piedi.
-zone.craters.description = L'acqua si è accumulata in questo cratere, reliquia delle vecchie guerre. Recupera l'area. Raccogli la sabbia. Fondi il vetro metallico. Pompa l'acqua per raffreddare torrette e trapani.
+zone.craters.description = L'acqua si è accumulata in questo cratere, reliquia delle vecchie guerre. Recupera l'area. Raccogli la sabbia. Fondi il vetro metallico. Pompa l'acqua per raffreddare torrette e trivelle.
 zone.ruinousShores.description = Oltre i rifiuti, c'è il litorale. Una volta, questa posizione ospitava una schiera di difesa costiera. Non rimane molto. Solo le strutture di difesa più elementari sono rimaste incolume, tutto il resto ridotto a rottami.\nContinua l'espansione verso l'esterno. Riscopri la tecnologia.
 zone.stainedMountains.description = Più nell'entroterra si trovano le montagne, non ancora contaminate da spore.\nEstrai l'abbondante titanio in questa zona. Scopri come usarlo.\n\nLa presenza del nemico è maggiore qui. Non dare loro il tempo di inviare le loro unità più forti.
 zone.overgrowth.description = Quest'area è invasa, più vicina alla fonte delle spore.\nIl nemico ha stabilito qui un avamposto. Costruisci unità col pugnale. Distruggilo. Riprenditi ciò che è stato perso.
-zone.tarFields.description = La periferia di una zona di produzione di petrolio, tra le montagne e il deserto. Una delle poche aree con riserve di catrame utilizzabili.\nAnche se abbandonata, questa zona ha alcune pericolose forze nemiche nelle vicinanze. Non sottovalutarlo.\n\n[lightgray]Ricerca la tecnologia di lavorazione dell'olio, se possibile.
+zone.tarFields.description = La periferia di una zona di produzione di petrolio, tra le montagne e il deserto. Una delle poche aree con riserve di catrame utilizzabili.\nAnche se abbandonata, questa zona ha alcune pericolose forze nemiche nelle vicinanze. Non sottovalutarlo.\n\n[lightgray]Ricerca la tecnologia di lavorazione del petrolio, se possibile.
 zone.desolateRift.description = Una zona estremamente pericolosa. Risorse abbondanti, ma poco spazio. Alto rischio di distruzione. Lascia il prima possibile. Non lasciarti ingannare dalla lunga distanza tra gli attacchi nemici.
-zone.nuclearComplex.description = Un ex impianto per la produzione e la lavorazione del torio, ridotto in rovina.\n[lightgray] Ricerca il torio e i suoi numerosi usi.\n\nIl nemico è presente qui in gran numero, alla costante ricerca di aggressori.
+zone.nuclearComplex.description = Un ex impianto per la produzione e la lavorazione del torio, ridotto in rovina.\n[lightgray] Ricerca il torio ed i suoi numerosi usi.\n\nIl nemico è presente qui in gran numero, alla costante ricerca di aggressori.
 zone.fungalPass.description = Un'area di transizione tra alte montagne e terre più basse, piene di spore. Qui si trova una piccola base di ricognizione nemica.\nDistruggila.\nUsa le unità Pugnale e Strisciatore. Elimina i due nuclei.
 zone.impact0078.description = <inserisci descrizione>
 zone.crags.description = <inserisci descrizione>
 settings.language = Lingua
+settings.data = Importa/Esporta salvataggio
 settings.reset = Resetta Alle Impostazioni Predefinite
 settings.rebind = Reimposta
 settings.controls = Controlli
@@ -413,27 +456,30 @@ blocks.poweruse = Utilizzo energia
 blocks.powerdamage = Energia/Danno
 blocks.itemcapacity = Capacità
 blocks.basepowergeneration = Generazione energia di base
-blocks.productiontime = Tempo produzione
-blocks.repairtime = Tempo di riparo completo
+blocks.productiontime = Tempo di produzione
+blocks.repairtime = Tempo di riparazione completa
 blocks.speedincrease = Aumento Velocità
 blocks.range = Raggio
 blocks.drilltier = Scavabili
-blocks.drillspeed = Velocità scavo stbile
+blocks.drillspeed = Velocità di scavo stabile
 blocks.boosteffect = Effetto boost
 blocks.maxunits = Unità attive max
 blocks.health = Salute
-blocks.buildtime = Tempo costruzione
+blocks.buildtime = Tempo di costruzione
+blocks.buildcost = Costo di Costruzione
 blocks.inaccuracy = Inaccuratezza
 blocks.shots = Colpi
 blocks.reload = Ricarica
 blocks.ammo = Munizioni
-bar.drilltierreq = Migliore trapano richiesto
+bar.drilltierreq = Miglior trivella richiesta
 bar.drillspeed = Velocità scavo: {0}/s
 bar.efficiency = Efficienza: {0}%
 bar.powerbalance = Energia: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Energia: {0}
 bar.poweroutput = Energia in uscita: {0}
 bar.items = Oggetti: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquido
 bar.heat = Calore
 bar.power = Energia
@@ -443,7 +489,7 @@ bullet.damage = [stat]{0}[lightgray] danno
 bullet.splashdamage = [stat]{0}[lightgray] danno ad area ~[stat] {1}[lightgray] blocchi
 bullet.incendiary = [stat]incendiario
 bullet.homing = [stat]autoguidato
-bullet.shock = [stat]shock
+bullet.shock = [stat]stordente
 bullet.frag = [stat]frammentazione
 bullet.knockback = [stat]{0}[lightgray] contraccolpo
 bullet.freezing = [stat]congelamento
@@ -478,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (richiede riapertura gioco)[]
 setting.indicators.name = Indicatori Alleati
 setting.autotarget.name = Mira automatica
 setting.keyboard.name = Controlli Mouse+Tastiera
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Limite FPS
 setting.fpscap.none = Niente
 setting.fpscap.text = {0} FPS
@@ -507,10 +554,12 @@ setting.mutemusic.name = Silenzia musica
 setting.sfxvol.name = Volume Effetti
 setting.mutesound.name = Togli suoni
 setting.crashreport.name = Invia rapporti sugli arresti anomali anonimamente
+setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Opacità chat
 setting.playerchat.name = Mostra Chat in-game
 uiscale.reset = La scala dell'interfaccia utente è stata modificata.\nPremere "OK" per confermare questa scala.\n[scarlet] Ripristina ed esci dalle impostazioni [accent] {0}[] impostazioni...
-uiscale.cancel = Annulla e esci
+uiscale.cancel = Annulla ed esci
 setting.bloom.name = Shaders
 keybind.title = Configurazione Tasti
 keybinds.mobile = [scarlet]La maggior parte dei keybind qui non sono funzionali sui dispositivi mobili. È supportato solo il movimento di base.
@@ -518,8 +567,8 @@ category.general.name = Generale
 category.view.name = Visualizzazione
 category.multiplayer.name = Multigiocatore
 command.attack = Attacca
-command.retreat = Ritorna indietro
-command.patrol = Guardia
+command.rally = Rally
+command.retreat = Torna indietro
 keybind.gridMode.name = Seleziona blocco
 keybind.gridModeShift.name = Seleziona categoria
 keybind.press = Premi un tasto...
@@ -527,14 +576,15 @@ keybind.press.axis = Premi un'asse o un tasto...
 keybind.screenshot.name = Screenshot della mappa
 keybind.move_x.name = Sposta_x
 keybind.move_y.name = Sposta_y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = seleziona
 keybind.diagonal_placement.name = Posizionamento diagonale
 keybind.pick.name = Scegli Blocco
 keybind.break_block.name = Rompi blocco
 keybind.deselect.name = Deseleziona
 keybind.shoot.name = spara
-keybind.zoom_hold.name = zoomma
-keybind.zoom.name = zoom
+keybind.zoom_hold.name = attiva zoom
+keybind.zoom.name = esegui zoom
 keybind.menu.name = menu
 keybind.pause.name = pausa
 keybind.minimap.name = Minimappa
@@ -547,18 +597,18 @@ keybind.toggle_menus.name = Abilita menù
 keybind.chat_history_prev.name = Scorri chat vero l'alto
 keybind.chat_history_next.name = Scorri chatt verso il basso
 keybind.chat_scroll.name = Scorri chat
-keybind.drop_unit.name = droppa materiali
-keybind.zoom_minimap.name = Zomma minimappa
+keybind.drop_unit.name = Lascia materiali
+keybind.zoom_minimap.name = Esegui Zoom minimappa
 mode.help.title = Descrizione delle modalità
 mode.survival.name = Sopravvivenza
-mode.survival.description = La modalità normale. Risorse limitate e ondate in entrata automatiche.
-mode.sandbox.name = Sandbox
-mode.sandbox.description = risorse infinite e nessun timer per le ondate.
+mode.survival.description = La modalità normale. Risorse limitate ed ondate in entrata automatiche.
+mode.sandbox.name = Creativa
+mode.sandbox.description = Risorse infinite e nessun timer per le ondate.
 mode.pvp.name = PvP
-mode.pvp.description = Lotta contro altri giocatori
+mode.pvp.description = Lotta contro altri giocatori.
 mode.attack.name = Attacco
 mode.attack.description = Obiettivo: Distruggere la base nemica, non ci sono ondate
-mode.custom = Regole customizzabili
+mode.custom = Regole personalizzate
 rules.infiniteresources = Risorse infinite
 rules.wavetimer = Timer ondate
 rules.waves = Ondate
@@ -600,14 +650,14 @@ item.silicon.name = Silicio
 item.plastanium.name = Plastanio
 item.phase-fabric.name = Tessuto di Fase
 item.surge-alloy.name = Lega di Sovratensione
-item.spore-pod.name = Piattaforma di Spore
+item.spore-pod.name = Baccello di Spore
 item.sand.name = Sabbia
-item.blast-compound.name = Polvere esplosiva
+item.blast-compound.name = Composto Esplosivo
 item.pyratite.name = Pirite
 item.metaglass.name = Vetro Metallico
 item.scrap.name = Rottame
 liquid.water.name = Acqua
-liquid.slag.name = Scorie
+liquid.slag.name = Scoria
 liquid.oil.name = Petrolio
 liquid.cryofluid.name = Criofluido
 mech.alpha-mech.name = Alpha
@@ -618,11 +668,11 @@ mech.delta-mech.weapon = Generatore di fulmini
 mech.delta-mech.ability = Scarica
 mech.tau-mech.name = Tau
 mech.tau-mech.weapon = Laser ricostruttore
-mech.tau-mech.ability = Ripara esplosioni
+mech.tau-mech.ability = Impulso riparatore
 mech.omega-mech.name = Omega
 mech.omega-mech.weapon = Sciame di missili
 mech.omega-mech.ability = Configurazione armata
-mech.dart-ship.name = Dart
+mech.dart-ship.name = Dardo
 mech.dart-ship.weapon = Ripetitore
 mech.javelin-ship.name = Giavellotto
 mech.javelin-ship.weapon = Missili esplosivi
@@ -634,10 +684,10 @@ mech.glaive-ship.weapon = Ripetitore di fiamma
 item.explosiveness = [LIGHT_GRAY]Esplosività: {0}
 item.flammability = [LIGHT_GRAY]Infiammabilità: {0}
 item.radioactivity = [LIGHT_GRAY]Radioattività: {0}
-unit.health = [LIGHT_GRAY]Vita: {0}
+unit.health = [LIGHT_GRAY]Salute: {0}
 unit.speed = [LIGHT_GRAY]Velocità: {0}
 mech.weapon = [LIGHT_GRAY]Armi: {0}
-mech.health = [LIGHT_GRAY]Vita: {0}
+mech.health = [LIGHT_GRAY]Salute: {0}
 mech.itemcapacity = [LIGHT_GRAY]Capacità oggetti: {0}
 mech.minespeed = [LIGHT_GRAY]Velocità di scavo: {0}
 mech.minepower = [LIGHT_GRAY]Potenza di scavo: {0}
@@ -662,18 +712,18 @@ block.shale.name = Scisto
 block.shale-boulder.name = Masso di scisto
 block.moss.name = Muschio
 block.shrubs.name = Arbusti
-block.spore-moss.name = Spore di Muschio
-block.shalerocks.name = Roccie di scisto
+block.spore-moss.name = Muschio di spore
+block.shalerocks.name = Rocce di scisto
 block.scrap-wall.name = Muro di Rottami
-block.scrap-wall-large.name = Muro di rottami grande
-block.scrap-wall-huge.name = Muro di rottami enorme
-block.scrap-wall-gigantic.name = Muro di Rottami Gigante
+block.scrap-wall-large.name = Muro di Rottami grande
+block.scrap-wall-huge.name = Muro di Rottami enorme
+block.scrap-wall-gigantic.name = Muro di Rottami gigante
 block.thruster.name = Propulsore
 block.kiln.name = Forno
 block.graphite-press.name = Pressa per grafite
 block.multi-press.name = Multi Pressa
 block.constructing = {0}\n[LIGHT_GRAY](In costruzione)
-block.spawn.name = Spawning nemico
+block.spawn.name = Spawn nemico
 block.core-shard.name = Nucleo: Frammento
 block.core-foundation.name = Nucleo: Fondamento
 block.core-nucleus.name = Nucleo: Kernel
@@ -688,12 +738,12 @@ block.darksand.name = Sabbia Scura
 block.ice.name = Ghiaccio
 block.snow.name = Neve
 block.craters.name = Crateri
-block.sand-water.name = Acqua Sabbiosa
+block.sand-water.name = Acqua sabbiosa
 block.darksand-water.name = Acqua sabbiosa scura
 block.char.name = Carbone
-block.holostone.name = Pietra di holo
+block.holostone.name = Pietra Holo
 block.ice-snow.name = Neve ghiacciata
-block.rocks.name = Roccie
+block.rocks.name = Rocce
 block.icerocks.name = Rocce ghiacciate
 block.snowrocks.name = Rocce innevate
 block.dunerocks.name = Rocce delle dune
@@ -725,92 +775,96 @@ block.phase-wall.name = Muro di fase
 block.phase-wall-large.name = Muro grande di fase
 block.thorium-wall.name = Muro di torio
 block.thorium-wall-large.name = Muro grande di torio
-block.door.name = porta
+block.door.name = Porta
 block.door-large.name = Porta grande
-block.duo.name = Torretta a due
+block.duo.name = Torretta Duo
 block.scorch.name = Bruciatore
-block.scatter.name = Spargimento
+block.scatter.name = Cannone a dispersione
 block.hail.name = Bombardiere
-block.lancer.name = Idrogetto
-block.conveyor.name = trasportatore
-block.titanium-conveyor.name = Nastro trasportatore potenziato
+block.lancer.name = Lanciere
+block.conveyor.name = Nastro trasportatore
+block.titanium-conveyor.name = Nastro trasportatore avanzato
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Incrocio
 block.router.name = Distributore
-block.distributor.name = Mega Separatore
+block.distributor.name = Distributore Grande
 block.sorter.name = Filtro
+block.message.name = Message
 block.overflow-gate.name = Separatore per eccesso
-block.silicon-smelter.name = Fonderia per silicio
+block.silicon-smelter.name = Fonderia
 block.phase-weaver.name = Tessitore di fase
 block.pulverizer.name = Polverizzatore
-block.cryofluidmixer.name = Miscelatore liquidi
+block.cryofluidmixer.name = Miscelatore di liquidi
 block.melter.name = Fonditore
 block.incinerator.name = Inceneritore
 block.spore-press.name = Pressa di Spore
 block.separator.name = Separatore
 block.coal-centrifuge.name = Centrifuga di Carbone
-block.power-node.name = Snodo energetico
-block.power-node-large.name = Snodo energetico grande
+block.power-node.name = Nodo energetico
+block.power-node-large.name = Nodo energetico grande
 block.surge-tower.name = Torre di Sovratensione
 block.battery.name = Batteria
-block.battery-large.name = Batteria grossa
-block.combustion-generator.name = Generatore a carbone
-block.turbine-generator.name = Turbina
+block.battery-large.name = Batteria grande
+block.combustion-generator.name = Generatore a combustibile
+block.turbine-generator.name = Turbina a vapore
 block.differential-generator.name = Generatore differenziale
 block.impact-reactor.name = Reattore ad Impatto
-block.mechanical-drill.name = Trapano meccanico
-block.pneumatic-drill.name = Trapano pneumatico
-block.laser-drill.name = Estrattore laser
+block.mechanical-drill.name = Trivella meccanica
+block.pneumatic-drill.name = Trivella pneumatica
+block.laser-drill.name = Trivella laser
 block.water-extractor.name = Estrattore d'acqua
 block.cultivator.name = Coltivatore
-block.dart-mech-pad.name = Blocco del Mech Dardo
-block.delta-mech-pad.name = Blocco del Mech Delta
-block.javelin-ship-pad.name = Blocco della Nave Giavellotto
-block.trident-ship-pad.name = Blocco della Nave Tridente
-block.glaive-ship-pad.name = Blocco della Nave Glaive
-block.omega-mech-pad.name = Blocco della Nave Omega
-block.tau-mech-pad.name = Blocco della Nave Tau
-block.conduit.name = Condotto
+block.dart-mech-pad.name = Piattaforma del Mech Dardo
+block.delta-mech-pad.name = Piattaforma del Mech Delta
+block.javelin-ship-pad.name = Piattaforma della Nave Giavellotto
+block.trident-ship-pad.name = Piattaforma della Nave Tridente
+block.glaive-ship-pad.name = Piattaforma della Nave Glaive
+block.omega-mech-pad.name = Piattaforma della Nave Omega
+block.tau-mech-pad.name = Piattaforma della Nave Tau
+block.conduit.name = Condotta
 block.mechanical-pump.name = Pompa meccanica
-block.item-source.name = Sorgente oggetti
-block.item-void.name = Vuoto oggetti
-block.liquid-source.name = Sorgente liquida
-block.power-void.name = Nullità Energetica
-block.power-source.name = Energia infinita
+block.item-source.name = Fonte infinita (oggetti)
+block.item-void.name = Cestino (oggetti)
+block.liquid-source.name = Fonte infinita (liquidi)
+block.power-void.name = Cestino (energia)
+block.power-source.name = Fonte infinita (energia)
 block.unloader.name = Scaricatore
 block.vault.name = Deposito
 block.wave.name = Idrogetto
 block.swarmer.name = Sciamatore
-block.salvo.name = Cannoncino
-block.ripple.name = Cannone
-block.phase-conveyor.name = Nastro trasportatore ad alta velocità
+block.salvo.name = Cannone Leggero
+block.ripple.name = Cannone Pesante
+block.phase-conveyor.name = Nastro di fase
 block.bridge-conveyor.name = Nastro trasportatore sopraelevato
 block.plastanium-compressor.name = Compressore al plastanio
 block.pyratite-mixer.name = Miscelatore di pirite
-block.blast-mixer.name = Miscelatore poleri
+block.blast-mixer.name = Miscelatore di esplosivi
 block.solar-panel.name = Pannello solare
-block.solar-panel-large.name = Pannrllo solare 3x3
-block.oil-extractor.name = Estrattore petrolio
+block.solar-panel-large.name = Pannello solare 3x3
+block.oil-extractor.name = Estrattore di petrolio
+block.command-center.name = Centro di Comando
 block.draug-factory.name = Fabbrica Droni Minatori
 block.spirit-factory.name = Fabbrica Droni Riparatori
 block.phantom-factory.name = Fabbrica Droni Fantasma
 block.wraith-factory.name = Fabbrica Combattenti Spettro
 block.ghoul-factory.name = Fabbrica Bombardieri Demoniaci
-block.dagger-factory.name = Fabbrica Mech col Pugnale
+block.dagger-factory.name = Fabbrica Droni Pugnalatori
 block.crawler-factory.name = Fabbrica Mech Strisciatore
 block.titan-factory.name = Fabbrica Mech Titano
 block.fortress-factory.name = Fabbrica Mech Fortezza
 block.revenant-factory.name = Fabbrica Combattenti Superstiti
 block.repair-point.name = Punto di riparazione
 block.pulse-conduit.name = Condotta attiva
-block.phase-conduit.name = Condotto ad alta velocità
+block.phase-conduit.name = Condotta di fase
 block.liquid-router.name = Distributore di liquidi
-block.liquid-tank.name = Tanica d'acqua
+block.liquid-tank.name = Serbatoio
 block.liquid-junction.name = Giunzione liquida
 block.bridge-conduit.name = Condotta sopraelevata
 block.rotary-pump.name = Pompa a turbina
 block.thorium-reactor.name = Reattore al torio
 block.mass-driver.name = Lancia Materiali
-block.blast-drill.name = Trapano Esplosivo
+block.blast-drill.name = Trivella ad impulsi
 block.thermal-pump.name = Pompa termica
 block.thermal-generator.name = Generatore termico
 block.alloy-smelter.name = Altoforno
@@ -819,17 +873,17 @@ block.mend-projector.name = Riparatore Grande
 block.surge-wall.name = Muro di Sovratensione
 block.surge-wall-large.name = Muro di Sovratensione Grande
 block.cyclone.name = Ciclone
-block.fuse.name = Fusibile
-block.shock-mine.name = Mina Scioccante
-block.overdrive-projector.name = Proiettore ad Attività Frenetica
-block.force-projector.name = Proiettore della Forza
-block.arc.name = Arco
+block.fuse.name = Frantume
+block.shock-mine.name = Mina Stordente
+block.overdrive-projector.name = Generatore di Campo di Overclock
+block.force-projector.name = Generatore di Campo di Forza
+block.arc.name = Arco Elettrico
 block.rtg-generator.name = Generatore Termico ai Radioisotopi
 block.spectre.name = Spettro
 block.meltdown.name = Fusione
 block.container.name = Contenitore
-block.launch-pad.name = Trampolino di Lancio
-block.launch-pad-large.name = Trampolino di Lancio Grande
+block.launch-pad.name = Ascensore Spaziale
+block.launch-pad-large.name = Ascensore Spaziale Avanzato
 team.blue.name = blu
 team.crux.name = rosso
 team.sharded.name = arancione
@@ -847,22 +901,22 @@ unit.ghoul.name = Bombardiere Demoniaco
 unit.wraith.name = Combattente Spettro
 unit.fortress.name = Fortezza
 unit.revenant.name = Superstite
-unit.eruptor.name = Eruttore
-unit.chaos-array.name = Schieramento di Chaos
-unit.eradicator.name = Eradicatore
+unit.eruptor.name = Incandescente
+unit.chaos-array.name = Matrice del Caos
+unit.eradicator.name = Estirpatore
 unit.lich.name = Lich
 unit.reaper.name = Mietitore
 tutorial.next = [lightgray]<Clicca per continuare>
 tutorial.intro = Sei entrato nel[scarlet] Tutorial di Mindustry.[]\nInizia [accent] scavando rame[]. Clicca un minerale di rame vicino al tuo nucleo per farlo.\n\n[accent]{0}/{1} rame
-tutorial.drill = Minare manualmente.\n[accent]Trapani []possono scavare automaticamente\nPiazzane uno su un minerale di rame
-tutorial.drill.mobile = L'estrazione manuale è inefficiente. \n[accent] I trapani [] possono estrarre automaticamente. \n Toccare la scheda del trapano in basso a destra. \n Selezionare il trapano meccanico [accent] []. \n Posizionarlo su una vena di rame toccando, quindi premere il segno di spunta [accent] [] in basso per confermare la selezione. \n Premere il tasto X [accent] [] per annullare il posizionamento.
-tutorial.blockinfo = Ogni blocco ha statistiche diverse. Ogni trapano può estrarre solo determinati minerali. \n Per controllare le informazioni e le statistiche di un blocco, [accent] tocca "?" mentre lo selezioni nel menu di creazione. []\n\n[accent] Accedi ora alle statistiche del trapano meccanico. []
-tutorial.conveyor = [accent] I nastri trasportatori [] sono usati per trasportare oggetti al nocciolo. \n Crea una linea di nastri dal trapano al nocciolo.
-tutorial.conveyor.mobile = [accent] I nastri trasportatori [] sono usati per trasportare oggetti nel nocciolo. \nFai una linea di nastri trasportatori dal trapano al nocciolo. \n[accent] Posizionati in una linea tenendo premuto il dito per alcuni secondi [] e trascinando in una direzione. \n\n [accent] {0} / {1} nastri trasportatori disposti in linea \n [accent] 0/1 oggetti consegnati
+tutorial.drill = Minare manualmente.\n[accent]Le trivelle []possono scavare automaticamente\nPiazzane una su un minerale di rame.
+tutorial.drill.mobile = L'estrazione manuale è inefficiente. \n[accent] Le trivelle [] possono estrarre automaticamente. \n Toccare la scheda della trivella in basso a destra. \n Selezionare la trivella meccanica [accent] []. \n Posizionarlo su una vena di rame toccando, quindi premere il segno di spunta [accent] [] in basso per confermare la selezione. \n Premere il tasto X [accent] [] per annullare il posizionamento.
+tutorial.blockinfo = Ogni blocco ha statistiche diverse. Ogni trivella può estrarre solo determinati minerali. \n Per controllare le informazioni e le statistiche di un blocco, [accent] tocca "?" mentre lo selezioni nel menu di creazione. []\n\n[accent] Accedi ora alle statistiche della trivella meccanica. []
+tutorial.conveyor = [accent] I nastri trasportatori [] sono usati per trasportare oggetti al nocciolo. \n Crea una linea di nastri dalla trivella al nocciolo.
+tutorial.conveyor.mobile = [accent] I nastri trasportatori [] sono usati per trasportare oggetti nel nocciolo. \nCrea una linea di nastri trasportatori dalla trivella al nocciolo. \n[accent] Posizionati in una linea tenendo premuto il dito per alcuni secondi [] e trascinando in una direzione. \n\n [accent] {0} / {1} nastri trasportatori disposti in linea \n [accent] 0/1 oggetti consegnati
 tutorial.turret = Strutture difensive devono essere costruite per respingere il nemico [LIGHT_GRAY] []. \nCostruisci una torretta a due vicino alla tua base.
-tutorial.drillturret = Torrette a due richiedono[accent] munizioni di rame[] per sparare.\n Duo turrets require[accent] copper ammo []to shoot.\nPosiziona un trapano vicino alla torretta per rifornirlo di rame estratto.
-tutorial.pause = Durante la battaglia, puoi mettere in pausa il gioco [accent]. []\nPuoi mettere in fila gli edifici mentre sei in pausa. \n\n[accent] Premi spazio per mettere in pausa.
-tutorial.pause.mobile = Durante la battaglia, puoi mettere in pausa il gioco [accent]. []\nPuoi mettere in fila gli edifici mentre sei in pausa. \n\n[accent] Premi questo pulsante in alto a sinistra per mettere in pausa.
+tutorial.drillturret = Torrette a due richiedono[accent] munizioni di rame[] per sparare.\n Duo turrets require[accent] copper ammo []to shoot.\nPosiziona una trivella vicino alla torretta per rifornirlo di rame estratto.
+tutorial.pause = Durante la battaglia, puoi mettere in pausa il gioco [accent]. []\nPuoi disporre gli edifici mentre sei in pausa. \n\n[accent] Premi spazio per mettere in pausa.
+tutorial.pause.mobile = Durante la battaglia, puoi mettere in pausa il gioco [accent]. []\nPuoi disporre gli edifici mentre sei in pausa. \n\n[accent] Premi questo pulsante in alto a sinistra per mettere in pausa.
 tutorial.unpause = Ora premi di nuovo spazio per annullare la pausa.
 tutorial.unpause.mobile = Ora premilo di nuovo per annullare la pausa.
 tutorial.breaking = I blocchi spesso devono essere distrutti. \n [accent] Tieni premuto il tasto destro del mouse [] per distruggere tutti i blocchi in una selezione. []\n\n[accent] Distruggi tutti i blocchi di scarto a sinistra del tuo core usando la selezione dell'area .
@@ -870,33 +924,33 @@ tutorial.breaking.mobile = I blocchi spesso devono essere distrutti. \n [accent]
 tutorial.withdraw = In alcune situazioni, è necessario prendere gli oggetti direttamente dai blocchi. \n Per fare ciò, [accent] tocca un blocco [] con oggetti al suo interno, quindi [accent] tocca l'oggetto [] nell'inventario. \nPosti multipli possono essere ritirati da [accent] toccando e tenendo premuto []. \n\n[accent] Prelevare un po' di rame dal nucleo. []
 tutorial.deposit = Deposita gli oggetti in blocchi trascinandoli dalla tua nave al blocco di destinazione. \n\n[accent] Riporta il rame nel nucleo. []
 tutorial.waves = Il nemico [LIGHT_GRAY] si avvicina. \n\n Difendi il tuo nucleo per 2 ondate. Costruisci più torrette.
-tutorial.waves.mobile = Il [lightgray] nemico si avvicina.\n\n Difendi il nucleo per due ondate. La tua nave sparerà automaticamente contro i nemici.\nCostruisci più torrette e trapani. Scava più rame
-tutorial.launch = Una volta raggiunta un'onda specifica, sei in grado di [accent] decollare con il nucleo [], lasciando indietro le tue difese e [accent] ottenendo tutte le risorse nel tuo nucleo. [] \n Queste risorse possono quindi essere utilizzate per ricercare nuove tecnologie.\n\n [accent] Premi il pulsante di avvio.
+tutorial.waves.mobile = Il [lightgray] nemico si avvicina.\n\n Difendi il nucleo per due ondate. La tua nave sparerà automaticamente contro i nemici.\nCostruisci più torrette e trivelle. Scava più rame
+tutorial.launch = Una volta raggiunta un'onda specifica, sei in grado di [accent] decollare con il nucleo [], lasciando indietro le tue difese ed [accent] ottenendo tutte le risorse nel tuo nucleo. [] \n Queste risorse possono quindi essere utilizzate per ricercare nuove tecnologie.\n\n [accent] Premi il pulsante di avvio.
 item.copper.description = Un utile materiale, usato dappertutto
 item.lead.description = Un materiale di base, molto usato nei blocchi di trasporto.
-item.metaglass.description = Un durissimo composto di vetro. Estensivamente usato per trasporto di liquidi e immagazzinamento.
-item.graphite.description = Carbone mineralizzato, utilizzato per munizioni e insulazione elettrica.
-item.sand.description = Un materiale di base che viene usato molto nei processi di fusione, sia come lega che come lubrificante.
-item.coal.description = Un carburante comune e facilmente ottenibile.
-item.titanium.description = Un raro metallo super leggero usato ampiamente nel trasporto di liquidi, trapani e navi.
+item.metaglass.description = Un durissimo composto di vetro. Estensivamente usato per trasporto di liquidi ed immagazzinamento.
+item.graphite.description = Carbone mineralizzato, utilizzato per munizioni ed isolamento elettrico.
+item.sand.description = Un materiale di base che viene usato molto nei processi di fusione, sia come lega che come reagente.
+item.coal.description = Un combustibile comune facilmente ottenibile.
+item.titanium.description = Un raro metallo incredibilmente leggero usato ampiamente nella costruzione di trasporti, trivelle e navi.
 item.thorium.description = Un materiale denso e radioattivo, utilizzato nella costruzione di strutture e come carburante del reattore nucleare.
-item.scrap.description = Resti rimanenti di vecchie strutture e unità. Contiene tracce di molti metalli diversi.
+item.scrap.description = Resti rimanenti di vecchie strutture ed unità. Contiene tracce di molti metalli diversi.
 item.silicon.description = Un semiconduttore molto utile che viene utilizzato nei pannelli solari e nei macchinari elettronici.
 item.plastanium.description = Un materiale leggero e duttile, utilizzato nelle navi avanzate e come munizione.
 item.phase-fabric.description = Una sostanza quasi senza peso utilizzata nell'elettronica avanzata e nella tecnologia autoriparante.
 item.surge-alloy.description = Una lega avanzata con proprietà elettriche uniche.
 item.spore-pod.description = Utilizzato per la conversione in petrolio, esplosivi e carburante.
-item.blast-compound.description = Un composto altamente volatile, utilizzato nella produzione di bombe ed esplosivi. Può essere utilizzato come combustibile anche se non è consigliato.
-item.pyratite.description = Una sostanza molto infiammabile che viene utilizzata nelle armi a fuoco.
-liquid.water.description = comunemente usato per macchine di raffreddamento e trattamento dei rifiuti.
-liquid.slag.description = Vari tipi diversi di metallo fuso mescolati insieme. Può essere separato nei suoi minerali costituenti o spruzzato sulle unità nemiche come un'arma.
-liquid.oil.description = Può essere bruciato, esploso o usato come refrigerante.
-liquid.cryofluid.description = Il liquido più efficiente per il raffreddamento.
+item.blast-compound.description = Un composto altamente volatile, utilizzato nella produzione di bombe ed esplosivi. Può essere utilizzato come combustibile anche se non è consigliabile.
+item.pyratite.description = Una sostanza molto infiammabile che viene utilizzata nelle armi da fuoco.
+liquid.water.description = Il liquido più utile. Comunemente usato per il raffreddamento di macchinari ed il trattamento dei rifiuti.
+liquid.slag.description = Diversi tipi di metalli fusi, mescolati insieme. Può essere separato nei suoi minerali costituenti o spruzzato sulle unità nemiche come un'arma.
+liquid.oil.description = Un liquido usato nella produzione avanzata.\nPuò essere convertito in carbone per uso combustibile o spruzzato ed incendiato come arma.
+liquid.cryofluid.description = Un liquido inerte e non corrosivo creato da acqua e titanio.\nIl liquido più efficiente per il raffreddamento.
 mech.alpha-mech.description = Il mech standard. È abbastanza veloce e produce abbastanza danni, può anche generare 3 droni per aumentare il suo danno complessivo.
 mech.delta-mech.description = Un mech veloce, poco armato fatto per giocare a tocca e fuga con il nemico. Fa poco danno alle strutture, ma può uccidere un gran nummero di nemici grazie alle sue armi ad alto voltaggio.
 mech.tau-mech.description = Un mech di supporto. Cura i blocchi danneggiati sparandogli contro. Può spegnere fuochi e curare i compagni di squadra.
 mech.omega-mech.description = Un mech ingombrante e ben armato, fatto per stare in prima linea. La sue difese possono bloccare fino al 90% dei danni.
-mech.dart-ship.description = Una navicella standard. Molto veloce e leggera, ma può minare pochi blocchi e ha scarse potenzialità nella difesa.
+mech.dart-ship.description = Una navicella standard. Molto veloce e leggera, ma può minare pochi blocchi ed ha scarse potenzialità nella difesa.
 mech.javelin-ship.description = Una navetta da tocca e fuga. Anche se inizialmente lenta, può accelerare ad alte velocità e volare sopra gli avamposti dei nemici, e provocare molti danni ai nemici tramite l'utilizzo di fulmini o missili.
 mech.trident-ship.description = Un bombardiere pesante. Molto ben protetto.
 mech.glaive-ship.description = Una grande e ben armata macchina da guerra. Equipaggiata con lanciafamme e con accelerazione veloce.
@@ -904,129 +958,131 @@ unit.draug.description = Un drone minerario primitivo. Economico da produrre. Sa
 unit.spirit.description = L'unità drone di partenza. Si genera nel nucleo per impostazione predefinita. Scava automaticamente, raccoglie oggetti e ripara blocchi.
 unit.phantom.description = Un'unità drone avanzata. Scava automaticamente, raccoglie oggetti e ripara blocchi. Significativamente più efficace del drone di partenza.
 unit.dagger.description = Un unità terrena base, molto più efficiente se in branco.
-unit.crawler.description = Un'unità di terra costituita da un telaio abbattuto con alti esplosivi legati sulla parte superiore. Non particolarmente resistente. Esplode a contatto con i nemici.
-unit.titan.description = Un'unità di terra corazzata avanzata. Utilizza carburo come munizione. Attacca sia bersagli terrestri che aerei.
+unit.crawler.description = Un'unità di terra costituita da un telaio essenziale con potenti esplosivi legati sulla parte superiore. Non particolarmente resistente. Esplode a contatto con i nemici.
+unit.titan.description = Un'unità di terra corazzata avanzata equipaggiata con due piccoli lanciafiamme. Attacca sia bersagli terrestri che aerei.
 unit.fortress.description = Un'unità di terra di artiglieria pesante.
-unit.eruptor.description = Un mech pesante progettato per abbattere le strutture. Spara un flusso di scorie contro le fortificazioni nemiche, sciogliendole e dando fuoco ai gas.
+unit.eruptor.description = Un mech pesante progettato per abbattere le strutture. Spara un flusso di scoria contro le fortificazioni nemiche, sciogliendole e dando fuoco a tutto.
 unit.wraith.description = Un'unità d'intercezione rapida ed efficiente.
-unit.ghoul.description = Un bombardiere pesante. Utilizza composti esplosivi o piratite come munizioni.
-unit.revenant.description = Una serie di missili pesante volante.
+unit.ghoul.description = Un bombardiere pesante. Utilizza composti esplosivi o pirite come munizioni.
+unit.revenant.description = Un pesante lanciamissili volante.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Comprime pezzi di carbone in fogli di grafite puri.
-block.multi-press.description = Una versione aggiornata della pressa per grafite. Impiega acqua e energia per elaborare il carbone in modo rapido ed efficiente.
-block.silicon-smelter.description = Mescola sabbia con carbone riscaldato in assenza d'aria.
-block.kiln.description = Fonde la sabbia e il piombo in vetro metallico. Richiede piccole quantità di energia.
-block.plastanium-compressor.description = Produce plastanio da olio e titanio.
-block.phase-weaver.description = Produce tessuto di fase da torio radioattivo e elevate quantità di sabbia.
+block.multi-press.description = Una versione aggiornata della pressa per grafite. Impiega acqua ed energia per elaborare il carbone in modo rapido ed efficiente.
+block.silicon-smelter.description = Fonde sabbia e carbone riscaldati per ottenere silicio.
+block.kiln.description = Fonde la sabbia ed il piombo in vetro metallico. Richiede piccole quantità di energia.
+block.plastanium-compressor.description = Produce plastanio da petrolio e titanio.
+block.phase-weaver.description = Produce tessuto di fase da torio radioattivo ed elevate quantità di sabbia.
 block.alloy-smelter.description = Produce leghe di sovratensione da titanio, piombo, silicio e rame.
 block.cryofluidmixer.description = Combina acqua e titanio in criofluido che è molto più efficiente per il raffreddamento.
-block.blast-mixer.description = Utilizza olio per trasformare la piratite nel composto esplosivo, meno infiammabile ma più esplosivo.
-block.pyratite-mixer.description = Mescola carbone, piombo e sabbia in piratite altamente infiammabile.
-block.melter.description = Riscalda la pietra a temperature molto elevate per ottenere lava.
-block.separator.description = Espone la pietra alla pressione dell'acqua per ottenere vari minerali contenuti nella pietra.
-block.spore-press.description = Comprime baccelli di spore in olio.
-block.pulverizer.description = Schiaccia la pietra nella sabbia. Utile quando manca la sabbia naturale.
-block.coal-centrifuge.description = Solidifica l'olio in pezzi di carbone.
-block.incinerator.description = Elimina qualsiasi oggetto in eccesso o liquido.
-block.power-void.description = Elimina tutta l'energia messa al suo interno, esiste solo nella sabbiera.
-block.power-source.description = Produce energia infinita, esiste solo nella sabbiera.
-block.item-source.description = Produce oggetti infiniti, esiste solo nella sabbiera.
-block.item-void.description = Elimina gli oggetti che ci entrano dentro senza energia, esiste solo nella sabbiera.
-block.liquid-source.description = Emette continuamente liquidi. Esiste solo nella sabbiera.
-block.copper-wall.description = Un blocco difensivo economico. \n Utile per proteggere il nucleo e le torrette nelle prime ondate.
-block.copper-wall-large.description = Un blocco difensivo economico. \n Utile per proteggere il nucleo e le torrette nelle prime ondate. \nOccupa più blocchi
-block.titanium-wall.description =Un blocco difensivo moderatamente forte.\nFornisce una protezione moderata dai nemici.
-block.titanium-wall-large.description = Un blocco difensivo moderatamente forte. \n Fornisce una protezione moderata dai nemici. \nOccupa più blocchi
+block.blast-mixer.description = Frantuma e mescola le spore con la pirite per produrre Composto Esplosivo.
+block.pyratite-mixer.description = Mescola carbone, piombo e sabbia in pirite altamente infiammabile.
+block.melter.description = Riscalda la pietra a temperature molto elevate per ottenere scoria liquida.
+block.separator.description = Sottopone le scoria a centrifugazione per ottenere i vari minerali contenuti.
+block.spore-press.description = Comprime le spore in petrolio.
+block.pulverizer.description = Polverizza la pietra.\nUtile quando manca la sabbia naturale.
+block.coal-centrifuge.description = Solidifica il petrolio in pezzi di carbone.
+block.incinerator.description = Elimina qualsiasi oggetto o liquido in eccesso.
+block.power-void.description = Elimina tutta l'energia che riceve, esiste solo nella modalità creativa.
+block.power-source.description = Produce energia infinita, esiste solo nella modalità creativa.
+block.item-source.description = Produce oggetti infiniti, esiste solo nella modalità creativa.
+block.item-void.description = Elimina gli oggetti che vi entrano senza bisogno di energia, esiste solo nella modalità creativa.
+block.liquid-source.description = Emette continuamente liquidi. Esiste solo nella modalità creativa.
+block.copper-wall.description = Un blocco difensivo economico.\nUtile per proteggere il nucleo e le torrette nelle prime ondate.
+block.copper-wall-large.description = Un blocco difensivo economico.\nUtile per proteggere il nucleo e le torrette nelle prime ondate. \nOccupa più blocchi
+block.titanium-wall.description = Un blocco difensivo moderatamente forte.\nFornisce una protezione moderata dai nemici.
+block.titanium-wall-large.description = Un blocco difensivo moderatamente forte.\nFornisce una protezione moderata dai nemici. \nOccupa più blocchi
 block.thorium-wall.description = Un forte blocco difensivo.\nBuona protezione dai nemici.
 block.thorium-wall-large.description = Un forte blocco difensivo.\nBuona protezione dai nemici.\nOccupa più blocchi
 block.phase-wall.description = Non è forte come un muro di torio, ma devia i proiettili a meno che non siano troppo potenti.
 block.phase-wall-large.description = Non è forte come un muro di torio, ma devia i proiettili a meno che non siano troppo potenti.\nOccupa più blocchi
 block.surge-wall.description = Il blocco difensivo più forte. \nHa una piccola possibilità di innescare un fulmine verso l'attaccante.
 block.surge-wall-large.description = Il blocco difensivo più forte. \n Ha una piccola possibilità di innescare un fulmine verso l'attaccante.\nOccupa più blocchi
-block.door.description = Una piccola porta che può essere aperta e chiusa toccandola. \nSe aperta, i nemici possono sparare e attraversare.
-block.door-large.description = Una grande porta che può essere aperta e chiusa toccandola. \nSe aperta, i nemici possono sparare e attraversare. \nOccupa più  blocchi
-block.mender.description = Ripara periodicamente blocchi nelle vicinanze. Mantiene le difese riparate tra le ondate.\nPuò usare del silicio per aumentare la portata e l'efficienza.
-block.mend-projector.description = Cura periodicamente gli edifici nelle vicinanze.
-block.overdrive-projector.description = Aumenta la velocità di edifici vicini come trapani e nastri trasportatori.
+block.door.description = Una piccola porta che può essere aperta e chiusa toccandola. \nSe aperta, i nemici possono sparare ed attraversare.
+block.door-large.description = Una grande porta che può essere aperta e chiusa toccandola. \nSe aperta, i nemici possono sparare ed attraversare. \nOccupa più  blocchi
+block.mender.description = Ripara periodicamente blocchi nelle vicinanze.\nUtilizza del silicio per aumentarne portata ed efficienza.
+block.mend-projector.description = Ripara periodicamente blocchi nelle vicinanze.\nUtilizza del tessuto di fase per aumentarne portata ed efficienza.
+block.overdrive-projector.description = Aumenta la velocità di edifici vicini come trivelle e nastri trasportatori.
 block.force-projector.description = Crea un campo di forza esagonale attorno a sé, proteggendo gli edifici e le unità all'interno da danni causati da proiettili
 block.shock-mine.description = Danneggia i nemici che la calpestano. Quasi invisibile al nemico.
-block.conveyor.description = Blocco di trasporto oggetti di base. Sposta gli oggetti in avanti e li deposita automaticamente in altri blocchi. Ruotabile.
-block.titanium-conveyor.description = Blocco trasporto oggetti avanzato. Sposta gli oggetti più velocemente dei trasportatori standard.
-block.junction.description = Funziona come un ponte per due nastri trasportatori incrociati. Utile in situazioni con due diversi nastri trasportatori che trasportano materiali diversi in posizioni diverse.
-block.bridge-conveyor.description = Blocco trasporto oggetti avanzato. Consente il trasporto di oggetti fino a 3 tessere di qualsiasi terreno o edificio.
-block.phase-conveyor.description = Blocco trasporto oggetti avanzato. Utilizza la potenza per teletrasportare gli oggetti su un trasportatore di fase collegato su più piastrelle.
+block.conveyor.description = Nastro di base. Sposta gli oggetti in avanti e li deposita automaticamente in altri blocchi. Ruotabile.
+block.titanium-conveyor.description = Nastro avanzato. Sposta gli oggetti più velocemente dei nastri standard.
+block.junction.description = Permette di incrociare nastri che trasportano materiali diversi in posizioni diverse.
+block.bridge-conveyor.description = Consente il trasporto di oggetti fino a 3 tessere ad un altro nastro sopraelevato.\nPuò passare sopra ad altri blocchi od edifici.
+block.phase-conveyor.description = Nastro avanzato. Consuma energia per teletrasportare gli oggetti su un altro nastro di fase collegato.
 block.sorter.description = Divide gli oggetti. Se l'oggetto corrisponde a quello selezionato, Può passare. Altrimenti viene espulso sui lati.
 block.router.description = Accetta gli elementi da una direzione e li emette fino a 3 altre direzioni allo stesso modo. Utile per suddividere i materiali da una fonte a più destinazioni.
 block.distributor.description = Un distributore avanzato che divide gli oggetti in altre 7 direzioni allo stesso modo.
-block.overflow-gate.description = Una combinazione di un divisore e di un router , che distribuisce sui suoi lati se la via centrale è bloccata.
+block.overflow-gate.description = Una combinazione di un incrocio e di un distributore , che distribuisce sui suoi lati se in nastro difronte si satura.
 block.mass-driver.description = Ultimo blocco di trasporto di oggetti. Raccoglie diversi oggetti e poi li spara su un'altra Lancia Materiali a lungo raggio.
 block.mechanical-pump.description = Una pompa economica con potenza lenta, ma nessun consumo di energia.
-block.rotary-pump.description = Una pompa avanzata che raddoppia la velocità sfruttando la potenza.
+block.rotary-pump.description = Una pompa avanzata che raddoppia la velocità consumando energia.
 block.thermal-pump.description = La pompa migliore. Tre volte più veloce di una pompa meccanica e l'unica pompa in grado di recuperare la lava.
-block.conduit.description = Blocco di trasporto del liquido di base. Funziona come un nastro trasportatore, ma con liquidi. Ideale per estrattori, pompe o altri condotti.
-block.pulse-conduit.description = Blocco trasporto liquidi avanzato. Trasporta i liquidi più velocemente e immagazzina più dei condotti standard.
-block.liquid-router.description = Accetta i liquidi da una direzione e li emette fino a 3 altre direzioni allo stesso modo. Può anche immagazzinare una certa quantità di liquido. Utile per suddividere i liquidi da una fonte a più bersagli.
+block.conduit.description = Condotta di base. Funziona come un nastro trasportatore, ma per i liquidi. Ideale per estrattori, pompe o altre condotte.
+block.pulse-conduit.description = Condotta avanzata. Trasporta più liquido e più velocemente delle condotte standard.
+block.liquid-router.description = Accetta i liquidi da una direzione e li emette fino a 3 altre direzioni allo stesso modo. Può anche immagazzinare una certa quantità di liquido. Utile per suddividere i liquidi da una fonte verso più destinazioni.
 block.liquid-tank.description = Conserva una grande quantità di liquidi. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali o come protezione per il raffreddamento di blocchi vitali.
-block.liquid-junction.description = Funziona come un ponte per due condotti di attraversamento. Utile in situazioni con due condotti diversi che trasportano liquidi diversi in luoghi diversi.
-block.bridge-conduit.description = Blocco trasporto liquidi avanzato. Consente il trasporto di liquidi fino a 3 piastrelle di qualsiasi terreno o edificio.
-block.phase-conduit.description = Blocco trasporto liquidi avanzato. Utilizza la potenza per teletrasportare i liquidi in un condotto di fase collegato su più piastrelle.
-block.power-node.description = Trasmette energia ai nodi collegati. È possibile collegare fino a quattro fonti di alimentazione, eliminatori di energia o nodi. Il nodo riceverà energia o fornirà energia a tutti i blocchi adiacenti.
-block.power-node-large.description = Ha un raggio maggiore rispetto al nodo di alimentazione e si collega a un massimo di sei fonti di alimentazione, eliminatori di energia o nodi.
-block.surge-tower.description = Un nodo di alimentazione a lungo raggio con meno connessioni disponibili.
-block.battery.description = Accumula energia ogni volta che c'è abbondanza e fornisce energia ogni volta che c'è carenza, purché rimanga capacità.
+block.liquid-junction.description = Permette di incrociare condotte che trasportano liquidi diversi in posizioni diverse.
+block.bridge-conduit.description = Consente il trasporto di liquidi fino a 3 tessere da un altra condotta sopraelevata.\nPuò passare sopra ad altri blocchi od edifici.
+block.phase-conduit.description = Condotta avanzata. Consuma energia per teletrasportare i liquidi in un altra condotta di fase collegata.
+block.power-node.description = Trasmette energia tra i nodi collegati. È possibile creare fino a quattro collegamenti.\nClicca sul nodo per configurare i collegamenti.
+block.power-node-large.description = Ha un raggio maggiore rispetto al nodo energetico e si possono creare un massimo di sei collegamenti.\nClicca sul nodo per configurare i collegamenti.
+block.surge-tower.description = Un nodo di alimentazione a lungo raggio solo due connessioni disponibili.\nClicca sul nodo per configurare i collegamenti.
+block.battery.description = Accumula energia ogni volta che c'è abbondanza e fornisce energia ogni volta che c'è carenza, purché rimanga carica.
 block.battery-large.description = Immagazzina molta più energia di una normale batteria.
-block.combustion-generator.description = Genera energia bruciando olio o materiali infiammabili.
+block.combustion-generator.description = Genera energia bruciando combustibile.
 block.thermal-generator.description = Genera una grande quantità di energia dalla lava.
-block.turbine-generator.description = Più efficiente di un generatore di combustione, ma richiede acqua aggiuntiva.
-block.differential-generator.description = Genera grandi quantità di energia. Utilizza la differenza di temperatura tra criofluido e piratite in fiamme.
-block.rtg-generator.description = Un generatore termoelettrico radioisotopico che non richiede raffreddamento ma fornisce meno energia di un reattore al torio.
+block.turbine-generator.description = Più efficiente di un generatore a combustione, ma richiede l'aggiunta di acqua.
+block.differential-generator.description = Genera grandi quantità di energia. Utilizza la differenza di temperatura tra criofluido e pirite in combustione.
+block.rtg-generator.description = Un generatore che sfrutta il calore del decadimento di materiale radioattivo per produrre energia.\nNon richiede raffreddamento ma fornisce meno energia di un reattore al torio.
 block.solar-panel.description = Fornisce una piccola quantità di energia dal sole.
 block.solar-panel-large.description = Fornisce un'alimentazione molto migliore rispetto a un pannello solare standard, ma è anche molto più costoso da costruire.
 block.thorium-reactor.description = Genera enormi quantità di energia dal torio altamente radioattivo. Richiede un raffreddamento costante. Esploderà violentemente se vengono fornite quantità insufficienti di refrigerante.
 block.impact-reactor.description = Un generatore avanzato, in grado di creare enormi quantità di energia alla massima efficienza. Richiede un significativo apporto di energia per avviare il processo.
-block.mechanical-drill.description = Un trapano economico. Se posizionato su riquadri appropriati, genera gli oggetti a un ritmo lento indefinitamente.
-block.pneumatic-drill.description = Un trapano migliorato che è più veloce e in grado di elaborare materiali più duri sfruttando la pressione dell'aria.
-block.laser-drill.description = Consente di perforare ancora più velocemente attraverso la tecnologia laser, ma richiede potenza. Inoltre, con questo trapano è possibile recuperare il torio radioattivo.
-block.blast-drill.description = Il trapano migliore. Richiede grandi quantità di energia.
+block.mechanical-drill.description = Una trivella economica. Se posizionato su riquadri appropriati, estrae minerali a un ritmo lento e costante.
+block.pneumatic-drill.description = Una trivella migliorata più veloce ed in grado di elaborare materiali più duri sfruttando la pressione dell'aria.
+block.laser-drill.description = Consente di perforare ancora più velocemente attraverso la tecnologia laser, ma richiede energia. Inoltre, con questa trivella è possibile recuperare il torio radioattivo.
+block.blast-drill.description = La trivella migliore. Richiede grandi quantità di energia.
 block.water-extractor.description = Estrae l'acqua dal terreno. Usalo quando non c'è nessun lago nelle vicinanze.
 block.cultivator.description = Coltiva il terreno con acqua per ottenere materia organica.
-block.oil-extractor.description = Utilizza grandi quantità di energia per estrarre olio dalla sabbia. Usalo quando non c'è una fonte diretta di petrolio nelle vicinanze.
+block.oil-extractor.description = Utilizza grandi quantità di energia per estrarre petrolio dalla sabbia. Usalo quando non c'è una fonte diretta di petrolio nelle vicinanze.
 block.core-shard.description = La prima iterazione del nucleo. Una volta distrutto, tutti i contatti con la regione vengono persi. Non lasciare che questo accada.
 block.core-foundation.description = La seconda versione del nucleo. Meglio corazzato. Immagazzina più risorse.
-block.core-nucleus.description = La terza e ultima versione del nucleo. Estremamente ben corazzato. Immagazzina enormi quantità di risorse.
+block.core-nucleus.description = La terza ed ultima versione del nucleo. Estremamente ben corazzato. Immagazzina enormi quantità di risorse.
 block.vault.description = Immagazzina una grande quantità di oggetti. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali. Uno [LIGHT_GRAY]scaricatore[] può essere utilizzato per recuperare elementi dal deposito.
-block.container.description = Memorizza una piccola quantità di oggetti. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali. Uno [LIGHT_GRAY]scaricatore[] può essere utilizzato per recuperare elementi dal contenitore.
-block.unloader.description = Scarica gli oggetti da un contenitore, caveau o nucleo su un trasportatore o direttamente in un blocco adiacente. Il tipo di articolo da scaricare può essere modificato toccando lo scaricatore.
-block.launch-pad.description = Lancia oggetti senza necessità di un lancio di base. Incompiuto.
-block.launch-pad-large.description = Una versione migliore della piattaforma di lancio, immagazzina più oggetti. Lancia oggetti più frequentemente.
+block.container.description = Immagazzina una piccola quantità di oggetti. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali. Uno [LIGHT_GRAY]scaricatore[] può essere utilizzato per recuperare elementi dal contenitore.
+block.unloader.description = Scarica gli oggetti da un contenitore, caveau o nucleo su un trasportatore o direttamente in un blocco adiacente. L'oggetto da scaricare può essere scelto toccando lo scaricatore.
+block.launch-pad.description = Lancia oggetti nel tuo nucleo senza necessità di un lasciare la zona.
+block.launch-pad-large.description = Una versione migliore dell'Ascensore Spaziale, immagazzina più oggetti. Lancia oggetti più frequentemente.
 block.duo.description = Una torretta piccola ed economica.
-block.scatter.description = Una torretta anti-aria di medie dimensioni. Spruzza grumi di piombo o frammenti di scorie sulle unità nemiche.
+block.scatter.description = Una torretta antiaerea di medie dimensioni. Spara schegge di piombo o frammenti di rottami sulle unità nemiche.
 block.scorch.description = Brucia qualsiasi nemico di terra vicino ad esso. Molto efficace a distanza ravvicinata.
 block.hail.description = Una piccola torretta di artiglieria.
-block.wave.description = Una torretta a fuoco rapido di medie dimensioni che spara bolle liquide.
-block.lancer.description = Una torretta di medie dimensioni che spara fasci di elettricità caricati.
+block.wave.description = Una torretta a fuoco rapido di medie dimensioni che spara liquidi.
+block.lancer.description = Una torretta di medie dimensioni che dopo un breve caricamento spara potenti fasci elettrici.
 block.arc.description = Una piccola torretta che spara elettricità in un arco casuale verso il nemico.
 block.swarmer.description = Una torretta di medie dimensioni che spara missili esplosivi.
 block.salvo.description = Una torretta di medie dimensioni che spara colpi in salve.
-block.fuse.description = Una grande torretta che spara potenti raggi a corto raggio.
+block.fuse.description = Una grande torretta a corto raggio che spara tre potenti schegge perforanti.
 block.ripple.description = Una grande torretta di artiglieria che spara più colpi contemporaneamente.
 block.cyclone.description = Una grande torretta a fuoco rapido.
 block.spectre.description = Una grande torretta che spara due potenti proiettili contemporaneamente.
-block.meltdown.description = Una grande torretta che spara potenti raggi a lungo raggio.
-block.draug-factory.description = Produce droni minerari
+block.meltdown.description = Una grande torretta che spara un potente laser a lungo raggio.
+block.command-center.description = Da istruzioni alle unità alleate nella mappa. Comanda la ricongizione, l'attacco del nucleo nemico o la ritirata verso il proprio nucleo o fabbrica.\nQuando non è presente un nucleo nemico, le unità pattuglieranno anche se viene ordinato un attacco.
+block.draug-factory.description = Produce droni per la raccolta mineraria.
 block.spirit-factory.description = Produce droni che riparano blocchi.
-block.phantom-factory.description = Produce unità drone avanzate che sono significativamente più efficaci di un drone riparatore.
-block.wraith-factory.description = Produce unità intercettatrici veloci e veloci.
+block.phantom-factory.description = Produce droni avanzati che seguono il giocatore e lo assistono nella costruzione.
+block.wraith-factory.description = Produce unità intercettatrici veloci.
 block.ghoul-factory.description = Produce bombardieri pesanti.
 block.revenant-factory.description = Produce unità laser di terra pesanti.
-block.dagger-factory.description = Produce unità di base di terra.
-block.crawler-factory.description = Produce unità di sciame veloci autodistruggenti.
+block.dagger-factory.description = Produce unità di base corpo a corpo di terra.
+block.crawler-factory.description = Produce unità di sciame veloci ed autodistruggenti.
 block.titan-factory.description = Produce unità terrestri avanzate e corazzate.
 block.fortress-factory.description = Produce unità di terra di artiglieria pesante.
-block.repair-point.description = Cura continuamente l'unità danneggiata più vicina
-block.dart-mech-pad.description = Fornisce la trasformazione in un mech di attacco di base. \nUtilizzare toccando stando in piedi su di esso.
-block.delta-mech-pad.description = Lascia la tua attuale nave e trasformala in un mech veloce e leggermente corazzato fatto per gli attacchi di tipo "colpisci e scappa". \nUsa il blocco toccando due volte mentre ti ci trovi sopra.
-block.tau-mech-pad.description = Lascia la tua attuale nave e trasformala in un mech di supporto in grado di curare edifici e unità amichevoli. \n Usa il blocco toccando due volte mentre sei in piedi su di esso.
-block.omega-mech-pad.description = Lascia la tua attuale nave e trasformala in un mech voluminoso e ben corazzato, creato per gli assalti in prima linea. \nUsa il blocco toccando due volte mentre sei in piedi su di esso.
-block.javelin-ship-pad.description = Lascia la tua attuale nave e trasformala in un intercettore forte e veloce con armi elettriche.\nUsa il blocco toccando due volte mentre ti trovi su di esso.
-block.trident-ship-pad.description = Lascia la tua attuale nave e trasformala in un bombardiere pesantemente ben corazzato. \nUsa il blocco toccando due volte mentre ti trovi su di esso.
-block.glaive-ship-pad.description = Lascia la tua attuale nave e trasformati in una grande nave ben corazzata. \n Usa il blocco toccando due volte mentre ti trovi su di esso.
+block.repair-point.description = Cura continuamente l'unità danneggiata più vicina.
+block.dart-mech-pad.description = Trasforma la tua nave in un mech di attacco di base. \nUsa il blocco toccando due volte mentre ti trovi su di esso.
+block.delta-mech-pad.description = Trasforma la tua nave in un mech veloce e leggermente corazzato, ideale per colpire e scappare. \nUsa il blocco toccando due volte mentre ti ci trovi sopra.
+block.tau-mech-pad.description = Trasforma la tua nave in un mech di supporto in grado di curare edifici ed unità alleate. \n Usa il blocco toccando due volte mentre sei in piedi su di esso.
+block.omega-mech-pad.description = Trasforma la tua nave in un mech voluminoso e ben corazzato, creato per gli assalti in prima linea. \nUsa il blocco toccando due volte mentre sei in piedi su di esso.
+block.javelin-ship-pad.description = Trasforma la tua nave in un intercettore forte e veloce con armi elettriche.\nUsa il blocco toccando due volte mentre ti trovi su di esso.
+block.trident-ship-pad.description = Trasforma la tua nave in un bombardiere pesante e ben corazzato. \nUsa il blocco toccando due volte mentre ti trovi su di esso.
+block.glaive-ship-pad.description = Trasforma la tua nave in una nave grande e ben corazzata. \nUsa il blocco toccando due volte mentre ti trovi su di esso.

core/assets/bundles/bundle_ko.properties

@@ -1,4 +1,4 @@
-credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]
+credits.text = 제작자 [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[] / [scarlet]한국어 번역자[] - [royal]Potion[]
 credits = 제작자
 contributors = 번역 및 기여자들
 discord = Mindustry Discord 에 참여 해 보세요!
@@ -16,24 +16,21 @@ screenshot.invalid = 맵이 너무 커서 스크린샷을 찍을 메모리가
 gameover = 게임 오버
 gameover.pvp = [accent]{0}[] 팀이 승리했습니다!
 highscore = [accent]최고점수 달성!
-
 load.sound = 소리
 load.map = 맵
 load.image = 사진
 load.content = 컨텐츠
 load.system = 시스템
-
-stat.wave = 웨이브 성공:[accent]{0}
-stat.enemiesDestroyed = 파괴한 적 수:[accent]{0}
-stat.built = 건설한 건물 수:[accent]{0}
-stat.destroyed = 파괴된 건물 수:[accent]{0}
-stat.deconstructed = 파괴한 건물 수:[accent]{0}
-stat.delivered = 획득한 자원:
-stat.rank = 최종 기록: [accent]{0}
-
+stat.wave = 버틴 단계 수 : [accent]{0}
+stat.enemiesDestroyed = 파괴한 적 수 : [accent]{0}
+stat.built = 건설한 건물 수 : [accent]{0}
+stat.destroyed = 파괴된 건물 수 : [accent]{0}
+stat.deconstructed = 파괴한 건물 수 : [accent]{0}
+stat.delivered = 획득한 자원 :
+stat.rank = 최종 점수: [accent]{0}
 launcheditems = [accent]창고
 map.delete = 정말로 "[accent]{0}[]" 맵을 삭제하시겠습니까?
-level.highscore = 최고 점수: [accent]{0}
+level.highscore = 최고 점수 : [accent]{0}
 level.select = 맵 선택
 level.mode = 게임 모드 :
 showagain = 다음 세션에서 이 메세지를 표시하지 않습니다
@@ -51,6 +48,7 @@ minimap = 미니맵
 close = 닫기
 website = 웹사이트
 quit = 나가기
+save.quit = 저장  나가기
 maps = 맵
 maps.browse = 맵 검색
 continue = 계속하기
@@ -62,7 +60,6 @@ uploadingcontent = 컨텐츠 업로드
 uploadingpreviewfile = 미리보기 파일 업로드
 committingchanges = 바뀐 점 적용
 done = 완료
-
 about.button = 정보
 name = 이름 :
 noname = 먼저 [accent] 유저 이름[] 을 설정하세요.
@@ -77,7 +74,7 @@ players = 현재 {0}명 접속중
 players.single = 현재 {0}명만 있음.
 server.closing = [accent]서버 닫는중...
 server.kicked.kick = 서버에서 추방되었습니다!
-server.kicked.whitelist = 당신은 여기의 화이트리스트가 아닙니다.
+server.kicked.whitelist = 당신은 이 서버의 화이트리스트가 아닙니다.
 server.kicked.serverClose = 서버 종료됨.
 server.kicked.vote = 당신은 투표로 추방되었습니다. 그러니 좀 적당히 하지 그랬어요?
 server.kicked.clientOutdated = 오래된 버전의 게임입니다! 게임을 업데이트 하세요!
@@ -95,6 +92,7 @@ server.versions = 클라이언트 버전 : [accent] {0}[]\n서버 버전 : [acce
 host.info = [accent]호스트[] 버튼은 현재 네트워크의 [scarlet]6567[] 포트를 사용합니다.\n[LIGHT_GRAY]같은 Wi-Fi 또는 로컬 네트워크[] 에서 서버 목록을 볼 수 있습니다.\n\n만약 플레이어들이 이 IP를 통해 어디에서나 연결할 수 있게 하고 싶다면, 공유기 설정에서 [accent]포트 포워딩[]을 하시거나 Vpn을 사용하셔야 합니다.\n\n[LIGHT_GRAY]참고: LAN 게임 연결에 문제가 있는 사람이 있다면, 방화벽 설정에서 Mindustry 가 로컬 네트워크에 액세스하도록 허용했는지 확인 해 주세요.
 join.info = 여기서 [accent]서버 IP[]를 입력하여 다른 서버에 접속할 수 있습니다.\n또는 [accent]로컬 네트워크(LAN)[] 서버를 검색하여 접속할 수 있습니다.\nLAN 및 WAN 멀티 플레이어 모두 지원됩니다.\n\n[LIGHT_GRAY]참고:여기에서는 자동으로 글로벌 서버를 추가하지 않습니다. IP로 다른 사람의 서버에 접속할려면 직접 서버 주소를 찾아서 적으셔야합니다.[]\n\n[ROYAL]한국의 서버로는 mindustry.kr[accent](포트없음)[],6568과 server1.mindustry.r-e.kr의 8000,8001,8002,8004포트가 있습니다.\n서버 주소 입력방법은 < 주소:포트 >의 형식입니다.
 hostserver = 서버 열기
+invitefriends = 친구 초대
 hostserver.mobile = 서버\n열기
 host = 서버 열기
 hosting = [accent]서버 여는중...
@@ -124,17 +122,18 @@ server.version = [lightgray]서버 버전: {0} {1}
 server.custombuild = [yellow]사용자 정의 서버
 confirmban = 이 플레이어를 차단하시겠습니까?
 confirmkick = 정말로 이 플레이어를 추방시키겠습니까?
+confirmvotekick = 정말로 이 플레이어 추방에 투표하시겠습니까?
 confirmunban = 이 플레이어를 차단해제 하시겠습니까?
 confirmadmin = 이 플레이어를 관리자로 만들겠습니까?
 confirmunadmin = 이 플레이어를 일반 유저로 만들겠습니까?
 joingame.title = 게임 참가
 joingame.ip = 주소:
 disconnect = 서버와 연결이 해제되었습니다.
-disconnect.data = 맵 데이터를 받아오는데 실패했습니다..
+disconnect.error = Connection error.
 disconnect.closed = 연결이 끊어졌습니다..
 disconnect.timeout = 연결 시간 한계 도달..
 disconnect.data = 월드 데이터 로딩 실패..
-
+cantconnect = 게임 [accent]{0}[]에 접속하지 못했습니다.
 connecting = [accent]연결중...
 connecting.data = [accent]월드 데이터 로딩중...
 server.port = 포트:
@@ -160,6 +159,7 @@ save.rename = 이름 변경
 save.rename.text = 새 이름:
 selectslot = 저장슬롯을 선택하십시오.
 slot = [accent]{0}번째 슬롯
+editmessage = 글 수정하기
 save.corrupted = [accent]세이브 파일이 손상되었거나 잘못된 파일입니다! 만약 게임을 업데이트 했다면 이것은 아마 저장 형식 변경일 것이고, 이것은 버그가 [scarlet]아닙니다[].
 empty = <비어있음>
 on = 켜기
@@ -173,6 +173,7 @@ save.playtime = 플레이시간: {0}
 warning = 경고.
 confirm = 확인
 delete = 삭제
+view.workshop = 워크샵에서 보기
 ok = OK
 open = 열기
 customize = 맞춤설정
@@ -210,6 +211,8 @@ map.nospawn.pvp = 이 맵에는 적팀 코어가 없습니다! 에디터에서 [
 map.nospawn.attack = 이 맵에는 플레이어가 공격할 수 있는 적의 코어가 없습니다! 에디터에서 [ROYAL] 빨강색 팀[] 코어를 맵에 추가하세요.
 map.invalid = 파일이 잘못되었거나 손상되어 맵을 열 수 없습니다.
 map.publish.error = 맵 업로드 오류 : {0}
+map.publish.confirm = 맵을 업로드 하시겠습니까?\n\n[lightgray]먼저 워크샵 EULA에 동의하시지 않으면 맵이 표시되지 않습니다!
+eula = 스팀 EULA
 map.publish = 맵 업로드 완료!
 map.publishing = [accent]맵 업로드 중...
 editor.brush = 브러쉬
@@ -219,18 +222,19 @@ editor.oregen.info = 광물 무작위 생성:
 editor.mapinfo = 맵 정보
 editor.author = 만든이:
 editor.description = 설명:
-editor.waves = 웨이브:
+editor.nodescription = 맵을 업로드하려면 최소 4자 이상의 설명이 있어야합니다.
+editor.waves = 단계 :
 editor.rules = 규칙:
 editor.generation = 맵 생성 설정:
 editor.ingame = 인게임 편집
 editor.publish.workshop = 워크샵 업로드
 editor.newmap = 신규 맵
 workshop = 워크샵
-waves.title = 웨이브
+waves.title = 단계
 waves.remove = 삭제
 waves.never = 여기까지 유닛생성
 waves.every = 매
-waves.waves = 웨이브마다
+waves.waves = 단계마다
 waves.perspawn = 생성
 waves.to = 부터
 waves.boss = 이 유닛을 보스로 설정
@@ -238,9 +242,9 @@ waves.preview = 미리보기
 waves.edit = 편집
 waves.copy = 클립보드로 복사
 waves.load = 클립보드에서 불러오기
-waves.invalid = 클립보드의 잘못된 웨이브 데이터
-waves.copied = 웨이브 복사됨
-waves.none = 적 웨이브가 설정되지 않았습니다.\n비어있을 시 자동으로 기본 적 웨이브로 설정됩니다.
+waves.invalid = 클립보드의 잘못된 단계 데이터
+waves.copied = 단계 코드 복사됨
+waves.none = 적 단계가 설정되지 않았습니다.\n비어있을 시 자동으로 기본 적 단계로 설정됩니다.
 editor.default = [LIGHT_GRAY]<기본값>
 details = 설명
 edit = 편집
@@ -285,8 +289,8 @@ editor.resizemap = 맵 크기 조정
 editor.mapname = 맵 이름:
 editor.overwrite = [accept]경고!이 명령은 기존 맵을 덮어씌우게 됩니다.
 editor.overwrite.confirm = [scarlet]경고![] 이 이름을 가진 맵이 이미 있습니다. 덮어 쓰시겠습니까?
+editor.exists = 같은 이름의 맵이 이미 존재합니다.
 editor.selectmap = 불러올 맵 선택:
-
 toolmode.replace = 재배치
 toolmode.replace.description = 블록을 배치합니다.
 toolmode.replaceall = 모두 재배치
@@ -301,12 +305,11 @@ toolmode.fillteams = 팀 채우기
 toolmode.fillteams.description = 블록 대신 팀 건물로 채웁니다.
 toolmode.drawteams = 팀 그리기
 toolmode.drawteams.description = 블록 대신 팀 건물을 배치합니다.
-
 filters.empty = [LIGHT_GRAY]필터가 없습니다!! 아래 버튼을 눌러 추가하세요.
 filter.distort = 왜곡
 filter.noise = 맵 전체에 타일 혹은 블럭 뿌리기
-filter.median = 중앙값
-filter.oremedian = 자원 중앙값
+filter.median = 타일 비율 조정
+filter.oremedian = 자원 크기 조정
 filter.blend = 벽 주위에 타일 설치
 filter.defaultores = 기본 자원값 추가
 filter.ore = 자원
@@ -333,7 +336,6 @@ filter.option.floor2 = 2번째 바닥
 filter.option.threshold2 = 2번째 한계점
 filter.option.radius = 반경
 filter.option.percentile = 백분위수
-
 width = 넓이:
 height = 높이:
 menu = 메뉴
@@ -351,12 +353,11 @@ tutorial.retake = 튜토리얼
 editor = 편집기
 mapeditor = 맵 편집기
 donate = 기부
-
 abandon = 포기
 abandon.text = 이 구역의 모든 자원이 적에게 빼앗길 것입니다.
 locked = 잠김
 complete = [LIGHT_GRAY]완료:
-zone.requirement = 지역 {1} 에서 웨이브 {0} 달성
+zone.requirement = 지역 {1} 에서 단계 {0} 달성
 resume = 지역 계속 플레이:\n[LIGHT_GRAY]{0}
 bestwave = [LIGHT_GRAY]최고 점수: {0}
 launch = < 출격 >
@@ -364,21 +365,20 @@ launch.title = 출격 성공
 launch.next = [LIGHT_GRAY]다음 출격기회는 {0} 단계에서 나타납니다.
 launch.unable2 = [scarlet]출격할 수 없습니다.[]
 launch.confirm = 출격하게 되면 모든 자원이 코어로 들어갑니다.\n또한 성공하기 전까지 기지로 돌아갈 수 없습니다.
-launch.skip.confirm = 만약 지금 출격하시지 않고 스킵하신다면, 다음 출격 웨이브까지 기다려야 합니다.
+launch.skip.confirm = 만약 지금 출격하시지 않고 스킵하신다면, 다음 출격 단계까지 기다려야 합니다.
 uncover = 구역 개방
 configure = 코어 시작자원 설정
 configure.locked = {0} 단계에서 시작자원 설정 잠금이 해제됩니다.
-configure.invalid = 해당 가격은 0 과 {0} 사이여야 합니다.
+configure.invalid = 해당  0 과 {0} 사이여야 합니다.
 zone.unlocked = [LIGHT_GRAY] 잠금 해제되었습니다!
-zone.requirement.complete = 웨이브 {0} 달성:\n{1} 지역 요구사항이 충족되었습니다!
-zone.config.complete = 웨이브 {0} 달성:\n시작자원 설정 기능이 해금되었습니다!
+zone.requirement.complete = 단계 {0} 달성:\n{1} 지역 요구사항이 충족되었습니다!
+zone.config.complete = 단계 {0} 달성:\n시작자원 설정 기능이 해금되었습니다!
 zone.resources = 자원이 감지되었습니다 :
 zone.objective = [lightgray]게임 모드: [accent]{0}
 zone.objective.survival = 생존
 zone.objective.attack = 적 코어 파괴
 add = 추가...
 boss.health = 보스 체력
-
 connectfail = [crimson]{0}[accent] 서버에 연결하지 못했습니다.[]
 error.unreachable = 서버에 연결하지 못했습니다.\n서버 주소가 정확히 입력되었나요?
 error.invalidaddress = 잘못된 주소입니다.
@@ -389,7 +389,6 @@ error.mapnotfound = 맵 파일을 찾을 수 없습니다!
 error.io = 네트워크 I/O 오류.
 error.any = 알 수 없는 네트워크 오류.
 error.bloom = 블룸 그래픽 효과를 적용하지 못했습니다.\n당신의 기기가 이 기능을 지원하지 않는 것일 수도 있습니다.
-
 zone.groundZero.name = 전초기지
 zone.desertWastes.name = 쓰레기 사막
 zone.craters.name = 크레이터
@@ -404,7 +403,6 @@ zone.saltFlats.name = 소금 사막
 zone.impact0078.name = Impact 0078
 zone.crags.name = 협곡
 zone.fungalPass.name = 포자 지대
-
 zone.groundZero.description = 이 장소는 다시 시작하기에 최적의 환경을 지닌 장소입니다. 적은 수준의 위협이 있으며 자원의 양은 적습니다.\n가능한 한 많은 양의 구리와 납을 수집하십시오.\n출격합시다!
 zone.frozenForest.description = 이 지역도 산과 가까운 지역입니다 포자들이 흩뿌려져 있으며 극한의 추위도 포자룰 막을 수 있을거 같지 않습니다.\n전력을 통해서 모험을 시작하십시오 화력 발전소를 짓고 수리드론을 사용하는 법을 배우십시오.
 zone.desertWastes.description = 이 황무지는 끝을 알수 없을 정도로 광활합니다 그리고 십자가 형태의 버려진 구조물이 존재합니다.\n석탄이 존재하며 이를 화력발전에 쓰거나 흑연정제에 쓰십시오.\n\n[lightgray]이 지역에서의 착륙장소는 확실하지 않습니다.
@@ -419,7 +417,6 @@ zone.nuclearComplex.description = 과거 토륨의 생산, 연구와 처리를
 zone.fungalPass.description = 고산지대과 포자지대 사이의 지역입니다. 소규모의 적 정찰기지가 있으니 디거와 크롤러를 이용해 적의 코어를 파괴하십시오.
 zone.impact0078.description = [ROYAL]죄송합니다. 아직 설명이 준비되지 않았습니다.
 zone.crags.description = [ROYAL]죄송합니다. 아직 설명이 준비되지 않았습니다.
-
 settings.language = 언어
 settings.data = 게임 데이터
 settings.reset = 설정 초기화
@@ -440,8 +437,8 @@ info.title = [accent]정보
 error.title = [crimson]오류가 발생했습니다.
 error.crashtitle = 오류가 발생했습니다.
 attackpvponly = [scarlet]오직 Pvp/공격 모드에서만 사용가능합니다.
-blocks.input = 입력
-blocks.output = 출력
+blocks.input = 소모 자원
+blocks.output = 출력 자원
 blocks.booster = 가속
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = 전력 용량
@@ -474,20 +471,20 @@ blocks.inaccuracy = 오차각
 blocks.shots = 발포 횟수
 blocks.reload = 재장전
 blocks.ammo = 탄약
-
-bar.drilltierreq = 드릴이 요구됨
+bar.drilltierreq = 더 좋은 드릴이 요구됨
 bar.drillspeed = 채광 속도 : {0}/s
 bar.efficiency = 효율성 : {0}%
 bar.powerbalance = 전력 : {0}/s
-bar.poweramount = 전력 : {0}
-bar.poweroutput = 전력 출력 : {0}
-bar.items = 아이템: {0}
+bar.powerstored = 에너지 저장량 : {0}/{1}
+bar.poweramount = 전력 저장량 : {0}
+bar.poweroutput = 전력 생산량 : {0}/s
+bar.items = 최대 120개중 {0}개 중
+bar.capacity = 저장공간 : {0}
 bar.liquid = 액체
 bar.heat = 발열
 bar.power = 전력
-bar.progress = 건설 진행
-bar.spawned = 유닛: {0}/{1}
-
+bar.progress = 생산 진행도
+bar.spawned = 최대 {1}기 중 {0}기 생산됨
 bullet.damage = [stat]{0}[lightgray] 데미지
 bullet.splashdamage = [stat]{0}[lightgray] 범위 데미지 ~[stat] {1}[lightgray] 타일
 bullet.incendiary = [stat]방화
@@ -499,7 +496,6 @@ bullet.freezing = [stat]동결
 bullet.tarred = [stat]타르
 bullet.multiplier = [stat]{0}[lightgray]x 탄약 소모율
 bullet.reload = [stat]{0}[lightgray]x 사격 속도
-
 unit.blocks = 블록
 unit.powersecond = 전력/초
 unit.liquidsecond = 액체/초
@@ -525,9 +521,10 @@ setting.linear.name = 선형 필터링
 setting.animatedwater.name = 움직이는 물
 setting.animatedshields.name = 움직이는 보호막
 setting.antialias.name = 안티 에일리어싱[LIGHT_GRAY] (재시작 필요)[]
-setting.indicators.name = 아군/적 인디게이터 표시
+setting.indicators.name = 아군/적 인디케이터 표시
 setting.autotarget.name = 자동 조준
 setting.keyboard.name = 마우스+키보드 조작
+setting.touchscreen.name = 터치스크린 
 setting.fpscap.name = 최대 FPS
 setting.fpscap.none = 없음
 setting.fpscap.text = {0}FPS
@@ -570,8 +567,8 @@ category.general.name = 일반
 category.view.name = 보기
 category.multiplayer.name = 멀티플레이
 command.attack = 공격
+command.rally = Rally
 command.retreat = 후퇴
-command.patrol = 순찰
 keybind.gridMode.name = 블록 선택
 keybind.gridModeShift.name = 카테고리 선택
 keybind.press = 키를 누르세요.
@@ -612,7 +609,6 @@ mode.pvp.description = 실제 플레이어와 PvP를 합니다. 맵에 적어도
 mode.attack.name = 공격
 mode.attack.description = 적 기지를 파괴하세요. 맵에 빨간팀 코어가 있어야 플레이 가능합니다.
 mode.custom = 사용자 정의 규칙
-
 rules.infiniteresources = 무한 자원
 rules.wavetimer = 웨이브 타이머
 rules.waves = 웨이브
@@ -639,7 +635,6 @@ rules.title.resourcesbuilding = 자원 & 건축
 rules.title.player = 플레이어들
 rules.title.enemy = 적
 rules.title.unit = 유닛
-
 content.item.name = 아이템
 content.liquid.name = 액체
 content.unit.name = 유닛
@@ -701,7 +696,6 @@ mech.buildspeed = [LIGHT_GRAY]건설 속도: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]발열 용량: {0}
 liquid.viscosity = [LIGHT_GRAY]점도: {0}
 liquid.temperature = [LIGHT_GRAY]온도: {0}
-
 block.sand-boulder.name = 사암
 block.grass.name = 잔디
 block.salt.name = 소금
@@ -790,10 +784,13 @@ block.hail.name = 헤일
 block.lancer.name = 랜서
 block.conveyor.name = 컨베이어
 block.titanium-conveyor.name = 티타늄 컨베이어
+block.armored-conveyor.name = 장갑 컨베이어
+block.armored-conveyor.description = 운송 속도는 티타늄 컨베이어와 비슷하나, 훨씬 단단합니다. 그러나 컨베이어외에는 자원을 받지 못합니다. \n\n[royal]체력이 늘어났지만, 벽만큼 단단하지는 않습니다. 단단하다고 해서 안심하지 마세요.
 block.junction.name = 교차기
 block.router.name = 분배기
 block.distributor.name = 대형 분배기
 block.sorter.name = 필터
+block.message.name = 메모 블럭
 block.overflow-gate.name = 오버플로 게이트
 block.silicon-smelter.name = 실리콘 제련소
 block.phase-weaver.name = 메타 합성기
@@ -846,7 +843,7 @@ block.blast-mixer.name = 폭발물 혼합기
 block.solar-panel.name = 태양 전지판
 block.solar-panel-large.name = 대형 태양 전지판
 block.oil-extractor.name = 석유 추출기
-block.command-center.name = 유닛 명령 
+block.command-center.name = 지휘소
 block.draug-factory.name = 광부 드론 공장
 block.spirit-factory.name = 수리 드론 공장
 block.phantom-factory.name = 건설 드론 공장
@@ -897,8 +894,8 @@ team.purple.name = 보라색 팀
 unit.spirit.name = 스피릿 수리 드론
 unit.draug.name = 드라우그 채광 드론
 unit.phantom.name = 팬텀 건설 드론
-unit.dagger.name = 디거
-unit.crawler.name = 자폭자
+unit.dagger.name = 대거
+unit.crawler.name = 크롤러
 unit.titan.name = 타이탄
 unit.ghoul.name = 구울 폭격기
 unit.wraith.name = 유령 전투기
@@ -914,35 +911,33 @@ tutorial.intro = Mindustry 튜토리얼을 시작하겠습니다. 튜토리얼
 tutorial.drill = 수동으로 채광하는 것은 효율이 낮습니다.\n[accent]드릴[]은 자동으로 드릴 바로아래에 있는 광물들을 채광합니다.\n드릴 카테고리의 기계식 드릴을 선택하여 구리 광맥위에 설치하세요.\n마우스 오른쪽 버튼으로 취소가 가능합니다.
 tutorial.drill.mobile = 수동으로 채광하는 것은 효율이 낮습니다.\n[accent]드릴[]은 자동으로 드릴 바로아래에 있는 광물들을 채광합니다.\n드릴 카테고리의 기계식 드릴을 선택하여 구리 광맥위에 설치하세요.\n취소 버튼을 눌러 건축하기 전의 설계를 취소할 수 있습니다.
 tutorial.blockinfo = 블록들은 각각 능력이 다르며, 하위 티어의 드릴은 채광할 수 있는 광물의 종류가 적습니다.\n블럭의 정보를 확인하기 위해서는,[accent] 카테고리의 블럭을 누른 후, "?"버튼을 클릭하여 블럭의 정보를 확인하세요.[]\n[royal]궁금한 블럭의 정보를 아무거나 한 번 확인해보세요.
-tutorial.conveyor = [accent]컨베이어[]는 붙어 있는 곳에서 받는 아이템을 코어로 운반합니다.\n드릴에서 코어까지 컨베이어 라인을 만드세요.\n[accent]컨베이어를 클릭 후 건설을 시작하려는 지점을 마우스 왼쪽 버튼으로 꾸욱 누른 뒤[] 드래그하여 설계하세요.\n\n컨베이어 건설 수[accent]{0}/{1}\n[accent]광물을 코어로 운반하세요.
-tutorial.conveyor.mobile = [accent]컨베이어[]는 붙어 있는 곳에서 받는 아이템을 코어로 운반합니다.\n드릴에서 코어까지 컨베이어 라인을 만드세요.\n[accent]컨베이어를 화면에 1초정도 클릭하여 작은 노란색 원이 잠깐 나타났다 사라질 때까지 기다리신 후[] 드래그하여 설계하세요.\n\n컨베이어 건설 수[accent]{0}/{1}\n[accent]광물을 코어로 운반하세요.
+tutorial.conveyor = [accent]컨베이어[]는 붙어 있는 곳에서 받는 아이템을 코어로 운반합니다.\n드릴에서 코어까지 컨베이어 라인을 만드세요.\n[accent]컨베이어를 클릭 후 건설을 시작하려는 지점을 마우스 왼쪽 버튼으로 꾸욱 누른 뒤[] 드래그하여 설계하세요.\n\n[accent]컨베이어를 2개 이상 건설 후 광물을 코어로 운반하세요.
+tutorial.conveyor.mobile = [accent]컨베이어[]는 붙어 있는 곳에서 받는 아이템을 코어로 운반합니다.\n드릴에서 코어까지 컨베이어 라인을 만드세요.\n[accent]컨베이어를 화면에 1초정도 클릭하여 작은 노란색 원이 잠깐 나타났다 사라질 때까지 기다리신 후[] 드래그하여 설계하세요.\n\n[accent]컨베이어를 2개 이상 건설 후 광물을 코어로 운반하세요.
 tutorial.turret = 방어 구조물은 [LIGHT_GRAY]적[]을 물리치기 위해 반드시 필요합니다.\n포탑 카테고리의 듀오 포탑을 선택하신 후, 기지 근처에 듀오 포탑을 설치하세요.
-tutorial.drillturret = 듀오 포탑이 공격하기 위해서는[accent] 구리 탄약[]을 필요로 합니다.\n포탑 근처의 구리 광맥에 드릴을 설치하고 컨베이어로 포탑과 이어서 포탑에 구리를 공급하세요.\n또는 직접 코어에서 광물을 꺼내 포탑에 넣을 수 도 있습니다.
-tutorial.pause = 싱글 플래이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]스페이스 버튼[]을 눌러 일시정지하세요.
-tutorial.pause.mobile = 싱글 플래이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]일시정지 버튼[]을 눌러 일시정지하세요.
+tutorial.drillturret = 듀오 포탑이 공격하기 위해서는[accent] 구리 탄약[]을 필요로 합니다.\n포탑 근처의 구리 광맥에 드릴을 설치하고 컨베이어로 포탑과 이어서 포탑에 구리를 공급하세요.\n또는 직접 코어에서 광물을 꺼내 포탑에 넣을 수도 있습니다.
+tutorial.pause = 싱글 플레이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]스페이스 버튼[]을 눌러 일시정지하세요.
+tutorial.pause.mobile = 싱글 플레이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]일시정지 버튼[]을 눌러 일시정지하세요.
 tutorial.unpause = 게임을 진행하기 위해 [accent]스페이스 버튼[]을 다시 누르세요.
 tutorial.unpause.mobile = 게임을 진행하기 위해 같은 위치의 버튼을 다시 누르세요.
 tutorial.breaking = 설계를 방해하는 블록을 제거하기 위해서 [accent]첫 번째 지점을 마우스 오른쪽 버튼[]으로 누른 뒤 드래그하여 범위를 지정해서 제거하세요.[]\n\n[accent]코어 근처의 조각 블럭 3개[]를 제거하세요.
-tutorial.breaking.mobile = 설계를 방해하는 블록을 제거하기 위해서 [accent]망치 버튼을 눌러 제거모드[]로 변경하신 후, 첫번째 지점을 누른 후 드래그하여 범위를 지정한뒤 V버튼을 클릭해 블럭을 제거하세요.\n\n[accent]코어 근처의 조각 블럭 3개[]를 제거하세요.
-tutorial.withdraw = [accent]코어나 창고,공장[]같은 자원을 넣을 수 있는 일부 블럭에서는 직접 자원을 빼낼 수도 있습니다.\n[accent]코어를 클릭 후 자원을 눌러서 자원을 빼내세요.
+tutorial.breaking.mobile = 설계를 방해하는 블록을 제거하기 위해서 [accent]망치 버튼을 눌러 제거모드[]로 변경하신 후, 첫번째 지점을 누른 후 드래그하여 범위를 지정한뒤 V버튼을 클릭해 블럭을 제거하세요.\n\n[accent]코어 근처의 조각벽 3개[]를 제거하세요.
+tutorial.withdraw = [accent]코어나 창고, 공장[]같은 자원을 넣을 수 있는 일부 블럭에서는 직접 자원을 빼낼 수도 있습니다.\n[accent]코어를 클릭 후 자원을 눌러서 자원을 빼내세요.
 tutorial.deposit = 자원을 다시 블록에 넣을수도 있습니다.\n\n[accent]당신의 기체에서 코어로 드래그[]하여 자원을 되돌려 넣으세요.
 tutorial.waves = [LIGHT_GRAY]적[]이 접근합니다.\n당신의 기체는 적을 향해 클릭하여 공격할 수 있습니다. 또한, 구리를 더 캐내고 포탑을 더 지어서 방어를 강화하세요.\n\n[accent]2단계 동안 코어를 보호하세요.[]
 tutorial.waves.mobile = [LIGHT_GRAY]적[]이 접근합니다.\n당신의 기체는 적을 자동조준하지만, 원하는 적을 클릭하여 공격하고 싶은 대상을 바꿀 수 있습니다.\n구리를 더 캐내고 포탑을 더 지어서 방어를 강화하세요.\n\n[accent]2단계동안 코어를 방어하세요.[]
 tutorial.launch = 특정 단계에 도달하면 [accent]출격[]이 가능합니다.\n[accent]출격[]을 하게되면 해당 지역의 코어에 들어있는 자원들을 캠페인의 자원 창고로 보내지만, 해당 지역의 [accent]모든 것들[]은 날라가게 되니 주의하세요.
-
-
 item.copper.description = 모든 종류의 블록에서 광범위하게 사용되는 자원입니다.
 item.lead.description = 쉽게 구할 수 있으며, 전자 및 액체 수송 블록에서 광범위하게 사용되는 자원입니다.
-item.metaglass.description = 초강력 유리 화합물. 액체 분배 및 저장에 광범위하게 사용됩니다.\n\n[royal]빨리 생산할수록 게임이 편해집니다.
+item.metaglass.description = 초강력 유리 화합물. 액체 분배 및 저장에 광범위하게 사용됩니다.\n\n[royal]액체를 활용하기 위한 필수품입니다.
 item.graphite.description = 탄약 및 전기 절연에 사용되는 광물질화 탄소.
 item.sand.description = 고티어 합금을 제작할 때 사용되는 일반적인 재료입니다.
 item.coal.description = 흔하고 쉽게 구할 수 있는 연료.
 item.titanium.description = 파이프 재료나 고급 드릴, 비행기/기체 등에서 재료로 사용되는 자원입니다.
 item.thorium.description = 건물의 재료, 터렛의 탄약 또는 핵연료로 사용되는 방사성 금속입니다.
 item.scrap.description = 오래된 건물과 유닛의 남은 잔해. 미량의 다양한 금속들이 포함되어 있습니다.
-item.silicon.description = 매우 유용한 물질로, 기체를 만들거나 태양 전지판 등 전자 건물에 사용할 수 있습니다.\n\n[royal]이 것이 생산되면 발전속도가 급속도로 빨라집니다.
+item.silicon.description = 매우 유용한 물질로, 기체를 만들거나 태양 전지판 등 전자 건물에 사용할 수 있습니다.\n\n[royal]전력을 효과적으로 생산/관리하기 위한 필수품입니다.
 item.plastanium.description = 고급 항공기 및 분열 탄약에 사용되는 가벼운 연성 재료.
-item.phase-fabric.description = 최첨단 전자 제품과 자기수리 기술에 사용되는 거의 무중력에 가까운 물질입니다.\n\n[royal]발전기 근처에 있는 오버드라이브에 함부로 이 것을 넣지마세요.
+item.phase-fabric.description = 최첨단 전자 제품과 자기수리 기술에 사용되는 거의 무중력에 가까운 물질입니다.\n\n[royal]메타 가속하면 범위가 늘어나는 건물들이 있습니다.
 item.surge-alloy.description = 순간적으로 전압이 증가하는 전기 특성을 가진 고급 합금입니다.
 item.spore-pod.description = 석유를 만들거나 탄약과 합성해 연료로 전환하는데 사용됩니다.
 item.blast-compound.description = 터렛 및 건설의 재료로 사용되는 휘발성 폭발물.\n연료로도 사용할 수 있지만, 별로 추천하지는 않습니다.
@@ -956,13 +951,13 @@ mech.delta-mech.description = 빠르게 이동하는 적을 처치하기 위한
 mech.tau-mech.description = 지원형 기체.\n총을 발사하여 건물을 치료하고 회복 능력 사용으로 화재를 진압하거나, 반경 내 아군을 치유시킵니다.
 mech.omega-mech.description = 지상 기체 최종판이자 건물 파괴용으로 적합한 부피가 크고 튼튼한 기체.\n방어 모드는 최대 90% 의 피해를 줄일 수 있습니다.
 mech.dart-ship.description = 표준 비행선.\n빠르고 가볍지만 공격력이 거의 없고 채광 속도가 느립니다.
-mech.javelin-ship.description = 치고 빠지는 공격을 위한 비행선.\n처음에는 느리지만, 가속도가 붙어 엄청난 속도로 미사일 피해를 입힐 수 있으며, 전격 능력을 사용할 수 있습니다.\n\n[royal]보호막을 제거하기에 가장 좋습니다.
-mech.trident-ship.description = 대형 공중 폭격능력과 빠른 건설능력을 가진 폭격기.\n당연하게도 엄청 단단합니다.
+mech.javelin-ship.description = 치고 빠지는 공격을 위한 비행선.\n처음에는 느리지만, 가속도가 붙어 엄청난 속도로 미사일 피해를 입힐 수 있으며, 전격 능력을 사용할 수 있습니다.\n\n[royal]지나가기만 해도 보호막을 전부 파괴합니다.
+mech.trident-ship.description = 대형 공중 폭격능력과 빠른 건설능력을 가진 폭격기입니다.
 mech.glaive-ship.description = 크고 잘 무장된 총을 가진 비행선.\n방화용 리피터가 장착되어 있으며, 가속도와 최대속도가 높습니다.
 unit.draug.description = 가장 기본적인 채굴 드론입니다 저렴하게 생산 가능하며 자동으로 구리와 납을 캐내 가까운 코어에 저장합니다.
 unit.spirit.description = 블록을 자동으로 수리합니다.
 unit.phantom.description = 첨단 드론 유닛. 플레이어의 건설을 도와줍니다.
-unit.dagger.description = 기본 지상 유닛입니다.\n플레이어 기체처럼 드론을 소환하지는 않습니다.
+unit.dagger.description = 기본 지상 유닛입니다.
 unit.crawler.description = 지상 유닛. 적이 가까이에 있으면 폭발합니다.
 unit.titan.description = 고급 지상 유닛입니다.\n원거리 총 대신에 근접 화염 방사기를 가지고 있으며, 지상과 공중 둘다 공격할 수 있습니다.
 unit.fortress.description = 중포 지상 유닛.\n높은 공격력을 가진 총과 높은 체력을 가지고 있습니다.
@@ -970,6 +965,7 @@ unit.eruptor.description = 지상 유닛. 광재를 넣은 파도와 같은 무
 unit.wraith.description = 적 핵심 건물 및 유닛을 집중적으로 공격하는 방식을 사용하는 전투기 입니다.
 unit.ghoul.description = 무겁고 튼튼한 지상 폭격기 입니다.\n주로 적 건물로 이동하여 엄청난 폭격을 가합니다.
 unit.revenant.description = 플래이어가 생산가능한 최종 공중 전투기. 폭발물을 쓰는 스웜 포탑과 같은 무기를 사용합니다.
+block.message.description = 글을 작성할 수 있습니다. 이 것을 이용하여 같은 팀과 소통을 해보세요.
 block.graphite-press.description = 석탄 덩어리를 흑연으로 압축합니다.
 block.multi-press.description = 흑연 압축기의 상향 버전입니다. 물과 전력을 이용해 석탄을 빠르고 효율적으로 압축합니다.
 block.silicon-smelter.description = 석탄과 모래를 사용해 실리콘을 생산합니다.
@@ -1032,7 +1028,7 @@ block.power-node.description = 전기을 연결된 대상과 연동시킵니다.
 block.power-node-large.description = 전기를 연결된 대상과 연동시킵니다.\n최대 30개의 대상을 연결시킬 수 있고, 범위도 더 넓습니다.
 block.surge-tower.description = 전기를 연결된 대상과 연동시킵니다.\n2개의 대상만 연결시킬 수 있지만 대신에 범위가 매우 넓습니다.
 block.battery.description = 전력 생산량에 여유가 있을경우, 생산된 잉여 전력을 여기에 저장합니다.\n\n[ROYAL]이것을 이용해 한순간에 많은 전력을 사용하는 포탑들을 보조가능합니다.
-block.battery-large.description = 일반 배터리보다 훨씬 많은 량의 전력을 저장합니다.\n\n[ROYAL]임시 전력을 만들어서 냉각기에 전기가 부족해 원자로 폭발이 일어나는 것을 막아보는 것은 어떨까요? 
+block.battery-large.description = 일반 배터리보다 훨씬 많은 량의 전력을 저장합니다.\n\n[ROYAL]배터리 9개를 설치하는 것보다 효율이 좋습니다.
 block.combustion-generator.description = 인화성 물질을 태워 소량의 전력을 생산합니다.
 block.thermal-generator.description = 건설가능한 열이 있는 타일 위에 건설하면 전력을 생산합니다.\n\n[ROYAL]용암 웅덩이 혹은 열기지대에서 무한정 열을 발산합니다.
 block.turbine-generator.description = 화력 발전기보다 효율적이지만, 액체가 추가적으로 필요합니다.\n\n[ROYAL]일반 타일에서 물추출기 1개로 2개가 가동가능합니다.
@@ -1041,8 +1037,8 @@ block.rtg-generator.description = 방사성동위원소 열전기 발전기\n토
 block.solar-panel.description = 태양광으로 극소량의 전기을 생산합니다.
 block.solar-panel-large.description = 일반 태양 전지판보다 훨씬 발전량이 많지만, 건축비도 훨씬 비쌉니다.
 block.thorium-reactor.description = 토륨을 이용해 막대한 양의 전기를 생산합니다. 지속적인 냉각이 필요하며 냉각제의 양이 부족하면 크게 폭발합니다.\n\n[royal]폭발로 인한 피해를 버틸 수 있는 건물은 없습니다.
-block.impact-reactor.description = 최첨단 발전기\n폭발물과 냉각수를 이용해 최고의 효율로 매우 많은 양의 전기를 생산할 수 있습니다. 발전을 시작하는데 전기가 필요하며 발전기를 가동하는데 시간이 많이 걸립니다.\n[royal]오버드라이브 프로젝터로 10000이상의 전기를 생산할 수 있으며, 가동중에 전기가 끊기면 가동을 다시 해야되기 때문에 창고,물탱크,배터리 등을 주위에 설치하고 나서 가동하는 것을 추천합니다.
-block.mechanical-drill.description = 싸구려 드릴. 적절한 타일 위에 놓였을때 매우 느린 속도로 채광합니다.\n\n[ROYAL]구리와 납은 광부 드론으로 대체가 가능합니다.
+block.impact-reactor.description = 최첨단 발전기\n폭발물과 냉각수를 이용해 최고의 효율로 매우 많은 양의 전기를 생산할 수 있습니다. 발전을 시작하는데 전기가 필요하며 발전기를 가동하는데 시간이 많이 걸립니다.\n[royal]오버드라이브 프로젝터로 10000이상의 전기를 생산할 수 있으며, 가동중에 전기가 끊기면 가동을 다시 해야되기 때문에 창고,물탱크,배터리 등을 주위에 설치하고 나서 가동하는 것을 추천드립니다.
+block.mechanical-drill.description = 싸구려 드릴. 적절한 타일 위에 놓였을때 매우 느린 속도로 채광합니다.\n\n[ROYAL]구리와 납은 채광 드론으로 대체가 가능합니다.
 block.pneumatic-drill.description = 기압을 이용하여 보다 빠르게 단단한 물질을 채광할 수 있는 향상된 드릴.\n\n[ROYAL]전기를 사용하지 않는 드릴이라도 물과 오버드라이브를 이용하여 가속할 수 있습니다.
 block.laser-drill.description = 토륨을 채광할 수 있는 고급 드릴입니다. 전력과 물을 공급하여 빠른 속도로 채광할 수 있습니다.\n\n[ROYAL]드릴아래에 배치된 광물타일의 비율에 따라 채광량이 달라집니다.
 block.blast-drill.description = 최상위 드릴입니다. 많은량의 전력이 필요합니다.\n\n[ROYAL]물추출기 하나면 충분합니다.
@@ -1052,14 +1048,14 @@ block.oil-extractor.description = 대량의 전력과 물을 사용하여 모래
 block.core-shard.description = 코어의 1단계 형태입니다.\n이것이 파괴되면 플레이하고 있는 지역과의 연결이 끊어지니 적의 공격에 파괴되지 않도록 주의하세요.\n[ROYAL]연결이 끊긴다는 말은 게임오버와 일맥상통합니다.
 block.core-foundation.description = 코어의 2단계 형태입니다.\n첫 번째 코어보다 더 튼튼하고 더 많은 자원을 저장할 수 있습니다.\n\n[ROYAL]크기도 좀 더 큽니다.
 block.core-nucleus.description = 코어의 3단계이자 마지막 형태입니다.\n최고로 튼튼하며 막대한 양의 자원들을 저장할 수 있습니다.
-block.vault.description = 각종 대량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 창고에서 물건을 회수할 수 있습니다.\n\n[royal]포탑의 탄약, ☆핵융합로의 폭발물☆, 원자로 냉각수의 티타늄등 여러 자원들의 여분을 미리 저장하여 혹시모를 사태를 예방하세요.
+block.vault.description = 각종 대량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 창고에서 물건을 회수할 수 있습니다.\n\n[royal]포탑의 탄약, 핵융합로의 폭발물, 원자로 냉각수의 티타늄등 여러 자원들의 여분을 미리 저장하여 혹시모를 사태를 예방하세요.
 block.container.description = 각종 소량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 컨테이너에서 자원을 회수할 수 있습니다.\n\n[royal]또는 컨테이너를 클릭하고 자원을 눌러 자원을 강탈해갈수도 있습니다.
 block.unloader.description = 컨테이너, 창고 또는 코어에서 인접한 블록으로 자원을 출하합니다. 출하시킬 자원의 종류는 언로더를 눌러 지정할 수 있습니다.
-block.launch-pad.description = 출격할 필요 없이 자원을 수송시킵시다.\n\n[royal]제발 멀티에서 이거 설치하고 잠수좀 타지마세요. 하는 것도 없이 자원만 빼가는 건 너무 민폐입니다.
-block.launch-pad-large.description = 출격 패드의 강화버전\n더 많은 자원을 더 자주 출격시킵니다.\n\n[ROYAL]크기도 더 크다죠
+block.launch-pad.description = 출격할 필요 없이 자원을 수송시킵시다.\n\n[royal]캠페인에서 이 것을 이용해 게임 중에 테크 트리를 올릴 수 있습니다.
+block.launch-pad-large.description = 출격 패드의 강화버전\n더 많은 자원을 더 자주 출격시킵니다.\n\n[ROYAL]크기도 더 큽니다.
 block.duo.description = 소형 포탑입니다.\n가장 기본적인 포탑으로 약한 탄환을 발사합니다.
 block.scatter.description = 중형 대공 포탑입니다.\n납이나 고철 덩어리를 적에게 쏩니다.
-block.scorch.description = 소형 포탑입니다.\n지상의 적을 매우 강력한 화염으로 지져버립니다. 사거리가 짧고 지상만 공격 가능한 것 때문인지 지상유닛 상대로는 최고의 공격력을 보여줍니다.\n\n[royal]너무 빨리 모든 것을 태우다보니 건물에는 불이 안 붙더군요.
+block.scorch.description = 소형 포탑입니다.\n지상의 적을 매우 강력한 화염으로 지져버립니다. 근거리에서 효과적입니다.\n\n[royal]유닛 상대로 무지막지한 공격력을 보여줍니다.
 block.hail.description = 소형 포탑입니다.\n장거리로 포탄을 발사합니다.
 block.wave.description = 중형 포탑입니다. 대상에게 포탑에 공급된 액체를 발사합니다. 물또는 냉각수가 공급되면 자동으로 불을 끕니다.
 block.lancer.description = 중형 포탑입니다.\n적을 레이저로 관통합니다.
@@ -1071,22 +1067,22 @@ block.ripple.description = 대형 포탑입니다.\n여러 발의 사격을 동
 block.cyclone.description = 대형 포탑입니다.\n초고속으로 사격합니다.
 block.spectre.description = 초대형 포탑입니다.\n한 번에 두 발의 강력한 총알을 쏩니다.
 block.meltdown.description = 초대형 포탑.\n장거리의 강력한 열광선을 발사합니다.
-block.command-center.description = 아군 유닛에게 이동 명령을 내릴 수 있는 건물입니다.\n명령의 종류는 순찰/공격/후퇴가 있으며, 순찰은 유닛이 맵 주위를 돌아다니게, 공격은 유닛들을 적 코어를 향해 공격하도록, 후퇴는 유닛들을 아군 코어 또는 공장으로 돌아오게 합니다.\n\n[royal]이제 공중유닛도 모아서 보낼 수 있습니다!
+block.command-center.description = 아군 유닛에게 이동 명령을 내릴 수 있는 건물입니다.\n명령의 종류는 순찰/공격/후퇴가 있으며, 순찰은 유닛이 순찰 지점을 돌아다니게, 공격은 유닛들을 적 코어를 향해 공격하도록, 후퇴는 유닛들을 아군 코어 또는 공장으로 돌아오게 합니다.\n\n[royal]생존 모드일 경우 공격 명령이 유닛을 적 생성 지점으로 보내니 조심하세요.
 block.draug-factory.description = 구리와 납을 캐는 채광 드론을 생산합니다.\n\n[ROYAL]이 드론은 영혼을 가지고 있습니다.
 block.spirit-factory.description = 블록을 수리하는 수리 드론을 생산합니다.\n\n[ROYAL]드론에도 정령이 있다죠.
 block.phantom-factory.description = 건설을 도와주는 빌더 드론을 생산합니다.\n\n[ROYAL]당신의 환영입니다.
-block.wraith-factory.description = 빠른 뺑소니 요격기 유닛을 생산합니다.\n\n[ROYAL]?:저거 안죽어요??\n??:님 인터넷을 확인해보셈\n?:아 왠지 기체가 이상한 곳을 조준하더라..
+block.wraith-factory.description = 빠른 뺑소니 요격기 유닛을 생산합니다.\n\n[ROYAL]체력 자체는 무척 적습니다.
 block.ghoul-factory.description = 중탄두 폭격기를 생산합니다.\n\n[ROYAL]적 위를 유령처럼 맴돕니다.
-block.revenant-factory.description = 중량의 폭발물 스웜 포대를 가진 전함을 생산합니다.\n\n[ROYAL]캠페인과 사용자 정의 게임에서 ai가 다른 대표적인 유닛이라죠.
-block.dagger-factory.description = 기본 지상 유닛을 생산합니다.\n\n[ROYAL]원래대로라면 대거라 읽어야 되지만 총을 쏜다는 것이 이상하기도 해서 한국 커뮤니티에서는 그냥 디거라 부른다죠. 그게 좀 더 입에 붙잖아요?
-block.crawler-factory.description = 자폭하는 지상 유닛을 생산합니다.\n\n[ROYAL]가까이 가기만 해도 죽는 섬세한 친구랍니다.
-block.titan-factory.description = 화염방사기를 장착한 지상유닛를 생산합니다.\n\n[ROYAL]최강이 될 수도, 최약이 될 수도 있습니다.
+block.revenant-factory.description = 중량의 폭발물 스웜 포대를 가진 전함을 생산합니다.\n\n[ROYAL]
+block.dagger-factory.description = 기본 지상 유닛을 생산합니다.\n\n[ROYAL]대거지만 단검으로 공격하진 않습니다.
+block.crawler-factory.description = 자폭하는 지상 유닛을 생산합니다.\n\n[ROYAL]레일만으로도 막을 수 있습니다.
+block.titan-factory.description = 화염방사기를 장착한 지상유닛를 생산합니다.\n\n[ROYAL]유닛 상대로 강력한 공격력을 보여줍니다.
 block.fortress-factory.description = 중대포 지상유닛를 생산합니다.
-block.repair-point.description = 주변에서 가장 가까운 손상된 유닛을 지속적으로 치료합니다.\n\n[ROYAL]이 것으로 플래이어는 지속적인 교전이 가능해집니다.
+block.repair-point.description = 주변에서 가장 가까운 손상된 유닛을 지속적으로 치료합니다.
 block.dart-mech-pad.description = 기본적인 공격용 지상 기체로 전환할 수 있습니다.\n눌러서 변신하세요.\n\n[ROYAL]한 번 더 눌러서 기본 공중 기체로 전환가능합니다.
 block.delta-mech-pad.description = 전격 무기와 천둥의 특수능력을 가진 기체로 전환할 수 있습니다.\n눌러서 전환하세요.\n\n[ROYAL]공중으로 날았다가 착지하는 것으로 특수능력의 발현이 가능합니다.
 block.tau-mech-pad.description = 수리의 능력을 가진 지원형 기체로 전환할 수 있습니다.\n눌러서 전환하세요.\n\n[ROYAL]주변에 피해를 입은 유닛이 있다면 수리의 파동을 발산합니다.
 block.omega-mech-pad.description = 포탑과의 전투가 용이하고 기체중에서 가장 단단한 기체로 전환할 수 있습니다.\n눌러서 전환하세요.\n\n[ROYAL]교전시에 지상에 착지한 상태라면 방어모드에 진입해 90퍼센트의 피해를 흡수합니다.
 block.javelin-ship-pad.description = 전격 무기와 강력하고 번개의 특수능력을 가진 빠른 요격체로 전환할 수 있습니다.\n눌러서 전환하세요.\n\n[ROYAL]최고 속도에 도달하면 주변을 번개로 지져버립니다.
 block.trident-ship-pad.description = 잘 무장된 중폭격기로 전환이 가능합니다.\n눌러서 전환하세요.\n\n[ROYAL]적들의 위에서 폭격하기 때문에 비전투 건물이나 실드를 파괴할 때 용이합니다. 더해서 건물 건설 속도가 가장 빠릅니다.
-block.glaive-ship-pad.description = 방화기를 장착한 전투기로 전환이 가능합니다.\n누르거나 클릭하여 이 기체로 바꿉니다.\n\n[ROYAL]컨트롤하기 가장 적합한 기체입니다.
+block.glaive-ship-pad.description = 방화기를 장착한 전투기로 전환이 가능합니다.\n누르거나 클릭하여 이 기체로 바꿉니다.\n\n[ROYAL]속도가 가장 빠릅니다.

core/assets/bundles/bundle_nl.properties

@@ -48,9 +48,18 @@ minimap = Minimap
 close = Close
 website = Website
 quit = Quit
+save.quit = Save & Quit
 maps = Maps
+maps.browse = Browse Maps
 continue = Continue
 maps.none = [LIGHT_GRAY]No maps found!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = About
 name = Name:
 noname = Pick a[accent] player name[] first.
@@ -65,12 +74,14 @@ players = {0} players online
 players.single = {0} player online
 server.closing = [accent]Closing server...
 server.kicked.kick = You have been kicked from the server!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server closed.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Outdated client! Update your game!
 server.kicked.serverOutdated = Outdated server! Ask the host to update!
 server.kicked.banned = You are banned on this server.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = You have been kicked recently.\nWait before connecting again.
 server.kicked.nameInUse = There is someone with that name\nalready on this server.
 server.kicked.nameEmpty = Your chosen name is invalid.
@@ -81,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings.
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[LIGHT_GRAY]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
 hostserver = Host Game
+invitefriends = Invite Friends
 hostserver.mobile = Host\nGame
 host = Host
 hosting = [accent]Opening server...
 hosts.refresh = Refresh
 hosts.discovering = Discovering LAN games
+hosts.discovering.any = Discovering games
 server.refreshing = Refreshing server
 hosts.none = [lightgray]No local games found!
 host.invalid = [scarlet]Can't connect to host.
@@ -109,13 +122,18 @@ server.version = [lightgray]Version: {0} {1}
 server.custombuild = [yellow]Custom Build
 confirmban = Are you sure you want to ban this player?
 confirmkick = Are you sure you want to kick this player?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Are you sure you want to make this player an admin?
 confirmunadmin = Are you sure you want to remove admin status from this player?
 joingame.title = Join Game
 joingame.ip = Address:
 disconnect = Disconnected.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Failed to load world data!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connecting...
 connecting.data = [accent]Loading world data...
 server.port = Port:
@@ -141,6 +159,7 @@ save.rename = Rename
 save.rename.text = New name:
 selectslot = Select a save.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 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>
 on = On
@@ -148,12 +167,13 @@ off = Off
 save.autosave = Autosave: {0}
 save.map = Map: {0}
 save.wave = Wave {0}
-save.difficulty = Difficulty: {0}
+save.mode = Gamemode: {0}
 save.date = Last Saved: {0}
 save.playtime = Playtime: {0}
 warning = Warning.
 confirm = Confirm
 delete = Delete
+view.workshop = View In Workshop
 ok = OK
 open = Open
 customize = Customize
@@ -190,6 +210,11 @@ map.nospawn = This map does not have any cores for the player to spawn in! Add a
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] red[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Brush
 editor.openin = Open In Editor
 editor.oregen = Ore Generation
@@ -197,11 +222,14 @@ editor.oregen.info = Ore Generation:
 editor.mapinfo = Map Info
 editor.author = Author:
 editor.description = Description:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.ingame = Edit In-Game
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
 waves.never = <never>
@@ -218,6 +246,7 @@ waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]<Default>
+details = Details...
 edit = Edit...
 editor.name = Name:
 editor.spawn = Spawn Unit
@@ -227,6 +256,7 @@ editor.errorload = Error loading file:\n[accent]{0}
 editor.errorsave = Error saving file:\n[accent]{0}
 editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined.
 editor.update = Update
@@ -259,6 +289,7 @@ editor.resizemap = Resize Map
 editor.mapname = Map Name:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
 editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
+editor.exists = A map with this name already exists.
 editor.selectmap = Select a map to load:
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Unlock configuring loadout:\nWave {0}.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
@@ -434,6 +466,7 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display In-Game Chat
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -530,8 +567,8 @@ category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
 command.attack = Attack
+command.rally = Rally
 command.retreat = Retreat
-command.patrol = Patrol
 keybind.gridMode.name = Block Select
 keybind.gridModeShift.name = Category Select
 keybind.press = Press a key...
@@ -747,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Junction
 block.router.name = Router
 block.distributor.name = Distributor
 block.sorter.name = Sorter
+block.message.name = Message
 block.overflow-gate.name = Overflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.ghoul.description = A heavy carpet bomber.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.

core/assets/bundles/bundle_nl_BE.properties

@@ -48,9 +48,18 @@ minimap = Kaartje
 close = Sluit
 website = Website
 quit = Verlaat
+save.quit = Save & Quit
 maps = Kaarten
+maps.browse = Browse Maps
 continue = Ga verder
 maps.none = [LIGHT_GRAY]Geen kaarten gevonden!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Extra info
 name = Naam:
 noname = Kies eerst[accent] een naam[].
@@ -65,12 +74,14 @@ players = {0} spelers online
 players.single = {0} speler online
 server.closing = [accent]Server wordt gesloten...
 server.kicked.kick = Je bent uit de server gegooid!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server gesloten.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Verouderde versie! Update Mindustry!
 server.kicked.serverOutdated = Verouderde server! Vraag de eigenaar van de server om de server te updaten!
 server.kicked.banned = Je bent verbannen van deze server.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Je bent daarnet van de server gegooid.\nWacht even voor je weer verbindt
 server.kicked.nameInUse = Er is al iemand met dezelfde naam op de server.
 server.kicked.nameEmpty = Je gekozen naam is ongeldig.
@@ -81,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = Ook De [accent]host[] knop hosts een server op poort [scarlet]6567[]. \nIedereen die verbonden is met dezelfde [LIGHT_GRAY]wifi of lokaal netwerk[] zou je server moeten zien in zijn server lijst.\n\nAls je wil dat personen kunnen verbinden met je server van ergens anders via IP. Dan is [accent]port forwarding[] is nodig.\n\n[LIGHT_GRAY]Nota: Als iemand problemen heeft met het verbinden tot je LAN spel, zorg dan dat mindustry toestemming heeft tot je lokale netwerk in de Firewall instellingen. 
 join.info = Hier kan je een [accent]server IP[] invullen waarmee je wil verbinden. Je kan hier ook verbinden met servers op je [accent]lokale netwerk[]. LAN en WAN multiplayer wordt ondersteund.\n\n[LIGHT_GRAY]Belangrijk: er is geen automatische globale server lijst; als je met iemand wil verbinden via een IP adres moet je zijn/haar IP adres vragen. 
 hostserver = Host Game
+invitefriends = Invite Friends
 hostserver.mobile = Host\nGame
 host = Host
 hosting = [accent]De server wordt geopend...
 hosts.refresh = Herlaad
 hosts.discovering = LAN games worden gezocht
+hosts.discovering.any = Discovering games
 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).
@@ -109,13 +122,18 @@ server.version = [lightgray]Versie: {0} {1}
 server.custombuild = [yellow]Aangepaste versie
 confirmban = Ben je zeker dat je deze speler wil verbannen?
 confirmkick = Ben je zeker dat je deze speler van de server wil gooien?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Ben je zeker dat je de verbanning ongedaan wil maken?
 confirmadmin = Ben je zeker dat je deze speler administrator wil maken?
 confirmunadmin = Ben je zeker dat je de Administrator status van deze speler ongedaan wilt maken?
 joingame.title = Verbinden met server
 joingame.ip = IP adres:
 disconnect = Verbinding verbroken.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Laden map data mislukt!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Verbinden...
 connecting.data = [accent]Laden map data...
 server.port = Poort:
@@ -141,6 +159,7 @@ save.rename = Naam wijzigen
 save.rename.text = Nieuwe naam:
 selectslot = Selecteer een save.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 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>
 on = Aan
@@ -148,12 +167,13 @@ off = Uit
 save.autosave = Autosave: {0}
 save.map = Map: {0}
 save.wave = Golf {0}
-save.difficulty = Moeilijkheid: {0}
+save.mode = Gamemode: {0}
 save.date = Last Saved: {0}
 save.playtime = Playtime: {0}
 warning = Waarschuwing.
 confirm = Bevestig
 delete = Verwijder
+view.workshop = View In Workshop
 ok = OK
 open = Open
 customize = Pas aan
@@ -190,6 +210,11 @@ map.nospawn = This map does not have any cores for the player to spawn in! Add a
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-blue[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Brush
 editor.openin = Open In Editor
 editor.oregen = Ore Generation
@@ -197,11 +222,14 @@ editor.oregen.info = Ore Generation:
 editor.mapinfo = Map Info
 editor.author = Author:
 editor.description = Description:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.ingame = Edit In-Game
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
 waves.never = <never>
@@ -218,6 +246,7 @@ waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]<Default>
+details = Details...
 edit = Edit...
 editor.name = Name:
 editor.spawn = Spawn Unit
@@ -227,6 +256,7 @@ editor.errorload = Error loading file:\n[accent]{0}
 editor.errorsave = Error saving file:\n[accent]{0}
 editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined.
 editor.update = Update
@@ -259,6 +289,7 @@ editor.resizemap = Resize Map
 editor.mapname = Map Name:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
 editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
+editor.exists = A map with this name already exists.
 editor.selectmap = Select a map to load:
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Unlock configuring loadout:\nWave {0}.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
@@ -434,6 +466,7 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}/s
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display In-Game Chat
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -530,8 +567,8 @@ category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
 command.attack = Attack
+command.rally = Rally
 command.retreat = Retreat
-command.patrol = Patrol
 keybind.gridMode.name = Block Select
 keybind.gridModeShift.name = Category Select
 keybind.press = Press a key...
@@ -747,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Junction
 block.router.name = Router
 block.distributor.name = Distributor
 block.sorter.name = Sorter
+block.message.name = Message
 block.overflow-gate.name = Overflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.ghoul.description = A heavy carpet bomber.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.

core/assets/bundles/bundle_pl.properties

@@ -16,13 +16,11 @@ 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!
-
 load.sound = Dźwięki
 load.map = Mapy
 load.image = Obrazy
 load.content = Treść
 load.system = System
-
 stat.wave = Fale powstrzymane:[accent] {0}
 stat.enemiesDestroyed = Przeciwnicy zniszczeni:[accent] {0}
 stat.built = Budynki zbudowane:[accent] {0}
@@ -30,7 +28,6 @@ stat.destroyed = Budynki zniszczone:[accent] {0}
 stat.deconstructed = Budynki zrekonstruowane:[accent] {0}
 stat.delivered = Surowce wystrzelone:
 stat.rank = Ocena: [accent]{0}
-
 launcheditems = [accent]Wystrzelone przedmioty
 map.delete = Jesteś pewny, że chcesz usunąć "[accent]{0}[]"?
 level.highscore = Rekord: [accent]{0}
@@ -51,7 +48,9 @@ minimap = Minimapa
 close = Zamknij
 website = Strona Gry
 quit = Wyjdź
+save.quit = Save & Quit
 maps = Mapy
+maps.browse = Browse Maps
 continue = Kontynuuj
 maps.none = [LIGHT_GRAY]Nie znaleziono żadnych map!
 invalid = Invalid
@@ -93,6 +92,7 @@ server.versions = Twoja wersja gry:[accent] {0}[]\nWersja gry serwera:[accent] {
 host.info = Przycisk [accent]host[] hostuje serwer na porcie [scarlet]6567[] i [scarlet]6568.[]\nKtokolwiek z tym samym [LIGHT_GRAY]wifi lub hotspotem[] powinien zobaczyć twój serwer.\n\nJeśli chcesz, aby każdy z twoim IP mógł dołączyć, [accent]przekierowywanie portów[] jest potrzebne.\n\n[LIGHT_GRAY]Notka:Jeśli ktokolwiek ma problem z dołączeniem do gry, upewnij się, że udostępniłeś Mindustry dostęp do sieci.
 join.info = Tutaj możesz wpisać [accent]IP serwera[], aby dołączyć lub wyszukaj [accent]serwery w lokalnej sieci[], do których chcesz dołączyć .\nGra wieloosobowa na LAN i WAN jest wspomagana.\n\n[LIGHT_GRAY]Notka: Nie ma automatycznej listy wszystkich serwerów; jeśli chcesz dołączyć przez IP, musisz zapytać się hosta o IP.
 hostserver = Stwórz Serwer
+invitefriends = Invite Friends
 hostserver.mobile = Hostuj\ngrę
 host = Hostuj
 hosting = [accent] Otwieranie serwera...
@@ -122,6 +122,7 @@ server.version = [lightgray]Wersja: {0}
 server.custombuild = [yellow]Zmodowany klient
 confirmban = Jesteś pewny, że chcesz zbanować tego gracza?
 confirmkick = Jesteś pewny, że chcesz wyrzucić tego gracza?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Jesteś pewny, że chcesz odbanować tego gracza?
 confirmadmin = Jesteś pewny, że chcesz dać rangę admina temu graczowi?
 confirmunadmin = Jesteś pewny, że chcesz zabrać rangę admina temu graczowi?
@@ -132,6 +133,7 @@ disconnect.error = Błąd połączenia.
 disconnect.closed = Połączenie zostało zamknięte.
 disconnect.timeout = Przekroczono limit czasu.
 disconnect.data = Nie udało się załadować mapy!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Łączenie...
 connecting.data = [accent]Ładowanie danych świata...
 server.port = Port:
@@ -157,6 +159,7 @@ save.rename = Zmień nazwę
 save.rename.text = Nowa nazwa:
 selectslot = Wybierz zapis.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 save.corrupted = [accent]Zapis gry jest uszkodzony lub nieprawidłowy! Jeżeli aktualizowałeś grę, najprawdopodobniej jest to zmiana w formacie zapisu i [scarlet]nie jest[] to błąd.
 empty = <pusto>
 on = Włączone
@@ -164,12 +167,13 @@ off = Wyłączone
 save.autosave = Autozapis: {0}
 save.map = Mapa: {0}
 save.wave = Fala {0}
-save.difficulty = Poziom trudności: {0}
+save.mode = Gamemode: {0}
 save.date = Ostatnio zapisano: {0}
 save.playtime = Czas gry: {0}
 warning = Uwaga.
 confirm = Potwierdź
 delete = Usuń
+view.workshop = View In Workshop
 ok = Ok
 open = Otwórz
 customize = Dostosuj
@@ -207,6 +211,8 @@ map.nospawn.pvp = Ta mapa nie ma żadnego rdzenia przeciwnika, aby mogli się zr
 map.nospawn.attack = Ta mapa nie ma żadnego rdzenia przeciwnika, aby można było go zaatakować! Dodaj[SCARLET] czerwony[] rdzeń do mapy w edytorze.
 map.invalid = Błąd podczas ładowania mapy: uszkodzony lub niepoprawny plik mapy.
 map.publish.error = Błąd podczas publikowania mapy: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
 map.publish = Opublikowano mapę.
 map.publishing = [accent]Publikowanie mapy...
 editor.brush = Pędzel
@@ -216,6 +222,7 @@ editor.oregen.info = Generacja złóż:
 editor.mapinfo = Informacje o mapie
 editor.author = Autor:
 editor.description = Opis:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Fale:
 editor.rules = Zasady:
 editor.generation = Generacja:
@@ -282,8 +289,8 @@ editor.resizemap = Zmień rozmiar mapy
 editor.mapname = Nazwa mapy:
 editor.overwrite = [accent]Uwaga!\nSpowoduje to nadpisanie istniejącej mapy.
 editor.overwrite.confirm = [scarlet]Uwaga![] Mapa pod tą nazwą już istnieje. Jesteś pewny, że chcesz ją nadpisać?
+editor.exists = A map with this name already exists.
 editor.selectmap = Wybierz mapę do załadowania:
-
 toolmode.replace = Zastąp
 toolmode.replace.description = Rysuje tylko na stałych blokach.
 toolmode.replaceall = Zastąp wszystko
@@ -298,7 +305,6 @@ toolmode.fillteams = Wypełń Drużyny
 toolmode.fillteams.description = Wypełniaj drużyny zamiast bloków.
 toolmode.drawteams = Rysuj Drużyny
 toolmode.drawteams.description = Rysuj drużyny zamiast bloków.
-
 filters.empty = [LIGHT_GRAY]Brak filtrów! Dodaj jeden za pomocą przycisku poniżej.	 
 filter.distort = Zniekształcanie
 filter.noise = Szum
@@ -330,7 +336,6 @@ filter.option.floor2 = Druga podłoga
 filter.option.threshold2 = Drugi próg
 filter.option.radius = Zasięg
 filter.option.percentile = Percentyl
-
 width = Szerokość:
 height = Wysokość:
 menu = Menu
@@ -348,7 +353,6 @@ tutorial.retake = Ponów Samouczek
 editor = Edytor
 mapeditor = Edytor map
 donate = Wspomóż nas
-
 abandon = Opuść
 abandon.text = Ta strefa i wszystkie jej surowce będą przejęte przez przeciwników.
 locked = Zablokowane
@@ -375,7 +379,6 @@ zone.objective.survival = Przeżyj
 zone.objective.attack = Zniszcz Rdzeń Wroga
 add = Dodaj...
 boss.health = Zdrowie Bossa
-
 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.
@@ -386,7 +389,6 @@ error.mapnotfound = Plik mapy nie został znaleziony!
 error.io = Błąd siecowy I/O.
 error.any = Nieznany błąd sieci.
 error.bloom = Nie udało się załadować bloom.\nTwoje urządzenie może nie wspierać tej funkcji.
-
 zone.groundZero.name = Wybuch Lądowy
 zone.desertWastes.name = Pustynne Pustkowia
 zone.craters.name = Kratery
@@ -415,7 +417,6 @@ zone.nuclearComplex.description = Dawny zakład produkcji i przetwarzania toru,
 zone.fungalPass.description = Przejściowy obszar pomiędzy wysokimi górami a nisko znajdującymi się, ogarniętymi przez zarodniki równinami. Znajduje się tu mała postawiona przez wrogów baza zwiadowcza.\nZniszcz ją.\nUżyj jednostek Nóż i Pełzak. Zniszcz oba rdżenie.
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
-
 settings.language = Język
 settings.data = Dane Gry
 settings.reset = Przywróć domyślne
@@ -470,11 +471,11 @@ blocks.inaccuracy = Niedokładność
 blocks.shots = Strzały
 blocks.reload = Strzałów/sekundę
 blocks.ammo = Amunicja
-
 bar.drilltierreq = Wymagane Lepsze Wiertło
 bar.drillspeed = Prędkość wiertła: {0}/s
 bar.efficiency = Efektywność: {0}%
 bar.powerbalance = Moc: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Moc: {0}
 bar.poweroutput = Wyjście mocy: {0}
 bar.items = Przedmiotów: {0}
@@ -484,7 +485,6 @@ bar.heat = Ciepło
 bar.power = Prąd
 bar.progress = Postęp Budowy
 bar.spawned = Jednostki: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] Obrażenia
 bullet.splashdamage = [stat]{0}[lightgray] Obrażenia obszarowe ~[stat] {1}[lightgray] kratki
 bullet.incendiary = [stat]zapalający
@@ -496,7 +496,6 @@ bullet.freezing = [stat]zamrażający
 bullet.tarred = [stat]smolny
 bullet.multiplier = [stat]{0}[lightgray]x mnożnik amunicji
 bullet.reload = [stat]{0}[lightgray]x szybkość ataku
-
 unit.blocks = Klocki
 unit.powersecond = jednostek prądu na sekundę
 unit.liquidsecond = jednostek płynów na sekundę
@@ -525,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (wymaga restartu)[]
 setting.indicators.name = Wskaźniki Przyjaciół
 setting.autotarget.name = Automatyczne Celowanie
 setting.keyboard.name = Sterowanie Myszka+Klawiatura
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Maksymalny FPS
 setting.fpscap.none = Nieograniczone
 setting.fpscap.text = {0} FPS
@@ -556,7 +556,6 @@ setting.mutesound.name = Wycisz dźwięki
 setting.crashreport.name = Wysyłaj anonimowo dane o crashu gry
 setting.savecreate.name = Automatyczne tworzenie zapisu
 setting.publichost.name = Widoczność gry publicznej
-
 setting.chatopacity.name = Przezroczystość czatu
 setting.playerchat.name = Wyświetlaj czat w grze
 uiscale.reset = Skala interfejsu uległa zmianie.\nNaciśnij "OK" by potwierdzić zmiany.\n[scarlet]Cofanie zmian i wyjście z gry za[accent] {0}[]
@@ -568,8 +567,8 @@ category.general.name = Ogólne
 category.view.name = Wyświetl
 category.multiplayer.name = Multiplayer
 command.attack = Atakuj
+command.rally = Rally
 command.retreat = Wycofaj
-command.patrol = Patrol
 keybind.gridMode.name = Wybieranie Bloku
 keybind.gridModeShift.name = Wybieranie Kategorii
 keybind.press = Naciśnij wybrany klawisz...
@@ -610,7 +609,6 @@ 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
@@ -637,7 +635,6 @@ rules.title.resourcesbuilding = Zasoby i Budowanie
 rules.title.player = Gracze
 rules.title.enemy = Przeciwnicy
 rules.title.unit = Jednostki
-
 content.item.name = Przedmioty
 content.liquid.name = Płyny
 content.unit.name = Jednostki
@@ -699,7 +696,6 @@ mech.buildspeed = [LIGHT_GRAY]Szybkość Budowy: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Wytrzymałość na przegrzewanie: {0}
 liquid.viscosity = [LIGHT_GRAY]Lepkość: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
-
 block.sand-boulder.name = Piaskowy Głaz
 block.grass.name = Trawa
 block.salt.name = Sól
@@ -788,10 +784,13 @@ block.hail.name = Grad
 block.lancer.name = Lancer
 block.conveyor.name = Przenośnik
 block.titanium-conveyor.name = Tytanowy przenośnik
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Węzeł
 block.router.name = Rozdzielacz
 block.distributor.name = Dystrybutor
 block.sorter.name = Sortownik
+block.message.name = Message
 block.overflow-gate.name = Brama Przeciwprzepełnieniowa
 block.silicon-smelter.name = Huta Krzemu
 block.phase-weaver.name = Fazowa Fabryka
@@ -966,6 +965,7 @@ unit.eruptor.description = Ciężki mech stworzony do niszczenia struktur. Strze
 unit.wraith.description = Szybka jednostka, stosuje taktyke uderz-uciekaj Namierza jakiekolwiek źródło prądu.
 unit.ghoul.description = Ciężki bombowiec dywanowy. Rozdziera struktury wroga, atakując krytyczną infrastrukturę.
 unit.revenant.description = Ciężka, unosząca sie platforma z rakietami.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Kompresuje kawałki węgla w czyste blaszki grafitu.
 block.multi-press.description = Ulepszona wersja prasy grafitowej. Używa wody i prądu do kompresowania węgla szybko i efektywnie.
 block.silicon-smelter.description = Redukuje piasek za pomocą wysoce czystego węgla w celu wytworzenia krzemu.

core/assets/bundles/bundle_ru.properties

@@ -1,4 +1,4 @@
-credits.text = Создатель [ROYAL]Anuken[] — [SKY]anukendev@gmail.com[]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в оф. [accent]discord-сервер Mindustry[] в канал [accent]#русский[].\n\nРедакторы и переводчики на русский язык:\n[blue]Prosta4ok_ua[green]#[yellow]6336\n[darkgray]XZ[gray]imur\n[#30FF30]Beryllium\n[tan]Felix [slate]Corvus
+credits.text = Создатель [ROYAL]Anuken[] — [SKY]anukendev@gmail.com[]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в оф. [accent]discord-сервер Mindustry[] в канал [accent]#русский[].\n\nРедакторы и переводчики на русский язык:\n[blue]Prosta4ok_ua[green]#[yellow]6336\n[darkgray]XZ[gray]imur\n[#30FF30]Beryllium\n[tan]Felix [slate]Corvus\n[orange]Vanguard
 credits = Авторы
 contributors = Переводчики и помощники
 discord = Присоединяйтесь к нашему Discord!
@@ -14,15 +14,13 @@ linkfail = Не удалось открыть ссылку!\nURL-адрес бы
 screenshot = Cкриншот сохранён в {0}
 screenshot.invalid = Карта слишком большая, возможно, не хватает памяти для скриншота.
 gameover = Игра окончена
-gameover.pvp = [accent] {0}[] команда победила!
+gameover.pvp = [accent]{0}[] команда победила!
 highscore = [accent]Новый рекорд!
-
 load.sound = Звуки
 load.map = Карты
 load.image = Изображения
 load.content = Содержимое
 load.system = Система
-
 stat.wave = Волн отражено:[accent] {0}
 stat.enemiesDestroyed = Врагов уничтожено:[accent] {0}
 stat.built = Строений построено:[accent] {0}
@@ -30,7 +28,6 @@ stat.destroyed = Строений уничтожено:[accent] {0}
 stat.deconstructed = Строений деконструировано:[accent] {0}
 stat.delivered = Ресурсов запущено:
 stat.rank = Финальный счёт: [accent]{0}
-
 launcheditems = [accent]Запущенные предметы
 map.delete = Вы действительно хотите удалить карту «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
@@ -51,6 +48,7 @@ minimap = Мини-карта
 close = Закрыть
 website = Веб-сайт
 quit = Выход
+save.quit = Сохранить & Выйти
 maps = Карты
 maps.browse = Просмотр карт
 continue = Продолжить
@@ -62,7 +60,6 @@ uploadingcontent = Выгрузка содержимого
 uploadingpreviewfile = Выгрузка файла предпросмотра
 committingchanges = Внесение изменений
 done = Готово
-
 about.button = Об игре
 name = Имя:
 noname = Для начала, придумайте[accent] себе имя[].
@@ -73,8 +70,8 @@ techtree = Дерево технологий
 research.list = [lightgray]Исследование:
 research = Исследование
 researched = [lightgray]{0} исследовано.
-players = Игроков на сервере: {0}
-players.single = {0} игрок на сервере
+players = Игроков: {0}
+players.single = {0} игрок
 server.closing = [accent]Закрытие сервера…
 server.kicked.kick = Вас выгнали с сервера!
 server.kicked.whitelist = Вы не в белом списке сервера.
@@ -95,6 +92,7 @@ server.versions = Ваша версия:[accent] {0}[]\nВерсия серве
 host.info = Кнопка [accent]Сервер[] запускает сервер на порте [accent]6567[]. \nЛюбой пользователь в той же [lightgray]локальной сети или WiFi[] должен увидеть ваш сервер в своём списке серверов.\n\nЕсли Вы хотите, чтобы люди могли подключаться откуда угодно по IP, то требуется [accent]переадресация (проброс) портов[] и наличие [red]ВНЕШНЕГО[] WAN адреса (WAN адрес [red]НЕ должен[] начинаться с [red]10[][lightgray].x.x.x[], [red]100.64[][lightgray].x.x[], [red]172.16[][lightgray].x.x[], [red]192.168[][lightgray].x.x[], [red]127[][lightgray].x.x.x[])!\nКлиентам мобильных операторов нужно уточнять информацию в личном кабинете на сайте вашего оператора!\n\n[lightgray]Примечание: Если у кого-то возникают проблемы с подключением к вашей игре по локальной сети, убедитесь, что Вы разрешили доступ Mindustry к вашей локальной сети в настройках брандмауэра. Обратите внимание, что публичные сети иногда не позволяют обнаружение сервера.
 join.info = Здесь Вы можете ввести [accent]IP-адрес сервера[] для подключения или открыть [accent]локальную сеть[] для подключения к другим серверам.\nПоддерживаются оба многопользовательских режима: LAN и WAN.\n\n[lightgray]Примечание: это НЕ автоматический глобальный список серверов; если Вы хотите подключиться к кому-то по IP, вам нужно спросить у хоста его IP-адрес.
 hostserver = Запустить многопользовательский сервер
+invitefriends = Пригласить друзей
 hostserver.mobile = Запустить\nсервер
 host = Сервер
 hosting = [accent]Открытие сервера…
@@ -121,9 +119,10 @@ server.edit = Редактировать сервер
 server.outdated = [crimson]Устаревший сервер![]
 server.outdated.client = [crimson]Устаревший клиент![]
 server.version = [gray]Версия: {0} {1}
-server.custombuild = [yellow]Пользовательская сборка
+server.custombuild = [accent]Пользовательская сборка
 confirmban = Вы действительно хотите заблокировать этого игрока?
 confirmkick = Вы действительно хотите выгнать этого игрока?
+confirmvotekick = Вы действительно хотите голосованием выгнать этого игрока?
 confirmunban = Вы действительно хотите разблокировать этого игрока?
 confirmadmin = Вы действительно хотите сделать этого игрока администратором?
 confirmunadmin = Вы действительно хотите убрать этого игрока из администраторов?
@@ -134,12 +133,13 @@ disconnect.error = Ошибка соединения.
 disconnect.closed = Соединение закрыто.
 disconnect.timeout = Время истекло.
 disconnect.data = Ошибка при загрузке данных мира!
+cantconnect = Не удаётся присоединиться к игре ([accent]{0}[]).
 connecting = [accent]Подключение…
 connecting.data = [accent]Загрузка данных мира…
 server.port = Порт:
 server.addressinuse = Данный адрес уже используется!
 server.invalidport = Неверный номер порта!
-server.error = [crimson]Ошибка создания сервера: [accent]{0}
+server.error = [crimson]Ошибка создания сервера.
 save.old = Это сохранение для старой версии игры и больше не может использоваться.\n\n[lightgray]Совместимость сохранений будет реализована в финальной версии 4.0.
 save.new = Новое сохранение
 save.overwrite = Вы уверены, что хотите перезаписать\nэтот слот для сохранения?
@@ -159,6 +159,7 @@ save.rename = Переименовать
 save.rename.text = Новое название:
 selectslot = Выберите сохранение.
 slot = [accent]Слот {0}
+editmessage = Редактировать сообщение
 save.corrupted = [accent]Сохранённый файл повреждён или имеет недопустимый формат!\nЕсли Вы только что обновили свою игру, это, вероятно, из-за изменения формата сохранения, и [scarlet]не является[] ошибкой.
 empty = <Пусто>
 on = Вкл
@@ -166,12 +167,13 @@ off = Выкл
 save.autosave = Автосохранение: {0}
 save.map = Карта: {0}
 save.wave = Волна {0}
-save.difficulty = Сложность: {0}
+save.mode = Режим игры: {0}
 save.date = Последнее сохранение: {0}
 save.playtime = Время в игре: {0}
 warning = Предупреждение.
 confirm = Подтверждение
 delete = Удалить
+view.workshop = Просмотреть в Мастерской
 ok = ОК
 open = Открыть
 customize = Настроить правила
@@ -209,6 +211,8 @@ map.nospawn.pvp = У этой карты нет вражеских ядер, в
 map.nospawn.attack = У этой карты нет вражеских ядер для атаки игроком! Добавьте[SCARLET] красное[] ядро на эту карту в редакторе.
 map.invalid = Ошибка загрузки карты: повреждённый или недопустимый файл карты.
 map.publish.error = Ошибка при публикации карты: {0}
+map.publish.confirm = Вы уверены, что хотите опубликовать эту карту?\n\n[lightgray]Убедитесь, что вы согласны с EULA Мастерской, иначе ваши карты не будут отображаться!
+eula = Лицензионное соглашение Steam с конечным пользователем
 map.publish = Карта опубликована.
 map.publishing = [accent]Отправка карты…
 editor.brush = Кисть
@@ -218,11 +222,12 @@ editor.oregen.info = Генерация руд:
 editor.mapinfo = Параметры карты
 editor.author = Автор:
 editor.description = Описание:
+editor.nodescription = Чтобы опубликовать карту, она должна содержать по крайней мере 4 символа в описании.
 editor.waves = Волны:
 editor.rules = Правила:
 editor.generation = Генерация:
 editor.ingame = Редактировать в игре
-editor.publish.workshop = Опубликовать в Steam Workshop
+editor.publish.workshop = Опубликовать в Мастерской Steam
 editor.newmap = Новая карта
 workshop = Workshop
 waves.title = Волны
@@ -247,9 +252,9 @@ editor.name = Название:
 editor.spawn = Создать боевую единицу
 editor.removeunit = Удалить боевую единицу
 editor.teams = Команды
-editor.errorload = Ошибка загрузки файла:\n[accent]{0}
-editor.errorsave = Ошибка сохранения файла:\n[accent]{0}
-editor.errorimage = Это изображение, а не карта. Не нужно менять расширение, ожидая, что это сработает.\n\nЕсли Вы хотите импортировать устаревшую карту, то используйте кнопку «Импортировать устаревшее изображение» в редакторе.
+editor.errorload = Ошибка загрузки файла.
+editor.errorsave = Ошибка сохранения файла.
+editor.errorimage = Это изображение, а не карта.\n\nЕсли Вы хотите импортировать карту версии 3.5/40 сборки, то используйте кнопку [accent][Импортировать устаревшую карту][] в редакторе.
 editor.errorlegacy = Эта карта слишком старая и использует устаревший формат карты, который больше не поддерживается.
 editor.errornot = Это не файл карты.
 editor.errorheader = Этот файл карты недействителен или повреждён.
@@ -270,7 +275,7 @@ editor.importmap = Импортировать карту
 editor.importmap.description = Импортировать уже существующую карту
 editor.importfile = Импортировать файл
 editor.importfile.description = Импортировать файл карты извне
-editor.importimage = Импортировать устаревшее изображение
+editor.importimage = Импортировать устаревшую карту
 editor.importimage.description = Импортировать изображение карты извне
 editor.export = Экспорт…
 editor.exportfile = Экспортировать файл
@@ -284,8 +289,8 @@ editor.resizemap = Изменить размер карты
 editor.mapname = Название карты:
 editor.overwrite = [accent]Внимание! \nЭто перезапишет уже существующую карту.
 editor.overwrite.confirm = [scarlet]Осторожно![] Карта с таким названием уже существует. Вы действительно хотите её перезаписать?
+editor.exists = Карта с таким именем уже существует.
 editor.selectmap = Выберите карту для загрузки:
-
 toolmode.replace = Заменить
 toolmode.replace.description = Рисует только\nна сплошных блоках.
 toolmode.replaceall = Заменить всё
@@ -300,7 +305,6 @@ toolmode.fillteams = Изменить команду блоков
 toolmode.fillteams.description = Изменяет принадлежность\nблоков к команде.
 toolmode.drawteams = Изменить команду блока
 toolmode.drawteams.description = Изменяет принадлежность\nблока к команде.
-
 filters.empty = [lightgray]Нет фильтров! Добавьте один при помощи кнопки ниже.
 filter.distort = Искажение
 filter.noise = Шум
@@ -332,7 +336,6 @@ filter.option.floor2 = Вторая поверхность
 filter.option.threshold2 = Вторичный предельный порог
 filter.option.radius = Радиус
 filter.option.percentile = Процентиль
-
 width = Ширина:
 height = Высота:
 menu = Меню
@@ -350,7 +353,6 @@ tutorial.retake = Перепройти обучение
 editor = Редактор
 mapeditor = Редактор карт
 donate = Пожертво\nвать
-
 abandon = Покинуть
 abandon.text = Эта зона и все её ресурсы будут отданы противнику.
 locked = Заблокировано
@@ -370,14 +372,13 @@ configure.locked = [lightgray]Возможность разблокировки
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = Зона «[lightgray]{0}» теперь разблокирована.
 zone.requirement.complete = Вы достигли {0}-ой волны,\nУсловия для зоны «{1}» выполнены.
-zone.config.complete = Вы достигли {0}-ой волны,\Возможность выгрузки ресурсов теперь разблокирована.
+zone.config.complete = Вы достигли {0}-ой волны,Возможность выгрузки ресурсов теперь разблокирована.
 zone.resources = [lightgray]Обнаруженные ресурсы:
 zone.objective = [lightgray]Цель: [accent]{0}
 zone.objective.survival = Выжить
 zone.objective.attack = Уничтожить вражеское ядро
 add = Добавить…
 boss.health = Здоровье босса
-
 connectfail = [crimson]Ошибка подключения:\n\n[accent]{0}
 error.unreachable = Сервер недоступен.\nВы уверены, что адрес введён корректно?
 error.invalidaddress = Некорректный адрес.
@@ -388,7 +389,6 @@ error.mapnotfound = Файл карты не найден!
 error.io = Сетевая ошибка ввода-вывода.
 error.any = Неизвестная сетевая ошибка.
 error.bloom = Не удалось инициализировать свечение (Bloom).\nВозможно, ваше устройство не поддерживает его.
-
 zone.groundZero.name = Отправная точка
 zone.desertWastes.name = Покинутые пустоши
 zone.craters.name = Кратеры
@@ -417,18 +417,17 @@ zone.nuclearComplex.description = Бывший завод по производ
 zone.fungalPass.description = Переходная область между высокими горами и более низкими, покрытыми спорами землями. Здесь расположена небольшая разведывательная база противника.\nУничтожьте ее.\nИспользуйте единицы «Кинжал» и «Камикадзе». Достаньте до обоих ядер.
 zone.impact0078.description = <вставить описание здесь>
 zone.crags.description = <вставить описание здесь>
-
 settings.language = Язык
 settings.data = Игровые данные
 settings.reset = Сбросить по умолчанию
-settings.rebind = Переназначить
+settings.rebind = Сменить
 settings.controls = Управление
 settings.game = Игра
 settings.sound = Звук
 settings.graphics = Графика
 settings.cleardata = Очистить игровые данные…
 settings.clear.confirm = Вы действительно хотите очистить свои данные?\nЭто нельзя отменить!
-settings.clearall.confirm = [scarlet]ОСТОРОЖНО![]\nЭто сотрёт все данные, включая сохранения, карты, прогресс кампании и настройки управления.\nПосле того как Вы нажмете 'ОК', игра уничтожит все данные и автоматически закроется.
+settings.clearall.confirm = [scarlet]ОСТОРОЖНО![]\nЭто сотрёт все данные, включая сохранения, карты, прогресс кампании и настройки управления.\nПосле того как Вы нажмете [accent][ОК][], игра уничтожит все данные и автоматически закроется.
 settings.clearunlocks = Очистить прогресс кампании
 settings.clearall = Очистить всё
 paused = [accent]< Пауза >
@@ -472,11 +471,11 @@ blocks.inaccuracy = Разброс
 blocks.shots = Выстрелы
 blocks.reload = Выстрелы/секунду
 blocks.ammo = Боеприпасы
-
 bar.drilltierreq = Требуется лучший бур
 bar.drillspeed = Скорость бурения: {0}/s
 bar.efficiency = Эффективность: {0}%
 bar.powerbalance = Энергия: {0}/с
+bar.powerstored = Накоплено: {0}/{1}
 bar.poweramount = Энергия: {0}
 bar.poweroutput = Выход энергии: {0}
 bar.items = Предметы: {0}
@@ -486,7 +485,6 @@ bar.heat = Нагрев
 bar.power = Энергия
 bar.progress = Прогресс строительства
 bar.spawned = Боев. ед.: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] урона
 bullet.splashdamage = [stat]{0}[lightgray] урона в радиусе ~[stat] {1}[lightgray] блоков
 bullet.incendiary = [stat]зажигательный
@@ -498,7 +496,6 @@ bullet.freezing = [stat]замораживающий
 bullet.tarred = [stat]горючий
 bullet.multiplier = [stat]{0}[lightgray]x количество боеприпасов
 bullet.reload = [stat]{0}[lightgray]x скорость стрельбы
-
 unit.blocks = блоки
 unit.powersecond = единиц энергии/секунду
 unit.liquidsecond = жидкостных единиц/секунду
@@ -527,6 +524,7 @@ setting.antialias.name = Сглаживание[lightgray] (требует пе
 setting.indicators.name = Отображать индикаторы расположения союзников и врагов
 setting.autotarget.name = Автозахват цели
 setting.keyboard.name = Мышь+Управление с клавиатуры
+setting.touchscreen.name = Сенсорное управление
 setting.fpscap.name = Максимальный FPS
 setting.fpscap.none = Неограниченный
 setting.fpscap.text = {0} FPS
@@ -559,7 +557,7 @@ setting.crashreport.name = Отправлять анонимные отчёты
 setting.savecreate.name = Автоматическое создание сохранений
 setting.publichost.name = Общедоступность игры
 setting.chatopacity.name = Непрозрачность чата
-setting.playerchat.name = Отображать чат в игре
+setting.playerchat.name = Отображать облака чата над игроками
 uiscale.reset = Масштаб пользовательского интерфейса был изменён.\nНажмите «ОК» для подтверждения этого масштаба.\n[scarlet]Возврат настроек и выход через[accent] {0}[] секунд…
 uiscale.cancel = Отменить & Выйти
 setting.bloom.name = Свечение
@@ -569,8 +567,8 @@ category.general.name = Основное
 category.view.name = Просмотр
 category.multiplayer.name = Сетевая игра
 command.attack = Атаковать
+command.rally = Точка сбора
 command.retreat = Отступить
-command.patrol = Патрулирование
 keybind.gridMode.name = Выбрать блок
 keybind.gridModeShift.name = Выбрать категорию
 keybind.press = Нажмите клавишу…
@@ -578,7 +576,7 @@ keybind.press.axis = Нажмите оси или клавишу…
 keybind.screenshot.name = Скриншот карты
 keybind.move_x.name = Движение по оси x
 keybind.move_y.name = Движение по оси y
-keybind.fullscreen.name = Полноэкранний режим
+keybind.fullscreen.name = Полноэкранный режим
 keybind.select.name = Выбор/Выстрел
 keybind.diagonal_placement.name = Диагональное размещение
 keybind.pick.name = Выбрать блок
@@ -611,7 +609,6 @@ mode.pvp.description = Боритесь против других игроков
 mode.attack.name = Атака
 mode.attack.description = Уничтожьте вражескую базу. Никаких волн.\n[gray]Для игры требуется красное ядро на карте.
 mode.custom = Пользовательские правила
-
 rules.infiniteresources = Бесконечные ресурсы (Игрок)
 rules.wavetimer = Интервал волн
 rules.waves = Волны
@@ -638,7 +635,6 @@ rules.title.resourcesbuilding = Ресурсы & строительство
 rules.title.player = Игроки
 rules.title.enemy = Враги
 rules.title.unit = Боев. ед.
-
 content.item.name = Предметы
 content.liquid.name = Жидкости
 content.unit.name = Боевые единицы
@@ -700,7 +696,6 @@ mech.buildspeed = [lightgray]Скорость строительства: {0}%
 liquid.heatcapacity = [lightgray]Теплоёмкость: {0}
 liquid.viscosity = [lightgray]Вязкость: {0}
 liquid.temperature = [lightgray]Температура: {0}
-
 block.sand-boulder.name = Песчаный валун
 block.grass.name = Трава
 block.salt.name = Соль
@@ -759,7 +754,7 @@ block.spore-cluster.name = Скопление спор
 block.metal-floor.name = Металлический пол 1
 block.metal-floor-2.name = Металлический пол 2
 block.metal-floor-3.name = Металлический пол 3
-block.metal-floor-5.name = Металлический пол 5
+block.metal-floor-5.name = Металлический пол 4
 block.metal-floor-damaged.name = Повреждённый металлический пол
 block.dark-panel-1.name = Тёмная панель 1
 block.dark-panel-2.name = Тёмная панель 2
@@ -789,10 +784,13 @@ block.hail.name = Град
 block.lancer.name = Копейщик
 block.conveyor.name = Конвейер
 block.titanium-conveyor.name = Титановый конвейер
+block.armored-conveyor.name = Бронированный конвейер
+block.armored-conveyor.description = Перемещает предметы с той же скоростью, что и титановые конвейеры, но обладает большей бронёй. Не принимает на вход с боков ни от чего кроме как от других конвейеров.
 block.junction.name = Перекрёсток
 block.router.name = Маршрутизатор
 block.distributor.name = Распределитель
 block.sorter.name = Сортировщик
+block.message.name = Сообщение
 block.overflow-gate.name = Избыточный затвор
 block.silicon-smelter.name = Кремниевый плавильный завод
 block.phase-weaver.name = Фазовый ткач
@@ -846,7 +844,7 @@ block.solar-panel.name = Солнечная панель
 block.solar-panel-large.name = Большая солнечная панель
 block.oil-extractor.name = Нефтяная вышка
 block.command-center.name = Командный центр
-block.draug-factory.name =  Завод добывающих дронов «Драуг»
+block.draug-factory.name = Завод добывающих дронов «Драугр»
 block.spirit-factory.name = Завод ремонтных дронов «Дух»
 block.phantom-factory.name = Завод строительных дронов «Фантом»
 block.wraith-factory.name = Завод истребителей «Призрак»
@@ -888,13 +886,13 @@ block.launch-pad.name = Стартовая площадка
 block.launch-pad-large.name = Большая стартовая площадка
 team.blue.name = Синяя
 team.crux.name = Красная
-team.sharded.name = Разрозненная
+team.sharded.name = Оранжевая
 team.orange.name = Оранжевая
 team.derelict.name = Покинутая
 team.green.name = Зелёная
 team.purple.name = Фиолетовая
 unit.spirit.name = Ремонтный дрон «Дух»
-unit.draug.name = Добывающий дрон «Драуг»
+unit.draug.name = Добывающий дрон «Драугр»
 unit.phantom.name = Строительный дрон «Фантом»
 unit.dagger.name = Кинжал
 unit.crawler.name = Камикадзе
@@ -967,6 +965,7 @@ unit.eruptor.description = Тяжёлый мех, предназначенный
 unit.wraith.description = Быстрый перехватчик. Целевые генераторы энергии.
 unit.ghoul.description = Тяжёлый ковровой бомбардировщик. Проникает через вражеские структуры, нацеливаясь на критическую инфраструктуру.
 unit.revenant.description = Тяжёлый, парящий массив, который вооружён ракетами.
+block.message.description = Сохраняет сообщение. Используется для связи между союзниками.
 block.graphite-press.description = Сжимает куски угля в чистые листы графита.
 block.multi-press.description = Обновлённая версия графитовой печати. Использует воду и энергию для быстрой и эффективной переработки угля.
 block.silicon-smelter.description = Соединяет песок с чистым углем. Производит кремний.
@@ -1068,7 +1067,7 @@ block.ripple.description = Очень мощная артиллерийская
 block.cyclone.description = Большая противовоздушная и наземная башня. Выстреливает взрывными глыбами зенитных орудий в ближайшие подразделения.
 block.spectre.description = Массивная двуствольная пушка. Стреляет крупными бронебойными пулями по воздушным и наземным целям.
 block.meltdown.description = Массивная лазерная пушка. Заряжает и стреляет постоянным лазерным лучом в ближайших врагов. Требуется охлаждающая жидкость для работы.
-block.command-center.description = Командует перемещениями боевых единиц по всей карте.\nУказывает подразделениям [accent]патрулировать[] территорию, [accent]атаковать[] вражеское ядро или [accent]отступать[] к ядру/фабрике. Когда вражеское ядро не представлено, единицы будут патрулировать при команде [accent]атаки[].
+block.command-center.description = Командует перемещениями боевых единиц по всей карте.\nУказывает подразделениям [accent]собираться[] вокруг командного центра, [accent]атаковать[] вражеское ядро или [accent]отступать[] к ядру/фабрике. Когда вражеское ядро не представлено, единицы будут патрулировать при команде [accent]атаки[].
 block.draug-factory.description = Производит добывающих дронов
 block.spirit-factory.description = Производит дронов, которые помогают в строительстве.
 block.phantom-factory.description = Производит улучшенных дронов, которые помогают в строительстве.

core/assets/bundles/bundle_se.properties

@@ -48,9 +48,18 @@ minimap = Minikarta
 close = Stäng
 website = Website
 quit = Avsulta
+save.quit = Save & Quit
 maps = Kartor
+maps.browse = Browse Maps
 continue = Fortsätt
 maps.none = [lightgray]No maps found!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Om
 name = Namn:
 noname = Välj ett[accent] namn[] först.
@@ -65,12 +74,14 @@ players = {0} spelare online
 players.single = {0} spelare online
 server.closing = [accent]Stänger server...
 server.kicked.kick = You have been kicked from the server!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server stängd.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Outdated client! Uppdatera ditt spel!
 server.kicked.serverOutdated = Outdated server! Ask the host to update!
 server.kicked.banned = Du är bannad från servern.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = You have been kicked recently.\nWait before connecting again.
 server.kicked.nameInUse = Någon med det namnet finns redan\npå servern.
 server.kicked.nameEmpty = Ditt namn är ogiltigt.
@@ -81,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [lightgray]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[lightgray]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. Note that public networks sometimes do not allow server discovery.
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
 hostserver = Host Multiplayer Game
+invitefriends = Invite Friends
 hostserver.mobile = Host\nGame
 host = Host
 hosting = [accent]Öppnar server...
 hosts.refresh = Refresh
 hosts.discovering = Discovering LAN games
+hosts.discovering.any = Discovering games
 server.refreshing = Refreshing server
 hosts.none = [lightgray]No local games found!
 host.invalid = [scarlet]Can't connect to host.
@@ -109,13 +122,18 @@ server.version = [gray]v{0} {1}
 server.custombuild = [yellow]Custom Build
 confirmban = Are you sure you want to ban this player?
 confirmkick = Are you sure you want to kick this player?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Are you sure you want to make this player an admin?
 confirmunadmin = Are you sure you want to remove admin status from this player?
 joingame.title = Join Game
 joingame.ip = Adress:
 disconnect = Disconnected.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Failed to load world data!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Ansluter...
 connecting.data = [accent]Loading world data...
 server.port = Port:
@@ -141,6 +159,7 @@ save.rename = Byt namn
 save.rename.text = Nytt namn:
 selectslot = Select a save.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 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 = <tom>
 on = På
@@ -148,12 +167,13 @@ off = Av
 save.autosave = Autospara: {0}
 save.map = Map: {0}
 save.wave = Våg {0}
-save.difficulty = Difficulty: {0}
+save.mode = Gamemode: {0}
 save.date = Last Saved: {0}
 save.playtime = Speltid: {0}
 warning = Varning.
 confirm = Confirm
 delete = Radera
+view.workshop = View In Workshop
 ok = OK
 open = Öppna
 customize = Customize Rules
@@ -190,6 +210,11 @@ map.nospawn = This map does not have any cores for the player to spawn in! Add a
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-orange[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Pensel
 editor.openin = Öppna I Redigeraren
 editor.oregen = Malmgenerering
@@ -197,11 +222,14 @@ editor.oregen.info = Malmgenerering:
 editor.mapinfo = Map Info
 editor.author = Skapare:
 editor.description = Beskrivning:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Vågor:
 editor.rules = Regler:
 editor.generation = Generering:
 editor.ingame = Edit In-Game
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = Vågor
 waves.remove = Ta bort
 waves.never = <aldrig>
@@ -218,6 +246,7 @@ waves.invalid = Invalid waves in clipboard.
 waves.copied = Vågor kopierade.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [lightgray]<Default>
+details = Details...
 edit = Redigera...
 editor.name = Namn:
 editor.spawn = Spawn Unit
@@ -227,6 +256,7 @@ editor.errorload = Error loading file:\n[accent]{0}
 editor.errorsave = Error saving file:\n[accent]{0}
 editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined. Are you trying to load a save file?
 editor.update = Uppdatera
@@ -259,6 +289,7 @@ editor.resizemap = Resize Map
 editor.mapname = Kartnamn:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
 editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
+editor.exists = A map with this name already exists.
 editor.selectmap = Select a map to load:
 toolmode.replace = Byt ut
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [lightgray]Unlock configuring loadout: Wave {0}.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
@@ -434,6 +466,7 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Skott
 blocks.reload = Shots/Second
@@ -442,9 +475,11 @@ bar.drilltierreq = Bättre Borr Krävs
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Effektivitet: {0}%
 bar.powerbalance = Power: {0}/s
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Föremål: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Vätska
 bar.heat = Hetta
 bar.power = Power
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[lightgray] (requires restart)[]
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Begränsade FPS
 setting.fpscap.none = Inga
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = Ljudeffektvolym
 setting.mutesound.name = Stäng Av Ljudeffekter
 setting.crashreport.name = Skicka Anonyma Krashrapporter
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chattgenomskinlighet
 setting.playerchat.name = Visa Chatt
 uiscale.reset = UI-skalan har ändrats.\nTryck "OK" för att använda den här skalan.\n[scarlet]Avslutar och återställer om[accent] {0}[] sekunder...
@@ -530,8 +567,8 @@ category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
 command.attack = Attack
+command.rally = Rally
 command.retreat = Retreat
-command.patrol = Patrol
 keybind.gridMode.name = Block Select
 keybind.gridModeShift.name = Category Select
 keybind.press = Press a key...
@@ -747,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Korsning
 block.router.name = Router
 block.distributor.name = Distributor
 block.sorter.name = Sorterare
+block.message.name = Message
 block.overflow-gate.name = Overflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
 unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critital infrastructure.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with pure coal. Produces silicon.

core/assets/bundles/bundle_tk.properties

@@ -48,9 +48,18 @@ minimap = Minimap
 close = Kapat
 website = Website
 quit = Cik
+save.quit = Save & Quit
 maps = Haritalar
+maps.browse = Browse Maps
 continue = Devam et
 maps.none = [LIGHT_GRAY]Harita bulunamadi!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Hakkinda
 name = isim:
 noname = Pick a[accent] player name[] first.
@@ -65,12 +74,14 @@ players = {0} oyuncu cevrimici
 players.single = {0} oyuncu cevrimici
 server.closing = [accent]Oyun kapaniyor.
 server.kicked.kick = Oyundan cikarildin
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Oyun kapandi
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Yeni bir versiyon mevcut! Hemen indir!
 server.kicked.serverOutdated = Eski oyun! Yapimciya guncellemesini soyle!
 server.kicked.banned = Oyundan kalici olarak cikarildin.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Oyundan cikarilmistin.\nBaglanmadn once biraz bekle.
 server.kicked.nameInUse = Oyunda bu isimde bir\nkisi zaten var.
 server.kicked.nameEmpty = ismin gecerli degil.
@@ -81,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = [accent]host[] su linkte bir oyun acti! [scarlet]6567[]. \nSeninle [LIGHT_GRAY]ayni internete[] sahip olan kisiler oyunu gorebilir.\n\neger baska yerlerden kisilerind de gelmesini istiyorsan, [accent]oyun acmak[]zorunludur.\n\n[LIGHT_GRAY]Not: eger baglanmakta gucluk cekiliyorsa, antivirusunun internetine baglanmasini izin vermesini sagla.
 join.info = Buradan,[accent]Oyunun linkini[] kullanarak katilabilir, yada, [accent]internetinle[] baglanacak oyun bulabilirsin\ninternetli ve Linkli oyunlar desteklenir.\n\n[LIGHT_GRAY]Not: Otomatik bir oyun listesi goruntulenemez. Yapimcidan linkini iste.
 hostserver = Oyun ac
+invitefriends = Invite Friends
 hostserver.mobile = Host\nGame
 host = Oyun ac
 hosting = [accent]Oyun aciliyor
 hosts.refresh = Yenile
 hosts.discovering = internet oyunu araniyor
+hosts.discovering.any = Discovering games
 server.refreshing = liste yenileniyor
 hosts.none = [lightgray]internet oyunu bulunamadi!
 host.invalid = [scarlet]Oyuna baglanilamadi.
@@ -109,13 +122,18 @@ server.version = [lightgray]Versiyon: {0}
 server.custombuild = [yellow]ozel yapi
 confirmban = Bu oyuncuyu kalici olarak atmak istedigine emin misin?
 confirmkick = Are you sure you want to kick this player?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Bu oyuncunun yasagini geri almak ister misin?
 confirmadmin = Bu oyuncuyu yetkili yapmak istedigine emin misin?
 confirmunadmin = Bu oyuncunun yetkisini almak istedigine emin misin?
 joingame.title = Oyuna katil
 joingame.ip = Link:
 disconnect = Cikildi
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Oyunun geri yuklenemedi!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Baglaniliyor
 connecting.data = [accent]Loading world data...
 server.port = Link:
@@ -141,6 +159,7 @@ save.rename = Yeniden adlandir
 save.rename.text = Yeni isim:
 selectslot = Kayitli bir dosya sec.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 save.corrupted = [accent]Kayit gecersiz!\nOyunu guncellediysen, bu buyuk ihtimalle degistirilecek vebu bir [scarlet]sorun degildir.[]
 empty = <empty>
 on = Acik
@@ -148,12 +167,13 @@ off = Kapali
 save.autosave = Otomatik kayit: {0}
 save.map = Harita: {0}
 save.wave = Dalga {0}
-save.difficulty = Zorluk: {0}
+save.mode = Gamemode: {0}
 save.date = En sonki kayit: {0}
 save.playtime = Oyun Zamani!: {0}
 warning = Warning.
 confirm = Onayla
 delete = Sil
+view.workshop = View In Workshop
 ok = Tamam
 open = Ac
 customize = Customize
@@ -190,6 +210,11 @@ map.nospawn = Haritada Oyncularin cikmasi icin cekirdek yok! Haritaya[ROYAL]Mavi
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] red[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Harita yuklenemedi. Gecersiz yada bozuk dosya.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Firca
 editor.openin = Editorde ac
 editor.oregen = Maden Yaratilma hizi
@@ -197,11 +222,14 @@ editor.oregen.info = Maden Yaratilmasi:
 editor.mapinfo = Harita bilgisi:
 editor.author = Yapimci:
 editor.description = Yorum:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.ingame = Edit In-Game
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
 waves.never = <never>
@@ -218,6 +246,7 @@ waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]<Default>
+details = Details...
 edit = Edit...
 editor.name = isim:
 editor.spawn = Spawn Unit
@@ -227,6 +256,7 @@ editor.errorload = Error loading file:\n[accent]{0}
 editor.errorsave = Error saving file:\n[accent]{0}
 editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined.
 editor.update = Update
@@ -259,6 +289,7 @@ editor.resizemap = Haritanin boyutunu degistir
 editor.mapname = Harita ismi:
 editor.overwrite = [accent]Dikkat et!\nBu bir haritanin uzerinden cececek.
 editor.overwrite.confirm = [scarlet]uyari![] bu isimde bir harita zaten var. Uzerinden gececek misin?
+editor.exists = A map with this name already exists.
 editor.selectmap = Yukleyecek bir harita sec:
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Reach wave {0}\nto configure loadout.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
@@ -434,6 +466,7 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Can
 blocks.buildtime = Build Time
+blocks.buildcost = Build Cost
 blocks.inaccuracy = sekme
 blocks.shots = vuruslar
 blocks.reload = Yeniden doldurma
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = Yok
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = Ses seviyesi
 setting.mutesound.name = Sesi kapat
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display In-Game Chat
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -530,8 +567,8 @@ category.general.name = General
 category.view.name = Goster
 category.multiplayer.name = Cok oyunculu
 command.attack = Attack
+command.rally = Rally
 command.retreat = Retreat
-command.patrol = Patrol
 keybind.gridMode.name = Block Select
 keybind.gridModeShift.name = Category Select
 keybind.press = Bir tusa bas...
@@ -747,10 +784,13 @@ block.hail.name = yagdirici
 block.lancer.name = Lazer topu
 block.conveyor.name = konvenyor
 block.titanium-conveyor.name = Titanyum konvenyor
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = ayirici
 block.router.name = dagitici
 block.distributor.name = yayici
 block.sorter.name = secici
+block.message.name = Message
 block.overflow-gate.name = Kapali dagatici
 block.silicon-smelter.name = Silikon eritici
 block.phase-weaver.name = Dokumaci
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.ghoul.description = A heavy carpet bomber. Uses blast compound or pyratite as ammo.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coke in order to produce silicon.

core/assets/bundles/bundle_tr.properties

@@ -77,8 +77,8 @@ researched = [lightgray]{0} Araştırıldı.
 players = {0} çevrimiçi oyuncu
 players.single = {0} çevrimiçi oyuncu
 server.closing = [accent]Sunucu kapatılıyor...
-server.kicked.whitelist = Beyaz listede değilsin.
 server.kicked.kick = Sunucudan atıldın!
+server.kicked.whitelist = Beyaz listede değilsin.
 server.kicked.serverClose = Sunucu kapandı.
 server.kicked.vote = Oylama ile atıldın. Görüşürüz.
 server.kicked.clientOutdated = Eski sürüm! Oyununu güncelle!
@@ -876,19 +876,19 @@ block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Repair Point
 block.pulse-conduit.name = Pulse Conduit
 block.phase-conduit.name = Phase Conduit
-block.liquid-router.name = Liquid Router
+block.liquid-router.name = Sıvı Yönlendiricisi
 block.liquid-tank.name = Sıvı Tankı
-block.liquid-junction.name = Liquid Junction
-block.bridge-conduit.name = Bridge Conduit
-block.rotary-pump.name = Rotary Pump
-block.thorium-reactor.name = Thorium Reactor
+block.liquid-junction.name = Sıvı Kavşağı
+block.bridge-conduit.name = Köprülü Boru
+block.rotary-pump.name = Rotary Pompa
+block.thorium-reactor.name = Toryum Reaktörü
 block.mass-driver.name = Mass Driver
 block.blast-drill.name = Airblast Drill
-block.thermal-pump.name = Thermal Pump
-block.thermal-generator.name = Thermal Generator
+block.thermal-pump.name = Termal Pompa
+block.thermal-generator.name = Termal Jeneratör
 block.alloy-smelter.name = Alaşım Karıştırıcısı
-block.mender.name = Mender
-block.mend-projector.name = Mend Projector
+block.mender.name = Tamirci
+block.mend-projector.name = Büyük Tamirci
 block.surge-wall.name = Surge Wall
 block.surge-wall-large.name = Large Surge Wall
 block.cyclone.name = Cyclone

core/assets/bundles/bundle_uk_UA.properties

@@ -16,13 +16,11 @@ screenshot.invalid = Мапа занадто велика, тому, мабут
 gameover = Гра завершена
 gameover.pvp = [accent] {0}[] команда перемогла!
 highscore = [YELLOW]Новий рекорд!
-
 load.sound = Звуки
 load.map = Мапи
 load.image = Зображення
 load.content = Зміст
 load.system = Система
-
 stat.wave = Хвиль відбито:[accent] {0}
 stat.enemiesDestroyed = Ворогів знищено:[accent] {0}
 stat.built = Будівель збудувано:[accent] {0}
@@ -30,7 +28,6 @@ stat.destroyed = Будівель знищено:[accent] {0}
 stat.deconstructed = Будівель декоструйовано[accent] {0}
 stat.delivered = Ресурсів запущено:
 stat.rank = Фінальний рахунок: [accent]{0}
-
 launcheditems = [accent]Запущені предмети
 map.delete = Ви впевнені, що хочете видалити мапу «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
@@ -51,6 +48,7 @@ minimap = Мінімапа
 close = Закрити
 website = Веб-сайт
 quit = Вихід
+save.quit = Зберегти & Вийти
 maps = Мапи
 maps.browse = Перегляд мап
 continue = Продовжити
@@ -62,7 +60,6 @@ uploadingcontent = Вивантаження вмісту
 uploadingpreviewfile = Вивантаження файлу передперегляду
 committingchanges = Здійснення змін
 done = Зроблено
-
 about.button = Про гру
 name = Ім’я:
 noname = Спочатку придумайте[accent] собі ім’я[].
@@ -75,13 +72,13 @@ research = Дослідження
 researched = [lightgray]{0} досліджено.
 players = Гравців на сервері: {0}
 players.single = {0} гравець на сервері
-server.closing = [accent]Закриття серверу…
+server.closing = [accent]Закриття сервера…
 server.kicked.kick = Ви були вигнані з сервера!
 server.kicked.whitelist = Ви не в білому спискі сервері.
 server.kicked.serverClose = Сервер закрито.
 server.kicked.vote = Вас було вигнано із сервера за допомогою голосування. Прощавайте.
 server.kicked.clientOutdated = Застарілий клієнт! Оновіть свою гру!
-server.kicked.serverOutdated = Застарілий сервер! Попросіть адміністратора серверу оновити сервер/гру!
+server.kicked.serverOutdated = Застарілий сервер! Попросіть адміністратора сервера оновити сервер/гру!
 server.kicked.banned = Ви заблоковані на цьому сервері.
 server.kicked.typeMismatch = Цей сервер не сумісний з вашим типом збірки.
 server.kicked.playerLimit = Цей сервер — заповнений. Дочекайтесь вільного слота.
@@ -93,16 +90,18 @@ server.kicked.customClient = Цей сервер не підтримує кор
 server.kicked.gameover = Гра завершена!
 server.versions = Ваша версія:[accent] {0}[]\nВерсія на сервері:[accent] {1}[]
 host.info = Кнопка [accent]Сервер[] розміщує сервер на порті [scarlet]6567[]. \nКористувачі, які знаходяться у тій же [lightgray]WiFi або локальній мережі[], повинні бачити ваш сервер у своєму списку серверів.\n\nЯкщо ви хочете, щоб люди могли приєднуватися з будь-якої точки через IP, то[accent] переадресація порту []обов’язкова.\n\n[lightgray]Примітка. Якщо у вас виникли проблеми з підключенням до вашої локальної гри, переконайтеся, що ви дозволили Mindustry доступ до вашої локальної мережі в налаштуваннях брандмауера. Зауважте, що публічні мережі іноді не дозволяють виявити сервер.
-join.info = Тут ви можете ввести [accent]IP серверу[] для підключення або знайти сервери у [accent]локальній мережі[] для підключення до них.\nПідтримується локальна мережа(LAN) і широкосмугова мережа(WAN).\n\n[lightgray] Примітка. Тут немає автоматичного глобального списку серверів; якщо ви хочете підключитися до когось через IP, вам доведеться попросити створювача серверу дати свій ip.
+join.info = Тут ви можете ввести [accent]IP сервера[] для підключення або знайти сервери у [accent]локальній мережі[] для підключення до них.\nПідтримується локальна мережа(LAN) і широкосмугова мережа(WAN).\n\n[lightgray] Примітка. Тут немає автоматичного глобального списку серверів; якщо ви хочете підключитися до когось через IP, вам доведеться попросити створювача сервера дати свій ip.
 hostserver = Запустити багатокористувацький сервер
+invitefriends = Запросити друзів
 hostserver.mobile = Запустити\nсервер
 host = Сервер
-hosting = [accent]Відкриття серверу…
+hosting = [accent]Відкриття сервера…
 hosts.refresh = Оновити
 hosts.discovering = Пошук локальних ігор
-server.refreshing = Оновлення серверу
+hosts.discovering.any = Пошук ігор
+server.refreshing = Оновлення сервера
 hosts.none = [lightgray]Локальних ігр не знайдено
-host.invalid = [scarlet]Не вдалося підключитися до хосту.
+host.invalid = [scarlet]Не вдалося підключитися до сервера.
 trace = Стежити за гравцем
 trace.playername = Ім’я гравця: [accent]{0}
 trace.ip = IP: [accent]{0}
@@ -123,19 +122,24 @@ server.version = [lightgray]Версія: {0}
 server.custombuild = [yellow]Користувацька збірка
 confirmban = Ви дійсно хочете заблокувати цього гравця?
 confirmkick = Ви дійсно хочете викинути цього гравця?
+confirmvotekick = Ви дійсно хочете вигнати цього гравця за допомогою голосуванняr?
 confirmunban = Ви дійсно хочете розблокувати цього гравця?
 confirmadmin = Ви дійсно хочете зробити цього гравця адміністратором?
 confirmunadmin = Ви дійсно хочете видалити статус адміністратора з цього гравця?
 joingame.title = Приєднатися до гри
 joingame.ip = IP:
 disconnect = Відключено.
+disconnect.error = Помилка з’єднання.
+disconnect.closed = З'єднання закрито.
+disconnect.timeout = Час вийшов.
 disconnect.data = Не вдалося завантажити дані світу!
+cantconnect = Не вдалося під’єднатися до гри ([accent]{0}[]).
 connecting = [accent]Підключення…
 connecting.data = [accent]Завантаження даних світу…
 server.port = Порт:
 server.addressinuse = Ця адреса вже використовується!
 server.invalidport = Недійсний номер порту!
-server.error = [crimson]Помилка створення серверу: [accent]{0}
+server.error = [crimson]Помилка створення сервера: [accent]{0}
 save.old = Це збереження для старої версії гри, і його більше не можна використовувати.\n\n [lightgray]Зворотна сумісність буде реалізована у фінальній версії 4.0.
 save.new = Нове збереження
 save.overwrite = Ви впевнені, що хочете перезаписати цей слот для збереження?
@@ -143,7 +147,7 @@ overwrite = Перезаписати
 save.none = Збережень не знайдено!
 saveload = [accent]Збереження…
 savefail = Не вдалося зберегти гру!
-save.delete.confirm = Ви впевнені, що хочете видалити це збереження?
+save.delete.confirm = Ви дійсно хочете видалити це збереження?
 save.delete = Видалити
 save.export = Експортувати збереження
 save.import.invalid = [accent]Це збереження недійсне!
@@ -155,19 +159,22 @@ save.rename = Перейменувати
 save.rename.text = Нова назва:
 selectslot = Виберіть збереження.
 slot = [accent]Слот {0}
-save.corrupted = [accent]Збережений файл пошкоджено або є недійсним! \nЯкщо ви щойно оновили свою гру, це, мабуть, є зміною формату збереження та [scarlet] не є[] помилкою.
+editmessage = Редагувати повідомлення
+save.corrupted = [accent]Збережений файл пошкоджено або недійсний! \nЯкщо ви щойно оновили свою гру, це, мабуть, є зміною формату збереження та [scarlet] не є[] помилкою.
 empty = <Порожньо>
 on = Увімкнено
 off = Вимкнено
 save.autosave = Автозбереження: {0}
 save.map = Мапа: {0}
 save.wave = Хвиля {0}
-save.difficulty = Складність: {0}
+save.mode = Режим гри: {0}
 save.date = Останнє збереження
 save.playtime = Час гри: {0}
 warning = Попередження
 confirm = Підтвердження
 delete = Видалити
+view.workshop = Переглянути в Майстерні
+workshop.listing = Редагувати список Майстерні
 ok = ОК
 open = Відкрити
 customize = Налаштувати правила
@@ -179,9 +186,9 @@ data.export = Експортувати дані
 data.import = Импортувати дані
 data.exported = Дані імпортовано.
 data.invalid = Це не дійсні ігрові дані.
-data.import.confirm = Імпорт зовнішніх даних видалить[scarlet] ВСІ[] віші поточні ігрові дані.\n[accent]Це не може бути скасоване![]\n\nЩойно дані імпортуються, гра негайно завершена.
+data.import.confirm = Імпорт зовнішніх даних видалить[scarlet] ВСІ[] ваші поточні ігрові дані.\n[accent]Це неможливо скасувати![]\n\nЩойно дані імпортуються, гра негайно закриється.
 classic.export = Експортувати класичні дані
-classic.export.text = Класичне (версія 3.5 збірка 40) збереження або мапа були знайдені. Ви хочете експортувати ці дані в домашню теку телефону, для використання у додатку Mindustry Classic?
+classic.export.text = Класичне (версія 3.5 збірка 40) збереження або мапа були знайдені. Ви хочете експортувати ці дані в домашню теку телефону, для використання у застосунку Mindustry Classic?
 quit.confirm = Ви впевнені, що хочете вийти?
 quit.confirm.tutorial = Ви впевнені, що хочете вийти з навчання?
 loading = [accent]Завантаження…
@@ -198,12 +205,22 @@ saveimage = Зберегти зображення
 unknown = Невідомо
 custom = Користувацька
 builtin = Вбудована
-map.delete.confirm = Ви впевнені, що хочете видалити цю мапу? Цю дію неможливо скасувати!
+map.delete.confirm = Ви дійсно хочете видалити цю мапу? Це неможливо буде скасувати!
 map.random = [accent]Випадкова мапа
-map.nospawn = Ця мапа не має жодного ядра для появи гравця! Додайте [ROYAL]помаранчеве[] ядро до цієї мапи у редакторі.
+map.nospawn = Ця мапа не має жодного ядра для появи гравця! Додайте [ROYAL]помаранчеве[] ядро до цієї мапи в редакторі.
 map.nospawn.pvp = У цієї мапи немає ворожих ядер, в яких гравець може з’явитися! Додайте [SCARLET]не помаранчеве[] ядро до цієї мапи в редакторі.
-map.nospawn.attack = У цієї мапи немає ворожих ядер, у яких гравець може з’явитися! Додайте [SCARLET]червоне[] ядро до цієї мапи в редакторі.
+map.nospawn.attack = У цієї мапи немає ворожих ядер, в яких гравець може з’явитися! Додайте [SCARLET]червоне[] ядро до цієї мапи в редакторі.
 map.invalid = Помилка завантаження мапи: пошкоджений або невірний файл мапи.
+map.publish.error = Помилка при опублікуванні мапи: {0}
+map.update = Оновити мапу
+map.load.error = Помилка отримання даних з Майстерню: {0}
+map.missing = Цю карту було видалено або переміщено.\n[lightgray]Перелік у Майстерні автоматично від’єднано від мапи.
+map.menu = Виберіть, що ви хочете зробити з цією мапою.
+map.changelog = Список змік (необов’язково):
+map.publish.confirm = Ви дійсно хочете опублікувати цю мапу?\n\n[lightgray]Переконайтеся, що спершу ви згодні з Ліцензійною угодою Steam, або ваші мапи не з’являться!
+eula = Ліцензійна угода
+map.publish = Мапа опублікована.
+map.publishing = [accent]Публікації мапи...
 editor.brush = Пензлик
 editor.openin = Відкрити в редакторі
 editor.oregen = Генерація руд
@@ -211,11 +228,14 @@ editor.oregen.info = Генерація руд:
 editor.mapinfo = Інформація про мапу
 editor.author = Автор:
 editor.description = Опис:
+editor.nodescription = Мапа повинна мати щонаймеше 4 символи для публікації.
 editor.waves = Хвилі:
 editor.rules = Правила:
 editor.generation = Генерація:
 editor.ingame = Редагувати у грі
+editor.publish.workshop = Опублікувати в Майстерні Steam
 editor.newmap = Нова мапа
+workshop = Майстерня
 waves.title = Хвилі
 waves.remove = Видалити
 waves.never = <ніколи>
@@ -232,6 +252,7 @@ waves.invalid = Недійсні хвилі у буфері обміну.
 waves.copied = Хвилі скопійовані.
 waves.none = Вороги не були встановлені.\nЗазначимо, що пусті хвилі будуть автоматично замінені звичайною хвилею.
 editor.default = [lightgray]<За замовчуванням>
+details = Деталі...
 edit = Редагувати…
 editor.name = Назва:
 editor.spawn = Створити бойову одиницю
@@ -241,6 +262,7 @@ editor.errorload = Помилка завантаження зображення:
 editor.errorsave = Помилка збереження зображення:\n[accent]{0}
 editor.errorimage = Це зображення, а не мапа. Не змінюйте розширення, очікуючи, що це запрацює.\n\nЯкщо Ви хочете імпортувати застарілку мапу, то використовуйте кнопку «Імпортувати застаріле зображення» у редакторі.
 editor.errorlegacy = Ця мапа занадто стара і використовує попередній формат мапи, який більше не підтримується.
+editor.errornot = Це не мапа.
 editor.errorheader = Цей файл мапи недійсний або пошкоджений.
 editor.errorname = Мапа не має імені. Може Ви намагаєтеся завантажити збереження?
 editor.update = Оновити
@@ -273,6 +295,7 @@ editor.resizemap = Змінити розмір мапи
 editor.mapname = Назва мапи:
 editor.overwrite = [accent]Попередження!\nЦе перезаписує існуючу мапу.
 editor.overwrite.confirm = [scarlet]Попередження![] Мапа з такою назвою вже існує. Ви впевнені, що хочете переписати її?
+editor.exists = Мапа за такою назвою вже існує.
 editor.selectmap = Виберіть мапу для завантаження:
 toolmode.replace = Замінити
 toolmode.replace.description = Малює тільки\nна суцільних блоках.
@@ -352,6 +375,7 @@ launch.skip.confirm = Якщо Ви пропустите зараз, Ви не
 uncover = Розкрити
 configure = Вивантажити конфігурацію
 configure.locked = [lightgray]Можливість розблокувати вивантаження ресурсів буде доступна на {0}-тій хвилі.
+configure.invalid = Кількість повинна бути числом між 0 та {0}.
 zone.unlocked = Зона «[lightgray]{0}» тепер розблокована.
 zone.requirement.complete = Ви досягли {0}-тої хвилі,\nВимоги до зони «{1}» виконані.
 zone.config.complete = Ви досягли {0}-тої хвилі.\nМожливість вивантаження ресурсів тепер розблокована.
@@ -448,6 +472,7 @@ blocks.boosteffect = Прискорювальний ефект
 blocks.maxunits = Максимальна кількість активних одиниць
 blocks.health = Здоров’я
 blocks.buildtime = Час будівництва
+blocks.buildcost = Вартість будування
 blocks.inaccuracy = Розкид
 blocks.shots = Постріли
 blocks.reload = Постріли/секунду
@@ -456,9 +481,11 @@ bar.drilltierreq = Потребується кращий бур
 bar.drillspeed = Швидкість буріння: {0}/с
 bar.efficiency = Ефективність: {0}%
 bar.powerbalance = Енергія: {0}/с
+bar.powerstored = Зберігає: {0}/{1}
 bar.poweramount = Енергія: {0}
 bar.poweroutput = Вихідна енергія: {0}
 bar.items = Предмети: {0}
+bar.capacity = Місткість: {0}
 bar.liquid = Рідина
 bar.heat = Нагрівання
 bar.power = Енергія
@@ -503,6 +530,7 @@ setting.antialias.name = Згладжування[lightgray] (потребує
 setting.indicators.name = Показувати у сторону ворогів та союзників
 setting.autotarget.name = Авто-стрільба
 setting.keyboard.name = Миш+Керування з клавіатури
+setting.touchscreen.name = Керування сенсорним екраном
 setting.fpscap.name = Максимальний FPS
 setting.fpscap.none = Необмежений
 setting.fpscap.text = {0} FPS
@@ -512,7 +540,7 @@ setting.difficulty.training = Навчання
 setting.difficulty.easy = Легка
 setting.difficulty.normal = Нормальна
 setting.difficulty.hard = Важка
-setting.difficulty.insane = Зачистка
+setting.difficulty.insane = Неможлива
 setting.difficulty.name = Складність:
 setting.screenshake.name = Тряска екрану
 setting.effects.name = Ефекти
@@ -533,8 +561,10 @@ setting.sfxvol.name = Гучність звукових ефектів
 setting.mutesound.name = Заглушити звук
 setting.crashreport.name = Відсилати анонімні звіти про аварійне завершення гри
 setting.savecreate.name = Автоматичне створення збережень
+setting.publichost.name = Загальнодоступність гри
 setting.chatopacity.name = Непрозорість чату
-setting.playerchat.name = Відображати чат у грі
+setting.playerchat.name = Відображати хмару чата над гравцями
+public.confirm = Ви хочете зробити цю гру загальнодоступною?\n[lightgray]Це можна змінити у Налаштування->Гра->Public Game Visibility.
 uiscale.reset = Масштаб користувальницького інтерфейсу було змінено.\nНатисніть «ОК» для підтверждення цього масшатабу.\n[scarlet]Повернення налаштувань і вихід через[accent] {0}[] …
 uiscale.cancel = Скасувати & Вийти
 setting.bloom.name = Світіння
@@ -544,8 +574,8 @@ category.general.name = Основне
 category.view.name = Перегляд
 category.multiplayer.name = Мережева гра
 command.attack = Атакувати
+command.rally = Точка збору
 command.retreat = Відступити
-command.patrol = Патрулювати
 keybind.gridMode.name = Вибрати блок
 keybind.gridModeShift.name = Вибрати категорію
 keybind.press = Натисніть клавішу…
@@ -561,11 +591,11 @@ keybind.break_block.name = Зламати блок
 keybind.deselect.name = Скасувати
 keybind.shoot.name = Постріл
 keybind.zoom_hold.name = Керування масштабом
-keybind.zoom.name = Приблизить
+keybind.zoom.name = Приблизити
 keybind.menu.name = Меню
 keybind.pause.name = Пауза
-keybind.minimap.name = Міні-мапа
-keybind.dash.name = Мчатися
+keybind.minimap.name = Мінімапа
+keybind.dash.name = Прискоритися/Літати
 keybind.chat.name = Чат
 keybind.player_list.name = Список гравців
 keybind.console.name = Консоль
@@ -574,26 +604,27 @@ keybind.toggle_menus.name = Меню перемикання
 keybind.chat_history_prev.name = Попередня історія чату
 keybind.chat_history_next.name = Наступна історія чату
 keybind.chat_scroll.name = Прокрутка чату
-keybind.drop_unit.name = Скинути бой. од.
+keybind.drop_unit.name = Скинути бойову одиницю
 keybind.zoom_minimap.name = Збільшити міні-мапу
 mode.help.title = Опис режимів
 mode.survival.name = Хвилі
 mode.survival.description = Звичайний режим. В цьому режимі треба самим добувати ресурси та хвилі йдуть автоматично.\n[gray]Потребуються точки появи ворогів для гри.
 mode.sandbox.name = Пісочниця
 mode.sandbox.description = В режимі «Пісочниця» незкінченні ресурси(але їх все одно можно добувати) та хвилі йдуть за вашим бажанням.
+mode.editor.name = Редактор
 mode.pvp.name = PVP
 mode.pvp.description = боріться проти інших гравців.\n[gray]Для гри потрібно принаймні 2 ядра різного кольору на мапі.
 mode.attack.name = Атака
 mode.attack.description = Зруйнуйте ворожу базу.\n[gray]Потрібно червоне ядро на мапі для гри.
-mode.custom = Користувальницькі правила
+mode.custom = Користувацькі правила
 rules.infiniteresources = Нескінченні ресурси
 rules.wavetimer = Таймер хвиль
 rules.waves = Хвилі
 rules.attack = Режим атаки
 rules.enemyCheat = Нескінченні ресурси для ШІ
 rules.unitdrops = Ресурс бойових одиниць
-rules.unitbuildspeedmultiplier = Множник швидкості виробництва бойов. Од.
-rules.unithealthmultiplier = Множник здоров’я бойов. од.
+rules.unitbuildspeedmultiplier = Множник швидкості виробництва бойових одиниць
+rules.unithealthmultiplier = Множник здоров’я бойових одиниць
 rules.playerhealthmultiplier = Множник здоров’я гравця
 rules.playerdamagemultiplier = Множник шкоди гравця
 rules.unitdamagemultiplier = Множник шкоди бойових одиниць
@@ -673,8 +704,6 @@ mech.buildspeed = [lightgray]Швидкість будування: {0}%
 liquid.heatcapacity = [lightgray]Теплоємність: {0}
 liquid.viscosity = [lightgray]В’язкість: {0}
 liquid.temperature = [lightgray]Температура: {0}
-block.sand-boulder.name = Sand Boulder
-block.grass.name = Трава
 block.sand-boulder.name = Пісочний валун
 block.grass.name = Трава
 block.salt.name = Сіль
@@ -725,10 +754,10 @@ block.ice-snow.name = Крижаний сніг
 block.rocks.name = Камені
 block.icerocks.name = Крижані камені
 block.snowrocks.name = Снігові камені
-block.dunerocks.name = Піщані Камені
+block.dunerocks.name = Піщані камені
 block.pine.name = Сосна
 block.white-tree-dead.name = Мертве біле дерево
-block.white-tree.name = Біле Дерево
+block.white-tree.name = Біле дерево
 block.spore-cluster.name = Скупчення спор
 block.metal-floor.name = Металевий пол 1
 block.metal-floor-2.name = Металевий пол 2
@@ -763,10 +792,13 @@ block.hail.name = Град
 block.lancer.name = Списоносець
 block.conveyor.name = Конвеєр
 block.titanium-conveyor.name = Титановий конвеєр
+block.armored-conveyor.name = Броньований конвеєр
+block.armored-conveyor.description = Переміщує предмети з тією ж швидкістю, як і титанові конвеєри, але має більше міцності. Не приймає введення з боків ні з чого, крім інших конвеєрів.
 block.junction.name = Перехрестя
 block.router.name = Маршрутизатор
 block.distributor.name = Розподілювач
 block.sorter.name = Сортувальник
+block.message.name = Повідомлення
 block.overflow-gate.name = Надмірний затвор
 block.silicon-smelter.name = Кремнієвий плавильний завод
 block.phase-weaver.name = Фазовий ткач
@@ -855,8 +887,8 @@ block.overdrive-projector.name = Сверхприводний проектор
 block.force-projector.name = Силовий проектор
 block.arc.name = Дуга
 block.rtg-generator.name = Радіоізотопний термоелектричний генератор
-block.spectre.name = Мара
-block.meltdown.name = Катастрофа
+block.spectre.name = Спектр
+block.meltdown.name = Випалювач
 block.container.name = Склад
 block.launch-pad.name = Стартовий майданчик
 block.launch-pad-large.name = Великий стартовий майданчик
@@ -868,7 +900,7 @@ team.derelict.name = Залишена
 team.green.name = Зелена
 team.purple.name = Фіолетова
 unit.spirit.name = Ремонтувальний дрон «Привид»
-unit.draug.name = Draug Miner Drone
+unit.draug.name = Добувний дрон «Драугр»
 unit.phantom.name = Будівельний дрон «Фантом»
 unit.dagger.name = Кинджал
 unit.crawler.name = Камікадзе
@@ -883,7 +915,7 @@ unit.eradicator.name = Викорінювач
 unit.lich.name = Лич
 unit.reaper.name = Жнець
 tutorial.next = [lightgray]<Натисніть для продовження>
-tutorial.intro = Ви розпочали[scarlet] навчання по Mindustry.[]\nРозпочність з[accent] видобування міді[]. Натисніть на мідну жилу біля вашого ядра, щоб зробити це.\n\n[accent]{0}/{1} міді
+tutorial.intro = Ви розпочали[scarlet] навчання по Mindustry.[]\nРозпочність з[accent] видобування міді[]. Використовуйте [[WASD] для руху, а потім натисність на мідну жилу біля вашого ядра, щоб зробити це.\n\n[accent]{0}/{1} міді
 tutorial.drill = Добування вручну неефективне.\n[accent]Бури []можуть добувати автоматично.\nНатисніть на вкладку свердла знизу зправа.\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням.\n[accent]Натисніть ПКМ[], щоб зупинити будування.
 tutorial.drill.mobile = Добування вручну неефективне.\n[accent]Бури []можуть добувати автоматично.\nНатисність на вкладку сведла знизу зправа.\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням, потім натисність на [accent] галочку[] нижче, щоб підтвердити розміщення to confirm your selection.\nPress the[accent] X button[] to cancel placement.
 tutorial.blockinfo = Кожен блок має різні характеристики. Кожний бур може видобувати тільки певні руди.\nЩоб переглянути інформацію та характеристики блока,[accent] натисність на кнопку «?», коли Ви вибрали блок у меню будування.[]\n\n[accent]Перегляньте характеристику Механічного бура прямо зараз.[]
@@ -941,6 +973,7 @@ unit.eruptor.description = Важкий мех, призначеней для з
 unit.wraith.description = Швидкий перехоплювач, який використовується для тактики «атакуй і біжи». Пріоритет — енергетичні генератори.
 unit.ghoul.description = Важкий килимовий бомбардувальник. Пробиває ворожі структури, орієнтуючись на віжливу інфраструктуру.
 unit.revenant.description = Важкий ракетний масив.
+block.message.description = Зберігає повідомлення. Використовується для комунікаціх між союзниками.
 block.graphite-press.description = Стискає шматки вугілля в чисті аркуші графіту.
 block.multi-press.description = Модернізована версія графітового преса. Використовує воду та енергію для швидкої та ефективної переробки вугілля.
 block.silicon-smelter.description = Змішує пісок з чистим вугіллям. Виробляє кремній.
@@ -1025,7 +1058,7 @@ block.core-foundation.description = Друга версія ядра. Краще
 block.core-nucleus.description = Третя і остання ітерація капсули ядра. Надзвичайно добре броньований. Зберігає величезні обсяги ресурсів.
 block.vault.description = Зберігає велику кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів із сховища.
 block.container.description = Зберігає велику кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів із сховища.
-block.unloader.description = Вивантажує предмети з контейнера, склепіння або серцевини на конвеєр або безпосередньо в сусідній блок. Тип предмета для завантаження можна змінити, натиснувши на блок.
+block.unloader.description = Вивантажує предмети з блока, який не переміщує предмети, на конвеєр або безпосередньо в сусідній блок. Тип предмета для завантаження можна змінити, натиснувши на блок.
 block.launch-pad.description = Запускає партії предметів без необхідності запуску ядра.
 block.launch-pad-large.description = Покращена версія стартового майданчика. Зберігає більше предметів. Запускається частіше.
 block.duo.description = Невелика дешева башта. Корисна проти наземних одиниць.

core/assets/bundles/bundle_zh_CN.properties

@@ -10,11 +10,11 @@ link.trello.description = Trello board 上的官方计划表
 link.itch.io.description = PC版下载和网页版(itch.io)
 link.google-play.description = 从谷歌商店获取安卓版
 link.wiki.description = 官方 Mindustry 维基
-linkfail = 打开链接失败！\nURL 已经复制到剪贴板。
-screenshot = 荧幕截图已放在 {0}
+linkfail = 打开链接失败！\n网址已经复制到剪贴板。
+screenshot = 屏幕截图已放在 {0}
 screenshot.invalid = 地图太大，可能没有足够的内存用于截图。
 gameover = 你的核心被摧毁了！
-gameover.pvp = [accent] {0}[] 队获胜!
+gameover.pvp = [accent] {0}[]队获胜!
 highscore = [accent]新纪录！
 load.sound = 音乐加载中
 load.map = 地图加载中
@@ -48,9 +48,18 @@ minimap = 小地图
 close = 关闭
 website = 官网
 quit = 退出
+save.quit = Save & Quit
 maps = 地图
+maps.browse = 浏览地图
 continue = 继续
 maps.none = [LIGHT_GRAY]没有找到地图！
+invalid = 无效
+preparingconfig = 正在准备配置
+preparingcontent = 正在准备内容
+uploadingcontent = 正在上传内容
+uploadingpreviewfile = 正在上传预览文件
+committingchanges = 提交更改
+done = 已完成
 about.button = 关于
 name = 名字：
 noname = 先取一个[accent]玩家名[]。
@@ -71,32 +80,35 @@ server.kicked.vote = 你被投票踢出了服务器。永别了。
 server.kicked.clientOutdated = 客户端过旧，请更新你的游戏。
 server.kicked.serverOutdated = 服务器过旧，请联系房主升级服务器。
 server.kicked.banned = 你在这个服务器上被拉入黑名单了。
-server.kicked.typeMismatch = 此服务器与您的不稳定测试版不兼容。
+server.kicked.typeMismatch = 此服务器与你的不稳定测试版不兼容。
+server.kicked.playerLimit = 服务器已满，请等待一个空位。
 server.kicked.recentKick = 你刚刚被踢出服务器。\n请稍后重新连接！
 server.kicked.nameInUse = 你的名字与服务器中的一个人重复了。
 server.kicked.nameEmpty = 无效的名字！
 server.kicked.idInUse = 你已在这个服务器上！不允许用两个账号连接。
-server.kicked.customClient = 这个服务器不支持定制版本。下载官方版本。
+server.kicked.customClient = 这个服务器不支持自定义版本。请下载官方版本。
 server.kicked.gameover = 游戏结束！
 server.versions = 客户端版本：[accent] {0}[]\n服务器版本：[accent] {1}[]
-host.info = [accent]创建局域网游戏[]按钮会在[scarlet]6567[]端口运行一个服务器。[]\n任何在同一个[LIGHT_GRAY]wifi或本地网络[]下的人都应该可以在服务器列表中看到你的服务器。\n\n如果你想让别人在任何地方都能通过IP地址连接，你需要设定[accent]端口转发[]。\n\n[LIGHT_GRAY]注意：如果某人无法连接到你的局域网游戏，请确保你在防火墙设置里允许了Mindustry访问本地网络。
-join.info = 此时，可以输入[accent]服务器的IP地址[]来连接，或寻找[accent]本地网络[]中的服务器来连接。\n局域网或广域网多人游戏都被支持。\n\n[LIGHT_GRAY]注意：没有全球服务器列表；如果你想通过IP地址连接某个服务器，你需要向房主询问IP地址。
+host.info = [accent]创建局域网游戏[]按钮会在[scarlet] 6567 []端口运行一个服务器。[]\n任何在同一个[LIGHT_GRAY] Wi-Fi 或本地网络[]下的人应该都可以在服务器列表中看到你的服务器。\n\n如果你想让别人在任何地方都能通过 IP 地址连接，你需要设定[accent]端口转发[]。\n\n[LIGHT_GRAY]注意：如果某人无法连接到你的局域网游戏，请确保你在防火墙设置里允许了 Mindustry 访问本地网络。
+join.info = 此时，可以输入[accent]服务器的 IP 地址[]来连接，或寻找[accent]本地网络[]中的服务器来连接。\n局域网或广域网多人游戏都支持。\n\n[LIGHT_GRAY]注意：没有全球服务器列表；如果你想通过 IP 地址连接某个服务器，你需要向房主询问 IP 地址。
 hostserver = 创建服务器
+invitefriends = 邀请朋友
 hostserver.mobile = 创建\n服务器
 host = 创建
 hosting = [accent]正在打开服务器……
 hosts.refresh = 刷新
 hosts.discovering = 正在搜索局域网服务器
+hosts.discovering.any = 正在搜索服务器
 server.refreshing = 正在刷新服务器
 hosts.none = [lightgray]未发现局域网游戏！
 host.invalid = [scarlet]无法连接服务器。
 trace = 跟踪玩家
 trace.playername = 玩家名称：[accent]{0}
-trace.ip = IP地址：[accent]{0}
-trace.id = 唯一的ID：[accent]{0}
+trace.ip = IP 地址：[accent]{0}
+trace.id = 唯一的 ID：[accent]{0}
 trace.mobile = 移动客户端：[accent]{0}
-trace.modclient = 定制版客户端：[accent]{0}
-invalidid = 无效的客户端ID！提交一个错误报告。
+trace.modclient = 自定义客户端：[accent]{0}
+invalidid = 无效的客户端 ID！提交一个错误报告。
 server.bans = 黑名单
 server.bans.none = 没有被拉黑的玩家！
 server.admins = 管理员
@@ -107,16 +119,21 @@ server.edit = 编辑服务器
 server.outdated = [crimson]服务器过旧！[]
 server.outdated.client = [crimson]客户端过旧！[]
 server.version = [lightgray]版本：{0} {1}
-server.custombuild = [yellow]定制版
+server.custombuild = [yellow]自定义
 confirmban = 确认拉黑这名玩家？
-confirmkick = 确定踢走这名玩家？
+confirmkick = 确定踢出这名玩家？
+confirmvotekick = 确定投票踢出这名玩家？
 confirmunban = 确定取消拉黑这名玩家？
 confirmadmin = 确定给予这名玩家管理员权限？
 confirmunadmin = 确定取消这名玩家的管理员权限？
 joingame.title = 加入游戏
 joingame.ip = 地址：
 disconnect = 已断开
-disconnect.data = 读取世界数据失败！
+disconnect.error = 连接错误。
+disconnect.closed = 连接关闭。
+disconnect.timeout = 连接超时。
+disconnect.data = 读取服务器数据失败！
+cantconnect = 无法加入([accent]{0}[])。
 connecting = [accent]连接中……
 connecting.data = [accent]加载中……
 server.port = 端口：
@@ -142,22 +159,24 @@ save.rename = 重命名
 save.rename.text = 新名称：
 selectslot = 选择一个存档。
 slot = [accent]存档位 {0}
-save.corrupted = [accent]存档损坏或无效！\n如果你刚刚升级了游戏，那么这可能是因为存档格式改变了，而[scarlet]不是[]bug 。
-empty = <空>
+editmessage = Edit Message
+save.corrupted = [accent]存档损坏或无效！\n如果你刚刚升级了游戏，那么这可能是因为存档格式改变了，而[scarlet]不是[] bug 。
+empty = < 空 >
 on = 开
 off = 关
 save.autosave = 自动保存：{0}
 save.map = 地图：{0}
-save.wave = 波次 {0}
-save.difficulty = 难度：{0}
+save.wave = 波次：{0}
+save.mode = 模式：{0}
 save.date = 最后保存：{0}
 save.playtime = 游戏时间：{0}
 warning = 警告！
 confirm = 确认
 delete = 删除
+view.workshop = 浏览创意工坊
 ok = 确定
 open = 打开
-customize = 定制
+customize = 自定义
 cancel = 取消
 openlink = 打开链接
 copylink = 复制链接
@@ -166,14 +185,14 @@ data.export = 导出数据
 data.import = 导入数据
 data.exported = 数据已导入。
 data.invalid = 非有效游戏数据。
-data.import.confirm = 导入外部游戏数据讲覆盖本地[scarlet]全部[]游戏数据。\n[accent]此操作无法撤销！[]\n\n数据导入后将自动退出游戏。
+data.import.confirm = 导入外部游戏数据将覆盖本地[scarlet]全部[]的游戏数据。\n[accent]此操作无法撤销！[]\n\n数据导入后将自动退出游戏。
 classic.export = 导出老版本数据
-classic.export.text = [accent]Mindustry []有了一个重要的更新。\n检测到此为老版本(v3.5 build 40)的存档或地图。是否要将这些保存导出到手机的主文件夹中，以便在 Mindustry 老版本应用程序中使用？
+classic.export.text = [accent]Mindustry []已经有了一个重要的更新。\n检测到此为老版本(v3.5 build 40)的存档或地图。是否要将这些保存导出到手机的主文件夹中，以便在 Mindustry 老版本应用程序中使用？
 quit.confirm = 确定退出？
-quit.confirm.tutorial = 你确定不玩教程就开始游戏？\n教程可以通过[accent]设置->游戏->重新游玩教程[]来再次游玩。
-loading = [accent]老滑稽祈祷中……
+quit.confirm.tutorial = 你确定要跳过教程？\n教程可以通过[accent]设置->游戏->重新游玩教程[]来再次游玩。
+loading = [accent]加载中……
 saving = [accent]保存中……
-wave = [accent]波次 {0}
+wave = [accent]波次{0}
 wave.waiting = [LIGHT_GRAY]下一波将在{0}秒后到来
 wave.waveInProgress = [LIGHT_GRAY]波次进行中
 waiting = [LIGHT_GRAY]等待中……
@@ -187,10 +206,15 @@ custom = 自定义
 builtin = 内建的
 map.delete.confirm = 你确定你想要删除这张地图吗？这个操作无法撤销！
 map.random = [accent]随机地图
-map.nospawn = 这个地图没有核心！请在编辑器中添加一个[ROYAL]蓝色[]的核心。
-map.nospawn.pvp = 这个地图没有敌人的核心！请在编辑器中添加一个[ROYAL]红色[]的核心。
-map.nospawn.attack = 这个地图没有敌人的核心！请在编辑中向地图添加一个[SCARLET]红色[]的核心。
+map.nospawn = 这个地图没有核心！请在编辑器中添加一个[ROYAL]己方[]的核心。
+map.nospawn.pvp = 这个地图没有敌人的核心！请在编辑器中添加一个[ROYAL]敌方[]的核心。
+map.nospawn.attack = 这个地图没有敌人的核心！请在编辑中向地图添加一个[SCARLET]敌方[]的核心。
 map.invalid = 地图载入错误：地图文件可能已经损坏。
+map.publish.error = 地图上传错误：{0}
+map.publish.confirm = 确定上传此地图？\n\n[lightgray]确定你同意 Steam 创意工坊的最终用户许可协议，否则你的地图将不会被展示！
+eula = Steam 最终用户许可协议
+map.publish = 地图已上传。
+map.publishing = [accent]地图上传中……
 editor.brush = 笔刷
 editor.openin = 在编辑器中打开
 editor.oregen = 矿石的生成
@@ -198,14 +222,17 @@ editor.oregen.info = 矿石的生成：
 editor.mapinfo = 地图信息
 editor.author = 作者：
 editor.description = 描述：
+editor.nodescription = 地图必须要有不少于4个字符的描述才能上传。
 editor.waves = 波数：
 editor.rules = 规则：
 editor.generation = 筛选器：
 editor.ingame = 游戏内编辑
+editor.publish.workshop = 上传到创意工坊
 editor.newmap = 新地图
+workshop = 创意工坊
 waves.title = 波数
 waves.remove = 移除
-waves.never = <永不>
+waves.never = < 无限 >
 waves.every = 每
 waves.waves = 波
 waves.perspawn = 每次生成
@@ -219,6 +246,7 @@ waves.invalid = 剪贴板中无效的波次信息。
 waves.copied = 波次信息已复制。
 waves.none = 无自定义敌人。\n请注意，空布局将自动替换为默认布局。
 editor.default = [LIGHT_GRAY]<默认>
+details = 详情……
 edit = 编辑……
 editor.name = 名称：
 editor.spawn = 生成单位
@@ -228,8 +256,9 @@ editor.errorload = 读取文件时出现错误：\n[accent]{0}
 editor.errorsave = 保存文件时出现错误：\n[accent]{0}
 editor.errorimage = 这是一幅画，不是地图。不要更改文件的扩展名来让他工作。\n\n如果你想导入地图，请在编辑器中使用“导入地图”这一按钮。
 editor.errorlegacy = 此地图太旧，而旧的地图格式不再受支持了。
+editor.errornot = 这不是地图文件。
 editor.errorheader = 此地图文件已失效或损坏。
-editor.errorname = 地图没有被定义的名称。
+editor.errorname = 地图没有被定义的名称。你是否在尝试加载存档文件？
 editor.update = 更新
 editor.randomize = 随机化
 editor.apply = 应用
@@ -260,6 +289,7 @@ editor.resizemap = 调整地图大小
 editor.mapname = 地图名称：
 editor.overwrite = [accent]警告！\n这将会覆盖一个已经存在的地图。
 editor.overwrite.confirm = [scarlet]警告！[]存在同名地图。你确定你想要覆盖？
+editor.exists = 已经存在同名地图。
 editor.selectmap = 选择一个地图加载：
 toolmode.replace = 替换
 toolmode.replace.description = 仅在实心块上绘制。
@@ -276,36 +306,36 @@ toolmode.fillteams.description = 填充团队而不是方块。
 toolmode.drawteams = 绘制团队
 toolmode.drawteams.description = 绘制团队而不是方块。
 filters.empty = [LIGHT_GRAY]没有筛选器！用下方的按钮添加一个。
-filter.distort = Distort
-filter.noise = Noise
-filter.median = Median
-filter.oremedian = Ore Median
-filter.blend = Blend
-filter.defaultores = Default Ores
-filter.ore = Ore
-filter.rivernoise = River Noise
-filter.mirror = Mirror
-filter.clear = Clear
-filter.option.ignore = Ignore
-filter.scatter = Scatter
-filter.terrain = Terrain
-filter.option.scale = Scale
-filter.option.chance = Chance
-filter.option.mag = Magnitude
-filter.option.threshold = Threshold
-filter.option.circle-scale = Circle Scale
-filter.option.octaves = Octaves
-filter.option.falloff = Falloff
-filter.option.angle = Angle
-filter.option.block = Block
-filter.option.floor = Floor
-filter.option.flooronto = Target Floor
-filter.option.wall = Wall
-filter.option.ore = Ore
-filter.option.floor2 = Secondary Floor
-filter.option.threshold2 = Secondary Threshold
-filter.option.radius = Radius
-filter.option.percentile = Percentile
+filter.distort = 扭曲程度
+filter.noise = 波动程度
+filter.median = 平均数
+filter.oremedian = 矿石平均数
+filter.blend = 混合程度
+filter.defaultores = 默认矿石
+filter.ore = 矿石
+filter.rivernoise = 河流波动程度
+filter.mirror = 镜像
+filter.clear = 清理
+filter.option.ignore = 忽略
+filter.scatter = 分散程度
+filter.terrain = 地形
+filter.option.scale = 规模大小
+filter.option.chance = 几率大小
+filter.option.mag = 巨大程度
+filter.option.threshold = 最大阈值
+filter.option.circle-scale = 圆规模
+filter.option.octaves = 递增
+filter.option.falloff = 递减
+filter.option.angle = 角度大小
+filter.option.block = 方块
+filter.option.floor = 地面
+filter.option.flooronto = 地面目标
+filter.option.wall = 墙
+filter.option.ore = 矿石
+filter.option.floor2 = 二重地面
+filter.option.threshold2 = 二重阈值
+filter.option.radius = 半径大小
+filter.option.percentile = 百分比
 width = 宽度：
 height = 高度：
 menu = 菜单
@@ -324,8 +354,8 @@ editor = 编辑器
 mapeditor = 地图编辑器
 donate = 打赏
 abandon = 放弃
-abandon.text = 这个区域和它的所有资源会被敌人重置。
-locked = 已被锁定
+abandon.text = 这个区域及其资源会被敌人重置。
+locked = 已锁定
 complete = [LIGHT_GRAY]完成：
 zone.requirement = 在{1}中达到{0}波
 resume = 暂停：\n[LIGHT_GRAY]{0}
@@ -339,6 +369,7 @@ launch.skip.confirm = 如果你现在跳过，在后来的波次前你将无法
 uncover = 解锁
 configure = 设定发射资源数量
 configure.locked = [LIGHT_GRAY]到达第 {0} 波\n才能设定发射资源。
+configure.invalid = 数量必须是0到{0}之间的数字。
 zone.unlocked = [LIGHT_GRAY]{0} 已解锁。
 zone.requirement.complete = 已达到第{0}波。\n达到解锁{1}的需求。
 zone.config.complete = 已达到第{0}波。\n允许携带发射的资源进入此地区。
@@ -372,18 +403,18 @@ zone.saltFlats.name = 盐碱荒滩
 zone.impact0078.name = 0078号冲击
 zone.crags.name = 悬崖
 zone.fungalPass.name = 真菌通道
-zone.groundZero.description = 重新开始的最佳位置。敌人威胁很小，资源少。\n尽可能收集多的铅和铜。\n行动。
+zone.groundZero.description = 重新开始的最佳位置。这儿敌人威胁很小，资源少。\n尽可能收集多的铅和铜。\n行动。
 zone.frozenForest.description = 即使在这里，靠近山脉的地方，孢子也已经扩散。寒冷的温度不可能永远容纳它们。\n\n此行动须投入电力。建造燃烧发电机并学会使用修理者。
-zone.desertWastes.description = 这些废物是巨大的，不可预测的，并且与废弃的结构交错在一起。燃烧它以获取动力或合成石墨。\n\n[lightgray]无法保证此着陆位置。
-zone.saltFlats.description = 在沙漠的郊区有盐滩。在这个地方几乎找不到资源。\n\n敌人在这里建立了一个资源存储区。根除他们的核心。不要留下任何东西。
-zone.craters.description = 水在这个火山口积聚，这是旧战争的遗迹。夺下该区域。收集沙子来冶炼玻璃。用水泵抽水冷却炮塔和钻头。
-zone.ruinousShores.description = 穿过荒地，就是海岸线。曾经这个地方安置了一个海岸防御阵列。现在剩下的不多了，只有最基本的防御结构仍然毫发无损，其他一切都被销毁了。\n继续向外扩展。继续研究科技。
-zone.stainedMountains.description = 在更远的内陆地区是山脉，但没有被孢子污染。\n在这一地区分布着丰富的钛。学习如何使用它。\n\n这里敌人的存在更大。不要给他们时间派出最强的部队。
-zone.overgrowth.description = 这个地区靠近孢子的来源，生长过度。\n敌人在这里建立了一个前哨站。建造尖刀单位来摧毁它并找回丢失的东西。
-zone.tarFields.description = 位于山脉和沙漠之间的产油区的郊区是少数几个有可用焦油储量的地区之一。\n尽管被废弃，但附近仍有一些危险的敌军。不要低估它们。\n\n[lightgray]如果可能，研究石油加工技术。
-zone.desolateRift.description = 非常危险的区域。资源丰富但空间小。破坏风险高。尽快离开，不要被敌人的攻击间隔太长所愚弄。
-zone.nuclearComplex.description = 以前生产和加工钍的设施已变成废墟。\n[lightgray]研究钍及其多种用途。\n\n敌人在这里大量存在，不断侦察入侵者。
-zone.fungalPass.description = 介于高山和低矮孢子丛生的土地之间的过渡地带。这里有一个小型的敌方侦察基地。\n侦察它。\n使用尖刀和爬行者单位来消灭两个核心。
+zone.desertWastes.description = 这些废料规模巨大，难以预测，并且与废弃的结构交错在一起。\n此地区有煤矿存在，燃烧它以获取动力或合成石墨。\n\n[lightgray]无法保证此着陆位置。
+zone.saltFlats.description = 在沙漠的郊区有盐滩。在这个地方几乎找不到资源。\n\n敌人在这里建立了一个资源存储区。摧毁他们的核心。不要留下任何东西。
+zone.craters.description = 水在这个火山口积聚，这是旧战争的遗迹。夺下该区域。收集沙子来冶炼玻璃。用水泵抽水来加速炮塔和钻头。
+zone.ruinousShores.description = 穿过荒地，就是海岸线。这个地方曾经建造了一个海岸防御线。但现在所剩无几，只有最基本的防御结构仍然毫发无损，其他一切都被摧毁了。\n继续向外扩展。继续研究科技。
+zone.stainedMountains.description = 在更远的内陆地区是山脉，但这里没有被孢子污染。\n在这一地区分布着丰富的钛，学习如何使用它。\n\n这里敌人的存在更大。不要给他们时间派出最强的部队。
+zone.overgrowth.description = 这个地区靠近孢子的来源，因此生长过度。\n敌人在这里建立了一个前哨站。建造尖刀单位来摧毁它并找回丢失的东西。
+zone.tarFields.description = 位于山脉和沙漠之间的产油区的郊区是少数几个有可用石油储量的地区之一。\n尽管被废弃，但附近仍有一些危险的敌军。不要低估它们。\n\n[lightgray]如果可能，研究石油加工技术。
+zone.desolateRift.description = 非常危险的区域。这儿资源丰富但空间小。敌人十分危险。尽快离开，不要被敌人的攻击间隔太长所愚弄。
+zone.nuclearComplex.description = 以前生产和加工钍的设施已变成废墟。\n[lightgray]研究钍及其多种用途。\n\n敌人在这里大量存在，不断消灭入侵者。
+zone.fungalPass.description = 介于高山和低矮孢子丛生的土地之间的过渡地带。这里有一个小型的敌方侦察基地。\n侦察它。\n使用尖刀和爬行者单位来摧毁两个核心。
 zone.impact0078.description = <在此处插入说明>
 zone.crags.description = <在此处插入说明>
 settings.language = 语言
@@ -435,6 +466,7 @@ blocks.boosteffect = 加成影响
 blocks.maxunits = 最大单位数量
 blocks.health = 生命值
 blocks.buildtime = 建造时间
+blocks.buildcost = 建造花费
 blocks.inaccuracy = 误差
 blocks.shots = 每秒发射数
 blocks.reload = 重新装弹
@@ -442,10 +474,12 @@ blocks.ammo = 子弹
 bar.drilltierreq = 需要更好的钻头
 bar.drillspeed = 挖掘速度：{0}/s
 bar.efficiency = 效率：{0}%
-bar.powerbalance = 能量：{0}
+bar.powerbalance = 能量：{0}/秒
+bar.powerstored = 储能：{0}/{1}
 bar.poweramount = 能量：{0}
 bar.poweroutput = 能量输出：{0}
 bar.items = 物体：{0}
+bar.capacity = 容量：{0}
 bar.liquid = 液体
 bar.heat = 热量
 bar.power = 电力
@@ -483,13 +517,14 @@ category.shooting = 发射
 category.optional = 可选的增强物品
 setting.landscape.name = 锁定横屏
 setting.shadows.name = 影子
-setting.linear.name = 光滑贴图
+setting.linear.name = 抗锯齿
 setting.animatedwater.name = 流动的水
 setting.animatedshields.name = 动态画面
 setting.antialias.name = 抗锯齿[LIGHT_GRAY]（需要重新启动）[]
 setting.indicators.name = 队友指示器
 setting.autotarget.name = 自动射击
 setting.keyboard.name = 鼠标+键盘操控
+setting.touchscreen.name = 触屏操控
 setting.fpscap.name = 最大FPS
 setting.fpscap.none = 无
 setting.fpscap.text = {0} FPS
@@ -520,6 +555,7 @@ setting.sfxvol.name = 音效音量
 setting.mutesound.name = 静音
 setting.crashreport.name = 发送匿名崩溃报告
 setting.savecreate.name = 自动创建存档
+setting.publichost.name = 公共游戏旁观
 setting.chatopacity.name = 聊天界面透明度
 setting.playerchat.name = 显示游戏内聊天界面
 uiscale.reset = UI缩放比例已经改变。\n按下“确定”来确定缩放比例\n[accent]{0}[]秒后[scarlet]退出并恢复设定。
@@ -531,8 +567,8 @@ category.general.name = 普通
 category.view.name = 查看
 category.multiplayer.name = 多人
 command.attack = 攻击
+command.rally = Rally
 command.retreat = 撤退
-command.patrol = 巡逻
 keybind.gridMode.name = 选择块
 keybind.gridModeShift.name = 选择类别
 keybind.press = 按一下键……
@@ -590,7 +626,7 @@ rules.wavespacing = 波次间隔时间：[LIGHT_GRAY]（秒）
 rules.buildcostmultiplier = 建设花费倍数
 rules.buildspeedmultiplier = 建设时间倍数
 rules.waitForWaveToEnd = 等待敌人时间
-rules.dropzoneradius = 敌人出生点毁灭大小:[LIGHT_GRAY]（格）
+rules.dropzoneradius = 敌人出生点毁灭大小：[LIGHT_GRAY]（格）
 rules.respawns = 每波最大重生次数
 rules.limitedRespawns = 重生限制次数
 rules.title.waves = 波次
@@ -651,7 +687,7 @@ item.radioactivity = [LIGHT_GRAY]放射性：{0}
 unit.health = [LIGHT_GRAY]生命值：{0}
 unit.speed = [LIGHT_GRAY]速度：{0}
 mech.weapon = [LIGHT_GRAY]武器：{0}
-mech.health = [LIGHT_GRAY]生命值： {0}
+mech.health = [LIGHT_GRAY]生命值：{0}
 mech.itemcapacity = [LIGHT_GRAY]物品容量：{0}
 mech.minespeed = [LIGHT_GRAY]采矿速度：{0}
 mech.minepower = [LIGHT_GRAY]采矿力量：{0}
@@ -715,10 +751,10 @@ block.pine.name = 松树
 block.white-tree-dead.name = 枯萎的白树
 block.white-tree.name = 白树
 block.spore-cluster.name = 孢子簇
-block.metal-floor.name = 金属地板
+block.metal-floor.name = 金属地板1
 block.metal-floor-2.name = 金属地板2
 block.metal-floor-3.name = 金属地板3
-block.metal-floor-5.name = 金属地板5
+block.metal-floor-5.name = 金属地板4
 block.metal-floor-damaged.name = 损坏的金属地板
 block.dark-panel-1.name = 暗面板1
 block.dark-panel-2.name = 暗面板2
@@ -748,10 +784,13 @@ block.hail.name = 冰雹炮
 block.lancer.name = 蓝瑟炮
 block.conveyor.name = 传送带
 block.titanium-conveyor.name = 钛传送带
+block.armored-conveyor.name = 装甲传送带
+block.armored-conveyor.description = 向钛传送带一样运物品，但有更好的装甲。除其他传送带，不接受任何边的输入。
 block.junction.name = 连接点
 block.router.name = 路由器
 block.distributor.name = 分配器
 block.sorter.name = 分类器
+block.message.name = 信息
 block.overflow-gate.name = 溢流门
 block.silicon-smelter.name = 硅冶炼厂
 block.phase-weaver.name = 相织布编织器
@@ -796,7 +835,7 @@ block.wave.name = 波浪
 block.swarmer.name = 蜂群
 block.salvo.name = 齐射炮
 block.ripple.name = 浪涌
-block.phase-conveyor.name = 相织布传送带
+block.phase-conveyor.name = 相织布传送带桥
 block.bridge-conveyor.name = 传送带桥
 block.plastanium-compressor.name = 塑钢压缩机
 block.pyratite-mixer.name = 硫混合器
@@ -817,7 +856,7 @@ block.fortress-factory.name = 堡垒机甲工厂
 block.revenant-factory.name = 亡魂战机工厂
 block.repair-point.name = 维修点
 block.pulse-conduit.name = 脉冲导管
-block.phase-conduit.name = 相织布导管
+block.phase-conduit.name = 相织布导管桥
 block.liquid-router.name = 液体路由器
 block.liquid-tank.name = 储液罐
 block.liquid-junction.name = 液体连接点
@@ -845,13 +884,13 @@ block.meltdown.name = 熔毁
 block.container.name = 容器
 block.launch-pad.name = 发射台
 block.launch-pad-large.name = 大型发射台
-team.blue.name = 蓝
-team.crux.name = red
-team.sharded.name = orange
-team.orange.name = 橙
-team.derelict.name = derelict
-team.green.name = 绿
-team.purple.name = 紫
+team.blue.name = 胖次蓝
+team.crux.name = 姨妈红
+team.sharded.name = 哲学黄
+team.orange.name = 太阳橙
+team.derelict.name = 高冷灰
+team.green.name = 原谅绿
+team.purple.name = 基佬紫
 unit.spirit.name = 幽灵修理机
 unit.draug.name = 德鲁格采矿机
 unit.phantom.name = 鬼怪建造机
@@ -874,7 +913,7 @@ tutorial.drill.mobile = 手动采矿效率低。\n[accent]钻头[]可以自动
 tutorial.blockinfo = 每个方块具有不同的数据。每个钻头只能开采某些矿石。\n要检查块的信息和统计信息，[accent]在菜单中点击问号。[]\n\n[accent]现在查看机械钻头的数据吧。[]
 tutorial.conveyor = [accent]传送带[]可以把物资传送到核心。\n请从钻头到核心间造一条传送带。
 tutorial.conveyor.mobile = [accent]传送带[]可以把物资传送到核心。\n请从钻头到核心间造一条传送带。\n[accent]长按数秒[]并向一个方向拖动来直线放置。\n\n[accent]{0}/{1} 条传送带\n[accent]0/1 物品
-tutorial.turret = 必须建造防御建筑来击退[LIGHT_GRAY]敌人[]。\n请在你核心附近造一个双管炮。
+tutorial.turret = 必须建造防御建筑来击退[LIGHT_GRAY]敌人[]。\n请在核心附近造一个双管炮。
 tutorial.drillturret = 双管炮需要[accent]铜[]作弹药来射击。\n可以放一个钻头在炮塔附近供应铜。
 tutorial.pause = 在战斗中，您可以[accent]暂停游戏[]。\n暂停时您可以规划建筑物。\n\n按[accent]空格[]暂停。
 tutorial.pause.mobile = 在战斗中，您可以[accent]暂停游戏[]。\n暂停时您可以规划建筑物。\n\n[accent]点击左上角的按钮以暂停。
@@ -888,7 +927,7 @@ tutorial.waves = [lightgray]敌人[]来了。\n\n保护核心，防御2波攻击
 tutorial.waves.mobile = [lightgray]敌人[]来了。\n\n保护核心，防御2波攻击。造更多的炮塔。你的机甲将对敌人自动开火。\n建造更多的炮塔和钻头，并采更多的矿。
 tutorial.launch = 特定波次中，你可以[accent]发射核心[]，[accent]携带核心中所有资源[]离开所有的建筑。\n资源可用来研究科技。\n\n[accent]点击发射按钮。
 item.copper.description = 一种有用的结构材料。在各种类型的方块中广泛使用。
-item.lead.description = 一种基本的起始材料。被广泛用于电子设备和液体运输方块。 
+item.lead.description = 一种基本的起始材料。广泛用于电子设备和液体运输。 
 item.metaglass.description = 一种超级强硬的复合玻璃。通常用来传送和收藏液体。
 item.graphite.description = 一种用于弹药和电路绝缘的矿化碳。
 item.sand.description = 一种常见的材料，广泛用于冶炼，包括制作合金和助熔剂。
@@ -907,7 +946,7 @@ liquid.water.description = 最有用的液体。常用于冷却和废物处理
 liquid.slag.description = 各种不同类型的熔融金属混合在一起的液体。可以被分解成其组成矿物，或作为武器喷向敌方单位。
 liquid.oil.description = 用于先进材料生产的液体。可以转换成煤作为燃料，或作为武器喷射和放火。
 liquid.cryofluid.description = 一种由水和钛制成的惰性、无腐蚀性的液体。具有极高的热容量。广泛用作冷却剂。
-mech.alpha-mech.description = 标准控制机甲。基于尖刀单位，具有升级的装甲和建筑能力。比Dart有更多的伤害输出。
+mech.alpha-mech.description = 标准控制机甲。基于尖刀单位，具有升级的装甲和建筑能力。比 Dart 有更多的伤害输出。
 mech.delta-mech.description = 一种快速，轻便的机甲，一击即退。对结构造成的伤害很小，但可以用弧形闪电武器快速杀死大量敌方单位。
 mech.tau-mech.description = 后勤机甲。治疗友军。可以熄灭火焰并治疗一定范围内的友军。
 mech.omega-mech.description = 一种装甲厚重的机甲，用于在前线攻击。它的护甲可以阻挡高达90%的伤害。
@@ -926,6 +965,7 @@ unit.eruptor.description = 一种用来拆除建筑物的重型机甲。在敌
 unit.wraith.description = 一种快速、一击即退的拦截器机甲。目标是发电机。
 unit.ghoul.description = 一种地毯式轰炸机。通过敌人的结构进行攻击，并瞄准关键的基础设施。
 unit.revenant.description = 一种发射导弹的重型飞行机甲。
+block.message.description = 储存一条信息。用于在盟军之间交流。
 block.graphite-press.description = 把大块的煤压缩成纯石墨片。
 block.multi-press.description = 石墨压缩机的升级版。利用水和电力快速高效地处理煤炭。
 block.silicon-smelter.description = 用高纯度的焦炭来加工沙子以生产硅。
@@ -977,7 +1017,7 @@ block.mass-driver.description = 终极传送带。收集物品后将它们射向
 block.mechanical-pump.description = 一种输出速度慢但没有功耗的廉价泵。
 block.rotary-pump.description = 先进的水泵。泵送更多液体，但需要动力。
 block.thermal-pump.description = 终级水泵。
-block.conduit.description = 基本液体传输块。像传送带一样工作，但用于液体。最适用于提取器，泵或其他导管。
+block.conduit.description = 基本液体传输块。像传送带一样工作，但用于液体。最适用于从泵或其他导管中提取液体。
 block.pulse-conduit.description = 高级液体传输块。比标准导管更快地输送液体并储存更多液体。
 block.liquid-router.description = 接受来自一个方向的液体并将它们平均输出到最多3个其他方向。也可以储存一定量的液体。用于将液体从一个源分成多个目标。
 block.liquid-tank.description = 存储大量液体。当存在对材料的非恒定需求或作为冷却重要块的安全措施时，将其用于创建缓冲区。

core/assets/bundles/bundle_zh_TW.properties

@@ -48,9 +48,18 @@ minimap = 小地圖
 close = 關閉
 website = Website
 quit = 退出
+save.quit = Save & Quit
 maps = 地圖
+maps.browse = Browse Maps
 continue = 繼續
 maps.none = [LIGHT_GRAY]找不到地圖!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = 關於
 name = 名稱：
 noname = 先選擇一個[accent]玩家名稱[]。
@@ -65,12 +74,14 @@ players = {0}個線上玩家
 players.single = {0}個線上玩家
 server.closing = [accent]正在關閉伺服器……
 server.kicked.kick = 您已被踢出伺服器！
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = 伺服器已關閉。
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = 客戶端版本過舊！請更新遊戲！
 server.kicked.serverOutdated = 伺服器版本過舊！請聯絡伺服主更新伺服器！
 server.kicked.banned = 您已經從這個伺服器被封禁。
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = 您已經從伺服器被踢除。\n請稍後再進行連線。
 server.kicked.nameInUse = 伺服器中已經\n有人有相同的名稱了。
 server.kicked.nameEmpty = 你的名稱必須至少包含一個字母或數字。
@@ -81,11 +92,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = 目前伺服器監聽於連接埠[scarlet]6567[]。\n所有跟您在同一個[LIGHT_GRAY]網路或區域網路[]環境的玩家應該能在他們的伺服器清單中找到您的伺服器。\n\n如果您希望網際網路上的玩家透過IP 位址連線到您的伺服器，您必須設定[accent]連接埠轉發[]。\n\n[LIGHT_GRAY]注意：如果區域網路內有玩家無法連線至您的伺服器，請務必確認您已於防火牆設定中開放Mindustry存取您的區域網路。
 join.info = 您可以在此輸入欲連線的[accent]伺服器的IP位址[]，或尋找[accent]區域網路[]內的伺服器。目前支援區域網路與網際網路連線。\n\n[LIGHT_GRAY]注意：這裡沒有網際網路伺服器清單，如果您想透過IP位址連線到某人的伺服器，您必須向他們詢問IP位址。
 hostserver = 建立伺服器
+invitefriends = Invite Friends
 hostserver.mobile = 建立\n伺服器
 host = 建立
 hosting = [accent]伺服器啟動中……
 hosts.refresh = 刷新
 hosts.discovering = 搜尋區域網路遊戲
+hosts.discovering.any = Discovering games
 server.refreshing = 刷新伺服器
 hosts.none = [lightgray]找不到區域網路伺服器！
 host.invalid = [scarlet]無法連線至伺服器。
@@ -109,13 +122,18 @@ server.version = [lightgray]版本：{0}
 server.custombuild = [yellow]自訂組建
 confirmban = 您確定要封禁該玩家嗎？
 confirmkick = 您確定要踢出該玩家嗎？
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = 您確定要解除封禁該玩家嗎？
 confirmadmin = 您確定要提升這個玩家為管理員嗎？
 confirmunadmin = 您確定要解除這個玩家的管理員嗎？
 joingame.title = 加入遊戲
 joingame.ip = IP位址：
 disconnect = 已中斷連線。
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = 無法載入地圖資料！
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]連線中……
 connecting.data = [accent]正在載入地圖資料……
 server.port = 連接埠：
@@ -141,6 +159,7 @@ save.rename = 重新命名
 save.rename.text = 新名稱：
 selectslot = 選取一個存檔。
 slot = [accent]存檔{0}
+editmessage = Edit Message
 save.corrupted = [accent]此存檔無效或已損毀！\n如果你剛剛升級了遊戲，那麼這可能是因為存檔格式改變了而[scarlet]不是[]錯誤。
 empty = 〈空白〉
 on = 開啟
@@ -148,12 +167,13 @@ off = 關閉
 save.autosave = 自動存檔：{0}
 save.map = 地圖：{0}
 save.wave = 波次：{0}
-save.difficulty = 難度：{0}
+save.mode = Gamemode: {0}
 save.date = 最後存檔時間：{0}
 save.playtime = 遊玩時間:{0}
 warning = 警告。
 confirm = 確認
 delete = 刪除
+view.workshop = View In Workshop
 ok = 確定
 open = 開啟
 customize = 自訂
@@ -190,6 +210,11 @@ map.nospawn = 這個地圖沒有核心！請在編輯器中添加一個[ROYAL]
 map.nospawn.pvp = 這個地圖沒有核心讓敵人重生！請在編輯器中添加一個[SCARLET]紅色[]的核心。
 map.nospawn.attack = 這個地圖沒有敵人核心讓可以攻擊！請在編輯器中添加一個[SCARLET]紅色[]的核心。
 map.invalid = 地圖載入錯誤：地圖可能已經損壞。
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = 粉刷
 editor.openin = 在編輯器中開啟
 editor.oregen = 礦石產生
@@ -197,11 +222,14 @@ editor.oregen.info = 礦石產生：
 editor.mapinfo = 地圖資訊
 editor.author = 作者：
 editor.description = 描述：
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = 波次：
 editor.rules = 規則：
 editor.generation = Generation:
 editor.ingame = 在遊戲中編輯
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = 波次
 waves.remove = 移除
 waves.never = 〈從來沒有〉
@@ -218,6 +246,7 @@ waves.invalid = 剪貼板中的波次無效。
 waves.copied = 波次已被複製。
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]〈默認〉
+details = Details...
 edit = 編輯……
 editor.name = 名稱：
 editor.spawn = 重生單位
@@ -227,6 +256,7 @@ editor.errorload = 加載文件時出錯：\n[accent]{0}
 editor.errorsave = 保存文件時出錯：\n[accent]{0}
 editor.errorimage = 這是一個圖像檔，而不是地圖。不要更改副檔名使它可用。\n\n如果要匯入地形圖像檔，請使用編輯器中的「匯入地形圖像檔」按鈕。
 editor.errorlegacy = 此地圖太舊，並使用不支持的舊地圖格式。
+editor.errornot = This is not a map file.
 editor.errorheader = 此地圖檔案無效或已損壞。
 editor.errorname = 地圖沒有定義名稱。
 editor.update = 更新
@@ -259,6 +289,7 @@ editor.resizemap = 調整地圖大小
 editor.mapname = 地圖名稱：
 editor.overwrite = [accent]警告！這將會覆蓋現有的地圖。
 editor.overwrite.confirm = [scarlet]警告！[]同名地圖存在，確定要覆蓋現有地圖？
+editor.exists = A map with this name already exists.
 editor.selectmap = 選取要載入的地圖：
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = 揭露
 configure = 配置裝載
 configure.locked = [LIGHT_GRAY]到達波次{0}\n以配置裝載。
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0}已解鎖。
 zone.requirement.complete = 到達波次{0}：\n滿足{1}區域要求。
 zone.config.complete = 到達波次{0}：\n裝載配置已解鎖。
@@ -434,6 +466,7 @@ blocks.boosteffect = 提升效應
 blocks.maxunits = 最大活躍單位
 blocks.health = 耐久度
 blocks.buildtime = 建設時間
+blocks.buildcost = Build Cost
 blocks.inaccuracy = 誤差
 blocks.shots = 射擊數
 blocks.reload = 重裝彈藥
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = 鑽頭速度：{0}/秒
 bar.efficiency = 效率：{0}%
 bar.powerbalance = 能量變化：{0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = 能量：{0}
 bar.poweroutput = 能量輸出：{0}
 bar.items = 物品：{0}
+bar.capacity = Capacity: {0}
 bar.liquid = 液體
 bar.heat = 熱
 bar.power = 能量
@@ -489,6 +524,7 @@ setting.antialias.name = 消除鋸齒[LIGHT_GRAY]（需要重啟）[]
 setting.indicators.name = 盟友指標
 setting.autotarget.name = 自動射擊
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = 最大FPS
 setting.fpscap.none = 没有
 setting.fpscap.text = {0}FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = 音效音量
 setting.mutesound.name = 靜音
 setting.crashreport.name = 發送匿名崩潰報告
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = 聊天框不透明度
 setting.playerchat.name = 在遊戲中顯示聊天框
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -530,8 +567,8 @@ category.general.name = 一般
 category.view.name = 查看
 category.multiplayer.name = 多人
 command.attack = 攻擊
+command.rally = Rally
 command.retreat = 撤退
-command.patrol = 巡邏
 keybind.gridMode.name = 方塊選取
 keybind.gridModeShift.name = 類別選取
 keybind.press = 按一下鍵……
@@ -747,10 +784,13 @@ block.hail.name = 冰雹炮
 block.lancer.name = 藍瑟炮
 block.conveyor.name = 輸送帶
 block.titanium-conveyor.name = 鈦輸送帶
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = 樞紐
 block.router.name = 分配器
 block.distributor.name = 大型分配器
 block.sorter.name = 分類器
+block.message.name = Message
 block.overflow-gate.name = 溢流器
 block.silicon-smelter.name = 煉矽廠
 block.phase-weaver.name = 相織布編織器
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = 一種快速、打了就跑的攔截機。
 unit.ghoul.description = 一種重型的鋪蓋性的轟炸機。使用爆炸化合物或黃鐵礦作為彈藥。
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = 使用高純度焦炭還原沙子以生產矽。

core/assets/contributors

@@ -1,4 +1,6 @@
 Prosta4okua
+Felix Corvus
+Vanguard
 Timmeey86
 Epowerj
 Baltazár Radics
@@ -78,3 +80,4 @@ itskatt
 Agent-Laevain
 AzariasB
 amrsoll
+Draco

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

@@ -2,6 +2,8 @@ package io.anuke.mindustry;
 
 import io.anuke.arc.*;
 import io.anuke.arc.assets.*;
+import io.anuke.arc.assets.loaders.*;
+import io.anuke.arc.audio.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
@@ -13,6 +15,7 @@ import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.mod.*;
 import io.anuke.mindustry.net.Net;
 
 import static io.anuke.arc.Core.*;
@@ -40,9 +43,15 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
         batch = new SpriteBatch();
         assets = new AssetManager();
         assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader());
+
+        tree = new FileTree();
+        assets.setLoader(Sound.class, new SoundLoader(tree));
+        assets.setLoader(Music.class, new MusicLoader(tree));
+
         assets.load("sprites/error.png", Texture.class);
         atlas = TextureAtlas.blankAtlas();
         Vars.net = new Net(platform.getNet());
+        mods = new Mods();
 
         UI.loadSystemCursors();
 
@@ -71,6 +80,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
         add(netServer = new NetServer());
         add(netClient = new NetClient());
 
+        assets.load(mods);
+
         assets.loadRun("contentinit", ContentLoader.class, () -> {
             content.init();
             content.load();
@@ -108,6 +119,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
                     listener.init();
                 }
                 super.resize(graphics.getWidth(), graphics.getHeight());
+                mods.each(Mod::init);
                 finished = true;
                 Events.fire(new ClientLoadEvent());
             }
@@ -182,7 +194,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
             if(assets.getCurrentLoading() != null){
                 String name = assets.getCurrentLoading().fileName.toLowerCase();
-                String key = name.contains("content") ? "content" : name.contains("msav") || name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system";
+                String key = name.contains("content") ? "content" : name.contains("mod") ? "mods" : name.contains("msav") || name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system";
                 font.draw(bundle.get("load." + key, ""), graphics.getWidth() / 2f, graphics.getHeight() / 2f - height / 2f - Scl.scl(10f), Align.center);
             }
         }

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

@@ -18,19 +18,21 @@ import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.input.*;
 import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.mod.*;
 import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.plugin.*;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
 
 import java.nio.charset.*;
 import java.util.*;
 
-import static io.anuke.arc.Core.settings;
+import static io.anuke.arc.Core.*;
 
 @SuppressWarnings("unchecked")
 public class Vars implements Loadable{
     /** Whether to load locales.*/
     public static boolean loadLocales = true;
+    /** Maximum number of broken blocks. TODO implement or remove.*/
+    public static final int maxBrokenBlocks = 256;
     /** IO buffer size. */
     public static final int bufferSize = 8192;
     /** global charset, since Android doesn't support the Charsets class */
@@ -43,6 +45,8 @@ public class Vars implements Loadable{
     public static final String discordURL = "https://discord.gg/mindustry";
     /** URL for sending crash reports to */
     public static final String crashReportURL = "http://mins.us.to/report";
+    /** URL the links to the wiki's modding guide.*/
+    public static final String modGuideURL = "https://mindustrygame.github.io/wiki/modding/";
     /** list of built-in servers.*/
     public static final Array<String> defaultServers = Array.with(/*"mins.us.to"*/);
     /** maximum distance between mine and core that supports automatic transferring */
@@ -120,8 +124,8 @@ public class Vars implements Loadable{
     public static FileHandle tmpDirectory;
     /** data subdirectory used for saves */
     public static FileHandle saveDirectory;
-    /** data subdirectory used for plugins */
-    public static FileHandle pluginDirectory;
+    /** data subdirectory used for mods */
+    public static FileHandle modDirectory;
     /** map file extension */
     public static final String mapExtension = "msav";
     /** save file extension */
@@ -130,6 +134,7 @@ public class Vars implements Loadable{
     /** list of all locales that can be switched to */
     public static Locale[] locales;
 
+    public static FileTree tree;
     public static Net net;
     public static ContentLoader content;
     public static GameState state;
@@ -138,7 +143,7 @@ public class Vars implements Loadable{
     public static DefaultWaves defaultWaves;
     public static LoopControl loops;
     public static Platform platform = new Platform(){};
-    public static Plugins plugins;
+    public static Mods mods;
 
     public static World world;
     public static Maps maps;
@@ -193,6 +198,9 @@ public class Vars implements Loadable{
 
         Version.init();
 
+        if(tree == null) tree = new FileTree();
+        if(mods == null) mods = new Mods();
+
         content = new ContentLoader();
         loops = new LoopControl();
         defaultWaves = new DefaultWaves();
@@ -240,15 +248,18 @@ public class Vars implements Loadable{
         mapPreviewDirectory = dataDirectory.child("previews/");
         saveDirectory = dataDirectory.child("saves/");
         tmpDirectory = dataDirectory.child("tmp/");
-        pluginDirectory = dataDirectory.child("plugins/");
+        modDirectory = dataDirectory.child("mods/");
 
+        modDirectory.mkdirs();
+
+        mods.load();
         maps.load();
     }
 
     public static void loadSettings(){
         Core.settings.setAppName(appName);
 
-        if(steam){
+        if(steam || "steam".equals(Version.modifier)){
             Core.settings.setDataDirectory(Core.files.local("saves/"));
         }
 

core/src/io/anuke/mindustry/ai/BlockIndexer.java

@@ -143,8 +143,11 @@ public class BlockIndexer{
         returnArray.clear();
         for(Team enemy : state.teams.enemiesOf(team)){
             if(state.teams.isActive(enemy)){
-                for(Tile tile : getFlagged(enemy)[type.ordinal()]){
-                    returnArray.add(tile);
+                ObjectSet<Tile> set = getFlagged(enemy)[type.ordinal()];
+                if(set != null){
+                    for(Tile tile : set){
+                        returnArray.add(tile);
+                    }
                 }
             }
         }

core/src/io/anuke/mindustry/ai/Pathfinder.java

@@ -6,6 +6,7 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.arc.util.async.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
@@ -32,7 +33,8 @@ public class Pathfinder implements Runnable{
     /** handles task scheduling on the update thread. */
     private TaskQueue queue = new TaskQueue();
     /** current pathfinding thread */
-    private @Nullable Thread thread;
+    private @Nullable
+    Thread thread;
 
     public Pathfinder(){
         Events.on(WorldLoadEvent.class, event -> {
@@ -63,7 +65,7 @@ public class Pathfinder implements Runnable{
 
     /** Packs a tile into its internal representation. */
     private int packTile(Tile tile){
-        return PathTile.get(tile.cost, tile.getTeamID(), (byte)0, (!tile.solid() || tile.breakable()) && tile.floor().drownTime <= 0f);
+        return PathTile.get(tile.cost, tile.getTeamID(), (byte)0, !tile.solid() && tile.floor().drownTime <= 0f);
     }
 
     /** Starts or restarts the pathfinding thread. */
@@ -81,13 +83,22 @@ public class Pathfinder implements Runnable{
         queue.clear();
     }
 
-    /** Update a tile in the internal pathfinding grid. Causes a completely pathfinding reclaculation. */
+    public int debugValue(Team team, int x, int y){
+        if(pathMap[team.ordinal()][PathTarget.enemyCores.ordinal()] == null) return 0;
+        return pathMap[team.ordinal()][PathTarget.enemyCores.ordinal()].weights[x][y];
+    }
+
+    /** Update a tile in the internal pathfinding grid. Causes a complete pathfinding reclaculation. */
     public void updateTile(Tile tile){
         if(net.client()) return;
 
-        int packed = packTile(tile);
         int x = tile.x, y = tile.y;
-        tiles[x][y] = packed;
+
+        tile.getLinkedTiles(t -> {
+            if(Structs.inBounds(t.x, t.y, tiles)){
+                tiles[t.x][t.y] = packTile(t);
+            }
+        });
 
         //can't iterate through array so use the map, which should not lead to problems
         for(PathData[] arr : pathMap){
@@ -113,19 +124,23 @@ public class Pathfinder implements Runnable{
     public void run(){
         while(true){
             if(net.client()) return;
-
-            queue.run();
-
-            //total update time no longer than maxUpdate
-            for(PathData data : list){
-                updateFrontier(data, maxUpdate / list.size);
-            }
-
             try{
-                Thread.sleep(updateInterval);
-            }catch(InterruptedException e){
-                //stop looping when interrupted externally
-                return;
+
+                queue.run();
+
+                //total update time no longer than maxUpdate
+                for(PathData data : list){
+                    updateFrontier(data, maxUpdate / list.size);
+                }
+
+                try{
+                    Thread.sleep(updateInterval);
+                }catch(InterruptedException e){
+                    //stop looping when interrupted externally
+                    return;
+                }
+            }catch(Exception e){
+                e.printStackTrace();
             }
         }
     }

core/src/io/anuke/mindustry/ai/WaveSpawner.java

@@ -48,7 +48,7 @@ public class WaveSpawner{
         for(SpawnGroup group : state.rules.spawns){
             int spawned = group.getUnitsSpawned(state.wave - 1);
 
-            if(group.type.isFlying){
+            if(group.type.flying){
                 float spread = margin / 1.5f;
 
                 eachFlyerSpawn((spawnX, spawnY) -> {

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

@@ -781,7 +781,7 @@ public class Blocks implements ContentList{
         }};
 
         copperWallLarge = new Wall("copper-wall-large"){{
-            requirements(Category.defense, ItemStack.mult(copperWall.buildRequirements, 4));
+            requirements(Category.defense, ItemStack.mult(copperWall.requirements, 4));
             health = 80 * 4 * wallHealthMultiplier;
             size = 2;
         }};
@@ -792,7 +792,7 @@ public class Blocks implements ContentList{
         }};
 
         titaniumWallLarge = new Wall("titanium-wall-large"){{
-            requirements(Category.defense, ItemStack.mult(titaniumWall.buildRequirements, 4));
+            requirements(Category.defense, ItemStack.mult(titaniumWall.requirements, 4));
             health = 110 * wallHealthMultiplier * 4;
             size = 2;
         }};
@@ -803,7 +803,7 @@ public class Blocks implements ContentList{
         }};
 
         thoriumWallLarge = new Wall("thorium-wall-large"){{
-            requirements(Category.defense, ItemStack.mult(thoriumWall.buildRequirements, 4));
+            requirements(Category.defense, ItemStack.mult(thoriumWall.requirements, 4));
             health = 200 * wallHealthMultiplier * 4;
             size = 2;
         }};
@@ -814,7 +814,7 @@ public class Blocks implements ContentList{
         }};
 
         phaseWallLarge = new DeflectorWall("phase-wall-large"){{
-            requirements(Category.defense, ItemStack.mult(phaseWall.buildRequirements, 4));
+            requirements(Category.defense, ItemStack.mult(phaseWall.requirements, 4));
             health = 150 * 4 * wallHealthMultiplier;
             size = 2;
         }};
@@ -825,7 +825,7 @@ public class Blocks implements ContentList{
         }};
 
         surgeWallLarge = new SurgeWall("surge-wall-large"){{
-            requirements(Category.defense, ItemStack.mult(surgeWall.buildRequirements, 4));
+            requirements(Category.defense, ItemStack.mult(surgeWall.requirements, 4));
             health = 230 * 4 * wallHealthMultiplier;
             size = 2;
         }};
@@ -836,7 +836,7 @@ public class Blocks implements ContentList{
         }};
 
         doorLarge = new Door("door-large"){{
-            requirements(Category.defense, ItemStack.mult(door.buildRequirements, 4));
+            requirements(Category.defense, ItemStack.mult(door.requirements, 4));
             openfx = Fx.dooropenlarge;
             closefx = Fx.doorcloselarge;
             health = 100 * 4 * wallHealthMultiplier;
@@ -915,7 +915,7 @@ public class Blocks implements ContentList{
         junction = new Junction("junction"){{
             requirements(Category.distribution, ItemStack.with(Items.copper, 1), true);
             speed = 26;
-            capacity = 15;
+            capacity = 12;
             health = 30;
         }};
 
@@ -923,7 +923,7 @@ public class Blocks implements ContentList{
             requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4));
             range = 4;
             speed = 70f;
-            bufferCapacity = 15;
+            bufferCapacity = 14;
         }};
 
         phaseConveyor = new ItemBridge("phase-conveyor"){{
@@ -1194,7 +1194,7 @@ public class Blocks implements ContentList{
             rotateSpeed = 1.4f;
             attribute = Attribute.water;
 
-            consumes.power(0.90f);
+            consumes.power(1f);
         }};
 
         cultivator = new Cultivator("cultivator"){{
@@ -1315,7 +1315,8 @@ public class Blocks implements ContentList{
             requirements(Category.turret, ItemStack.with(Items.copper, 85, Items.lead, 45));
             ammo(
             Items.scrap, Bullets.flakScrap,
-            Items.lead, Bullets.flakLead
+            Items.lead, Bullets.flakLead,
+            Items.metaglass, Bullets.flakGlass
             );
             reload = 18f;
             range = 170f;
@@ -1558,6 +1559,7 @@ public class Blocks implements ContentList{
         cyclone = new ItemTurret("cyclone"){{
             requirements(Category.turret, ItemStack.with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80));
             ammo(
+            Items.metaglass, Bullets.flakGlass,
             Items.blastCompound, Bullets.flakExplosive,
             Items.plastanium, Bullets.flakPlastic,
             Items.surgealloy, Bullets.flakSurge
@@ -1630,29 +1632,29 @@ public class Blocks implements ContentList{
             type = UnitTypes.draug;
             produceTime = 2500;
             size = 2;
-            maxSpawn = 2;
-            consumes.power(1.1f);
+            maxSpawn = 1;
+            consumes.power(1.2f);
             consumes.items();
         }};
 
         spiritFactory = new UnitFactory("spirit-factory"){{
             requirements(Category.units, ItemStack.with(Items.metaglass, 45, Items.lead, 55, Items.silicon, 45));
             type = UnitTypes.spirit;
-            produceTime = 3500;
+            produceTime = 4000;
             size = 2;
-            maxSpawn = 2;
-            consumes.power(0.80f);
-            consumes.items(new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 15));
+            maxSpawn = 1;
+            consumes.power(1.2f);
+            consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30));
         }};
 
         phantomFactory = new UnitFactory("phantom-factory"){{
-            requirements(Category.units, ItemStack.with(Items.titanium, 45, Items.thorium, 40, Items.lead, 55, Items.silicon, 105));
+            requirements(Category.units, ItemStack.with(Items.titanium, 50, Items.thorium, 60, Items.lead, 65, Items.silicon, 105));
             type = UnitTypes.phantom;
-            produceTime = 3650;
+            produceTime = 4400;
             size = 2;
-            maxSpawn = 2;
-            consumes.power(2f);
-            consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 10));
+            maxSpawn = 1;
+            consumes.power(2.5f);
+            consumes.items(new ItemStack(Items.silicon, 50), new ItemStack(Items.lead, 30), new ItemStack(Items.titanium, 20));
         }};
 
         commandCenter = new CommandCenter("command-center"){{

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

@@ -8,11 +8,9 @@ import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.blocks.*;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -23,7 +21,7 @@ public class Bullets implements ContentList{
     artilleryDense, arilleryPlastic, artilleryPlasticFrag, artilleryHoming, artlleryIncendiary, artilleryExplosive, artilleryUnit,
 
     //flak
-    flakScrap, flakLead, flakPlastic, flakExplosive, flakSurge,
+    flakScrap, flakLead, flakPlastic, flakExplosive, flakSurge, flakGlass, glassFrag,
 
     //missiles
     missileExplosive, missileIncendiary, missileSurge, missileJavelin, missileSwarm, missileRevenant,
@@ -39,7 +37,7 @@ public class Bullets implements ContentList{
     waterShot, cryoShot, slagShot, oilShot,
 
     //environment, misc.
-    fireball, basicFlame, pyraFlame, driverBolt, healBullet, frag, eruptorShot,
+    fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig, frag, eruptorShot,
 
     //bombs
     bombExplosive, bombIncendiary, bombOil;
@@ -57,7 +55,7 @@ public class Bullets implements ContentList{
             splashDamage = 33f;
         }};
 
-        artilleryPlasticFrag = new BasicBulletType(2.5f, 7, "bullet"){{
+        artilleryPlasticFrag = new BasicBulletType(2.5f, 10, "bullet"){{
             bulletWidth = 10f;
             bulletHeight = 12f;
             bulletShrink = 1f;
@@ -134,6 +132,16 @@ public class Bullets implements ContentList{
             frontColor = Pal.bulletYellow;
         }};
 
+        glassFrag = new BasicBulletType(3f, 6, "bullet"){{
+            bulletWidth = 5f;
+            bulletHeight = 12f;
+            bulletShrink = 1f;
+            lifetime = 20f;
+            backColor = Pal.gray;
+            frontColor = Color.white;
+            despawnEffect = Fx.none;
+        }};
+
         flakLead = new FlakBulletType(4.2f, 3){{
             lifetime = 60f;
             ammoMultiplier = 4f;
@@ -157,8 +165,23 @@ public class Bullets implements ContentList{
             splashDamageRadius = 24f;
         }};
 
+        flakGlass = new FlakBulletType(4f, 3){{
+            lifetime = 70f;
+            ammoMultiplier = 5f;
+            shootEffect = Fx.shootSmall;
+            reloadMultiplier = 0.8f;
+            bulletWidth = 6f;
+            bulletHeight = 8f;
+            hitEffect = Fx.flakExplosion;
+            splashDamage = 30f;
+            splashDamageRadius = 26f;
+            fragBullet = glassFrag;
+            fragBullets = 6;
+        }};
+
         flakPlastic = new FlakBulletType(4f, 6){{
             splashDamageRadius = 50f;
+            splashDamage = 25f;
             fragBullet = artilleryPlasticFrag;
             fragBullets = 6;
             hitEffect = Fx.plasticExplosion;
@@ -376,43 +399,13 @@ public class Bullets implements ContentList{
             statusDuration = 10f;
         }};
 
-        healBullet = new BulletType(5.2f, 13){
-            float healPercent = 3f;
+        healBullet = new HealBulletType(5.2f, 13){{
+            healPercent = 3f;
+        }};
 
-            {
-                shootEffect = Fx.shootHeal;
-                smokeEffect = Fx.hitLaser;
-                hitEffect = Fx.hitLaser;
-                despawnEffect = Fx.hitLaser;
-                collidesTeam = true;
-            }
-
-            @Override
-            public boolean collides(Bullet b, Tile tile){
-                return tile.getTeam() != b.getTeam() || tile.entity.healthf() < 1f;
-            }
-
-            @Override
-            public void draw(Bullet b){
-                Draw.color(Pal.heal);
-                Lines.stroke(2f);
-                Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f);
-                Draw.color(Color.white);
-                Lines.lineAngleCenter(b.x, b.y, b.rot(), 3f);
-                Draw.reset();
-            }
-
-            @Override
-            public void hitTile(Bullet b, Tile tile){
-                super.hit(b);
-                tile = tile.link();
-
-                if(tile.entity != null && tile.getTeam() == b.getTeam() && !(tile.block() instanceof BuildBlock)){
-                    Effects.effect(Fx.healBlockFull, Pal.heal, tile.drawx(), tile.drawy(), tile.block().size);
-                    tile.entity.healBy(healPercent / 100f * tile.entity.maxHealth());
-                }
-            }
-        };
+        healBulletBig = new HealBulletType(5.2f, 15){{
+            healPercent = 5.5f;
+        }};
 
         fireball = new BulletType(1f, 4){
             {

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

@@ -11,7 +11,6 @@ import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.Item.*;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
@@ -552,7 +551,7 @@ public class Fx implements ContentList{
             float length = 20f * e.finpow();
             float size = 7f * e.fout();
 
-            Draw.rect(((Item)e.data).icon(Icon.large), e.x + Angles.trnsx(e.rotation, length), e.y + Angles.trnsy(e.rotation, length), size, size);
+            Draw.rect(((Item)e.data).icon(Cicon.medium), e.x + Angles.trnsx(e.rotation, length), e.y + Angles.trnsy(e.rotation, length), size, size);
         });
 
 

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

@@ -220,7 +220,7 @@ public class Mechs implements ContentList{
         dart = new Mech("dart-ship", true){
             {
                 drillPower = 1;
-                mineSpeed = 0.9f;
+                mineSpeed = 3f;
                 speed = 0.5f;
                 drag = 0.09f;
                 health = 200f;

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

@@ -13,6 +13,7 @@ public class TechTree implements ContentList{
 
     @Override
     public void load(){
+        TechNode.context = null;
         all = new Array<>();
 
         root = node(coreShard, () -> {
@@ -30,6 +31,7 @@ public class TechTree implements ContentList{
 
                         node(distributor);
                         node(sorter, () -> {
+                            node(message);
                             node(overflowGate);
                         });
                         node(container, () -> {
@@ -301,19 +303,24 @@ public class TechTree implements ContentList{
         });
     }
 
-    private TechNode node(Block block, Runnable children){
-        ItemStack[] requirements = new ItemStack[block.buildRequirements.length];
+    private static TechNode node(Block block, Runnable children){
+        ItemStack[] requirements = new ItemStack[block.requirements.length];
         for(int i = 0; i < requirements.length; i++){
-            requirements[i] = new ItemStack(block.buildRequirements[i].item, 30 + block.buildRequirements[i].amount * 6);
+            requirements[i] = new ItemStack(block.requirements[i].item, 30 + block.requirements[i].amount * 6);
         }
 
         return new TechNode(block, requirements, children);
     }
 
-    private TechNode node(Block block){
+    private static TechNode node(Block block){
         return node(block, () -> {});
     }
 
+    public static void create(Block parent, Block block){
+        TechNode.context = all.find(t -> t.block == parent);
+        node(block, () -> {});
+    }
+
     public static class TechNode{
         static TechNode context;
 
@@ -321,19 +328,22 @@ public class TechTree implements ContentList{
         public final ItemStack[] requirements;
         public final Array<TechNode> children = new Array<>();
 
-        TechNode(Block block, ItemStack[] requirements, Runnable children){
-            if(context != null){
-                context.children.add(this);
+        TechNode(TechNode ccontext, Block block, ItemStack[] requirements, Runnable children){
+            if(ccontext != null){
+                ccontext.children.add(this);
             }
 
             this.block = block;
             this.requirements = requirements;
 
-            TechNode last = context;
             context = this;
             children.run();
-            context = last;
+            context = ccontext;
             all.add(this);
         }
+
+        TechNode(Block block, ItemStack[] requirements, Runnable children){
+            this(context, block, requirements, children);
+        }
     }
 }

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

@@ -17,14 +17,14 @@ public class UnitTypes implements ContentList{
 
     @Override
     public void load(){
-        draug = new UnitType("draug", Draug.class, Draug::new){{
-            isFlying = true;
+        draug = new UnitType("draug", Draug::new){{
+            flying = true;
             drag = 0.01f;
             speed = 0.3f;
             maxVelocity = 1.2f;
             range = 50f;
-            health = 60;
-            minePower = 0.5f;
+            health = 80;
+            minePower = 0.9f;
             engineSize = 1.8f;
             engineOffset = 5.7f;
             weapon = new Weapon("you have incurred my wrath. prepare to die."){{
@@ -32,13 +32,13 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        spirit = new UnitType("spirit", Spirit.class, Spirit::new){{
-            isFlying = true;
+        spirit = new UnitType("spirit", Spirit::new){{
+            flying = true;
             drag = 0.01f;
-            speed = 0.4f;
+            speed = 0.42f;
             maxVelocity = 1.6f;
             range = 50f;
-            health = 60;
+            health = 100;
             engineSize = 1.8f;
             engineOffset = 5.7f;
             weapon = new Weapon("heal-blaster"){{
@@ -48,22 +48,21 @@ public class UnitTypes implements ContentList{
                 roundrobin = true;
                 ejectEffect = Fx.none;
                 recoil = 2f;
-                bullet = Bullets.healBullet;
+                bullet = Bullets.healBulletBig;
                 shootSound = Sounds.pew;
             }};
         }};
 
-        phantom = new UnitType("phantom", Phantom.class, Phantom::new){{
-            isFlying = true;
+        phantom = new UnitType("phantom", Phantom::new){{
+            flying = true;
             drag = 0.01f;
             mass = 2f;
             speed = 0.45f;
             maxVelocity = 1.9f;
             range = 70f;
             itemCapacity = 70;
-            health = 220;
-            buildPower = 0.9f;
-            minePower = 1.1f;
+            health = 400;
+            buildPower = 1f;
             engineOffset = 6.5f;
             toMine = ObjectSet.with(Items.lead, Items.copper, Items.titanium);
             weapon = new Weapon("heal-blaster"){{
@@ -77,7 +76,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        dagger = new UnitType("dagger", Dagger.class, Dagger::new){{
+        dagger = new UnitType("dagger", Dagger::new){{
             maxVelocity = 1.1f;
             speed = 0.2f;
             drag = 0.4f;
@@ -93,7 +92,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        crawler = new UnitType("crawler", Crawler.class, Crawler::new){{
+        crawler = new UnitType("crawler", Crawler::new){{
             maxVelocity = 1.27f;
             speed = 0.285f;
             drag = 0.4f;
@@ -124,7 +123,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        titan = new UnitType("titan", Titan.class, Titan::new){{
+        titan = new UnitType("titan", Titan::new){{
             maxVelocity = 0.8f;
             speed = 0.22f;
             drag = 0.4f;
@@ -146,7 +145,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        fortress = new UnitType("fortress", Fortress.class, Fortress::new){{
+        fortress = new UnitType("fortress", Fortress::new){{
             maxVelocity = 0.78f;
             speed = 0.15f;
             drag = 0.4f;
@@ -168,7 +167,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        eruptor = new UnitType("eruptor", Eruptor.class, Eruptor::new){{
+        eruptor = new UnitType("eruptor", Eruptor::new){{
             maxVelocity = 0.81f;
             speed = 0.16f;
             drag = 0.4f;
@@ -190,7 +189,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        chaosArray = new UnitType("chaos-array", Dagger.class, Dagger::new){{
+        chaosArray = new UnitType("chaos-array", Dagger::new){{
             maxVelocity = 0.68f;
             speed = 0.12f;
             drag = 0.4f;
@@ -214,7 +213,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        eradicator = new UnitType("eradicator", Dagger.class, Dagger::new){{
+        eradicator = new UnitType("eradicator", Dagger::new){{
             maxVelocity = 0.68f;
             speed = 0.12f;
             drag = 0.4f;
@@ -239,12 +238,12 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        wraith = new UnitType("wraith", Wraith.class, Wraith::new){{
+        wraith = new UnitType("wraith", Wraith::new){{
             speed = 0.3f;
             maxVelocity = 1.9f;
             drag = 0.01f;
             mass = 1.5f;
-            isFlying = true;
+            flying = true;
             health = 75;
             engineOffset = 5.5f;
             range = 140f;
@@ -258,13 +257,13 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        ghoul = new UnitType("ghoul", Ghoul.class, Ghoul::new){{
+        ghoul = new UnitType("ghoul", Ghoul::new){{
             health = 220;
             speed = 0.2f;
             maxVelocity = 1.4f;
             mass = 3f;
             drag = 0.01f;
-            isFlying = true;
+            flying = true;
             targetAir = false;
             engineOffset = 7.8f;
             range = 140f;
@@ -282,7 +281,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        revenant = new UnitType("revenant", Revenant.class, Revenant::new){{
+        revenant = new UnitType("revenant", Revenant::new){{
             health = 1000;
             mass = 5f;
             hitsize = 20f;
@@ -291,7 +290,7 @@ public class UnitTypes implements ContentList{
             drag = 0.01f;
             range = 80f;
             shootCone = 40f;
-            isFlying = true;
+            flying = true;
             rotateWeapon = true;
             engineOffset = 12f;
             engineSize = 3f;
@@ -313,7 +312,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        lich = new UnitType("lich", Revenant.class, Revenant::new){{
+        lich = new UnitType("lich", Revenant::new){{
             health = 6000;
             mass = 20f;
             hitsize = 40f;
@@ -322,7 +321,7 @@ public class UnitTypes implements ContentList{
             drag = 0.02f;
             range = 80f;
             shootCone = 20f;
-            isFlying = true;
+            flying = true;
             rotateWeapon = true;
             engineOffset = 21;
             engineSize = 5.3f;
@@ -346,7 +345,7 @@ public class UnitTypes implements ContentList{
             }};
         }};
 
-        reaper = new UnitType("reaper", Revenant.class, Revenant::new){{
+        reaper = new UnitType("reaper", Revenant::new){{
             health = 11000;
             mass = 30f;
             hitsize = 56f;
@@ -355,7 +354,7 @@ public class UnitTypes implements ContentList{
             drag = 0.02f;
             range = 80f;
             shootCone = 30f;
-            isFlying = true;
+            flying = true;
             rotateWeapon = true;
             engineOffset = 40;
             engineSize = 7.3f;

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

@@ -11,6 +11,7 @@ import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
 
 import static io.anuke.arc.Core.files;
+import static io.anuke.mindustry.Vars.mods;
 
 /**
  * Loads all game content.
@@ -41,6 +42,14 @@ public class ContentLoader{
         new LegacyColorMapper(),
     };
 
+    /** Clears all initialized content.*/
+    public void clear(){
+        contentNameMap = new ObjectMap[ContentType.values().length];
+        contentMap = new Array[ContentType.values().length];
+        initialization = new ObjectSet<>();
+        loaded = false;
+    }
+
     /** Creates all content types. */
     public void createContent(){
         if(loaded){
@@ -57,20 +66,11 @@ public class ContentLoader{
             list.load();
         }
 
-        for(ContentType type : ContentType.values()){
-
-            for(Content c : contentMap[type.ordinal()]){
-                if(c instanceof MappableContent){
-                    String name = ((MappableContent)c).name;
-                    if(contentNameMap[type.ordinal()].containsKey(name)){
-                        throw new IllegalArgumentException("Two content objects cannot have the same name! (issue: '" + name + "')");
-                    }
-                    contentNameMap[type.ordinal()].put(name, (MappableContent)c);
-                }
-            }
+        if(mods != null){
+            mods.loadContent();
         }
 
-        //set up ID mapping
+        //check up ID mapping, make sure it's linear
         for(Array<Content> arr : contentMap){
             for(int i = 0; i < arr.size; i++){
                 int id = arr.get(i).id;
@@ -109,6 +109,7 @@ public class ContentLoader{
 
         for(ContentType type : ContentType.values()){
             for(Content content : contentMap[type.ordinal()]){
+                //TODO catch error and display it per mod
                 callable.accept(content);
             }
         }
@@ -138,6 +139,14 @@ public class ContentLoader{
 
     public void handleContent(Content content){
         contentMap[content.getContentType().ordinal()].add(content);
+
+    }
+
+    public void handleMappableContent(MappableContent content){
+        if(contentNameMap[content.getContentType().ordinal()].containsKey(content.name)){
+            throw new IllegalArgumentException("Two content objects cannot have the same name! (issue: '" + content.name + "')");
+        }
+        contentNameMap[content.getContentType().ordinal()].put(content.name, content);
     }
 
     public void setTemporaryMapper(MappableContent[][] temporaryMapper){

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

@@ -91,6 +91,7 @@ public class Control implements ApplicationListener, Loadable{
                 hiscore = true;
                 world.getMap().setHighScore(state.wave);
             }
+
             Sounds.wave.play();
         });
 
@@ -388,7 +389,10 @@ public class Control implements ApplicationListener, Loadable{
         saves.update();
 
         //update and load any requested assets
-        assets.update();
+        try{
+            assets.update();
+        }catch(Exception ignored){
+        }
 
         input.updateState();
 

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

@@ -0,0 +1,34 @@
+package io.anuke.mindustry.core;
+
+import io.anuke.arc.*;
+import io.anuke.arc.assets.loaders.*;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.files.*;
+
+/** Handles files in a modded context. */
+public class FileTree implements FileHandleResolver{
+    private ObjectMap<String, FileHandle> files = new ObjectMap<>();
+
+    public void addFile(String path, FileHandle f){
+        files.put(path, f);
+    }
+
+    /** Gets an asset file.*/
+    public FileHandle get(String path){
+        if(files.containsKey(path)){
+            return files.get(path);
+        }else{
+            return Core.files.internal(path);
+        }
+    }
+
+    /** Clears all mod files.*/
+    public void clear(){
+        files.clear();
+    }
+
+    @Override
+    public FileHandle resolve(String fileName){
+        return get(fileName);
+    }
+}

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

@@ -16,6 +16,7 @@ import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
 import io.anuke.mindustry.world.blocks.BuildBlock.*;
+import io.anuke.mindustry.world.blocks.power.*;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -31,19 +32,24 @@ public class Logic implements ApplicationListener{
 
     public Logic(){
         Events.on(WaveEvent.class, event -> {
+            for(Player p : playerGroup.all()){
+                p.respawns = state.rules.respawns;
+            }
+
             if(world.isZone()){
                 world.getZone().updateWave(state.wave);
             }
-            for (Player p : playerGroup.all()) {
-                p.respawns = state.rules.respawns;
-            }
         });
 
         Events.on(BlockDestroyEvent.class, event -> {
             //blocks that get broken are appended to the team's broken block queue
             Tile tile = event.tile;
             Block block = tile.block();
+            //skip null entities or nukes, for obvious reasons
+            if(tile.entity == null || tile.block() instanceof NuclearReactor) return;
+
             if(block instanceof BuildBlock){
+
                 BuildEntity entity = tile.entity();
 
                 //update block to reflect the fact that something was being constructed
@@ -56,7 +62,33 @@ public class Logic implements ApplicationListener{
             }
 
             TeamData data = state.teams.get(tile.getTeam());
-            data.brokenBlocks.addFirst(BrokenBlock.get(tile.x, tile.y, tile.rotation(), block.id));
+
+            //remove existing blocks that have been placed here.
+            //painful O(n) iteration + copy
+            for(int i = 0; i < data.brokenBlocks.size; i++){
+                BrokenBlock b = data.brokenBlocks.get(i);
+                if(b.x == tile.x && b.y == tile.y){
+                    data.brokenBlocks.removeIndex(i);
+                    break;
+                }
+            }
+
+            data.brokenBlocks.addFirst(new BrokenBlock(tile.x, tile.y, tile.rotation(), block.id, tile.entity.config()));
+        });
+
+        Events.on(BlockBuildEndEvent.class, event -> {
+            if(!event.breaking){
+                TeamData data = state.teams.get(event.team);
+
+                //painful O(n) iteration + copy
+                for(int i = 0; i < data.brokenBlocks.size; i++){
+                    BrokenBlock b = data.brokenBlocks.get(i);
+                    if(b.x == event.tile.x && b.y == event.tile.y){
+                        data.brokenBlocks.removeIndex(i);
+                        break;
+                    }
+                }
+            }
         });
     }
 
@@ -151,6 +183,7 @@ public class Logic implements ApplicationListener{
         Time.runTask(30f, () -> {
             for(Tile tile : new ObjectSetIterator<>(state.teams.get(defaultTeam).cores)){
                 for(Item item : content.items()){
+                    if(tile == null || tile.entity == null || tile.entity.items == null) continue;
                     data.addItem(item, tile.entity.items.get(item));
                 }
                 world.removeBlock(tile);

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

@@ -76,6 +76,7 @@ public class NetClient implements ApplicationListener{
 
             ConnectPacket c = new ConnectPacket();
             c.name = player.name;
+            c.mods = mods.getModStrings();
             c.mobile = mobile;
             c.versionType = Version.type;
             c.color = Color.rgba8888(player.color);
@@ -133,7 +134,7 @@ public class NetClient implements ApplicationListener{
     //called on all clients
     @Remote(called = Loc.server, targets = Loc.server, variants = Variant.both)
     public static void sendMessage(String message, String sender, Player playersender){
-        if(Vars.ui != null){
+        if(Vars.ui != null && !(playersender != null && net.server() && sender.startsWith("[#" + player.getTeam().color.toString() + "]<T>"))){
             Vars.ui.chatfrag.addMessage(message, sender);
         }
 
@@ -230,6 +231,15 @@ public class NetClient implements ApplicationListener{
         ui.loadfrag.hide();
     }
 
+    @Remote(variants = Variant.one, priority = PacketPriority.high)
+    public static void onKick(String reason){
+        netClient.disconnectQuietly();
+        state.set(State.menu);
+        logic.reset();
+        ui.showText("$disconnect", reason, Align.left);
+        ui.loadfrag.hide();
+    }
+
     @Remote(variants = Variant.both)
     public static void onInfoMessage(String message){
         ui.showText("", message);
@@ -320,6 +330,11 @@ public class NetClient implements ApplicationListener{
     @Remote(variants = Variant.one, priority = PacketPriority.low, unreliable = true)
     public static void onStateSnapshot(float waveTime, int wave, int enemies, short coreDataLen, byte[] coreData){
         try{
+            if(wave > state.wave){
+                state.wave = wave;
+                Events.fire(new WaveEvent());
+            }
+
             state.wavetime = waveTime;
             state.wave = wave;
             state.enemies = enemies;

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

@@ -79,6 +79,11 @@ public class NetServer implements ApplicationListener{
             con.hasBegunConnecting = true;
             con.mobile = packet.mobile;
 
+            if(packet.uuid == null || packet.usid == null){
+                con.kick(KickReason.idInUse);
+                return;
+            }
+
             if(admins.isIDBanned(uuid)){
                 con.kick(KickReason.banned);
                 return;
@@ -99,6 +104,23 @@ public class NetServer implements ApplicationListener{
                 return;
             }
 
+            Array<String> extraMods = packet.mods.copy();
+            Array<String> missingMods = mods.getIncompatibility(extraMods);
+
+            if(!extraMods.isEmpty() || !missingMods.isEmpty()){
+                //can't easily be localized since kick reasons can't have formatted text with them
+                StringBuilder result = new StringBuilder("[accent]Incompatible mods![]\n\n");
+                if(!missingMods.isEmpty()){
+                    result.append("Missing:[lightgray]\n").append("> ").append(missingMods.toString("\n> "));
+                    result.append("[]\n");
+                }
+
+                if(!extraMods.isEmpty()){
+                    result.append("Unnecessary mods:[lightgray]\n").append("> ").append(extraMods.toString("\n> "));
+                }
+                con.kick(result.toString());
+            }
+
             if(!admins.isWhitelisted(packet.uuid, packet.usid)){
                 info.adminUsid = packet.usid;
                 info.lastName = packet.name;
@@ -124,7 +146,7 @@ public class NetServer implements ApplicationListener{
                         return;
                     }
 
-                    if(player.uuid.equals(packet.uuid) || player.usid.equals(packet.usid)){
+                    if(player.uuid != null && player.usid != null && (player.uuid.equals(packet.uuid) || player.usid.equals(packet.usid))){
                         con.kick(KickReason.idInUse);
                         return;
                     }
@@ -195,6 +217,11 @@ public class NetServer implements ApplicationListener{
         registerCommands();
     }
 
+    @Override
+    public void init(){
+        mods.each(mod -> mod.registerClientCommands(clientCommands));
+    }
+
     private void registerCommands(){
         clientCommands.<Player>register("help", "[page]", "Lists all commands.", (args, player) -> {
             if(args.length > 0 && !Strings.canParseInt(args[0])){
@@ -257,7 +284,7 @@ public class NetServer implements ApplicationListener{
             }
 
             boolean checkPass(){
-                if(votes >= votesRequired() && target.isAdded() && target.con.isConnected()){
+                if(votes >= votesRequired()){
                     Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] {0}[orange] will be banned from the server for {1} minutes.", target.name, (kickDuration/60)));
                     target.getInfo().lastKicked = Time.millis() + kickDuration*1000;
                     playerGroup.all().each(p -> p.uuid != null && p.uuid.equals(target.uuid), p -> p.con.kick(KickReason.vote));
@@ -400,22 +427,18 @@ public class NetServer implements ApplicationListener{
             return;
         }
 
-        if(player.con.hasConnected){
-            Events.fire(new PlayerLeave(player));
-            Call.sendMessage("[accent]" + player.name + "[accent] has disconnected.");
-            Call.onPlayerDisconnect(player.id);
-        }
-        player.remove();
-        Log.info("&lm[{1}] &lc{0} has disconnected. &lg&fi({2})", player.name, player.uuid, reason);
-    }
+        if(!player.con.hasDisconnected){
+            if(player.con.hasConnected){
+                Events.fire(new PlayerLeave(player));
+                Call.sendMessage("[accent]" + player.name + "[accent] has disconnected.");
+                Call.onPlayerDisconnect(player.id);
+            }
 
-    private static float compound(float speed, float drag){
-        float total = 0f;
-        for(int i = 0; i < 50; i++){
-            total *= (1f - drag);
-            total += speed;
+            Log.info("&lm[{1}] &lc{0} has disconnected. &lg&fi({2})", player.name, player.uuid, reason);
         }
-        return total;
+
+        player.remove();
+        player.con.hasDisconnected = true;
     }
 
     @Remote(targets = Loc.client, unreliable = true)
@@ -445,8 +468,8 @@ public class NetServer implements ApplicationListener{
 
         long elapsed = Time.timeSinceMillis(connection.lastRecievedClientTime);
 
-        float maxSpeed = boosting && !player.mech.flying ? player.mech.boostSpeed : player.mech.speed;
-        float maxMove = elapsed / 1000f * 60f * Math.min(compound(maxSpeed, player.mech.drag) * 1.25f, player.mech.maxSpeed * 1.2f);
+        float maxSpeed = boosting && !player.mech.flying ? player.mech.compoundSpeedBoost : player.mech.compoundSpeed;
+        float maxMove = elapsed / 1000f * 60f * Math.min(maxSpeed, player.mech.maxSpeed) * 1.2f;
 
         player.pointerX = pointerX;
         player.pointerY = pointerY;
@@ -704,7 +727,12 @@ public class NetServer implements ApplicationListener{
             //iterate through each player
             for(int i = 0; i < playerGroup.size(); i++){
                 Player player = playerGroup.all().get(i);
-                if(player.isLocal || player.con == null) continue;
+                if(player.isLocal) continue;
+
+                if(player.con == null || !player.con.isConnected()){
+                    onDisconnect(player, "disappeared");
+                    continue;
+                }
 
                 NetConnection connection = player.con;
 

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

@@ -34,6 +34,13 @@ public interface Platform{
     /** Steam: View a map listing on the workshop.*/
     default void viewMapListing(Map map){}
 
+    /** Steam: View a map listing on the workshop.*/
+    default void viewMapListing(String mapid){}
+
+    /** Steam: View map workshop info, removing the map ID tag if its listing is deleted.
+     * Also presents the option to update the map. */
+    default void viewMapListingInfo(Map map){}
+
     /** Steam: Open workshop for maps.*/
     default void openWorkshop(){}
 

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

@@ -18,12 +18,10 @@ import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.EffectEntity;
-import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
 
 import static io.anuke.arc.Core.*;
@@ -240,6 +238,8 @@ public class Renderer implements ApplicationListener{
         blocks.drawBlocks(Layer.block);
         blocks.drawFog();
 
+        blocks.drawBroken();
+
         Draw.shader(Shaders.blockbuild, true);
         blocks.drawBlocks(Layer.placement);
         Draw.shader();
@@ -308,7 +308,7 @@ public class Renderer implements ApplicationListener{
             float fract = landTime / Fx.coreLand.lifetime;
             TileEntity entity = player.getClosestCore();
 
-            TextureRegion reg = entity.block.icon(Block.Icon.full);
+            TextureRegion reg = entity.block.icon(Cicon.full);
             float scl = Scl.scl(4f) / camerascale;
             float s = reg.getWidth() * Draw.scl * scl * 4f * fract;
 

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

@@ -68,6 +68,7 @@ public class UI implements ApplicationListener, Loadable{
     public DeployDialog deploy;
     public TechTreeDialog tech;
     public MinimapDialog minimap;
+    public ModsDialog mods;
 
     public Cursor drillCursor, unloadCursor;
 
@@ -108,6 +109,7 @@ public class UI implements ApplicationListener, Loadable{
         ClickListener.clicked = () -> Sounds.press.play();
 
         Colors.put("accent", Pal.accent);
+        Colors.put("unlaunched", Color.valueOf("8982ed"));
         Colors.put("highlight", Pal.accent.cpy().lerp(Color.white, 0.3f));
         Colors.put("stat", Pal.stat);
         loadExtraCursors();
@@ -178,7 +180,7 @@ public class UI implements ApplicationListener, Loadable{
 
     @Override
     public void update(){
-        if(disableUI) return;
+        if(disableUI || Core.scene == null) return;
 
         Core.scene.act();
         Core.scene.draw();
@@ -222,6 +224,7 @@ public class UI implements ApplicationListener, Loadable{
         deploy = new DeployDialog();
         tech = new TechTreeDialog();
         minimap = new MinimapDialog();
+        mods = new ModsDialog();
 
         Group group = Core.scene.root;
 
@@ -358,8 +361,16 @@ public class UI implements ApplicationListener, Loadable{
     }
 
     public void showText(String titleText, String text){
+        showText(titleText, text, Align.center);
+    }
+
+    public void showText(String titleText, String text, int align){
         new Dialog(titleText){{
-            cont.margin(15).add(text).width(400f).wrap().get().setAlignment(Align.center, Align.center);
+            cont.row();
+            cont.addImage().width(400f).pad(2).colspan(2).height(4f).color(Pal.accent);
+            cont.row();
+            cont.add(text).width(400f).wrap().get().setAlignment(align, align);
+            cont.row();
             buttons.addButton("$ok", this::hide).size(90, 50).pad(4);
         }}.show();
     }
@@ -406,6 +417,34 @@ public class UI implements ApplicationListener, Loadable{
         dialog.show();
     }
 
+
+    public void showCustomConfirm(String title, String text, String yes, String no, Runnable confirmed){
+        FloatingDialog dialog = new FloatingDialog(title);
+        dialog.cont.add(text).width(500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center);
+        dialog.buttons.defaults().size(200f, 54f).pad(2f);
+        dialog.setFillParent(false);
+        dialog.buttons.addButton(no, dialog::hide);
+        dialog.buttons.addButton(yes, () -> {
+            dialog.hide();
+            confirmed.run();
+        });
+        dialog.keyDown(KeyCode.ESCAPE, dialog::hide);
+        dialog.keyDown(KeyCode.BACK, dialog::hide);
+        dialog.show();
+    }
+
+    public void showOkText(String title, String text, Runnable confirmed){
+        FloatingDialog dialog = new FloatingDialog(title);
+        dialog.cont.add(text).width(500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center);
+        dialog.buttons.defaults().size(200f, 54f).pad(2f);
+        dialog.setFillParent(false);
+        dialog.buttons.addButton("$ok", () -> {
+            dialog.hide();
+            confirmed.run();
+        });
+        dialog.show();
+    }
+
     public String formatAmount(int number){
         if(number >= 1000000){
             return Strings.fixed(number / 1000000f, 1) + "[gray]mil[]";

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

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
 import io.anuke.mindustry.game.EventType.*;
@@ -82,7 +82,8 @@ public class World{
         return height()*tilesize;
     }
 
-    public @Nullable Tile tile(int pos){
+    public @Nullable
+    Tile tile(int pos){
         return tiles == null ? null : tile(Pos.x(pos), Pos.y(pos));
     }
 

core/src/io/anuke/mindustry/editor/MapEditor.java

@@ -16,7 +16,7 @@ import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.BlockPart;
 
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 public class MapEditor{
     public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15, 20};
@@ -52,6 +52,9 @@ public class MapEditor{
 
         loading = true;
         tags.putAll(map.tags);
+        if(map.file.parent().parent().name().equals("1127400") && steam){
+            tags.put("steamid",  map.file.parent().name());
+        }
         MapIO.loadMap(map, context);
         checkLinkedTiles();
         renderer.resize(width(), height());

core/src/io/anuke/mindustry/editor/MapEditorDialog.java

@@ -15,6 +15,7 @@ import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
@@ -23,7 +24,7 @@ import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.io.*;
 import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.ui.Styles;
+import io.anuke.mindustry.ui.*;
 import io.anuke.mindustry.ui.dialogs.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
@@ -147,8 +148,19 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
         if(steam){
             menu.cont.addImageTextButton("$editor.publish.workshop", Icon.linkSmall, () -> {
+                Map builtin = maps.all().find(m -> m.name().equals(editor.getTags().get("name", "").trim()));
+                if(editor.getTags().containsKey("steamid") && builtin != null && !builtin.custom){
+                    platform.viewMapListing(editor.getTags().get("steamid"));
+                    return;
+                }
+
                 Map map = save();
 
+                if(editor.getTags().containsKey("steamid") && map != null){
+                    platform.viewMapListingInfo(map);
+                    return;
+                }
+
                 if(map == null) return;
 
                 if(map.tags.get("description", "").length() < 4){
@@ -162,7 +174,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 }
 
                 platform.publishMap(map);
-            }).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.getTags().containsKey("steamid") ? "$view.workshop" : "$editor.publish.workshop"));
+            }).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.getTags().containsKey("steamid") ? editor.getTags().get("author").equals(player.name) ? "$workshop.listing" : "$view.workshop" : "$editor.publish.workshop"));
 
             menu.cont.row();
         }
@@ -203,14 +215,6 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 return;
             }
 
-            Vector2 v = pane.stageToLocalCoordinates(Core.input.mouse());
-
-            if(v.x >= 0 && v.y >= 0 && v.x <= pane.getWidth() && v.y <= pane.getHeight()){
-                Core.scene.setScrollFocus(pane);
-            }else{
-                Core.scene.setScrollFocus(null);
-            }
-
             if(Core.scene != null && Core.scene.getKeyboardFocus() == this){
                 doInput();
             }
@@ -282,7 +286,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
         });
     }
 
-    public Map save(){
+    public @Nullable Map save(){
         boolean isEditor = state.rules.editor;
         state.rules.editor = false;
         String name = editor.getTags().get("name", "").trim();
@@ -676,6 +680,11 @@ public class MapEditorDialog extends Dialog implements Disposable{
         pane = new ScrollPane(content);
         pane.setFadeScrollBars(false);
         pane.setOverscroll(true, false);
+        pane.exited(() -> {
+            if(pane.hasScroll()){
+                Core.scene.setScrollFocus(view);
+            }
+        });
         ButtonGroup<ImageButton> group = new ButtonGroup<>();
 
         int i = 0;
@@ -693,7 +702,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
         });
 
         for(Block block : blocksOut){
-            TextureRegion region = block.icon(Block.Icon.medium);
+            TextureRegion region = block.icon(Cicon.medium);
 
             if(!Core.atlas.isFound(region)) continue;
 

core/src/io/anuke/mindustry/editor/MapGenerateDialog.java

@@ -388,7 +388,7 @@ public class MapGenerateDialog extends FloatingDialog{
                             GenTile tile = buffer1[px][py];
                             color = MapIO.colorFor(content.block(tile.floor), content.block(tile.block), content.block(tile.ore), Team.derelict);
                         }
-                        pixmap.drawPixel(px, pixmap.getHeight() - 1 - py, color);
+                        pixmap.draw(px, pixmap.getHeight() - 1 - py, color);
                     }
                 }
 

core/src/io/anuke/mindustry/editor/MapInfoDialog.java

@@ -59,18 +59,25 @@ public class MapInfoDialog extends FloatingDialog{
 
             t.row();
             t.add("$editor.rules").padRight(8).left();
-            t.addButton("$edit", () -> ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules())).left().width(200f);
+            t.addButton("$edit", () -> {
+                ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules());
+                hide();
+            }).left().width(200f);
 
             t.row();
             t.add("$editor.waves").padRight(8).left();
-            t.addButton("$edit", waveInfo::show).left().width(200f);
+            t.addButton("$edit", () -> {
+                waveInfo.show();
+                hide();
+            }).left().width(200f);
 
             t.row();
             t.add("$editor.generation").padRight(8).left();
-            t.addButton("$edit",
-                () -> generate.show(Vars.maps.readFilters(editor.getTags().get("genfilters", "")),
-                filters -> editor.getTags().put("genfilters", JsonIO.write(filters)))
-            ).left().width(200f);
+            t.addButton("$edit", () -> {
+                generate.show(Vars.maps.readFilters(editor.getTags().get("genfilters", "")),
+                filters -> editor.getTags().put("genfilters", JsonIO.write(filters)));
+                hide();
+            }).left().width(200f);
 
             name.change();
             description.change();

core/src/io/anuke/mindustry/editor/MapRenderer.java

@@ -68,6 +68,11 @@ public class MapRenderer implements Disposable{
         updates.addAll(delayedUpdates);
         delayedUpdates.clear();
 
+        //????
+        if(chunks == null){
+            return;
+        }
+
         for(int x = 0; x < chunks.length; x++){
             for(int y = 0; y < chunks[0].length; y++){
                 IndexedRenderer mesh = chunks[x][y];

core/src/io/anuke/mindustry/editor/MapView.java

@@ -56,10 +56,16 @@ public class MapView extends Element implements GestureListener{
             public boolean mouseMoved(InputEvent event, float x, float y){
                 mousex = x;
                 mousey = y;
+                requestScroll();
 
                 return false;
             }
 
+            @Override
+            public void enter(InputEvent event, float x, float y, int pointer, Element fromActor){
+                requestScroll();
+            }
+
             @Override
             public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
                 if(pointer != 0){

core/src/io/anuke/mindustry/editor/WaveInfoDialog.java

@@ -140,7 +140,7 @@ public class WaveInfoDialog extends FloatingDialog{
                     t.margin(0).defaults().pad(3).padLeft(5f).growX().left();
                     t.addButton(b -> {
                         b.left();
-                        b.addImage(group.type.iconRegion).size(30f).padRight(3);
+                        b.addImage(group.type.icon(Cicon.medium)).size(32f).padRight(3);
                         b.add(group.type.localizedName).color(Pal.accent);
                     }, () -> showUpdate(group)).pad(-6f).padBottom(0f);
 
@@ -221,7 +221,7 @@ public class WaveInfoDialog extends FloatingDialog{
         for(UnitType type : content.units()){
             dialog.cont.addButton(t -> {
                 t.left();
-                t.addImage(type.iconRegion).size(40f).padRight(2f);
+                t.addImage(type.icon(Cicon.medium)).size(40f).padRight(2f);
                 t.add(type.localizedName);
             }, () -> {
                 lastType = type;
@@ -253,7 +253,7 @@ public class WaveInfoDialog extends FloatingDialog{
                 for(int j = 0; j < spawned.length; j++){
                     if(spawned[j] > 0){
                         UnitType type = content.getByID(ContentType.unit, j);
-                        table.addImage(type.iconRegion).size(30f).padRight(4);
+                        table.addImage(type.icon(Cicon.medium)).size(8f * 4f).padRight(4);
                         table.add(spawned[j] + "x").color(Color.lightGray).padRight(6);
                         table.row();
                     }

core/src/io/anuke/mindustry/entities/Units.java

@@ -20,6 +20,11 @@ public class Units{
     private static float cdist;
     private static boolean boolResult;
 
+    /** @return whether this player can interact with a specific tile. if either of these are null, returns true.*/
+    public static boolean canInteract(Player player, Tile tile){
+        return player == null || tile == null || tile.interactable(player.getTeam());
+    }
+
     /**
      * Validates a target.
      * @param target The target to validate

core/src/io/anuke/mindustry/entities/bullet/HealBulletType.java

@@ -0,0 +1,50 @@
+package io.anuke.mindustry.entities.bullet;
+
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.entities.*;
+import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.graphics.*;
+import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.*;
+
+public class HealBulletType extends BulletType{
+    protected float healPercent = 3f;
+
+    public HealBulletType(float speed, float damage){
+        super(speed, damage);
+
+        shootEffect = Fx.shootHeal;
+        smokeEffect = Fx.hitLaser;
+        hitEffect = Fx.hitLaser;
+        despawnEffect = Fx.hitLaser;
+        collidesTeam = true;
+    }
+
+    @Override
+    public boolean collides(Bullet b, Tile tile){
+        return tile.getTeam() != b.getTeam() || tile.entity.healthf() < 1f;
+    }
+
+    @Override
+    public void draw(Bullet b){
+        Draw.color(Pal.heal);
+        Lines.stroke(2f);
+        Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f);
+        Draw.color(Color.white);
+        Lines.lineAngleCenter(b.x, b.y, b.rot(), 3f);
+        Draw.reset();
+    }
+
+    @Override
+    public void hitTile(Bullet b, Tile tile){
+        super.hit(b);
+        tile = tile.link();
+
+        if(tile.entity != null && tile.getTeam() == b.getTeam() && !(tile.block() instanceof BuildBlock)){
+            Effects.effect(Fx.healBlockFull, Pal.heal, tile.drawx(), tile.drawy(), tile.block().size);
+            tile.entity.healBy(healPercent / 100f * tile.entity.maxHealth());
+        }
+    }
+}

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

@@ -9,7 +9,7 @@ import io.anuke.arc.math.geom.Position;
 import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.entities.EntityGroup;
+import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.TimedEntity;
 import io.anuke.mindustry.entities.traits.DrawTrait;
 import io.anuke.mindustry.entities.type.Unit;
@@ -48,8 +48,7 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{
     public static void transferItemTo(Item item, int amount, float x, float y, Tile tile){
         if(tile == null || tile.entity == null || tile.entity.items == null) return;
         for(int i = 0; i < Mathf.clamp(amount / 3, 1, 8); i++){
-            Time.run(i * 3, () -> create(item, x, y, tile, () -> {
-            }));
+            Time.run(i * 3, () -> create(item, x, y, tile, () -> {}));
         }
         tile.entity.items.add(item, amount);
     }

core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java

@@ -1,6 +1,5 @@
 package io.anuke.mindustry.entities.traits;
 
-import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.Queue;
 import io.anuke.arc.collection.*;
@@ -8,6 +7,7 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.type.*;
@@ -104,7 +104,11 @@ public interface BuilderTrait extends Entity, TeamTrait{
         if(current.breaking){
             entity.deconstruct(unit, core, 1f / entity.buildCost * Time.delta() * getBuildPower(tile) * state.rules.buildSpeedMultiplier);
         }else{
-            entity.construct(unit, core, 1f / entity.buildCost * Time.delta() * getBuildPower(tile) * state.rules.buildSpeedMultiplier);
+            if(entity.construct(unit, core, 1f / entity.buildCost * Time.delta() * getBuildPower(tile) * state.rules.buildSpeedMultiplier)){
+                if(current.hasConfig){
+                    Call.onTileConfig(null, tile, current.config);
+                }
+            }
         }
 
         current.progress = entity.progress;
@@ -200,7 +204,8 @@ public interface BuilderTrait extends Entity, TeamTrait{
      * Return the build requests currently active, or the one at the top of the queue.
      * May return null.
      */
-    default @Nullable BuildRequest buildRequest(){
+    default @Nullable
+    BuildRequest buildRequest(){
         return buildQueue().size == 0 ? null : buildQueue().first();
     }
 
@@ -256,6 +261,8 @@ public interface BuilderTrait extends Entity, TeamTrait{
         public final int x, y, rotation;
         public final Block block;
         public final boolean breaking;
+        public boolean hasConfig;
+        public int config;
 
         public float progress;
         public boolean initialized;
@@ -278,6 +285,12 @@ public interface BuilderTrait extends Entity, TeamTrait{
             this.breaking = true;
         }
 
+        public BuildRequest configure(int config){
+            this.config = config;
+            this.hasConfig = true;
+            return this;
+        }
+
         public Tile tile(){
             return world.tile(x, y);
         }

core/src/io/anuke/mindustry/entities/traits/DamageTrait.java

@@ -1,5 +1,11 @@
 package io.anuke.mindustry.entities.traits;
 
+import io.anuke.mindustry.entities.type.*;
+
 public interface DamageTrait{
     float damage();
+
+    default void killed(Entity other){
+
+    }
 }

core/src/io/anuke/mindustry/entities/traits/KillerTrait.java

@@ -0,0 +1,5 @@
+package io.anuke.mindustry.entities.traits;
+
+public interface KillerTrait{
+    void killed(Entity other);
+}

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

@@ -6,6 +6,7 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
@@ -35,6 +36,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
     protected static final int timerShootLeft = timerIndex++;
     protected static final int timerShootRight = timerIndex++;
 
+    protected boolean loaded;
     protected UnitType type;
     protected Interval timer = new Interval(5);
     protected StateMachine state = new StateMachine();
@@ -92,7 +94,8 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
         }
     }
 
-    public @Nullable Tile getSpawner(){
+    public @Nullable
+    Tile getSpawner(){
         return world.tile(spawner);
     }
 
@@ -233,7 +236,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
 
     @Override
     public TextureRegion getIconRegion(){
-        return type.iconRegion;
+        return type.icon(Cicon.full);
     }
 
     @Override
@@ -262,7 +265,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
 
     @Override
     public boolean isFlying(){
-        return type.isFlying;
+        return type.flying;
     }
 
     @Override
@@ -338,7 +341,9 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
     public void added(){
         state.set(getStartState());
 
-        health(maxHealth());
+        if(!loaded){
+            health(maxHealth());
+        }
 
         if(isCommanded()){
             onCommand(getCommand());
@@ -375,6 +380,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
     @Override
     public void readSave(DataInput stream, byte version) throws IOException{
         super.readSave(stream, version);
+        loaded = true;
         byte type = stream.readByte();
         this.spawner = stream.readInt();
 

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

@@ -134,6 +134,13 @@ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Pool
         return 1f;
     }
 
+    @Override
+    public void killed(Entity other){
+        if(owner instanceof KillerTrait){
+            ((KillerTrait)owner).killed(other);
+        }
+    }
+
     @Override
     public void absorb(){
         supressCollision = true;

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

@@ -15,8 +15,12 @@ public abstract class DestructibleEntity extends SolidEntity implements HealthTr
     @Override
     public void collision(SolidTrait other, float x, float y){
         if(other instanceof DamageTrait){
+            boolean wasDead = isDead();
             onHit(other);
             damage(((DamageTrait)other).damage());
+            if(!wasDead && isDead()){
+                ((DamageTrait)other).killed(this);
+            }
         }
     }
 

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

@@ -10,6 +10,7 @@ import io.anuke.arc.math.geom.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.arc.util.pooling.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
@@ -47,8 +48,9 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
 
     public float baseRotation;
     public float pointerX, pointerY;
-    public String name = "name";
-    public @Nullable String uuid, usid;
+    public String name = "noname";
+    public @Nullable
+    String uuid, usid;
     public boolean isAdmin, isTransferring, isShooting, isBoosting, isMobile, isTyping;
     public float boostHeat, shootHeat, destructTime;
     public boolean achievedFlight;
@@ -158,7 +160,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
 
     @Override
     public TextureRegion getIconRegion(){
-        return mech.iconRegion;
+        return mech.icon(Cicon.full);
     }
 
     @Override
@@ -254,7 +256,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
 
     @Override
     public String toString(){
-        return "Player{" + id + ", mech=" + mech.name + ", local=" + isLocal + ", " + x + ", " + y + "}";
+        return "Player{" + name + ", mech=" + mech.name + ", id=" + id + ", local=" + isLocal + ", " + x + ", " + y + "}";
     }
 
     @Override
@@ -279,7 +281,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
     public void drawShadow(float offsetX, float offsetY){
         float scl = mech.flying ? 1f : boostHeat / 2f;
 
-        Draw.rect(mech.iconRegion, x + offsetX * scl, y + offsetY * scl, rotation - 90);
+        Draw.rect(getIconRegion(), x + offsetX * scl, y + offsetY * scl, rotation - 90);
     }
 
     @Override
@@ -390,14 +392,14 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
             Draw.color();
             font.setColor(color);
             font.draw(name, x, y + nameHeight, 0, Align.center, false);
-        }
 
-        if(isAdmin){
-            float s = 3f;
-            Draw.color(color.r * 0.5f, color.g * 0.5f, color.b * 0.5f, 1f);
-            Draw.rect(Core.atlas.find("icon-admin-badge"), x + layout.width / 2f + 2 + 1, y + nameHeight - 1.5f, s, s);
-            Draw.color(color);
-            Draw.rect(Core.atlas.find("icon-admin-badge"), x + layout.width / 2f + 2 + 1, y + nameHeight - 1f, s, s);
+            if(isAdmin){
+                float s = 3f;
+                Draw.color(color.r * 0.5f, color.g * 0.5f, color.b * 0.5f, 1f);
+                Draw.rect(Core.atlas.find("icon-admin-badge"), x + layout.width / 2f + 2 + 1, y + nameHeight - 1.5f, s, s);
+                Draw.color(color);
+                Draw.rect(Core.atlas.find("icon-admin-badge"), x + layout.width / 2f + 2 + 1, y + nameHeight - 1f, s, s);
+            }
         }
 
         if(Core.settings.getBool("playerchat") && ((textFadeTime > 0 && lastText != null) || isTyping)){
@@ -814,6 +816,8 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
         item.amount = 0;
         placeQueue.clear();
         dead = true;
+        lastText = null;
+        textFadeTime = 0f;
         target = null;
         moveTarget = null;
         spawner = lastSpawner = null;

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

@@ -7,6 +7,7 @@ import io.anuke.arc.collection.ObjectSet;
 import io.anuke.arc.math.geom.Point2;
 import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.traits.HealthTrait;
 import io.anuke.mindustry.entities.traits.TargetTrait;
@@ -230,6 +231,11 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
         return proximity;
     }
 
+    /** Tile configuration. Defaults to 0. Used for block rebuilding. */
+    public int config(){
+        return 0;
+    }
+
     @Override
     public void removed(){
         if(sound != null){

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

@@ -1,6 +1,5 @@
 package io.anuke.mindustry.entities.type;
 
-import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.graphics.*;
@@ -9,6 +8,7 @@ import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.effect.*;
@@ -216,10 +216,14 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
         float cx = x - fsize/2f, cy = y - fsize/2f;
 
         for(Team team : Team.all){
-            avoid(unitGroups[team.ordinal()].intersect(cx, cy, fsize, fsize));
+            if(team != getTeam() || !(this instanceof Player)){
+                avoid(unitGroups[team.ordinal()].intersect(cx, cy, fsize, fsize));
+            }
         }
 
-        avoid(playerGroup.intersect(cx, cy, fsize, fsize));
+        if(!(this instanceof Player)){
+            avoid(playerGroup.intersect(cx, cy, fsize, fsize));
+        }
         velocity.add(moveVector.x / mass() * Time.delta(), moveVector.y / mass() * Time.delta());
     }
 
@@ -227,7 +231,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
         float radScl = 1.5f;
 
         for(Unit en : arr){
-            if(en.isFlying() != isFlying()) continue;
+            if(en.isFlying() != isFlying() || (en instanceof Player && en.getTeam() != getTeam())) continue;
             float dst = dst(en);
             float scl = Mathf.clamp(1f - dst / (getSize()/(radScl*2f) + en.getSize()/(radScl*2f)));
             moveVector.add(Tmp.v1.set((x - en.x) * scl, (y - en.y) * scl).limit(0.4f));
@@ -403,7 +407,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
             float size = (itemSize + Mathf.absin(Time.time(), 5f, 1f)) * itemtime;
 
             Draw.mixcol(Pal.accent, Mathf.absin(Time.time(), 5f, 0.5f));
-            Draw.rect(item.item.icon(Item.Icon.large),
+            Draw.rect(item.item.icon(Cicon.medium),
                 x + Angles.trnsx(rotation + 180f, backTrns),
                 y + Angles.trnsy(rotation + 180f, backTrns),
                 size, size, rotation);

core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java

@@ -2,7 +2,6 @@ package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
-import io.anuke.mindustry.entities.type.FlyingUnit;
 import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;

core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java

@@ -1,23 +1,19 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.arc.Core;
-import io.anuke.arc.Events;
-import io.anuke.arc.collection.IntIntMap;
-import io.anuke.arc.collection.Queue;
-import io.anuke.arc.math.Mathf;
+import io.anuke.arc.*;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.traits.BuilderTrait;
-import io.anuke.mindustry.entities.traits.TargetTrait;
+import io.anuke.mindustry.*;
+import io.anuke.mindustry.entities.*;
+import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.units.UnitState;
-import io.anuke.mindustry.game.EventType.BuildSelectEvent;
-import io.anuke.mindustry.game.Teams.TeamData;
-import io.anuke.mindustry.gen.BrokenBlock;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.BuildBlock;
-import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
+import io.anuke.mindustry.entities.units.*;
+import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.game.Teams.*;
+import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.*;
+import io.anuke.mindustry.world.blocks.BuildBlock.*;
 
 import java.io.*;
 
@@ -45,7 +41,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
             BuildEntity entity = (BuildEntity)target;
             TileEntity core = getClosestCore();
 
-            if(isBuilding() && entity == null && isRebuild()){
+            if(isBuilding() && entity == null && canRebuild()){
                 target = world.tile(buildRequest().x, buildRequest().y);
                 circle(placeDistance * 0.7f);
                 target = null;
@@ -100,9 +96,9 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
                     incDrones(playerTarget);
                     TargetTrait prev = target;
                     target = playerTarget;
-                    float dst = 90f + (id % 4)*30;
+                    float dst = 90f + (id % 10)*3;
                     float tdst = dst(target);
-                    float scale = (Mathf.lerp(1f, 0.77f, 1f - Mathf.clamp((tdst - dst) / dst)));
+                    float scale = (Mathf.lerp(1f, 0.2f, 1f - Mathf.clamp((tdst - dst) / dst)));
                     circle(dst);
                     velocity.scl(scale);
                     target = prev;
@@ -151,9 +147,8 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
         }
     }
 
-    boolean isRebuild(){
-        //disabled until further notice, reason being that it's too annoying when playing enemies and too broken for ally use
-        return false; //Vars.state.rules.enemyCheat && team == waveTeam;
+    boolean canRebuild(){
+        return true;
     }
 
     @Override
@@ -188,13 +183,14 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
                 }
             }
 
-            if(isRebuild() && !isBuilding()){
+            if(timer.get(timerTarget, 80) && Units.closestEnemy(getTeam(), x, y, 100f, u -> !(u instanceof BaseDrone)) == null && !isBuilding()){
                 TeamData data = Vars.state.teams.get(team);
                 if(!data.brokenBlocks.isEmpty()){
-                    long block = data.brokenBlocks.removeLast();
-
-                    placeQueue.addFirst(new BuildRequest(BrokenBlock.x(block), BrokenBlock.y(block), BrokenBlock.rotation(block), content.block(BrokenBlock.block(block))));
-                    setState(build);
+                    BrokenBlock block = data.brokenBlocks.removeLast();
+                    if(Build.validPlace(getTeam(), block.x, block.y, content.block(block.block), block.rotation)){
+                        placeQueue.addFirst(new BuildRequest(block.x, block.y, block.rotation, content.block(block.block)).configure(block.config));
+                        setState(build);
+                    }
                 }
             }
         }

core/src/io/anuke/mindustry/entities/type/base/Crawler.java

@@ -1,6 +1,4 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Crawler extends GroundUnit{
 }

core/src/io/anuke/mindustry/entities/type/base/Dagger.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Dagger extends GroundUnit{
 
 }

core/src/io/anuke/mindustry/entities/type/base/Eruptor.java

@@ -1,6 +1,4 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Eruptor extends GroundUnit{
 }

core/src/io/anuke/mindustry/entities/type/base/FlyingUnit.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
@@ -8,6 +8,7 @@ import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.world.*;
@@ -15,8 +16,8 @@ import io.anuke.mindustry.world.meta.*;
 
 import static io.anuke.mindustry.Vars.*;
 
-public abstract class FlyingUnit extends BaseUnit{
-    protected float[] weaponAngles = {0, 0};
+public class FlyingUnit extends BaseUnit{
+    protected float[] weaponAngles = {0,0};
 
     protected final UnitState
 
@@ -36,13 +37,14 @@ public abstract class FlyingUnit extends BaseUnit{
 
                 if(target == null) targetClosestEnemyFlag(BlockFlag.producer);
                 if(target == null) targetClosestEnemyFlag(BlockFlag.turret);
+
+                if(target == null && isCommanded() && getCommand() != UnitCommand.attack){
+                    onCommand(getCommand());
+                }
             }
 
-            if(target == null){
+            if(getClosestSpawner() == null && getSpawner() != null && target == null){
                 target = getSpawner();
-            }
-
-            if(target == getSpawner() && getSpawner() != null){
                 circle(80f + Mathf.randomSeed(id) * 120);
             }else if(target != null){
                 attack(type.attackLength);

core/src/io/anuke/mindustry/entities/type/base/Fortress.java

@@ -1,6 +1,4 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Fortress extends GroundUnit{
 }

core/src/io/anuke/mindustry/entities/type/base/Ghoul.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.FlyingUnit;
-
 public class Ghoul extends FlyingUnit{
 
 }

core/src/io/anuke/mindustry/entities/type/base/GroundUnit.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.type;
+package io.anuke.mindustry.entities.type.base;
 
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
@@ -9,6 +9,7 @@ import io.anuke.mindustry.*;
 import io.anuke.mindustry.ai.Pathfinder.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
@@ -18,7 +19,7 @@ import io.anuke.mindustry.world.meta.*;
 
 import static io.anuke.mindustry.Vars.*;
 
-public abstract class GroundUnit extends BaseUnit{
+public class GroundUnit extends BaseUnit{
     protected static Vector2 vec = new Vector2();
 
     protected float walkTime;

core/src/io/anuke/mindustry/entities/type/base/Revenant.java

@@ -4,7 +4,6 @@ import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.FlyingUnit;
 
 public class Revenant extends FlyingUnit{
 

core/src/io/anuke/mindustry/entities/type/base/Titan.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.GroundUnit;
-
 public class Titan extends GroundUnit{
 
 }

core/src/io/anuke/mindustry/entities/type/base/Wraith.java

@@ -1,7 +1,5 @@
 package io.anuke.mindustry.entities.type.base;
 
-import io.anuke.mindustry.entities.type.FlyingUnit;
-
 public class Wraith extends FlyingUnit{
 
 }

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

@@ -0,0 +1,23 @@
+package io.anuke.mindustry.game;
+
+import java.util.*;
+
+/** Defines sizes of a content's preview icon. */
+public enum Cicon{
+    /** Full size. */
+    full(0),
+    tiny(8 * 2),
+    small(8 * 3),
+    medium(8 * 4),
+    large(8 * 5),
+    xlarge(8 * 6);
+
+    public static final Cicon[] all = values();
+    public static final Cicon[] scaled = Arrays.copyOfRange(all, 1, all.length);
+
+    public final int size;
+
+    Cicon(int size){
+        this.size = size;
+    }
+}

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

@@ -1,12 +1,16 @@
 package io.anuke.mindustry.game;
 
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.mod.Mods.*;
 import io.anuke.mindustry.type.ContentType;
 
 
 /** Base class for a content type that is loaded in {@link io.anuke.mindustry.core.ContentLoader}. */
 public abstract class Content{
     public final short id;
+    /** The mod that loaded this piece of content. */
+    public @Nullable LoadedMod mod;
 
     public Content(){
         this.id = (short)Vars.content.getBy(getContentType()).size;

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

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.annotations.Annotations.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.traits.BuilderTrait;
 import io.anuke.mindustry.entities.type.*;
@@ -83,6 +83,10 @@ public class EventType{
 
     }
 
+    public static class ContentReloadEvent{
+
+    }
+
     public static class DisposeEvent{
 
     }
@@ -195,7 +199,8 @@ public class EventType{
     public static class BlockBuildEndEvent{
         public final Tile tile;
         public final Team team;
-        public final @Nullable Player player;
+        public final @Nullable
+        Player player;
         public final boolean breaking;
 
         public BlockBuildEndEvent(Tile tile, @Nullable Player player, Team team, boolean breaking){

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

@@ -150,6 +150,7 @@ public class GlobalData{
 
     @SuppressWarnings("unchecked")
     public void load(){
+        items.clear();
         unlocked = Core.settings.getObject("unlocks", ObjectMap.class, ObjectMap::new);
         for(Item item : Vars.content.items()){
             items.put(item, Core.settings.getInt("item-" + item.name, 0));

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

@@ -1,10 +1,13 @@
 package io.anuke.mindustry.game;
 
+import io.anuke.mindustry.*;
+
 public abstract class MappableContent extends Content{
     public final String name;
 
     public MappableContent(String name){
         this.name = name;
+        Vars.content.handleMappableContent(this);
     }
 
     @Override

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

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.audio.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.core.GameState.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
@@ -17,16 +17,22 @@ public class MusicControl{
     private static final float finTime = 120f, foutTime = 120f, musicInterval = 60 * 60 * 3f, musicChance = 0.6f, musicWaveChance = 0.5f;
 
     /** normal, ambient music, plays at any time */
-    public final Array<Music> ambientMusic = Array.with(Musics.game1, Musics.game3, Musics.game4, Musics.game6);
+    public Array<Music> ambientMusic = Array.with();
     /** darker music, used in times of conflict  */
-    public final Array<Music> darkMusic = Array.with(Musics.game2, Musics.game5, Musics.game7);
+    public Array<Music> darkMusic = Array.with();
     private Music lastRandomPlayed;
     private Interval timer = new Interval();
-    private @Nullable Music current;
+    private @Nullable
+    Music current;
     private float fade;
     private boolean silenced;
 
     public MusicControl(){
+        Events.on(ClientLoadEvent.class, e -> {
+            ambientMusic = Array.with(Musics.game1, Musics.game3, Musics.game4, Musics.game6);
+            darkMusic = Array.with(Musics.game2, Musics.game5, Musics.game7);
+        });
+
         //only run music 10 seconds after a wave spawns
         Events.on(WaveEvent.class, e -> Time.run(60f * 10f, () -> {
             if(Mathf.chance(musicWaveChance)){

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

@@ -7,6 +7,7 @@ import io.anuke.arc.files.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.async.*;
+import io.anuke.mindustry.*;
 import io.anuke.mindustry.core.GameState.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.io.*;
@@ -253,6 +254,17 @@ public class Saves{
             return meta.map;
         }
 
+        public void cautiousLoad(Runnable run){
+            Array<String> mods = Array.with(getMods());
+            mods.removeAll(Vars.mods.getModStrings());
+
+            if(!mods.isEmpty()){
+                ui.showConfirm("$warning", Core.bundle.format("mod.missing", mods.toString("\n")), run);
+            }else{
+                run.run();
+            }
+        }
+
         public String getName(){
             return Core.settings.getString("save-" + index + "-name", "untitled");
         }
@@ -262,6 +274,10 @@ public class Saves{
             Core.settings.save();
         }
 
+        public String[] getMods(){
+            return meta.mods;
+        }
+
         public Zone getZone(){
             return meta == null || meta.rules == null ? null : meta.rules.zone;
         }

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

@@ -1,9 +1,8 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.annotations.Annotations.Struct;
 import io.anuke.arc.collection.*;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.*;
+import io.anuke.mindustry.world.*;
 
 /** Class for various team-based utilities. */
 public class Teams{
@@ -52,7 +51,7 @@ public class Teams{
         public final ObjectSet<Tile> cores = new ObjectSet<>();
         public final EnumSet<Team> enemies;
         public final Team team;
-        public LongQueue brokenBlocks = new LongQueue();
+        public Queue<BrokenBlock> brokenBlocks = new Queue<>();
 
         public TeamData(Team team, EnumSet<Team> enemies){
             this.team = team;
@@ -62,8 +61,16 @@ public class Teams{
 
     /** Represents a block made by this team that was destroyed somewhere on the map.
      * This does not include deconstructed blocks.*/
-    @Struct
-    public class BrokenBlockStruct{
-        public short x, y, rotation, block;
+    public static class BrokenBlock{
+        public final short x, y, rotation, block;
+        public final int config;
+
+        public BrokenBlock(short x, short y, short rotation, short block, int config){
+            this.x = x;
+            this.y = y;
+            this.rotation = rotation;
+            this.block = block;
+            this.config = config;
+        }
     }
 }

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

@@ -1,9 +1,10 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.g2d.TextureRegion;
-import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.mindustry.Vars;
+import io.anuke.annotations.Annotations.*;
+import io.anuke.arc.*;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.mindustry.*;
 
 /** Base interface for an unlockable content type. */
 public abstract class UnlockableContent extends MappableContent{
@@ -11,6 +12,8 @@ public abstract class UnlockableContent extends MappableContent{
     public String localizedName;
     /** Localized description. May be null. */
     public String description;
+    /** Icons by Cicon ID.*/
+    protected TextureRegion[] cicons = new TextureRegion[Cicon.all.length];
 
     public UnlockableContent(String name){
         super(name);
@@ -19,10 +22,24 @@ public abstract class UnlockableContent extends MappableContent{
         this.description = Core.bundle.getOrNull(getContentType() + "." + name + ".description");
     }
 
+    /** Generate any special icons for this content. Called asynchronously.*/
+    @CallSuper
+    public void createIcons(PixmapPacker out, PixmapPacker editor){
+
+    }
+
+    /** Returns a specific content icon, or the region {contentType}-{name} if not found.*/
+    public TextureRegion icon(Cicon icon){
+        if(cicons[icon.ordinal()] == null){
+            cicons[icon.ordinal()] = Core.atlas.find(getContentType().name() + "-" + name + "-" + icon.name(), Core.atlas.find(getContentType().name() + "-" + name + "-full", Core.atlas.find(getContentType().name() + "-" + name, Core.atlas.find(name))));
+        }
+        return cicons[icon.ordinal()];
+    }
+
     /** Returns the localized name of this content. */
     public abstract String localizedName();
 
-    public abstract TextureRegion getContentIcon();
+    //public abstract TextureRegion getContentIcon();
 
     /** This should show all necessary info about this content in the specified table. */
     public abstract void displayInfo(Table table);

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

@@ -2,15 +2,19 @@ package io.anuke.mindustry.graphics;
 
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.Texture.TextureFilter;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.Texture.*;
 import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.graphics.glutils.FrameBuffer;
+import io.anuke.arc.graphics.glutils.*;
+import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.entities.type.base.*;
 import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.game.Teams.*;
 import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.Block.*;
 
 import static io.anuke.arc.Core.camera;
 import static io.anuke.mindustry.Vars.*;
@@ -120,6 +124,20 @@ public class BlockRenderer implements Disposable{
         Draw.shader();
     }
 
+    public void drawBroken(){
+        if(unitGroups[player.getTeam().ordinal()].all().contains(p -> p instanceof BuilderDrone)){
+            for(BrokenBlock block : state.teams.get(player.getTeam()).brokenBlocks){
+                Block b = content.block(block.block);
+                if(!camera.bounds(Tmp.r1).grow(tilesize * 2f).overlaps(Tmp.r2.setSize(b.size * tilesize).setCenter(block.x * tilesize + b.offset(), block.y * tilesize + b.offset()))) continue;
+
+                Draw.alpha(0.5f);
+                Draw.mixcol(Pal.accent, 0.2f + Mathf.absin(5f, 0.2f));
+                Draw.rect(b.icon(Cicon.full), block.x * tilesize + b.offset(), block.y * tilesize + b.offset(), b.rotate ? block.rotation * 90 : 0f);
+            }
+            Draw.reset();
+        }
+    }
+
     public void drawShadows(){
         if(!shadowEvents.isEmpty()){
             Draw.flush();

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

@@ -77,7 +77,9 @@ public class Drawf{
         Draw.rect(edge, x2, y2, edge.getWidth() * scale * Draw.scl, edge.getHeight() * scale * Draw.scl, rotation);
 
         Lines.stroke(12f * scale);
+        Lines.precise(true);
         Lines.line(line, x + Tmp.v1.x, y + Tmp.v1.y, x2 - Tmp.v1.x, y2 - Tmp.v1.y, CapStyle.none, 0f);
+        Lines.precise(false);
         Lines.stroke(1f);
     }
 

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

@@ -14,6 +14,7 @@ import io.anuke.arc.util.noise.RidgedPerlin;
 import io.anuke.arc.util.noise.Simplex;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.content.UnitTypes;
+import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.UnitType;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.Floor;
@@ -252,7 +253,9 @@ public class MenuRenderer implements Disposable{
     private void drawFlyers(){
         Draw.color(0f, 0f, 0f, 0.4f);
 
-        float size = Math.max(flyerType.iconRegion.getWidth(), flyerType.iconRegion.getHeight()) * Draw.scl * 1.6f;
+        TextureRegion icon = flyerType.icon(Cicon.full);
+
+        float size = Math.max(icon.getWidth(), icon.getHeight()) * Draw.scl * 1.6f;
 
         flyers((x, y) -> {
             Draw.rect(flyerType.region, x - 12f, y - 13f, flyerRot - 90);

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

@@ -106,7 +106,7 @@ public class MinimapRenderer implements Disposable{
     public void updateAll(){
         for(int x = 0; x < world.width(); x++){
             for(int y = 0; y < world.height(); y++){
-                pixmap.drawPixel(x, pixmap.getHeight() - 1 - y, colorFor(world.tile(x, y)));
+                pixmap.draw(x, pixmap.getHeight() - 1 - y, colorFor(world.tile(x, y)));
             }
         }
         texture.draw(pixmap, 0, 0);
@@ -114,7 +114,7 @@ public class MinimapRenderer implements Disposable{
 
     public void update(Tile tile){
         int color = colorFor(world.tile(tile.x, tile.y));
-        pixmap.drawPixel(tile.x, pixmap.getHeight() - 1 - tile.y, color);
+        pixmap.draw(tile.x, pixmap.getHeight() - 1 - tile.y, color);
 
         Pixmaps.drawPixel(texture, tile.x, pixmap.getHeight() - 1 - tile.y, color);
     }

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

@@ -1,22 +1,18 @@
 package io.anuke.mindustry.graphics;
 
-import io.anuke.arc.Core;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Tmp;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.input.InputHandler;
-import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.arc.*;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.math.*;
+import io.anuke.arc.math.geom.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.entities.*;
+import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.input.*;
+import io.anuke.mindustry.world.*;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -112,6 +108,13 @@ public class OverlayRenderer{
 
             if(tile != null && tile.block() != Blocks.air && tile.getTeam() == player.getTeam()){
                 tile.block().drawSelect(tile);
+
+                if(Core.input.keyDown(Binding.rotateplaced) && tile.block().rotate){
+                    control.input.drawArrow(tile.block(), tile.x, tile.y, tile.rotation(), true);
+                    Draw.color(Pal.accent, 0.3f + Mathf.absin(4f, 0.2f));
+                    Fill.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize/2f);
+                    Draw.color();
+                }
             }
         }
 
@@ -119,7 +122,7 @@ public class OverlayRenderer{
         if(input.isDroppingItem()){
             Vector2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
             float size = 8;
-            Draw.rect(player.item().item.icon(Item.Icon.large), v.x, v.y, size, size);
+            Draw.rect(player.item().item.icon(Cicon.medium), v.x, v.y, size, size);
             Draw.color(Pal.accent);
             Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time(), 5f, 1f));
             Draw.reset();

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

@@ -1,17 +1,18 @@
 package io.anuke.mindustry.graphics;
 
-import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.graphics.glutils.Shader;
 import io.anuke.arc.scene.ui.layout.Scl;
+import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.arc.util.Time;
 
 public class Shaders{
     public static Shadow shadow;
     public static BlockBuild blockbuild;
-    public static @Nullable Shield shield;
+    public static @Nullable
+    Shield shield;
     public static UnitBuild build;
     public static FogShader fog;
     public static MenuShader menu;

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

@@ -13,6 +13,7 @@ public enum Binding implements KeyBind{
     deselect(KeyCode.MOUSE_RIGHT),
     break_block(KeyCode.MOUSE_RIGHT),
     rotate(new Axis(KeyCode.SCROLL)),
+    rotateplaced(KeyCode.R),
     diagonal_placement(KeyCode.CONTROL_LEFT),
     pick(KeyCode.MOUSE_MIDDLE),
     dash(KeyCode.SHIFT_LEFT),