Updated bundles

* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description

* Oof

* ЈҮУКЕНГШҺЗХҸЖДЛОРПАВЫӘЧСМИТҒБӨ

* dada

* Translate new descriptions

* й

* Ukrainian finished. Fixed some errors.

* Translated everything. Maybe.

* /

* 1

* Added tutorial. Thank to Slava0135 and ymomfe.

* 1

* 1

* WATER

WATER

* [[]]

* 1

* gmmm

/-/-/-/

* idk what i changed

* Обновление и корректировка строк с 1 по 90

* router

* Обновление и корректировка строк с 87 по 252

Обновление и корректировка строк с 87 по 252, а так же правка предыдущих.
- 35 строку лучше привести в соответствии с оригинальным текстом, без дополнений и пояснений.
- 103 строка не переводится в соответствии с https://semver.org/lang/ru/ , хотя это не жёсткое правило, поскольку не влияет непосредственно на алгоритм работы с версиями.
- 187 Предлагаю эту строку перевести как 'Настройки карты', не смотря на оригинальный текст (соответственно и 230, 231).

* router

* Обновление и корректировка строк с 253 по 321 - "WorldEditor Update"

Обновление и корректировка строк с 253 по 321, а так же предыдущих.
- Разобраться с 297 строкой ("filter.option.percentile").
- Разобраться с местами применения 322 строки.

* озарение в переводе ;D

* Fixed "В"

* Unfinished Ukrainian language.

* Small fixes.

* Обновление и корректировка строк с 322 по 377 - "Campaign Update"

Обновление и корректировка строк с 322 по 377, а так же предыдущих.
- По прежнему нужно разобраться с 297 строкой ("filter.option.percentile"). Добавил метку для отличия функционала. Проверю и уберу к следующей сборке.

* Мелкие правки

* From additional improvements.

.github/workflows/gradle.yml

@@ -0,0 +1,17 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Run unit tests with gradle
+      run: ./gradlew test

.travis.yml

@@ -1,13 +1,27 @@
 jdk:
 - openjdk8
+dist: trusty
+android:
+  components:
+  - android-29
+  - build-tools-29.0.2
+
 script:
+- git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
+- cd ../MindustryBuilds
+- echo ${TRAVIS_BUILD_NUMBER} > version.txt
+- git add .
+- git commit -m "Updating to build ${TRAVIS_BUILD_NUMBER}"
+- git tag ${TRAVIS_BUILD_NUMBER}
+- git config --global user.name "Build Uploader"
+- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; fi
+- cd ../Mindustry
 - git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
 - "./gradlew test"
 - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
 - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
-
 deploy:
-  - provider: releases
+- provider: releases
   skip_cleanup: true
   draft: false
   api_key:
@@ -18,11 +32,12 @@ deploy:
   on:
     repo: Anuken/Mindustry
     tags: true
-  - provider: script
+- provider: script
   script: bash update_wiki.sh
   on:
     repo: Anuken/Mindustry
     tags: true
 env:
   global:
-    secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
+  - secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
+  - secure: VEskj/0TVX2o7iUVXuVPysj/VSWmPhDl57SrT7/nBNN/P/8N5jFAvx8PMzG7qT0S5FzKxuV20psE4WylUGRKdeRtK7/QNBV7T3YqYYM6BUB1VeRpxe5hLxTeuBK3izglFO8DkdDqjUtzQSjzkoYT75ilROjhBrBUPhVek7UlbBHbaklPWYFXHnJmYS1FpZTdzqIj+Y0Gd1PSL2MzK4X74aAHl0qaDgsTwYwtKs7IAz+kFaTZBRpi9VjQHAFhDlkDR3jo9wQjH8/F6x0lCgV/FulSc37Okdb40sLFG98xcEA6gWh1NPMkz8CulUdVE7mj7SJNxLbNvoMNrWOVRjmEsn59p/9LiNC1F9ncFz9vjQjAmi7rMFFGHGxe5nn8cIAkpTvHQQkZoWHAA9SNJTDMMf09m2pRy/vvzx+a6NVxyC9iNrhLlnBg4gxAqRh0S6NU0uL+fuygKixn7rqlnb7KMT7bAbfcuV+dng6c8V7hYKDCh7sJbH8iJump1xkwoM7ecnU8fxJF/oKOr/fbk0Bfxu+Q9qYLrV1+DEdm93Vl2Thq+DBKmI66jRGSva6HeCLFo81PEiEjP1nLv75+kvVfOqVqJrZD1BrvoG2eWT/3hVLrN2kEIWWlpvQVC7FL11yWmYtAuOBh/vfhI76zKr+YTS6ccG9rqW4XeYjJytshe8M=

README.md

@@ -40,6 +40,14 @@ After building, the output .JAR file should be in `/desktop/build/libs/Mindustry
 
 ### Downloads
 
-<a href="https://anuke.itch.io/mindustry"><img src="https://static.itch.io/images/badge.svg" width="auto" height="75"></a>
+[<img src="https://static.itch.io/images/badge.svg"
+     alt="Get it on Itch.io"
+     height="60">](https://anuke.itch.io/mindustry)
 
-<a href="https://play.google.com/store/apps/details?id=io.anuke.mindustry&hl=en"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cd/Get_it_on_Google_play.svg/1280px-Get_it_on_Google_play.svg.png" width="auto" height="75"></a>
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     alt="Get it on Google Play"
+     height="80">](https://play.google.com/store/apps/details?id=io.anuke.mindustry)
+
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80">](https://f-droid.org/packages/io.anuke.mindustry/)

android/build.gradle

@@ -50,8 +50,8 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.2'
-    compileSdkVersion 28
+    compileSdkVersion 29
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -70,27 +70,15 @@ android{
     }
 
     defaultConfig{
-        def vfile = file('../core/assets/version.properties')
+        Integer vcode = new Properties().with{p -> p.load(new FileInputStream(file('../core/assets/version.properties'))); return p }['androidBuildCode']?.toInteger() ?: 1
-
+        def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
-        def code = 0
-        def versionNameResult = "unknown"
-
-        if(vfile.exists()){
-            def props = new Properties()
-            props.load(new FileInputStream(vfile))
-
-            code = (props['androidBuildCode'] == null ? 0 : props['androidBuildCode']).toInteger() + 1
-
-            props['androidBuildCode'] = code.toString()
-            props.store(vfile.newWriter(), "Autogenerated file. Do not modify.")
-            versionNameResult = "$versionNumber-$versionType-${props['build'].replace(" ", "-")}"
-        }
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
-        versionCode code
+        
         versionName versionNameResult
+        versionCode vcode
     }
 
     compileOptions{

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -1,32 +1,28 @@
 package io.anuke.mindustry;
 
-import android.Manifest;
+import android.*;
-import android.content.Context;
+import android.content.*;
-import android.content.Intent;
+import android.content.pm.*;
-import android.content.pm.ActivityInfo;
+import android.net.*;
-import android.content.pm.PackageManager;
+import android.os.*;
-import android.net.Uri;
+import android.provider.Settings.*;
-import android.os.Build;
+import android.telephony.*;
-import android.os.Bundle;
+import io.anuke.arc.*;
-import android.provider.Settings.Secure;
+import io.anuke.arc.backends.android.surfaceview.*;
-import android.telephony.TelephonyManager;
+import io.anuke.arc.files.*;
-import io.anuke.arc.Core;
+import io.anuke.arc.function.*;
-import io.anuke.arc.backends.android.surfaceview.AndroidApplication;
+import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration;
+import io.anuke.arc.util.*;
-import io.anuke.arc.files.FileHandle;
+import io.anuke.arc.util.serialization.*;
-import io.anuke.arc.function.Consumer;
+import io.anuke.mindustry.game.Saves.*;
-import io.anuke.arc.function.Predicate;
+import io.anuke.mindustry.io.*;
-import io.anuke.arc.scene.ui.layout.UnitScl;
+import io.anuke.mindustry.net.Net;
-import io.anuke.arc.util.Strings;
-import io.anuke.arc.util.serialization.Base64Coder;
-import io.anuke.mindustry.core.Platform;
-import io.anuke.mindustry.game.Saves.SaveSlot;
-import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.ui.dialogs.FileChooser;
+import io.anuke.mindustry.ui.dialogs.*;
 
 import java.io.*;
-import java.util.ArrayList;
+import java.lang.System;
+import java.util.*;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -42,7 +38,14 @@ public class AndroidLauncher extends AndroidApplication{
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
         config.useImmersiveMode = true;
         config.depth = 0;
-        Platform.instance = new Platform(){
+        if(doubleScaleTablets && isTablet(this.getContext())){
+            UnitScl.dp.addition = 0.5f;
+        }
+
+        config.hideStatusBar = true;
+        Net.setClientProvider(new ArcNetClient());
+        Net.setServerProvider(new ArcNetServer());
+        initialize(new ClientLauncher(){
 
             @Override
             public void hide(){
@@ -122,16 +125,7 @@ public class AndroidLauncher extends AndroidApplication{
             public boolean canDonate(){
                 return true;
             }
-        };
+        }, config);
-
-        if(doubleScaleTablets && isTablet(this.getContext())){
-            UnitScl.dp.addition = 0.5f;
-        }
-
-        config.hideStatusBar = true;
-        Net.setClientProvider(new ArcNetClient());
-        Net.setServerProvider(new ArcNetServer());
-        initialize(new Mindustry(), config);
         checkFiles(getIntent());
     }
 

annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java

@@ -60,9 +60,12 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
 
     void process(String classname, String path, String rtype, String loadMethod) throws Exception{
         TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
-        MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        //MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
         MethodSpec.Builder dispose = MethodSpec.methodBuilder("dispose").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
 
+        MethodSpec.Builder loadBegin = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
+
         HashSet<String> names = new HashSet<>();
         Files.list(Paths.get(path)).forEach(p -> {
             String fname = p.getFileName().toString();
@@ -79,8 +82,16 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
                 name = name + "s";
             }
 
-            load.addStatement(name + " = io.anuke.arc.Core.audio."+loadMethod+"(io.anuke.arc.Core.files.internal(io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? $S : $S))",
+            String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname;
-                path.substring(path.lastIndexOf("/") + 1) + "/" + fname, (path.substring(path.lastIndexOf("/") + 1) + "/" + fname).replace(".ogg", ".mp3"));
+
+            //load.addStatement(name + " = io.anuke.arc.Core.audio."+loadMethod+"(io.anuke.arc.Core.files.internal(io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? $S : $S))",
+            //filepath, filepath.replace(".ogg", ".mp3"));
+
+            loadBegin.addStatement("io.anuke.arc.Core.assets.load(io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? $S : $S, "+rtype+".class, " +
+            "new io.anuke.arc.assets.loaders."+classname.substring(0, classname.length()-1)+"Loader."+classname.substring(0, classname.length()-1)+"Parameter((m, name, type) -> " + name + " = m.get(\"" + filepath + "\")))",
+            filepath, filepath.replace(".ogg", ".mp3"));
+
+
             dispose.addStatement(name + ".dispose()");
             dispose.addStatement(name + " = null");
             type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
@@ -91,7 +102,8 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
             type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
         }
 
-        type.addMethod(load.build());
+        //type.addMethod(load.build());
+        type.addMethod(loadBegin.build());
         type.addMethod(dispose.build());
         JavaFile.builder(packageName, type.build()).build().writeTo(Utils.filer);
     }

build.gradle

@@ -16,6 +16,8 @@ buildscript{
 
 allprojects{
     version = 'release'
+    apply plugin: 'maven'
+    group = 'com.github.Anuken'
 
     ext{
         versionNumber = '4'
@@ -119,6 +121,7 @@ allprojects{
                 props.load(new FileInputStream(pfile))
 
                 String buildid = getBuildVersion()
+                println("Compiling with build: '$buildid'")
 
                 props["type"] = versionType
                 props["number"] = versionNumber
@@ -199,6 +202,7 @@ project(":core"){
 
     task preGen{
         generateLocales()
+        writeVersion()
     }
 
     dependencies{

core/assets-raw/sprites/zones/pack.json

@@ -0,0 +1,8 @@
+{
+  duplicatePadding: true,
+  combineSubdirectories: true,
+  flattenPaths: true,
+  maxWidth: 2048,
+  maxHeight: 2048,
+  fast: true
+}

core/assets/bundles/bundle.properties

@@ -17,6 +17,12 @@ gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]New highscore!
 
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
+
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
 stat.built = Buildings Built:[accent] {0}
@@ -63,9 +69,11 @@ players.single = {0} player online
 server.closing = [accent]Closing server...
 server.kicked.kick = You have been kicked from the server!
 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.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.
@@ -156,6 +164,11 @@ cancel = Cancel
 openlink = Open Link
 copylink = Copy Link
 back = Back
+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
 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 = Are you sure you want to quit?
@@ -384,6 +397,7 @@ zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 
 settings.language = Language
+settings.data = Game Data
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
 settings.controls = Controls
@@ -518,6 +532,7 @@ setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.savecreate.name = Auto-Create Saves
 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...

core/assets/bundles/bundle_cs.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Map too large, potentially not enough memory for screenshot
 gameover = Konec hry
 gameover.pvp = [accent] {0}[] Tým Vyhrál!
 highscore = [accent]Nový Rekord!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
 stat.built = Buildings Built:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Buildings Destroyed:[accent] {0}
 stat.deconstructed = Buildings Deconstructed:[accent] {0}
 stat.delivered = Resources Launched:
 stat.rank = Final Rank: [accent]{0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
 launcheditems = [accent]Launched Items
 map.delete = Jsi si jistý že chceš smazat mapu "[accent]{0}[]"?
 level.highscore = Nejvyšší skóre: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} hráč online
 server.closing = [accent]Zavírám server...
 server.kicked.kick = Byl jsi vykopnut ze serveru!
 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.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é.
@@ -156,6 +161,11 @@ 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
 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 ?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Jazyk
+settings.data = Game Data
 settings.reset = nastavit výchozí
 settings.rebind = Přenastavit
 settings.controls = Ovládání
@@ -507,6 +518,7 @@ setting.mutemusic.name = Ztišit hudbu
 setting.sfxvol.name = SFX hlasitost
 setting.mutesound.name = Ztišit zvuky
 setting.crashreport.name = Poslat anonymní spis o zhroucení hry
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Stiskni osu nebo klávesu...
 keybind.screenshot.name = Sníměk mapy
 keybind.move_x.name = Pohyb na X
 keybind.move_y.name = Pohyb na Y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Vybrat/Střílet
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
@@ -790,6 +803,7 @@ block.blast-mixer.name = Výbušninový mixér
 block.solar-panel.name = Solární panel
 block.solar-panel-large.name = Velký solární panel
 block.oil-extractor.name = Ropný Extraktor
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Továrna na Spirit Drony
 block.phantom-factory.name = Továrna na Fantom Drony
@@ -1012,6 +1026,7 @@ block.ripple.description = Velká artilérní střílna, která vystřelí něko
 block.cyclone.description = Velká rychle pálící střílna.
 block.spectre.description = Velká střílna, která vystřelí dva mocné projektily naráz.
 block.meltdown.description = Velká střílna, která vystřelí mocný paprsek dalekého dosahu.
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produkuje lehké drony, kteří teží minerály a opravují budovy
 block.phantom-factory.description = Produkuje pokročilé drony kteří jsou podstatně efektivnější jak spirit droni.

core/assets/bundles/bundle_de.properties

@@ -2,12 +2,12 @@ credits.text = Entwickelt von [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\n\n[G
 credits = Danksagungen
 contributors = Übersetzer und Mitwirkende
 discord = Trete dem Mindustry Discord bei!
-link.discord.description = Der offizielle Mindustry Discord Chatroom
+link.discord.description = Der offizielle Mindustry Discord-Chatroom
 link.github.description = Quellcode des Spiels
 link.changelog.description = Liste der Änderungen
 link.dev-builds.description = Entwicklungs-Builds (instabil)
 link.trello.description = Offizielles Trello Board für geplante Features
-link.itch.io.description = itch.io Seite mit Downloads und der Web-Version des Spiels
+link.itch.io.description = itch.io-Seite mit Downloads und der Web-Version des Spiels
 link.google-play.description = Google Play Store Seite
 link.wiki.description = Offizelles Mindustry Wiki
 linkfail = Fehler beim Öffnen des Links!\nDie URL wurde in die Zwischenablage kopiert.
@@ -16,24 +16,27 @@ screenshot.invalid = Karte zu groß! Eventuell nicht ausreichend Arbeitsspeicher
 gameover = Der Kern wurde zerstört.
 gameover.pvp = Das[accent] {0}[] Team ist siegreich!
 highscore = [YELLOW] Neuer Highscore!
-stat.wave = Wellen Besiegt:[accent] {0}
+load.sound = Sounds
-stat.enemiesDestroyed = Gegner Zerstört:[accent] {0}
+load.map = Maps
-stat.built = Gebäude Gebaut:[accent] {0}
+load.image = Images
-stat.destroyed = Gebäude Zerstört:[accent] {0}
+load.content = Content
-stat.deconstructed = Gebäude Abgebaut:[accent] {0}
+load.system = System
+stat.wave = Wellen besiegt:[accent] {0}
+stat.enemiesDestroyed = Gegner zerstört:[accent] {0}
+stat.built = Gebäude gebaut:[accent] {0}
+stat.destroyed = Gebäude zerstört:[accent] {0}
+stat.deconstructed = Gebäude abgebaut:[accent] {0}
 stat.delivered = Übertragene Ressourcen:
 stat.rank = Finaler Rang: [accent]{0}
-placeline = Du hast einen Block ausgewählt.\nDu kannst[accent] davon eine Reihe bauen,[] indem du[accent] wenige Sekunden mit einem Finger drückst[] und ihn in eine Richtung ziehst.\nVersuche es.
-removearea = Du hast den Zerstörungsmodus ausgewählt.\nDu kannst[accent] Blöcke im Rechteck zerstören,[] indem du[accent] wenige Sekunden mit einem Finger drückst[] und ihn ziehst.\nVersuche es.
 launcheditems = [accent]Übertragene Items
 map.delete = Bist du sicher, dass du die Karte "[accent]{0}[]" löschen möchtest?
 level.highscore = Highscore: [accent]{0}
-level.select = Level Auswahl
+level.select = Level-Auswahl
 level.mode = Spielmodus:
-showagain = Nächstes mal nicht mehr anzeigen
+showagain = Nächstes Mal nicht mehr anzeigen
 coreattack = < Die Basis wird angegriffen! >
-nearpoint = [[ [scarlet]SOFORT DEN DROP POINT VERLASSEN[] ]\nVernichtung droht
+nearpoint = [[ [scarlet]SOFORT DEN DROPPOINT VERLASSEN[] ]\nVernichtung droht
-database = Core Database
+database = Kern-Datenbank
 savegame = Spiel speichern
 loadgame = Spiel laden
 joingame = Spiel beitreten
@@ -60,29 +63,31 @@ research = Erforschen
 researched = [LIGHT_GRAY]{0} erforscht.
 players = {0} Spieler online
 players.single = {0} Spieler online
-server.closing = [accent]Schließe den Server...
+server.closing = [accent]Schließe den Server ...
 server.kicked.kick = Du wurdest vom Server gekickt!
 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.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.
 server.kicked.idInUse = Du bist bereits auf dem Server! Anmeldungen mit zwei Accounts sind nicht gestattet.
 server.kicked.customClient = Der Server akzeptiert keine Custom Builds von Mindustry. Lade dir die offizielle Version herunter.
 server.kicked.gameover = Game Over!
-server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
+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.
+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.
+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
 hostserver.mobile = Host\nSpiel
 host = Host
-hosting = [accent] Server wird geöffnet...
+hosting = [accent] Server wird geöffnet ...
 hosts.refresh = Aktualisieren
 hosts.discovering = Suche nach LAN-Spielen
 server.refreshing = Server wird aktualisiert
-hosts.none = [lightgray] Keine LAN Spiele gefunden!
+hosts.none = [lightgray] Keine LAN-Spiele gefunden!
 host.invalid = [scarlet] Kann keine Verbindung zum Host herstellen.
 trace = Spieler verfolgen
 trace.playername = Spielername: [accent]{0}
@@ -90,7 +95,7 @@ trace.ip = IP: [accent]{0}
 trace.id = Eindeutige ID: [accent]{0}
 trace.mobile = Mobiler Client: [accent]{0}
 trace.modclient = Gemoddeter Client: [accent]{0}
-invalidid = Ungültige Client ID! Berichte den Bug.
+invalidid = Ungültige Client-ID! Berichte den Bug.
 server.bans = Bans
 server.bans.none = Keine gebannten Spieler gefunden!
 server.admins = Admins
@@ -156,6 +161,11 @@ cancel = Abbruch
 openlink = Link öffnen
 copylink = Kopiere Link
 back = Zurück
+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
 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 = Willst du wirklich aufhören?
@@ -320,7 +330,7 @@ zone.requirement = Welle {0} in Zone {1}
 resume = Zu Zone zurückkehren:\n[LIGHT_GRAY]{0}
 bestwave = [LIGHT_GRAY]Beste Welle: {0}
 launch = Abschluss
-launch.title = Abschluss Erfolgreich
+launch.title = Abschluss erfolgreich
 launch.next = [LIGHT_GRAY]Nächste Möglichkeit bei Welle {0}
 launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = Dies wird alle Ressourcen in deinen Kern übertragen.\nDu kannst nicht wieder zu dieser Karte zurückkehren.
@@ -344,7 +354,7 @@ error.timedout = Zeitüberschreitung!\nStelle sicher, dass die Portweiterleitung
 error.mismatch = Paketfehler:\nClient und Server passen möglicherweise nicht zusammen.\nStelle sicher, dass du und der Host jeweils die neueste Version von Mindustry haben!
 error.alreadyconnected = Bereits verbunden.
 error.mapnotfound = Kartendatei nicht gefunden!
-error.io = Netzwerk I/O Fehler.
+error.io = Netzwerk-Ein-/Ausgabe-Fehler.
 error.any = Unbekannter Netzwerkfehler.
 error.bloom = Bloom konnte nicht initialisiert werden.\nEs kann sein, dass dein Gerät es nicht unterstützt.
 zone.groundZero.name = Ground Zero
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <Beschreibung hier einfügen>
 zone.crags.description = <Beschreibung hier einfügen>
 settings.language = Sprache
+settings.data = Game Data
 settings.reset = Auf Standard zurücksetzen
 settings.rebind = Zuweisen
 settings.controls = Steuerung
@@ -393,7 +404,7 @@ no = Nein
 info.title = [accent]Info
 error.title = [crimson] Ein Fehler ist aufgetreten
 error.crashtitle = Ein Fehler ist aufgetreten!
-attackpvponly = [scarlet]Nur in Angriff oder PvP Modus verfügbar.
+attackpvponly = [scarlet]Nur in Angriff oder PvP-Modus verfügbar.
 blocks.input = Input
 blocks.output = Output
 blocks.booster = Verstärkung
@@ -507,6 +518,7 @@ setting.mutemusic.name = Musik stummschalten
 setting.sfxvol.name = Audioeffekt-Lautstärke
 setting.mutesound.name = Audioeffekte stummschalten
 setting.crashreport.name = Anonyme Absturzberichte senden
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Drücke eine Taste oder bewege eine Achse...
 keybind.screenshot.name = Karten Screenshot
 keybind.move_x.name = X-Achse
 keybind.move_y.name = Y-Achse
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Auswählen/Schießen
 keybind.diagonal_placement.name = Diagonal platzieren
 keybind.pick.name = Block Auswählen
@@ -646,28 +659,28 @@ mech.buildspeed = [LIGHT_GRAY]Baugeschwindigkeit: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Wärmekapazität: {0}
 liquid.viscosity = [LIGHT_GRAY]Viskosität: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatur: {0}
-block.sand-boulder.name = Sand Brocken
+block.sand-boulder.name = Sandbrocken
 block.grass.name = Gras
 block.salt.name = Salz
-block.saltrocks.name = Salz Gestein
+block.saltrocks.name = Salzgestein
 block.pebbles.name = Geröll
 block.tendrils.name = Ranken
 block.sandrocks.name = Sandstein
-block.spore-pine.name = Sporen Kiefer
+block.spore-pine.name = Kiefernsporen
-block.sporerocks.name = Sporen Gestein
+block.sporerocks.name = Gesteinssporen
 block.rock.name = Gestein
-block.snowrock.name = Schnee Gestein
+block.snowrock.name = Schnee-Gestein
-block.snow-pine.name = Schnee Kiefer
+block.snow-pine.name = Schnee-Kiefer
 block.shale.name = Schiefer
-block.shale-boulder.name = Schiefer Geröll
+block.shale-boulder.name = Schiefergeröll
 block.moss.name = Moos
 block.shrubs.name = Gestrüpp
-block.spore-moss.name = Sporen Moos
+block.spore-moss.name = Moossporen
-block.shalerocks.name = Schiefer Gestein
+block.shalerocks.name = Schiefer-Gestein
-block.scrap-wall.name = Schrott Mauer
+block.scrap-wall.name = Schrottmauer
-block.scrap-wall-large.name = Große Schrott Mauer
+block.scrap-wall-large.name = Große Schrottmauer
-block.scrap-wall-huge.name = Riesige Schrott Mauer
+block.scrap-wall-huge.name = Riesige Schrottmauer
-block.scrap-wall-gigantic.name = Gigantische Schrott Mauer
+block.scrap-wall-gigantic.name = Gigantische Schrottmauer
 block.thruster.name = Schubdüse
 block.kiln.name = Brennofen
 block.graphite-press.name = Graphit-Presse
@@ -689,23 +702,23 @@ block.ice.name = Eis
 block.snow.name = Schnee
 block.craters.name = Krater
 block.sand-water.name = Sandiges Wasser
-block.darksand-water.name = Dunkles Sandiges Wasser
+block.darksand-water.name = Dunkles sandiges Wasser
 block.char.name = Holzkohle
-block.holostone.name = Holo Stein
+block.holostone.name = Holo-Stein
 block.ice-snow.name = Eisschnee
 block.rocks.name = Felsen
-block.icerocks.name = Eis Felsen
+block.icerocks.name = Eis-Felsen
-block.snowrocks.name = Schnee Felsen
+block.snowrocks.name = Schnee-Felsen
-block.dunerocks.name = Dünen Felsen
+block.dunerocks.name = Dünen-Felsen
 block.pine.name = Kiefer
-block.white-tree-dead.name = Weißer Toter Baum
+block.white-tree-dead.name = Weißer toter Baum
 block.white-tree.name = Weißer Baum
-block.spore-cluster.name = Sporen Cluster
+block.spore-cluster.name = Sporen-Cluster
 block.metal-floor.name = Metallboden
 block.metal-floor-2.name = Metallboden 2
 block.metal-floor-3.name = Metallboden 3
 block.metal-floor-5.name = Metallboden 5
-block.metal-floor-damaged.name = Metallboden Beschädigt
+block.metal-floor-damaged.name = beschädigter Metallboden
 block.dark-panel-1.name = Dunkles Panel 1
 block.dark-panel-2.name = Dunkles Panel 2
 block.dark-panel-3.name = Dunkles Panel 3
@@ -713,9 +726,9 @@ block.dark-panel-4.name = Dunkles Panel 4
 block.dark-panel-5.name = Dunkles Panel 5
 block.dark-panel-6.name = Dunkles Panel 6
 block.dark-metal.name = Dunkles Metall
-block.ignarock.name = Igna Felsen
+block.ignarock.name = Igna-Felsen
 block.hotrock.name = Heißer Felsen
-block.magmarock.name = Magma Felsen
+block.magmarock.name = Magma-Felsen
 block.cliffs.name = Klippen
 block.copper-wall.name = Kupfermauer
 block.copper-wall-large.name = Große Kupfermauer
@@ -725,8 +738,8 @@ block.phase-wall.name = Phasenmauer
 block.phase-wall-large.name = Große Phasenmauer
 block.thorium-wall.name = Thorium-Mauer
 block.thorium-wall-large.name = Große Thorium-Mauer
-block.door.name = Tür
+block.door.name = Tor
-block.door-large.name = Große Tür
+block.door-large.name = Großes Tor
 block.duo.name = Duo
 block.scorch.name = Flammenwerfer
 block.scatter.name = Scatter
@@ -745,12 +758,12 @@ block.pulverizer.name = Pulverisierer
 block.cryofluidmixer.name = Kryoflüssigkeitsmixer
 block.melter.name = Schmelzer
 block.incinerator.name = Verbrennungsanlage
-block.spore-press.name = Sporen Presse
+block.spore-press.name = Sporenpresse
 block.separator.name = Separator
-block.coal-centrifuge.name = Kohlen Zentrifuge
+block.coal-centrifuge.name = Kohlenzentrifuge
 block.power-node.name = Stromknoten
 block.power-node-large.name = Großer Stromknoten
-block.surge-tower.name = Schwall Turm
+block.surge-tower.name = Schwall-Turm
 block.battery.name = Batterie
 block.battery-large.name = Große Batterie
 block.combustion-generator.name = Verbrennungsgenerator
@@ -762,13 +775,13 @@ block.pneumatic-drill.name = Pneumatischer Bohrer
 block.laser-drill.name = Laser-Bohrer
 block.water-extractor.name = Wasser-Extraktor
 block.cultivator.name = Kultivierer
-block.dart-mech-pad.name = Dart Mech Pad
+block.dart-mech-pad.name = Dart Mech-Pad
-block.delta-mech-pad.name = Delta Mech Pad
+block.delta-mech-pad.name = Delta Mech-Pad
-block.javelin-ship-pad.name = Javelin Luftschiff Pad
+block.javelin-ship-pad.name = Javelin Luftschiff-Pad
-block.trident-ship-pad.name = Trident Luftschiff Pad
+block.trident-ship-pad.name = Trident Luftschiff-Pad
-block.glaive-ship-pad.name = Glaive Luftschiff Pad
+block.glaive-ship-pad.name = Glaive Luftschiff-Pad
-block.omega-mech-pad.name = Omega Mech Pad
+block.omega-mech-pad.name = Omega Mech-Pad
-block.tau-mech-pad.name = Tau Mech Pad
+block.tau-mech-pad.name = Tau Mech-Pad
 block.conduit.name = Leitungsrohr
 block.mechanical-pump.name = Mechanische Pumpe
 block.item-source.name = Materialquelle
@@ -787,10 +800,11 @@ block.bridge-conveyor.name = Brücken-Transportband
 block.plastanium-compressor.name = Plastanium-Verdichter
 block.pyratite-mixer.name = Pyratit-Mixer
 block.blast-mixer.name = Sprengmixer
-block.solar-panel.name = Solar Panel
+block.solar-panel.name = Solarpanel
-block.solar-panel-large.name = Großes Solar Panel
+block.solar-panel-large.name = Großes Solarpanel
-block.oil-extractor.name = Öl Extraktor
+block.oil-extractor.name = Öl-Extraktor
-block.draug-factory.name = Draug Miner Drone Factory
+block.command-center.name = Command Center
+block.draug-factory.name = Draug Miner-Drohnenfactory
 block.spirit-factory.name = Spirit-Drohnenfabrik
 block.phantom-factory.name = Phantom-Drohnenfabrik
 block.wraith-factory.name = Wraith Fighter-Fabrik
@@ -814,8 +828,8 @@ block.blast-drill.name = Sprengbohrer
 block.thermal-pump.name = Thermische Pumpe
 block.thermal-generator.name = Thermischer Generator
 block.alloy-smelter.name = Legierungsschmelze
-block.mender.name = Heiler
+block.mender.name = Reparateur
-block.mend-projector.name = Heilprojektor
+block.mend-projector.name = Reparaturprojektor
 block.surge-wall.name = Spannungsstoß-Mauer
 block.surge-wall-large.name = Große Spannungsstoß-Mauer
 block.cyclone.name = Zyklon
@@ -824,12 +838,12 @@ block.shock-mine.name = Schock-Mine
 block.overdrive-projector.name = Beschleunigungs-Projektor
 block.force-projector.name = Kraftfeld-Projektor
 block.arc.name = Arcus
-block.rtg-generator.name = RTG Generator
+block.rtg-generator.name = RTG-Generator
 block.spectre.name = Phantom
 block.meltdown.name = Meltdown
 block.container.name = Container
-block.launch-pad.name = Launch Pad
+block.launch-pad.name = Launchpad
-block.launch-pad-large.name = Großes Launch Pad
+block.launch-pad-large.name = Großes Launchpad
 team.blue.name = Blau
 team.crux.name = red
 team.sharded.name = orange
@@ -837,14 +851,14 @@ team.orange.name = Orange
 team.derelict.name = derelict
 team.green.name = Grün
 team.purple.name = Lila
-unit.spirit.name = Spirit Drohne
+unit.spirit.name = Spirit-Drohne
-unit.draug.name = Draug Miner Drone
+unit.draug.name = Draug Miner-Drone
-unit.phantom.name = Phantom Drohne
+unit.phantom.name = Phantom-Drohne
 unit.dagger.name = Dagger
 unit.crawler.name = Crawler
 unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
+unit.ghoul.name = Ghoul-Bomber
-unit.wraith.name = Wraith Fighter
+unit.wraith.name = Wraith-Fighter
 unit.fortress.name = Fortress
 unit.revenant.name = Revenant
 unit.eruptor.name = Eruptor
@@ -874,10 +888,10 @@ tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core fo
 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.
 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 super harte Glasmischung. Wird zur Verteilung und Lagerung von Flüssigkeiten benutzt.
+item.metaglass.description = Eine extrem harte Glasmischung. Wird zur Verteilung und Lagerung von Flüssigkeiten benutzt.
 item.graphite.description = Mineralisierter Kohlenstoff Wird für Munition und elektrische Isolierung verwendet.
 item.sand.description = Ein gängiges Material, welches häufig in geschmolzener Form, flüssig oder als Legierung verwendet wird.
-item.coal.description = Ein sehr häufiger vorkommender Kraftstoff.
+item.coal.description = Ein sehr häufig vorkommender Kraftstoff.
 item.titanium.description = Ein seltenes, sehr leichtes Metall. Häufig in Flüssigkeits-Transport-Blöcken, Abbauanlagen und Luftschiffen verwendet.
 item.thorium.description = Ein dichtes radioaktives Metall, welches als strukturelle Unterstützung und nuklearer Kraftstoff verwendet wird.
 item.scrap.description = Überreste alter Gebäude und Einheiten. Enthalten Spuren verschiedener Metalle.
@@ -1012,6 +1026,7 @@ block.ripple.description = Ein großer Artillerie-Geschützturm, der mehrere Sch
 block.cyclone.description = Ein großer Schnellfeuer-Geschützturm.
 block.spectre.description = Ein großer Geschützturm, der zwei starke Schüsse gleichzeitig abfeuert.
 block.meltdown.description = Ein großer Geschützturm, der starke Strahlen mit großer Reichweite abfeuert.
+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.draug-factory.description = Produziert Draug-Mining-Drohnen.
 block.spirit-factory.description = Produziert leichte Drohnen, die Erz abbauen und Blöcke reparieren können.
 block.phantom-factory.description = Produziert erweiterte Drohnen, die deutlich effizienter sind als Spirit-Drohnen.

core/assets/bundles/bundle_et.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Maailm liiga suur, tõenäoliselt pole piisavalt mälu salv
 gameover = Mäng Läbi
 gameover.pvp = [accent] {0}[] tiim võitis!
 highscore = [accent]Uus rekord!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Raund:[accent] {0}
 stat.enemiesDestroyed = Vaenlasi hävitatud:[accent] {0}
 stat.built = Ehitisi ehitatud:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Ehitisi hävitatud:[accent] {0}
 stat.deconstructed = Ehitisi lahtivõetud:[accent] {0}
 stat.delivered = Materjale kaasa võetud:
 stat.rank = Lõplik Hinne: [accent]{0}
-placeline = Sa valisid ehitise\nSa saad[accent] panna neid sirges reas[] hoides näpuga all ja, siis viibates mõnes suunas.\n\n[scarlet] TEE SEDA
-removearea = Sa valisid hävitamise funktsiooni.\nsa saad[accent] hävitada[]hoides oma sõrme all mõne sekundi ja, siis viibates mõnele poole.\n\n[scarlet]TEE SEDA
 launcheditems = [accent]Kaasa võetud materjalid
 map.delete = Kas oled kindel, et soovid kustutada "[accent]{0}[]".
 level.highscore = Rekord: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} mängija mängus
 server.closing = [accent]Serveri sulgemine...
 server.kicked.kick = Sind visati serverist välja!
 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.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.
@@ -156,6 +161,11 @@ cancel = Tühista
 openlink = Ava Link
 copylink = Kopeeri Link
 back = Tagasi
+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
 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 = Oled kindel, et soovid lahkuda?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Keel
+settings.data = Game Data
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
 settings.controls = Controls
@@ -507,6 +518,7 @@ setting.mutemusic.name = Vaigista muusika
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
@@ -790,6 +803,7 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Drone Factory
 block.phantom-factory.name = Phantom Drone Factory
@@ -1012,6 +1026,7 @@ block.ripple.description = A large artillery turret which fires several shots si
 block.cyclone.description = A large rapid fire turret.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
 block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.

core/assets/bundles/bundle_fr_BE.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Carte trop grande, potentiellement pas assez de mémoire po
 gameover = Le base a été détruite.
 gameover.pvp = L'équipe[accent] {0}[] a gagnée !
 highscore = [accent]Nouveau meilleur score !
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Vagues vaincues:[accent] {0}
 stat.enemiesDestroyed = Ennemies détruits:[accent] {0}
 stat.built = Bâtiments construits:[accent] {0}
@@ -23,8 +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 = FRang Final: [accent]{0}
-placeline = Tu as sélectionné un bloc.\nTu peux les[accent] placer en rangée[] en[accent] maintenant ton doigt sur l'écran pendant quelque secondes[] et en le glissant vers n'importe qu'elle direction.\nEssaye!
-removearea = Tu as sélectionné le mode de suppression.\nTu peux[accent] supprimer les blocs en rectangle[] en[accent] maintenant ton doigt sur l'écran pendant quelques secondes[] et en le glissant.\nEssaye!
 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}
@@ -63,16 +66,18 @@ players.single = {0} joueur en ligne
 server.closing = [accent]Fermeture du serveur ...
 server.kicked.kick = Vous avez été expulsé du serveur !
 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.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.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
+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
@@ -156,6 +161,11 @@ cancel = Annuler
 openlink = Ouvrir le lien
 copylink = Copier le lien
 back = Retour
+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
 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 = Êtes-vous sûr de vouloir quitter?
@@ -346,7 +356,7 @@ error.alreadyconnected = Déjà connecté.
 error.mapnotfound = Fichier de carte introuvable !
 error.io = Network I/O error.
 error.any = Erreur réseau inconnue.
-error.bloom = Échec d'initialisation de la floraison.\nVotre appareil peut ne pas le supporter.
+error.bloom = Échec d'initialisation du flou lumineux.\nVotre appareil peut ne pas le supporter.
 zone.groundZero.name = Première Bataille
 zone.desertWastes.name = Déchets du désert
 zone.craters.name = Les Cratères
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insérer la description ici>
 zone.crags.description = <insérer la description ici>
 settings.language = Langage
+settings.data = Game Data
 settings.reset = Valeur par défaut.
 settings.rebind = Réatttribuer
 settings.controls = Contrôles
@@ -507,11 +518,12 @@ setting.mutemusic.name = Couper la musique
 setting.sfxvol.name = Volume des SFX
 setting.mutesound.name = Couper les SFX
 setting.crashreport.name = Envoyer des rapports d'incident anonymement.
+setting.savecreate.name = Auto-Create Saves
 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...
 uiscale.cancel = Annuler et quitter
-setting.bloom.name = Floraison
+setting.bloom.name = Flou lumineux
 keybind.title = Paramétrer les touches
 keybinds.mobile = [scarlet]La plupart des raccourcis clavier ne sont pas fonctionnelles sur les appareils mobiles. Seul le mouvement de base est pris en charge.
 category.general.name = Général
@@ -527,6 +539,7 @@ keybind.press.axis = Appuyez sur un axe ou une touche...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Mouvement X
 keybind.move_y.name = Mouvement Y
+keybind.fullscreen.name = Basculer en plein écran
 keybind.select.name = Sélectionner/Tirer
 keybind.diagonal_placement.name = Placement en diagonal
 keybind.pick.name = Choisir un bloc
@@ -562,7 +575,7 @@ mode.custom = Règles personnalisées
 rules.infiniteresources = Ressources infinies
 rules.wavetimer = Temps de vague
 rules.waves = Vague
-rules.attack = Attack Mode
+rules.attack = Mode attaque
 rules.enemyCheat = Ressources infinies pour l'IA
 rules.unitdrops = Uniter Drops
 rules.unitbuildspeedmultiplier = Multiplicateur de vitesse de création d'unités
@@ -675,7 +688,7 @@ block.multi-press.name = Multi-Presse
 block.constructing = {0}\n[LIGHT_GRAY](En construction)
 block.spawn.name = Générateur d'ennemi
 block.core-shard.name = Core: Shard
-block.core-foundation.name = Core: Foundation
+block.core-foundation.name = Core: Fondation
 block.core-nucleus.name = Core: Nucleus
 block.deepwater.name = Eau profonde
 block.water.name = Eau
@@ -790,6 +803,7 @@ block.blast-mixer.name = Mixeur à explosion
 block.solar-panel.name = Panneau solaire
 block.solar-panel-large.name = Grand panneau solaire
 block.oil-extractor.name = Extracteur de pétrol
+block.command-center.name = Centre de commandement
 block.draug-factory.name = Usine de "Drones draug miner"
 block.spirit-factory.name = Usine de "Drones spirituels"
 block.phantom-factory.name = Usine de "Drones fantômes"
@@ -852,26 +866,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.next = [lightgray]<Appuyez pour continuer>
-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.intro = Vous êtes entré dans le[scarlet] Tutoriel de Mindustry.[]\nCommencez par[accent] miner du cuivre[]. Appuyez ou cliquez sur une veine de minerai de cuivre près de votre base pour commencer à miner.\n\n[accent]{0}/{1} cuivre
 tutorial.drill = Le minage manuel est inefficace.\n[accent]Des foreuses[]peuvent miner automatiquement.\nPlacez-en une sur un filon de cuivre.
-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.drill.mobile = Le minage manuel est inefficace.\n[accent]Des foreuses[]peuvent miner automatiquement.\nAppuyez sur l'onglet de forage en bas à droite.\nSélectionnez la[accent] perceuse mécanique[].\nPlacez-la sur une veine de cuivre, puis appuyez sur la[accent] coche(V)[] ci-dessous pour confirmer votre sélection.\nAppuyez sur le [accent] bouton X[]pour annuler le 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.blockinfo = Chaque bloc a des statistiques différentes. Chaque foreuse ne peut extraire que certains minerais.\nPour vérifier les informations et les statistiques d'un bloc,[accent] tapez sur le "?" tout en le sélectionnant dans le menu de compilation.[]\n\n[accent]Accédez aux statistiques de la foreuse mécanique maintenant.[]
-tutorial.conveyor = [accent]Les Tapis roulants[] sont utilisés pour transporter des objets jusqu'à la base.\nFaites une ligne de tapis roulants de la foreuse à la base .
+tutorial.conveyor = [accent]Les tapis roulants[] sont utilisés pour transporter des objets jusqu'à la base.\nFaites une ligne de tapis roulants de la foreuse à la base.
-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.conveyor.mobile = [accent]Les tapis roulants[] sont utilisés pour transporter des objets jusqu'à la base.\nFaites une ligne de tapis roulants de la foreuse à la base.\n[accent]Placez en ligne en maintenant votre doigt enfoncé pendant quelques secondes[] et glisser dans une direction.\n\n[accent]{0}/{1} convoyeurs placés en ligne\n[accent]0/1 articles livrés
 tutorial.turret = Des constructions défensives doivent être construites pour repousser [LIGHT_GRAY]les ennemis[].Construisez une tourelle "duo" près de votre base.
 tutorial.drillturret = Les tourelles "Duo" ont besoin de [accent]munitions en cuivre[] pour tirer.\nPlacez une foreuse à côté de la tourelle pour l'approvisionner avec du cuivre.
-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 = Pendant le combat, vous pouvez[accent] mettre le jeu en pause.[]\nVous pouvez construire des bâtiments pendant que le jeu est en pause.\n\n[accent]Appuyez sur espace pour mettre le jeu en 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.pause.mobile = Pendant le combat, vous pouvez[accent] mettre le jeu en pause.[]\nVous pouvez construire des bâtiments pendant que le jeu est en pause.\n\n[accent]Appuyez sur le bouton en haut à gauche pour mettre le jeu en pause.
-tutorial.unpause = Now press space again to unpause.
+tutorial.unpause = Appuyez de nouveau sur espace pour reprendre le cour du jeu
-tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.unpause.mobile = Appuyez de nouveau sur cette touche pour reprendre le cour du jeu
-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 = Les blocs doivent souvent être détruits.\n[accent]Maintenez le bouton droit de la souris enfoncé.[] pour détruire tous les blocs sélectionnés.[]\n\n[accent]Détruisez tous les blocs de ferraille à gauche de votre base à l'aide de la sélection de zone.
-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.breaking.mobile = Les blocs doivent souvent être détruits.\n[accent]Sélectionnez le mode de déconstruction[], puis appuyez sur un bloc pour commencer à le casser.\nDétruisez une zone en maintenant votre doigt enfoncé pendant quelques secondes[] et glisser dans une direction.\nAppuyez sur la coche(V) pour confirmer.\n\n[accent]Détruisez tous les blocs de ferraille à gauche de votre base à l'aide de la sélection de zone.
-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.withdraw = Dans certaines situations, il est nécessaire de prendre des articles directement des blocs..\nPour faire ça, [accent]tapez sur un bloc[] avec des articles à l'intérieur, alors [accent]appuyez sur l'élément[] dans l'inventaire.\nPlusieurs éléments peuvent être retirés en [accent]tapotant et en maintenant enfoncée la touche[].\n\n[accent]Retirez un peu de cuivre de votre base.[]
-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.deposit = Déposez les éléments dans des blocs en les faisant glisser de votre vaisseau vers un module de stockage.\n\n[accent]Déposez votre cuivre dans la base.[]
-tutorial.waves = Les [LIGHT_GRAY]ennemies[] approchent.\n\nDéfendez votre base pour 2 vagues. Construisez plus de tourelles.
+tutorial.waves = Les [LIGHT_GRAY]ennemies[] approchent.\n\nDéfendez votre base durant 2 vagues.\nConstruisez plus de tourelles et de foreuses. Minez plus de cuivre.
-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.waves.mobile = [lightgray]Les ennemies approchent[].\n\nDéfendez votre base durant 2 vagues. Votre vaisseau tirera automatiquement sur les ennemis.\nConstruisez plus de tourelles et de foreuses. Minez plus de cuivre.
-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 = Une fois que vous atteignez une vague spécifique, vous êtes en mesure de[accent] lancer votre base[], laissant vos défenses derrière vous et[accent] en obtenant toutes les ressources de votre base.[]\nCes ressources peuvent ensuite servir à la recherche de nouvelles technologies.\n\n[accent]Appuyez sur le bouton de lancement.
 item.copper.description = Un matériau de construction utile. Utilisé intensivement dans tout les blocs.
 item.lead.description = Un matériau de départ. Utilisé intensivement en électronique et pour le transport de blocs.
 item.metaglass.description = Un composé de verre très résistant. Utilisation intensive pour la distribution et le stockage de liquides.
@@ -907,7 +921,7 @@ unit.dagger.description = Une unité terrestre de base. Utile en essaims.
 unit.crawler.description = Unité au sol composée d’un cadre dépouillé sur lequel sont fixés des explosifs puissants. Pas particulièrement durable. Explose au contact des ennemis.
 unit.titan.description = Une unité terrestre cuirassée avancée. Utilise de l'alliage lourd pour munition. Attaque les unités aérinnes comme terrestres.
 unit.fortress.description = Une unité terrestre d'artillerie lourde.
-unit.eruptor.description = Un mech lourd conçu pour abattre des structures. Tire un flot de scories sur les fortifications ennemies, les fait fondre et met le feu aux volatiles.
+unit.eruptor.description = Un mech lourd conçu pour abattre des structures. Tire un flot de scories sur les fortifications ennemies, les fait fondre et met en feu les volatiles.
 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.
@@ -1012,6 +1026,7 @@ block.ripple.description = Une grande tourelle d'artillerie qui tire plusieurs c
 block.cyclone.description = Une grande tourelle à tir rapide.
 block.spectre.description = Une grande tourelle qui tire deux balles puissantes à la fois.
 block.meltdown.description = Une grande tourelle qui tire de puissants faisceaux à longue portée.
+block.command-center.description = Donne des ordres aux unités alliées sur la carte.\nPermet aux unités de patrouiller, d’attaquer un noyau ennemi ou de se retirer dans le noyau/l’usine. En l'absence de base ennemi, les unités patrouillent par défaut autour du centre de commandement.
 block.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produit des drones légers qui extraient du minerai et réparent des blocs.
 block.phantom-factory.description = Produit des drones avancés qui sont bien plus efficaces que les drones spirituels.

core/assets/bundles/bundle_in_ID.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Peta terlalu besar, tidak cukp memori untuk menangkap layar
 gameover = Permainan Habis
 gameover.pvp = Tim[accent] {0}[] menang!
 highscore = [accent]Rekor Baru!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Gelombang Terkalahkan:[accent] {0}
 stat.enemiesDestroyed = Musuh Terhancurkan:[accent] {0}
 stat.built = Jumlah Blok yang Dibangun:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Jumlah Blok Dihancurkan Musuh:[accent] {0}
 stat.deconstructed = Jumlah Blok Dihancurkan Pemain:[accent] {0}
 stat.delivered = Sumber Daya yang Diluncurkan:
 stat.rank = Nilai Akhir: [accent]{0}
-placeline = Anda telah memilih sebuah blok.\nAnda bisa[accent] menaruhnya berjejeran[] dengan[accent] menekan layar beberapa saat[] dan menarik jarimu ke arah yang dituju.\n\n[scarlet]Cobalah.
-removearea = Anda telah memilih mode penghancuran.\nAnda bisa[accent] menghancurkan blok dalam sebuah kotak[] dengan[accent] menekan layar beberapa saat[] dan menarik jarimu sampai membentuk sebuah area.\n\n[scarlet]Cobalah.
 launcheditems = [accent]Sumber Daya 
 map.delete = Apakah Anda yakin ingin menghapus peta "[accent]{0}[]"?
 level.highscore = Nilai Tertinggi: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} pemain aktif
 server.closing = [accent]Menutup server...
 server.kicked.kick = Anda telah dikeluarkan dari server!
 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.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.
@@ -156,6 +161,11 @@ cancel = Batal
 openlink = Buka Tautan
 copylink = Salin Tautan
 back = Kembali
+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
 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 = Apakah Anda yakin ingin keluar?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Bahasa
+settings.data = Game Data
 settings.reset = Atur ulang ke Default (standar)
 settings.rebind = Rebind
 settings.controls = Kontrol
@@ -507,6 +518,7 @@ setting.mutemusic.name = Diamkan Musik
 setting.sfxvol.name = Volume SFX 
 setting.mutesound.name = Diamkan Suara
 setting.crashreport.name = Laporkan Masalah
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Tekan sumbu atau kunci...
 keybind.screenshot.name = Tangkapan Layar Peta
 keybind.move_x.name = Pindah x
 keybind.move_y.name = Pindah y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Pilih/Tembak
 keybind.diagonal_placement.name = Penaruhan Diagonal
 keybind.pick.name = Memilih Blok
@@ -790,6 +803,7 @@ block.blast-mixer.name = Mixer Peledak
 block.solar-panel.name = Panel Surya
 block.solar-panel-large.name = Panel Surya Besar
 block.oil-extractor.name = Pegekstrak Oli
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Pabrik Drone Spirit
 block.phantom-factory.name = Pabrik Drone Phantom
@@ -1012,6 +1026,7 @@ block.ripple.description = Menara meriam besar yang menembak beberapa peluru sek
 block.cyclone.description = Menara Penembak Beruntun Besar.
 block.spectre.description = Menara besar yang menembak dua peluru kuat sekaligus.
 block.meltdown.description = Menara besar ini menembak sinar panjang yang kuat.
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Memproduksi drone ringan yang menambang sumber daya dan memulih blok.
 block.phantom-factory.description = Memproduksi drone canggih yang lebih efektif dibandingkan drone spirit.

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}
@@ -63,9 +66,11 @@ players.single = {0} giocatori online
 server.closing = [accent]Chiusura server ...
 server.kicked.kick = Sei stato cacciato dal server!
 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.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.
@@ -156,6 +161,11 @@ cancel = Annulla
 openlink = Apri Link
 copylink = Copia link
 back = Indietro
+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
 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 = Sei sicuro di voler uscire?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Lingua
+settings.data = Game Data
 settings.reset = Resetta Alle Impostazioni Predefinite
 settings.rebind = Reimposta
 settings.controls = Controlli
@@ -507,6 +518,7 @@ setting.mutemusic.name = Silenzia musica
 setting.sfxvol.name = Volume SFX
 setting.mutesound.name = Togli suoni
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 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 = Diagonal Placement
 keybind.pick.name = Pick Block
@@ -790,6 +803,7 @@ block.blast-mixer.name = Mixer poleri
 block.solar-panel.name = Pannello solare
 block.solar-panel-large.name = Pannrllo solare 3x3
 block.oil-extractor.name = Estrattore petrolio
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Drone Factory
 block.phantom-factory.name = Phantom Drone Factory
@@ -1012,6 +1026,7 @@ block.ripple.description = A large artillery turret which fires several shots si
 block.cyclone.description = A large rapid fire turret.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
 block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.

core/assets/bundles/bundle_ja.properties

@@ -16,6 +16,11 @@ screenshot.invalid = マップが広すぎます。スクリーンショット
 gameover = ゲームオーバー
 gameover.pvp = [accent] {0}[] チームの勝利!
 highscore = [accent]ハイスコアを記録!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = 防衛したウェーブ:[accent] {0}
 stat.enemiesDestroyed = 敵による破壊数:[accent] {0}
 stat.built = 建設した建造物数:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = 破壊した建造物数:[accent] {0}
 stat.deconstructed = 解体した建造物数:[accent] {0}
 stat.delivered = 獲得した資源:
 stat.rank = 最終ランク: [accent]{0}
-placeline = ブロックを選択しました。\n[accent]少し長押し[]して、好きな方向にドラッグすると[accent]一直線上にブロックを設置[]することができます。\nやってみよう。
-removearea = 撤去モードが選択されました。\n[accent]少し長押し[]して、ドラッグすると[accent]範囲内のブロックを撤去[]することができます。\nやってみよう。
 launcheditems = [accent]回収したアイテム
 map.delete = マップ "[accent]{0}[]" を削除してもよろしいですか?
 level.highscore = ハイスコア: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} 人がオンライン
 server.closing = [accent]サーバーを閉じています...
 server.kicked.kick = サーバからキックされました!
 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.recentKick = 直前にキックされています。\nもう一度接続できるまでお待ちください。
 server.kicked.nameInUse = このサーバーでは、\nすでに同じ名前が使用されています。
 server.kicked.nameEmpty = 無効な名前です。
@@ -156,6 +161,11 @@ cancel = キャンセル
 openlink = リンクを開く
 copylink = リンクをコピー
 back = 戻る
+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
 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 = 終了してもよろしいですか?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = 言語
+settings.data = Game Data
 settings.reset = デフォルトにリセット
 settings.rebind = 再設定
 settings.controls = コントロール
@@ -507,6 +518,7 @@ setting.mutemusic.name = 音楽をミュート
 setting.sfxvol.name = 効果音 音量
 setting.mutesound.name = 効果音をミュート
 setting.crashreport.name = 匿名でクラッシュレポートを送信する
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = 軸またはキーを押してください...
 keybind.screenshot.name = スクリーンショット
 keybind.move_x.name = 左右移動
 keybind.move_y.name = 上下移動
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = 選択/ショット
 keybind.diagonal_placement.name = 斜め設置
 keybind.pick.name = ブロックの選択
@@ -790,6 +803,7 @@ block.blast-mixer.name = 化合物ミキサー
 block.solar-panel.name = ソーラーパネル
 block.solar-panel-large.name = 大型ソーラーパネル
 block.oil-extractor.name = 石油抽出機
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = スピリットドローン製造機
 block.phantom-factory.name = ファントムドローン製造機
@@ -1012,6 +1026,7 @@ block.ripple.description = 同時に複数ショットを発射する大型タ
 block.cyclone.description = 大型の連射型ターレットです。
 block.spectre.description = 一度に2発の強力な弾を放つ大型のターレットです。
 block.meltdown.description = 強力な長距離攻撃が可能な大型のターレットです。
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = 鉱石の採掘やブロックの修復を行う小型のドローンユニットのスピリットを製造します。
 block.phantom-factory.description = スピリットドローンの性能を遥かに凌ぐ上位のドローンユニットのファントムドローンを製造します。

core/assets/bundles/bundle_ko.properties

@@ -16,6 +16,11 @@ screenshot.invalid = 맵이 너무 커서 스크린샷을 찍을 메모리가
 gameover = 게임 오버
 gameover.pvp = [accent]{0}[] 팀이 승리했습니다!
 highscore = [accent]최고점수 달성!
+load.sound = 소리
+load.map = 맵
+load.image = 사진
+load.content = Content
+load.system = 시스템
 stat.wave = 웨이브 성공:[accent]{0}
 stat.enemiesDestroyed = 파괴한 적 수:[accent]{0}
 stat.built = 건설한 건물 수:[accent]{0}
@@ -23,10 +28,8 @@ stat.destroyed = 파괴된 건물 수:[accent]{0}
 stat.deconstructed = 파괴한 건물 수:[accent]{0}
 stat.delivered = 획득한 자원:
 stat.rank = 최종 기록: [accent]{0}
-placeline = 블록을 선택하셨습니다.\n][accent]몇초간 설치 시작지점을 누르고[] 원하는 방향을 향해 드래그 하면 [accent]일렬로[] 설치할 수 있습니다.\n한번 해 보세요.
-removearea = 블록 제거모드를 선택하셨습니다.\n[accent]몇초간 제거 시작지점을 누르고[] 원하는 구역 끝을 향해 드래그 하면 [accent]직사각형[] 안에 있는 모든 건물을 제거할 수 있습니다.\n한번 해 보세요.
 launcheditems = [accent]창고
-map.delete = 정말로 "[accent]{0}[]" 맵을 삭제하시겠습니까?\n
+map.delete = 정말로 "[accent]{0}[]" 맵을 삭제하시겠습니까?
 level.highscore = 최고 점수: [accent]{0}
 level.select = 맵 선택
 level.mode = 게임 모드 :
@@ -63,18 +66,20 @@ players.single = 현재 {0}명만 있음.
 server.closing = [accent]서버 닫는중...
 server.kicked.kick = 서버에서 추방되었습니다!
 server.kicked.serverClose = 서버 종료됨.
+server.kicked.vote = 당신은 투표로 추방되었습니다. 그러니 좀 적당히 하지 그랬어요?
 server.kicked.clientOutdated = 오래된 버전의 게임입니다! 게임을 업데이트 하세요!
 server.kicked.serverOutdated = 오래된 버전의 서버입니다! 서버 호스트 관리자에게 문의하세요!
 server.kicked.banned = 서버 규칙 위반으로 인해, 이제 당신은 영원히 이 서버를 플레이 하실 수 없습니다.
+server.kicked.typeMismatch = This server is not compatible with your build type.
 server.kicked.recentKick = 방금 추방처리 되었습니다.\n잠시 기다린 후에 접속 해 주세요.
 server.kicked.nameInUse = 이 닉네임이 이미 서버에서 사용중입니다.
-server.kicked.nameEmpty = 닉네임에는 반드시 알파벳 또는 숫자가 있어야 합니다.
+server.kicked.nameEmpty = 당신의 닉네임이 비어있습니다.
 server.kicked.idInUse = 이미 서버에 접속중입니다! 다중 계정은 허용되지 않습니다.
 server.kicked.customClient = 이 서버는 직접 빌드한 버전을 지원하지 않습니다. 공식 버전을 사용하세요.
 server.kicked.gameover = 코어가 파괴되었습니다...
 server.versions = 클라이언트 버전 : [accent] {0}[]\n서버 버전 : [accent] {1}[]
 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서버 주소 입력방법은 < 주소:포트 >의 형식입니다.
+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 = 서버 열기
 hostserver.mobile = 서버\n열기
 host = 서버 열기
@@ -156,6 +161,11 @@ cancel = 취소
 openlink = 링크 열기
 copylink = 링크 복사
 back = 뒤로가기
+data.export = 데이터 내보내기
+data.import = 데이터 불러오기
+data.exported = 데이터를 내보냈습니다.
+data.invalid = 유효한 게임 데이터가 아닙니다.
+data.import.confirm = 외부 게임 데이터를 불러옵니다...\n[accent]이 작업시 현재 게임 데이터는 삭제되고, 외부의 게임 데이터를 불러오니 주의하세요. 실행 취소가 불가능하며, 작업 후 게임이 바로 꺼집니다.
 classic.export = 클래식 데이터 추출
 classic.export.text = Mindustry 클래식 (v3.5 build 40)의 세이브파일 또는 맵 데이터가 발견되었습니다. 이 것들을 Mindustry 클래식 앱에서 사용하기 위해 홈 폴더로 추출할까요?
 quit.confirm = 정말로 종료하시겠습니까?
@@ -177,7 +187,7 @@ builtin = 기본맵
 map.delete.confirm = 이 맵을 삭제하시겠습니까? 이 명령은 취소할 수 없습니다!
 map.random = [accent]랜덤 맵
 map.nospawn = 이 맵에 플레이어가 생성될 코어가 없습니다! 맵 편집기에서 [ROYAL]노랑색 팀[]코어를 맵에 추가하세요.
-map.nospawn.pvp = 이 맵에는 적팀 코어가 없습니다! 에디터에서 [ROYAL]파란색 팀이 아닌[] 코어를 추가하세요.
+map.nospawn.pvp = 이 맵에는 적팀 코어가 없습니다! 에디터에서 [ROYAL]노랑색 팀이 아닌[] 코어를 추가하세요.
 map.nospawn.attack = 이 맵에는 플레이어가 공격할 수 있는 적의 코어가 없습니다! 에디터에서 [ROYAL] 빨강색 팀[] 코어를 맵에 추가하세요.
 map.invalid = 파일이 잘못되었거나 손상되어 맵을 열 수 없습니다.
 editor.brush = 브러쉬
@@ -206,7 +216,7 @@ waves.copy = 클립보드로 복사
 waves.load = 클립보드에서 불러오기
 waves.invalid = 클립보드의 잘못된 웨이브 데이터
 waves.copied = 웨이브 복사됨
-waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+waves.none = 적 웨이브가 설정되지 않았습니다.\n비어있을 시 자동으로 기본 적 웨이브로 설정됩니다.
 editor.default = [LIGHT_GRAY]<기본값>
 edit = 편집
 editor.name = 이름:
@@ -376,6 +386,7 @@ zone.fungalPass.description = 고산지대과 포자지대 사이의 지역입
 zone.impact0078.description = [ROYAL]죄송합니다. 아직 설명이 준비되지 않았습니다.
 zone.crags.description = [ROYAL]죄송합니다. 아직 설명이 준비되지 않았습니다.
 settings.language = 언어
+settings.data = 게임 데이터
 settings.reset = 설정 초기화
 settings.rebind = 키 재설정
 settings.controls = 조작
@@ -507,11 +518,12 @@ setting.mutemusic.name = 음소거
 setting.sfxvol.name = 효과음 크기
 setting.mutesound.name = 소리 끄기
 setting.crashreport.name = 오류 보고서 보내기
+setting.savecreate.name = 자동 저장 활성화
 setting.chatopacity.name = 채팅 투명도
 setting.playerchat.name = 인게임 채팅 표시
 uiscale.reset = UI 스케일이 변경되었습니다.\n"확인"버튼을 눌러 스케일을 확인하세요.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
-uiscale.cancel = Cancel & Exit
+uiscale.cancel = 취소 & 나가기
-setting.bloom.name = Bloom
+setting.bloom.name = 발광 효과
 keybind.title = 조작키 설정
 keybinds.mobile = [scarlet]여기 대부분의 키들은 모바일에서 작동하지 않습니다. 기본적인 것들만 지원됩니다.
 category.general.name = 일반
@@ -527,6 +539,7 @@ keybind.press.axis = 축 또는 키를 누르세요.
 keybind.screenshot.name = 맵 스크린샷
 keybind.move_x.name = 오른쪽/왼쪽 이동
 keybind.move_y.name = 위 / 아래 중간
+keybind.fullscreen.name = 전체 화면
 keybind.select.name = 선택
 keybind.diagonal_placement.name = 대각선 설치
 keybind.pick.name = 블록 선택
@@ -790,6 +803,7 @@ block.blast-mixer.name = 폭발물 혼합기
 block.solar-panel.name = 태양 전지판
 block.solar-panel-large.name = 대형 태양 전지판
 block.oil-extractor.name = 석유 추출기
+block.command-center.name = 유닛 명령 
 block.draug-factory.name = 광부 드론 공장
 block.spirit-factory.name = 수리 드론 공장
 block.phantom-factory.name = 건설 드론 공장
@@ -883,7 +897,7 @@ item.thorium.description = 건물의 재료, 터렛의 탄약 또는 핵연료
 item.scrap.description = 오래된 건물과 유닛의 남은 잔해. 미량의 다양한 금속들이 포함되어 있습니다.
 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연료로도 사용할 수 있지만, 별로 추천하지는 않습니다.
@@ -897,7 +911,7 @@ 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처음에는 느리지만, 가속도가 붙어 엄청난 속도로 미사일 피해를 입힐 수 있으며, 전격 능력을 사용할 수 있습니다.
+mech.javelin-ship.description = 치고 빠지는 공격을 위한 비행선.\n처음에는 느리지만, 가속도가 붙어 엄청난 속도로 미사일 피해를 입힐 수 있으며, 전격 능력을 사용할 수 있습니다.\n\n[royal]보호막을 제거하기에 가장 좋습니다.
 mech.trident-ship.description = 대형 공중 폭격능력과 빠른 건설능력을 가진 폭격기.\n당연하게도 엄청 단단합니다.
 mech.glaive-ship.description = 크고 잘 무장된 총을 가진 비행선.\n방화용 리피터가 장착되어 있으며, 가속도와 최대속도가 높습니다.
 unit.draug.description = 가장 기본적인 채굴 드론입니다 저렴하게 생산 가능하며 자동으로 구리와 납을 캐내 가까운 코어에 저장합니다.
@@ -976,27 +990,27 @@ block.battery.description = 전력 생산량에 여유가 있을경우, 생산
 block.battery-large.description = 일반 배터리보다 훨씬 많은 량의 전력을 저장합니다.\n\n[ROYAL]임시 전력을 만들어서 냉각기에 전기가 부족해 원자로 폭발이 일어나는 것을 막아보는 것은 어떨까요? 
 block.combustion-generator.description = 인화성 물질을 태워 소량의 전력을 생산합니다.
 block.thermal-generator.description = 건설가능한 열이 있는 타일 위에 건설하면 전력을 생산합니다.\n\n[ROYAL]용암 웅덩이 혹은 열기지대에서 무한정 열을 발산합니다.
-block.turbine-generator.description = 화력 발전기보다 효율적이지만, 액체가 추가적으로 필요합니다.\n\n[ROYAL]3*2<7.8
+block.turbine-generator.description = 화력 발전기보다 효율적이지만, 액체가 추가적으로 필요합니다.\n\n[ROYAL]일반 타일에서 물추출기 1개로 2개가 가동가능합니다.
 block.differential-generator.description = 냉각수와 파이라타이트의 온도 차를 이용해 안정적으로 원자로에 버금가는 양의 전기를 생산합니다. 
 block.rtg-generator.description = 방사성동위원소 열전기 발전기\n토륨또는 현상 구조체를 사용하며, 냉각이 필요없는 발전을 하지만 토륨 원자로에 비해 발전량이 매우 적습니다.
-block.solar-panel.description = 태양광으로 극소량의 전기을 생산합니다.\n\n[royal]??? : [][yellow]PRAISE THE SUN [T]/
+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.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]물추출기 하나면 충분합니다.
 block.water-extractor.description = 땅에서 물을 추출합니다. 근처에 호수가 없을 때 사용하세요.\n\n[ROYAL]물추출기의 효율이 달라지는 타일이 있습니다.
 block.cultivator.description = 소량의 포자를 산업용으로 사용가능한 포자로 배양하는 건물입니다.
-block.oil-extractor.description = 대량의 전력과 물을 사용하여 모래에서 기름을 추출합니다. 근처에 직접적인 석유 공급원이 없을때 사용하세요.\n\n[royal]모래 또는 고철을 이용하여 
+block.oil-extractor.description = 대량의 전력과 물을 사용하여 모래에서 기름을 추출합니다. 근처에 직접적인 석유 공급원이 없을때 사용하세요.\n\n[royal]모래 또는 고철을 이용하여 창조경제가 가능합니다.
 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.container.description = 각종 소량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 컨테이너에서 자원을 회수할 수 있습니다.\n\n[royal]또는 컨테이너를 클릭하고 자원을 눌러 자원을 강탈해갈수도 있습니다.
 block.unloader.description = 컨테이너, 창고 또는 코어에서 인접한 블록으로 자원을 출하합니다. 출하시킬 자원의 종류는 언로더를 눌러 지정할 수 있습니다.
-block.launch-pad.description = 출격할 필요 없이 자원을 수송시킵시다.\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납이나 고철 덩어리를 적에게 쏩니다.
@@ -1004,7 +1018,7 @@ block.scorch.description = 소형 포탑입니다.\n지상의 적을 매우 강
 block.hail.description = 소형 포탑입니다.\n장거리로 포탄을 발사합니다.
 block.wave.description = 중형 포탑입니다. 대상에게 포탑에 공급된 액체를 발사합니다. 물또는 냉각수가 공급되면 자동으로 불을 끕니다.
 block.lancer.description = 중형 포탑입니다.\n적을 레이저로 관통합니다.
-block.arc.description = 소형 포탑입니다.\n적을 전기로 지집니다.\n\n[royal]63 : JSA!!\n88 : 이젠..아니야...
+block.arc.description = 소형 포탑입니다.\n적을 전기로 지집니다.
 block.swarmer.description = 중형 포탑입니다.\n지상과 공중 적 모두를 공격하는 유도 미사일 포탑입니다.
 block.salvo.description = 중형 포탑입니다.\n3연발 탄환을 발사합니다.
 block.fuse.description = 대형 포탑입니다.\n강력한 단거리 빔을 쏩니다.
@@ -1012,6 +1026,7 @@ 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.draug-factory.description = 구리와 납을 캐는 채광 드론을 생산합니다.\n\n[ROYAL]이 드론은 영혼을 가지고 있습니다.
 block.spirit-factory.description = 블록을 수리하는 수리 드론을 생산합니다.\n\n[ROYAL]드론에도 정령이 있다죠.
 block.phantom-factory.description = 건설을 도와주는 빌더 드론을 생산합니다.\n\n[ROYAL]당신의 환영입니다.
@@ -1019,7 +1034,7 @@ block.wraith-factory.description = 빠른 뺑소니 요격기 유닛을 생산
 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.crawler-factory.description = 자폭하는 지상 유닛을 생산합니다.\n\n[ROYAL]가까이 가기만 해도 죽는 섬세한 친구랍니다.
 block.titan-factory.description = 화염방사기를 장착한 지상유닛를 생산합니다.\n\n[ROYAL]최강이 될 수도, 최약이 될 수도 있습니다.
 block.fortress-factory.description = 중대포 지상유닛를 생산합니다.
 block.repair-point.description = 주변에서 가장 가까운 손상된 유닛을 지속적으로 치료합니다.\n\n[ROYAL]이 것으로 플래이어는 지속적인 교전이 가능해집니다.

core/assets/bundles/bundle_nl.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Map too large, potentially not enough memory for screenshot
 gameover = Game Over
 gameover.pvp = het[accent] {0}[] team heeft gewonnen!
 highscore = [accent]Nieuw topscore!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Waves Verslagen:[accent] {0}
 stat.enemiesDestroyed = Vijanden Vernietigd:[accent] {0}
 stat.built = Gebouwen Gebouwd:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Gebouwen Vernietigd:[accent] {0}
 stat.deconstructed = Gebouwen Gesloopt:[accent] {0}
 stat.delivered = Middelen Gelanceerd:
 stat.rank = Eindrang: [accent]{0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
 launcheditems = [accent]Launched Items
 map.delete = Weet je zeker dat je de map wilt verwijderen? "[accent]{0}[]"?
 level.highscore = Topscore: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} player online
 server.closing = [accent]Closing server...
 server.kicked.kick = You have been kicked from the server!
 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.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.
@@ -156,6 +161,11 @@ cancel = Cancel
 openlink = Open Link
 copylink = Copy Link
 back = Back
+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
 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 = Are you sure you want to quit?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Language
+settings.data = Game Data
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
 settings.controls = Controls
@@ -507,6 +518,7 @@ setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
@@ -790,6 +803,7 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Drone Factory
 block.phantom-factory.name = Phantom Drone Factory
@@ -1012,6 +1026,7 @@ block.ripple.description = A large artillery turret which fires several shots si
 block.cyclone.description = A large rapid fire turret.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
 block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.

core/assets/bundles/bundle_nl_BE.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Kaart te groot, mogelijks te weinig geheugen voor een scree
 gameover = Game Over
 gameover.pvp = Het[accent] {0}[] team heeft gewonnen!
 highscore = [accent]Nieuw record!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Je overleefde tot aanvalsgolf: [accent]{0}[].
 stat.enemiesDestroyed = Vijanden vernietigd:[accent] {0}
 stat.built = Gebouwen gebouwd:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Gebouwen vernietigd:[accent] {0}
 stat.deconstructed = Gebouwen afgebroken:[accent] {0}
 stat.delivered = Gronstoffen meegenomen:
 stat.rank = Eindresultaat: [accent]{0}
-placeline = Je hebt een blok geselecteerd.\nJe kan[accent] in een lijn plaatsen[] door[accent] je vinger voor enkele seconden ingedrukt te houden[] en in een richting te slepen.\n\n[scarlet]DOE HET.
-removearea = Je hebt verwijderingsmodus geselecteerd.\nJe kan[accent] blokken verwijderen in een rechthoek[] door[accent] je vinger voor enkele seconden ingedrukt te houden[] en te slepen.\n\n[scarlet]DOE HET.
 launcheditems = [accent]Meegenomen grondstoffen
 map.delete = Ben je zeker dat je de kaart "[accent]{0}[]" wilt verwijderen?
 level.highscore = Beste score: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} speler online
 server.closing = [accent]Server wordt gesloten...
 server.kicked.kick = Je bent uit de server gegooid!
 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.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.
@@ -156,6 +161,11 @@ cancel = Annuleer
 openlink = Open Link
 copylink = Kopiëer Link
 back = Terug
+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
 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 = Weet je zeker dat je wilt stoppen?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Language
+settings.data = Game Data
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
 settings.controls = Controls
@@ -507,6 +518,7 @@ setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
@@ -790,6 +803,7 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Drone Factory
 block.phantom-factory.name = Phantom Drone Factory
@@ -1012,6 +1026,7 @@ block.ripple.description = A large artillery turret which fires several shots si
 block.cyclone.description = A large rapid fire turret.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
 block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.

core/assets/bundles/bundle_pl.properties

@@ -16,6 +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 = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Fale powstrzymane:[accent] {0}
 stat.enemiesDestroyed = Przeciwnicy zniszczeni:[accent] {0}
 stat.built = Budynki zbudowane:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Budynki zniszczone:[accent] {0}
 stat.deconstructed = Budynki zrekonstruowane:[accent] {0}
 stat.delivered = Surowce wystrzelone:
 stat.rank = Ocena: [accent]{0}
-placeline = Wybrałeś blok.\nMożesz umieścić[accent] w linii,[] [accent]przytrzymując palec przez kilka sekund[] i przeciągając.\nSpróbuj.
-removearea = Wybrałeś tryb usuwania.\nMożesz[accent] usunąć bloki w prostokoncie,[] [accent]przytrzymując palec przez kilka sekund i przeciągając[] and dragging.\nTry it.
 launcheditems = [accent]Wystrzelone przedmioty
 map.delete = Jesteś pewny, że chcesz usunąć "[accent]{0}[]"?
 level.highscore = Rekord: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} gracz online
 server.closing = [accent] Zamykanie serwera...
 server.kicked.kick = Zostałeś wyrzucony z serwera!
 server.kicked.serverClose = Serwer został zamknięty.
+server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Nieaktualna gra! Zaktualizują ją!
 server.kicked.serverOutdated = Nieaktualny serwer! Poproś hosta o jego aktualizację.
 server.kicked.banned = Zostałeś zbanowany na tym serwerze.
+server.kicked.typeMismatch = This server is not compatible with your build type.
 server.kicked.recentKick = Zostałeś niedawno wyrzucony.\nPoczekaj chwilę przed ponownym połączniem.
 server.kicked.nameInUse = Ta nazwa jest już zajęta na tym serwerze.
 server.kicked.nameEmpty = Wybrana przez Ciebie nazwa jest nieprawidłowa.
@@ -156,6 +161,11 @@ cancel = Anuluj
 openlink = Otwórz link
 copylink = Kopiuj link
 back = Wróć
+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
 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 = Czy na pewno chcesz wyjść?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Język
+settings.data = Game Data
 settings.reset = Przywróć domyślne
 settings.rebind = Zmień
 settings.controls = Sterowanie
@@ -507,6 +518,7 @@ setting.mutemusic.name = Wycisz muzykę
 setting.sfxvol.name = Głośność dźwięków
 setting.mutesound.name = Wycisz dźwięki
 setting.crashreport.name = Wysyłaj anonimowo dane o crashu gry
+setting.savecreate.name = Auto-Create Saves
 setting.chatopacity.name = Przezroczystość czatu
 setting.playerchat.name = Wyświetlaj czat w grze
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -527,6 +539,7 @@ keybind.press.axis = Naciśnij oś lub klawisz...
 keybind.screenshot.name = Zrzut ekranu mapy
 keybind.move_x.name = Poruszanie w poziomie
 keybind.move_y.name = Poruszanie w pionie
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Zaznacz
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Wybierz Blok
@@ -595,12 +608,12 @@ item.lead.name = Ołów
 item.coal.name = Węgiel
 item.graphite.name = Grafit
 item.titanium.name = Tytan
-item.thorium.name = Uran
+item.thorium.name = Tor
 item.silicon.name = Krzem
 item.plastanium.name = Plastan
 item.phase-fabric.name = Włókno Fazowe
-item.surge-alloy.name = Energon
+item.surge-alloy.name = Elektrum
-item.spore-pod.name = Kapsułka Zarodników
+item.spore-pod.name = Zarodnia
 item.sand.name = Piasek
 item.blast-compound.name = Wybuchowy związek
 item.pyratite.name = Piratian
@@ -745,7 +758,7 @@ block.pulverizer.name = Rozkruszacz
 block.cryofluidmixer.name = Mieszacz Lodocieczy
 block.melter.name = Przetapiacz
 block.incinerator.name = Spalacz
-block.spore-press.name = Spore Press
+block.spore-press.name = Prasa Zarodni
 block.separator.name = Rozdzielacz
 block.coal-centrifuge.name = Coal Centrifuge
 block.power-node.name = Węzeł Prądu
@@ -776,7 +789,7 @@ block.item-void.name = Próżnia przedmiotów
 block.liquid-source.name = Źródło płynów
 block.power-void.name = Próżnia prądu
 block.power-source.name = Nieskończony Prąd
-block.unloader.name = Wyciągacz
+block.unloader.name = Ekstraktor
 block.vault.name = Magazyn
 block.wave.name = Wave
 block.swarmer.name = Działo Rojowe
@@ -790,6 +803,7 @@ block.blast-mixer.name = Wybuchowy Mieszacz
 block.solar-panel.name = Panel Słoneczny
 block.solar-panel-large.name = Duży Panel Słoneczny
 block.oil-extractor.name = Ekstraktor Ropy
+block.command-center.name = Centrum Dowodzenia
 block.draug-factory.name = Fabryka Dronów Draug
 block.spirit-factory.name = Fabryka Dronów Duch
 block.phantom-factory.name = Fabryka Dronów Widmo
@@ -816,8 +830,8 @@ block.thermal-generator.name = Generator Termalny
 block.alloy-smelter.name = Piec Mieszający
 block.mender.name = Naprawiacz
 block.mend-projector.name = Projektor Napraw
-block.surge-wall.name = Ściana Energonu
+block.surge-wall.name = Ściana Elektronu
-block.surge-wall-large.name = Duża Ściana Energonu
+block.surge-wall-large.name = Duża Ściana Elektronu
 block.cyclone.name = Cyklon
 block.fuse.name = Lont
 block.shock-mine.name = Mina
@@ -828,8 +842,8 @@ block.rtg-generator.name = Generator RTG
 block.spectre.name = Huragan
 block.meltdown.name = Rozpad
 block.container.name = Kontener
-block.launch-pad.name = Skocznia
+block.launch-pad.name = Wyrzutnia
-block.launch-pad-large.name = Duża skocznia
+block.launch-pad-large.name = Duża Wyrzutnia
 team.blue.name = niebieski
 team.crux.name = czerwony
 team.sharded.name = pomarańczowy
@@ -898,33 +912,33 @@ mech.tau-mech.description = Mech pomocny. Naprawia budynki drużyny, strzelając
 mech.omega-mech.description = Duży i silny mech, zaprojektowany na ataki. Jego zdolność pozwala mu na zablokowanie do 90% obrażeń.
 mech.dart-ship.description = Standardowy statek. Lekki i szybki, ale jest kiepski jak chodzi o walkę i kopanie.
 mech.javelin-ship.description = Statek do ataku i szybkiej ucieczki. Zaczyna powoli, ale przyspiesza do wielkiej prędkości. Przy tej prędkości, może przelecieć koło wrogiej bazy i atakować piorunami czy rakietami. 
-mech.trident-ship.description = Ciężki bombowiec. Dobrze uzbrojony.
+mech.trident-ship.description = Ciężki bombowiec, zbudowany do budowy i niszczenia fortyfikacji wroga. Dość dobrze opancerzony.
-mech.glaive-ship.description = Duży, uzbrojony statek. Dobra prędkość i przyspieszenie. Ma ognisty karabin.
+mech.glaive-ship.description = Duży, uzbrojony statek. Dobra prędkość i przyspieszenie. Wyposażony w karabin zapalający. 
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
+unit.draug.description = Prymitywny dron górniczy. Tani w produkcji. Przeznaczony na stracenie. Automatycznie wydobywa miedź i ołów w pobliżu. Dostarcza wydobyte zasoby do najbliższego rdzenia.
-unit.spirit.description = Początkowy dron. Rdzeń zawsze tworzy jeden. Wydobywa surowce, naprawia budynki oraz pomaga przy budowie.
+unit.spirit.description = Zmodyfikowany dron draug, zaprojektowany do naprawy zamiast do wydobywania. Automatycznie naprawia wszelkie uszkodzone bloki w obszarze.
-unit.phantom.description = Zaawansowany dron. Wydobywa surowce, naprawia budynki oraz pomaga przy budowie szybciej niż dron Duch.
+unit.phantom.description = Zaawansowana jednostka dronów. Podąża za użytkownikiem. Pomaga w budowie bloków.
 unit.dagger.description = Podstawowy mech lądowy. Sam jest słaby, lecz przydatny w dużych ilościach.
 unit.crawler.description = Jednostka naziemna składająca się z rozebranej ramy z przypiętymi na górze materiałami wybuchowymi. Niezbyt trwały. Wybucha przy kontakcie z wrogami. Chodzi na czterech nogach jak pies.
-unit.titan.description = Bardziej zaawansowany mech lądowy. Atakuje cele lądowe i powietrzne.
+unit.titan.description = Zaawansowana, opancerzona jednostka naziemna. Atakuje zarówno cele naziemne, jak i powietrzne. Wyposażony w dwa miniaturowe miotacze ognia typu Płomień.
-unit.fortress.description = Wielka jednostka artyleryjna lądowa.
+unit.fortress.description = Ciężki mech artyleryjski. Wyposażony w dwa zmodyfikowane działa typu gradowego do ataku na dalekie odległości na konstrukcje i jednostki wroga.
 unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = Szybka jednostka, stosuje taktyke uderz-uciekaj.
+unit.wraith.description = Szybka jednostka, stosuje taktyke uderz-uciekaj Namierza jakiekolwiek źródło prądu.
-unit.ghoul.description = Ciężki bombowiec.
+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.graphite-press.description = Kompresuje kawałki węgla w czyste blaszki grafitu.
 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 piasek za pomocą wysoce czystego węgla w celu wytworzenia krzemu.
 block.kiln.description = Stapia ołów i piasek na metaszkło. Wymaga małej ilości energii.
 block.plastanium-compressor.description = Wytwarza plastan z oleju i tytanu.
-block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand.
+block.phase-weaver.description = Produkuje Włókna Fazowe z radioaktywnego toru i dużych ilości piasku.
-block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
+block.alloy-smelter.description = Produkuje stop Elektrum z tytanu, ołowiu, krzemu i miedzi.
-block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
+block.cryofluidmixer.description = Łączy wodę i tytan w lodociecz, który jest znacznie bardziej wydajny w chłodzeniu niż woda.
-block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound.
+block.blast-mixer.description = Kruszy i miesza skupiska zarodników z piratytem, tworząc związek wybuchowy.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Przetapia złom na żużel do dalszego przetwarzania lub użycia w wieżyczkach
 block.separator.description = Oddziel użyteczne materiały z mieszaniny jaką jest żużel.
 block.spore-press.description = Kompresuje kapsułki zarodników w olej.
-block.pulverizer.description = Mieli złom w drobny piaske. Przydatne, gdy brakuje naturalnego piasku.
+block.pulverizer.description = Mieli złom w drobny piasek. Przydatne, gdy brakuje naturalnego piasku.
 block.coal-centrifuge.description = Zestala olej w kawałki węgla.
 block.incinerator.description = Pozbywa się nadmiaru przedmiotów lub płynu
 block.power-void.description = Niszczy całą energię wprowadzoną do tego bloku. Dostępny tylko w trybie sandbox.
@@ -1012,6 +1026,7 @@ block.ripple.description = Duża wieża artyleryjska, która strzela jednocześn
 block.cyclone.description = Duża szybkostrzelna wieża.
 block.spectre.description = Duża wieża, która strzela dwoma potężnymi pociskami jednocześnie.
 block.meltdown.description = Duża wieża, która strzela potężnymi wiązkami dalekiego zasięgu.
+block.command-center.description = Wydaje polecenia ruchu sojuszniczym jednostkom na całej mapie.\nPowoduje patrolowanie jednostek, atakowanie wrogiego rdzenia lub wycofanie się do rdzenia / fabryki. Gdy nie ma rdzenia wroga, jednostki będą domyślnie patrolować pod dowództwem ataku.
 block.draug-factory.description = Produkuje drony wydobywcze Draug.
 block.spirit-factory.description = Produkuje lekkie drony, które naprawiają bloki.
 block.phantom-factory.description = Produkuje zaawansowane drony które pomgają przy budowie.

core/assets/bundles/bundle_pt_BR.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Mapa grande demais, Potencialmente sem memoria suficiente p
 gameover = O núcleo foi destruído.
 gameover.pvp = O time[accent] {0}[] É vitorioso!
 highscore = [YELLOW]Novo recorde!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Hordas derrotadas:[accent] {0}
 stat.enemiesDestroyed = Enimigos Destruídos:[accent] {0}
 stat.built = Construções construídas:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Construções destruídas:[accent] {0}
 stat.deconstructed = Construções desconstruídas:[accent] {0}
 stat.delivered = Recursos lançados:
 stat.rank = Rank Final: [accent]{0}
-placeline = Você selecionou um bloco.\nVocê pode[accent] colocar uma linha[] por[accent] carregar o seu dedo por alguns segundos[] e arrastar em uma direção.\nTente.
-removearea = Você selecionou o modo de remoção.\nVocê pode[accent] remover blocos dentro de um retângulo[] por[accent] carregar o seu dedo por alguns segundos[] e arrastar.\nTente.
 launcheditems = [accent]Itens lançados
 map.delete = Certeza que quer deletar o mapa "[accent]{0}[]"?
 level.highscore = Melhor\npontuação: [accent] {0}
@@ -63,9 +66,11 @@ players.single = {0} Jogador Ativo
 server.closing = [accent]Fechando servidor...
 server.kicked.kick = Voce foi expulso do servidor!
 server.kicked.serverClose = Servidor Fechado.
+server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Cliente desatualizado! Atualize seu jogo!
 server.kicked.serverOutdated = Servidor desatualiado! Peca ao dono para atualizar!
 server.kicked.banned = Voce foi banido do servidor.
+server.kicked.typeMismatch = This server is not compatible with your build type.
 server.kicked.recentKick = Voce foi banido recentemente.\nEspere para conectar de novo.
 server.kicked.nameInUse = Este nome ja esta sendo usado\nneste servidor.
 server.kicked.nameEmpty = Voce deve ter pelo menos uma letra ou numero.
@@ -156,6 +161,11 @@ cancel = Cancelar
 openlink = Abrir Link
 copylink = Copiar link
 back = Voltar
+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
 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 = Você tem certeza que quer sair?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Linguagem
+settings.data = Game Data
 settings.reset = Restaurar Padrões
 settings.rebind = Religar
 settings.controls = Controles
@@ -507,6 +518,7 @@ setting.mutemusic.name = Desligar Música
 setting.sfxvol.name = Volume de Efeitos
 setting.mutesound.name = Desligar Som
 setting.crashreport.name = Enviar denuncias de crash anonimas
+setting.savecreate.name = Auto-Create Saves
 setting.chatopacity.name = Opacidade do chat
 setting.playerchat.name = Mostrar chat em-jogo
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -527,6 +539,7 @@ keybind.press.axis = Pressione uma Axis ou tecla...
 keybind.screenshot.name = Captura do mapa
 keybind.move_x.name = mover_x
 keybind.move_y.name = mover_y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = selecionar
 keybind.diagonal_placement.name = Colocação diagonal
 keybind.pick.name = Pegar bloco
@@ -790,6 +803,7 @@ block.blast-mixer.name = Misturador de Explosão
 block.solar-panel.name = Painel Solar
 block.solar-panel-large.name = Painel Solar Grande
 block.oil-extractor.name = Extrator de Óleo
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Fabrica de Drone Spirit
 block.phantom-factory.name = Fabrica de Drone Phantom
@@ -1012,6 +1026,7 @@ block.ripple.description = Uma grande torre que atira simultaneamente.
 block.cyclone.description = Uma grande torre de tiro rapido.
 block.spectre.description = Uma grande torre que da dois tiros poderosos ao mesmo tempo.
 block.meltdown.description = Uma grande torre que atira dois raios poderosos ao mesmo tempo.
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produz drones leves que mineram e reparam blocos.
 block.phantom-factory.description = Produz unidades de drone avancadas Que são significativamente mais efetivos que um drone spirit.

core/assets/bundles/bundle_ru.properties

@@ -16,6 +16,11 @@ 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}
@@ -23,8 +28,6 @@ stat.destroyed = Строений уничтожено:[accent] {0}
 stat.deconstructed = Строений деконструировано:[accent] {0}
 stat.delivered = Ресурсов запущено:
 stat.rank = Финальный счёт: [accent]{0}
-placeline = Вы Выбрали блок.\nВы можете[accent] строить в линию[],[accent] удерживая палец в течение нескольких секунд[] и потом перетаскивая его.\n\n[scarlet]СДЕЛАЙ ЭТО.
-removearea = Вы Выбрали режим удаления.\nВы можете[accent] удалять блоки в прямоугольной области[],[accent] удерживая палец несколько секунд[] и потом перетаскивая его.\n\n[scarlet]СДЕЛАЙ ЭТО.
 launcheditems = [accent]Запущенные Предметы
 map.delete = Вы действительно хотите удалить карту «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
@@ -32,7 +35,7 @@ level.select = Выбор карты
 level.mode = Режим игры:
 showagain = Не показывать снова до следующей сессии
 coreattack = < Ядро находится под атакой! >
-nearpoint = [[ [scarlet]ПОКИНЬТЕ ТОЧКУ ВЫСАДКИ ПРОТИВНИКОВ НЕМЕДЛЕННО[] ]\nАннигиляция неизбежна.
+nearpoint = [[ [scarlet]ПОКИНЬТЕ ТОЧКУ ВЫСАДКИ НЕМЕДЛЕННО[] ]\nАннигиляция неизбежна.
 database = База данных ядра
 savegame = Сохранить игру
 loadgame = Загрузить игру
@@ -61,11 +64,13 @@ researched = [lightgray]{0} исследовано.
 players = Игроков на сервере: {0}
 players.single = {0} игрок на сервере
 server.closing = [accent]Закрытие сервера…
-server.kicked.kick = Вас Выгнали с сервера!
+server.kicked.kick = Вас выгнали с сервера!
 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.recentKick = Вы недавно были кикнуты.\nПодождите немного перед следующим подключением.
 server.kicked.nameInUse = На этом сервере есть кто-то с этим именем.
 server.kicked.nameEmpty = Ваше имя должно содержать хотя бы один символ или цифру.
@@ -73,7 +78,7 @@ server.kicked.idInUse = Вы уже на этом сервере! Соедине
 server.kicked.customClient = Этот сервер не поддерживает пользовательские сборки. Загрузите официальную версию.
 server.kicked.gameover = Игра окончена!
 server.versions = Ваша версия:[accent] {0}[]\nВерсия сервера:[accent] {1}[]
-host.info = Кнопка [accent]Сервер[] запускает сервер на порте [accent]6567[]. \nЛюбой пользователь в той же [lightgray]локальной сети или WiFi[] должен увидеть ваш сервер в своём списке серверов.\n\nЕсли Вы хотите, чтобы люди могли подключаться из откуда угодно по IP, то требуется [accent]переадресация (проброс) портов[].\n\n[lightgray]Примечание: Если у кого-то возникают проблемы с подключением к вашей игре по локальной сети, убедитесь, что Вы разрешили доступ Mindustry к вашей локальной сети в настройках брандмауэра. Обратите внимание, что публичные сети иногда не позволяют обнаружение сервера.
+host.info = Кнопка [accent]Сервер[] запускает сервер на порте [accent]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-адрес.
 hostserver = Запустить многопользовательский cервер
 hostserver.mobile = Запустить\ncервер
@@ -105,7 +110,7 @@ server.custombuild = [yellow]Пользовательская сборка
 confirmban = Вы действительно хотите заблокировать этого игрока?
 confirmkick = Вы действительно хотите выгнать этого игрока?
 confirmunban = Вы действительно хотите разблокировать этого игрока?
-confirmadmin = Вы уверены, что хотите сделать этого игрока администратором?
+confirmadmin = Вы действительно хотите сделать этого игрока администратором?
 confirmunadmin = Вы действительно хотите убрать этого игрока из администраторов?
 joingame.title = Присоединиться к игре
 joingame.ip = IP:
@@ -156,9 +161,14 @@ cancel = Отмена
 openlink = Открыть ссылку
 copylink = Скопировать ссылку
 back = Назад
+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 = Экспортировать данные с классической версии?
 classic.export.text = [accent]Mindustry[] получил глобальное обновление.\nБыло обнаружено Классическое (версия 3.5 сборка 40) сохранение или карта. Вы хотите экспортировать эти сохранения в домашнюю папку вашего телефона, для использования в приложении Mindustry Classic?
-quit.confirm = Вы уверены, что хотите Выйти?
+quit.confirm = Вы уверены, что хотите выйти?
 quit.confirm.tutorial = Вы уверены, что знаете Что делаете?\nОбучение может быть повторно запущено через[accent] Настройки->Игра->Открыть обучение.[]
 loading = [accent]Загрузка…
 saving = [accent]Сохранение…
@@ -244,26 +254,26 @@ editor.exportimage = Экспортировать изображение лан
 editor.exportimage.description = Экспортировать файл с изображением карты
 editor.loadimage = Импортировать\nизображение
 editor.saveimage = Экспортировать\nизображение
-editor.unsaved = [scarlet]У вас есть несохранённые изменения![]\nВы уверены, что хотите Выйти?
+editor.unsaved = [scarlet]У вас есть несохранённые изменения![]\nВы уверены, что хотите выйти?
 editor.resizemap = Изменить размер карты
 editor.mapname = Название карты:
 editor.overwrite = [accent]Внимание! \nЭто перезапишет уже существующую карту.
 editor.overwrite.confirm = [scarlet]Осторожно![] Карта с таким названием уже существует. Вы действительно хотите её перезаписать?
 editor.selectmap = Выберите карту для загрузки:
 toolmode.replace = Заменить
-toolmode.replace.description = Рисует только на сплошных блоках.
+toolmode.replace.description = Рисует только\nна сплошных блоках.
 toolmode.replaceall = Заменить всё
-toolmode.replaceall.description = Заменяет все блоки на карте.
+toolmode.replaceall.description = Заменяет все\nблоки на карте.
 toolmode.orthogonal = Ортогональная
-toolmode.orthogonal.description = Рисует только ортогональные линии.
+toolmode.orthogonal.description = Рисует только\nортогональные линии.
 toolmode.square = Квадрат
 toolmode.square.description = Квадратная кисть.
 toolmode.eraseores = Стереть руды
 toolmode.eraseores.description = Стереть только руды.
 toolmode.fillteams = Изменить команду блоков
-toolmode.fillteams.description = Изменяет принадлежность блоков к команде.
+toolmode.fillteams.description = Изменяет принадлежность\nблоков к команде.
 toolmode.drawteams = Изменить команду блока
-toolmode.drawteams.description = Изменяет принадлежность блока к команде.
+toolmode.drawteams.description = Изменяет принадлежность\nблока к команде.
 filters.empty = [lightgray]Нет фильтров! Добавьте один при помощи кнопки ниже.
 filter.distort = Искажение
 filter.noise = Шум
@@ -294,7 +304,7 @@ filter.option.ore = Руда
 filter.option.floor2 = Вторая поверхность
 filter.option.threshold2 = Вторичный предельный порог
 filter.option.radius = Радиус
-filter.option.percentile = Спад
+filter.option.percentile = Процентиль
 width = Ширина:
 height = Высота:
 menu = Меню
@@ -321,34 +331,34 @@ resume = Возобновить зону:\n[lightgray]{0}
 bestwave = [lightgray]Наилучшая волна: {0}
 launch = < ЗАПУСК >
 launch.title = Запуск успешен
-launch.next = [LIGHT_GRAY]Cледующая возможность на {0}-той волне
+launch.next = [lightgray]Cледующая возможность на {0}-той волне
 launch.unable2 = [scarlet]ЗАПУСК невозможен.[]
-launch.confirm = Это удалит все ресурсы в Вашем ядре.\nВы не сможете вернуться на эту базу.
+launch.confirm = Это [accent]запустит[] все ресурсы в Вашем ядре.\nВы не сможете вернуться на эту базу.
-launch.skip.confirm = Если Вы пропустите сейчас, Вы не сможете запустить до более поздних волн.
+launch.skip.confirm = Если Вы пропустите сейчас, то Вы не сможете произвести [accent]запуск[] до более поздних волн.
 uncover = Раскрыть
 configure = Выгрузить конфигурацию
-configure.locked = [LIGHT_GRAY]Возможность разблокировки Выгрузки ресурсов будет доступна на {0}-ой волне.
+configure.locked = [lightgray]Возможность разблокировки выгрузки ресурсов будет доступна на {0}-ой волне.
-zone.unlocked = Зона «[LIGHT_GRAY]{0}» теперь разблокирована.
+zone.unlocked = Зона «[lightgray]{0}» теперь разблокирована.
-zone.requirement.complete = Вы достигли {0}-ой волны,\nУсловия для зоны «{1}» Выполнены.
+zone.requirement.complete = Вы достигли {0}-ой волны,\nУсловия для зоны «{1}» выполнены.
-zone.config.complete = Вы достигли {0}-ой волны,Возможность Выгрузки ресурсов теперь разблокирована.
+zone.config.complete = Вы достигли {0}-ой волны,Возможность выгрузки ресурсов теперь разблокирована.
-zone.resources = Обнаруженные ресурсы:
+zone.resources = [lightgray]Обнаруженные ресурсы:
 zone.objective = [lightgray]Цель: [accent]{0}
 zone.objective.survival = Выжить
 zone.objective.attack = Уничтожить вражеское ядро
 add = Добавить…
 boss.health = Здоровье босса
-connectfail = [crimson]Ошибка подключения: [accent] {0}
+connectfail = [crimson]Ошибка подключения:\n\n[accent]{0}
-error.unreachable = Сервер недоступен.
+error.unreachable = Сервер недоступен.\nВы уверены, что адрес введён корректно?
 error.invalidaddress = Некорректный адрес.
-error.timedout = Время ожидания истекло!\nУбедитесь, что владелец сервера настроен для перенаправления портов и адрес корректный!
+error.timedout = Время ожидания истекло!\nУбедитесь, что владелец сервера настроил перенаправление (проброс) портов и адрес корректный!
-error.mismatch = Ошибка пакета:\nвозможное несоответствие версии клиента/сервера. \nУбедитесь, что у Вас и у создателя сервера установлена последняя версия Mindustry!
+error.mismatch = Ошибка пакета:\nвозможное несоответствие версии клиента/сервера.\nУбедитесь, что у Вас и создателя сервера установлена последняя версия Mindustry!
 error.alreadyconnected = Вы уже подключены.
 error.mapnotfound = Файл карты не найден!
 error.io = Сетевая ошибка ввода-Вывода.
 error.any = Неизвестная сетевая ошибка.
-error.bloom = Не удалось инициализировать цветение.\nВозможно, ваше устройство не поддерживает это.
+error.bloom = Не удалось инициализировать свечение (Bloom).\nВозможно, ваше устройство не поддерживает его.
-zone.groundZero.name = Нулевая земля
+zone.groundZero.name = Отправная точка
-zone.desertWastes.name = Пустынный мусор
+zone.desertWastes.name = Покинутые пустоши
 zone.craters.name = Кратеры
 zone.frozenForest.name = Ледяной Лес
 zone.ruinousShores.name = Разрушенные берега
@@ -356,26 +366,27 @@ zone.stainedMountains.name = Окрашенные горы
 zone.desolateRift.name = Пустынный разлом
 zone.nuclearComplex.name = Ядерный производственный комплекс
 zone.overgrowth.name = Заросли
-zone.tarFields.name = Дёгтяные поля
+zone.tarFields.name = Дёгтярные поля
 zone.saltFlats.name = Соляные равнины
-zone.impact0078.name = Импульс 0078
+zone.impact0078.name = Воздействие 0078
 zone.crags.name = Скалы
 zone.fungalPass.name = Грибной перевал
-zone.groundZero.description = Оптимальная локация для повторных игр. Низкая вражеская угроза. Мало ресурсов.\nПолучите как можно больше меди и свинца.\nДвигайтесь дальше.
+zone.groundZero.description = Оптимальная локация для повторных игр. Низкая вражеская угроза. Немного ресурсов.\nСоберите как можно больше свинца и меди.\nДвигайтесь дальше.
-zone.frozenForest.description = Даже здесь, ближе к горам, споры распространились. Холодные температуры не могут сдерживать их вечно. \nОтважтесь создать энергию. Постройте генераторы внутреннего сгорания. Научитесь пользоваться регенератором.
+zone.frozenForest.description = Даже здесь, ближе к горам, споры распространились. Холодные температуры не могут сдерживать их вечно.\n\nНачните вкладываться в энергию. Постройте генераторы внутреннего сгорания. Научитесь пользоваться регенератором.
-zone.desertWastes.description = Эти отходы огромны, непредсказуемы и перекрещены с заброшенными секторальными структурами.\nУголь присутствует в регионе. Сожгите его для энергии, или синтезируйте в графит.\n\n[lightgray]Это место посадки не может быть гарантировано.
+zone.desertWastes.description = Эти пустоши огромны, непредсказуемы и пронизаны заброшенными секторальными структурами.\nВ регионе представлен уголь. Сожгите его для энергии, или синтезируйте в графит.\n\n[lightgray]Место посадки здесь может не быть гарантировано.
-zone.saltFlats.description = На окраине пустыни лежат соляные равнины. В этом месте можно найти немного ресурсов.\n\nВраги построили здесь ресурсный комплекс. Искорените их ядро. Оставьте ничего стоящего.
+zone.saltFlats.description = На окраине пустыни лежат соляные равнины. В этой местности можно найти немного ресурсов.\n\nВраги возвели здесь комплекс хранения ресурсов. Искорените их ядро. Не оставьте камня на камне.
-zone.craters.description = В этом кратере скопилась вода, пережиток старых войн. Восстановите область. Соберите песок. Выплавите метастекло. Закачивайте воду для охлаждения турелей и дрелей.
+zone.craters.description = В этом кратере скопилась вода, реликвия времён старых войн. Восстановите область. Соберите песок. Выплавите метастекло. Выкачайте воду для охлаждения турелей и буров.
-zone.ruinousShores.description = Мимо отходов, это береговая линия. Когда-то здесь находился массив береговой обороны. Не так много осталось. Только самые основные оборонительные сооружения остались невредимыми, все остальное раздроблено на металлолом.\nПродолжайте экспансию наружу. Откройте для себя технологию.
+zone.ruinousShores.description = Мимо пустошей проходит береговая линия. Когда-то здесь располагался массив береговой обороны. Не так много от него осталось. Только самые базовые оборонительные сооружения остались невредимыми, всё остальное превратилось в металлолом.\nПродолжайте экспансию во вне. Переоткройте для себя технологии.
-zone.stainedMountains.description = Дальше вглубь материка лежат горы, но не  заражённые спорами.\nИзвлеките изобилие титана в этой области. Узнайте, как его использовать.\n\nВражеское присутствие здесь больше. Не дайте им время, чтобы отправлять свои сильнейшие боеВые единицы.
+zone.stainedMountains.description = Дальше вглубь местности лежат горы, еще не запятнанные спорами.\nИзвлеките изобилие титана в этой области. Узнайте, как его использовать.\n\nВражеское присутствие здесь сильнее. Не дайте им времени для отправки своих сильнейших боевых единиц.
-zone.overgrowth.description = Эта область заросла и находится ближе к источнику спор.\nВраг создал здесь форпост. Постройте боеВые единицы Кинжал. Уничтожьте его. Восстановите то, что было потеряно.
+zone.overgrowth.description = Эта заросшая область находится ближе к источнику спор.\nВраг организовал здесь форпост. Постройте боевые единицы «Титан». Уничтожьте его. Верните то, что было потеряно.
-zone.tarFields.description = Окраина зоны нефтедобычи, между горами и пустыней. Один из немногих районов с доступными запасами смолы.\nХотя область заброшенна, у неё есть некоторые опасные вражеские силы поблизости. Не стоит их недооценивать.\n\n[lightgray]Исследуйте технологию переработки нефти, если это возможно.
+zone.tarFields.description = Окраина зоны нефтедобычи, между горами и пустыней. Один из немногих районов с полезными запасами дёгтя.\nХотя область заброшенна, в этой области присутствуют поблизости некоторые опасные вражеские силы. Не стоит их недооценивать.\n\n[lightgray]Исследуйте технологию переработки нефти, если возможно.
-zone.desolateRift.description = ЧрезВычайно опасная зона. Много ресурсов, но мало места. Эвакуироваться нужно как можно скорее. Не расслабляйтесь между вражескими атаками
+zone.desolateRift.description = Чрезвычайно опасная зона. Обилие ресурсов, но мало места. Высокий риск разрушения. Эвакуироваться нужно как можно скорее. Не расслабляйтесь во время больших перерывов между вражескими атаками.
-zone.nuclearComplex.description = Бывший завод по производству и переработке тория, превращенный в руины.\n[lightgray]Исследуйте торий и его многократное использование.\n\nВраг здесь присутствует в большом количестве, постоянно разыскивая нападавших.
+zone.nuclearComplex.description = Бывший завод по производству и переработке тория, превращенный в руины.\n[lightgray]Исследуйте торий и варианты его многочисленного применения.\n\nВраг присутствует здесь в большом числе, постоянно разведывая нападающих.
-zone.fungalPass.description = Переходная зона между Высокими и низкими горами, покрытыми спорами землями. Здесь находится небольшая разведывательная база противника. \nУничтожьте ее. \nИспользуйте подразделения Кинжала и Камикадзе.
+zone.fungalPass.description = Переходная область между высокими горами и более низкими, покрытыми спорами землями. Здесь расположена небольшая разведывательная база противника.\nУничтожьте ее.\nИспользуйте единицы «Кинжал» и «Камикадзе». Достаньте до обоих ядер.
 zone.impact0078.description = <вставить описание здесь>
 zone.crags.description = <вставить описание здесь>
 settings.language = Язык
+settings.data = Game Data
 settings.reset = Сбросить по умолчанию
 settings.rebind = Смена
 settings.controls = Управление
@@ -475,7 +486,7 @@ 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.fpscap.name = Максимальный FPS
@@ -488,10 +499,10 @@ setting.difficulty.easy = Лёгкая
 setting.difficulty.normal = Нормальная
 setting.difficulty.hard = Сложная
 setting.difficulty.insane = Зачистка
-setting.difficulty.name = Складність:
+setting.difficulty.name = Сложность:
 setting.screenshake.name = Тряска экрана
 setting.effects.name = Эффекты
-setting.sensitivity.name = Чувствительность контроллера
+setting.sensitivity.name = Чувствительность контроллёра
 setting.saveinterval.name = Интервал сохранения
 setting.seconds = {0} сек.
 setting.fullscreen.name = Полноэкранный режим
@@ -507,9 +518,10 @@ setting.mutemusic.name = Заглушить музыку
 setting.sfxvol.name = Громкость звукоВых эффектов
 setting.mutesound.name = Заглушить звук
 setting.crashreport.name = Отправлять анонимные отчёты о Вылетах
+setting.savecreate.name = Auto-Create Saves
 setting.chatopacity.name = Непрозрачность чата
 setting.playerchat.name = Отображать чат в игре
-uiscale.reset = Масштаб пользовательского интерфейса был изменён.\nНажмите «ОК» для подтверждения этого масштаба.\n[scarlet]Возврат настроек и Выход через[accent] {0}[]…
+uiscale.reset = Масштаб пользовательского интерфейса был изменён.\nНажмите «ОК» для подтверждения этого масштаба.\n[scarlet]Возврат настроек и выход через[accent] {0}[]…
 uiscale.cancel = Отменить & Выйти
 setting.bloom.name = Свечение
 keybind.title = Настройка управления
@@ -527,6 +539,7 @@ keybind.press.axis = Нажмите клавишу…
 keybind.screenshot.name = Скриншот карты
 keybind.move_x.name = Движение по оси x
 keybind.move_y.name = Движение по оси y
+keybind.fullscreen.name = Полноэкранний режим
 keybind.select.name = Выбор/Выстрел
 keybind.diagonal_placement.name = Диагональное размещение
 keybind.pick.name = Выбрать блок
@@ -559,7 +572,7 @@ mode.pvp.description = Боритесь против других игроков
 mode.attack.name = Атака
 mode.attack.description = Уничтожь вражескую базу.\n[gray]Для игры требуется красное ядро на карте.
 mode.custom = Настройки правил
-rules.infiniteresources = Бескон. Ресурсы (Игрок)
+rules.infiniteresources = Бескон. ресурсы (Игрок)
 rules.wavetimer = Интервал волн
 rules.waves = Волны
 rules.attack = Режим атаки
@@ -789,7 +802,8 @@ block.pyratite-mixer.name = Мешалка пиротита
 block.blast-mixer.name = Мешалка взрывоопасного соединения
 block.solar-panel.name = Солнечная панель
 block.solar-panel-large.name = Большая солнечная панель
-block.oil-extractor.name = Нефтяная Вышка
+block.oil-extractor.name = Нефтяная вышка
+block.command-center.name = Командный центр
 block.draug-factory.name = Завод дронов «Драугр»
 block.spirit-factory.name = Завод ремонтных дронов «Призрак»
 block.phantom-factory.name = Завод строительных дронов «Фантом»
@@ -918,9 +932,9 @@ block.kiln.description = Выплавляет песок и свинец в со
 block.plastanium-compressor.description = Производит пластиний из нефти и титана.
 block.phase-weaver.description = Синтезирует фазовую ткань из радиоактивного тория и песка. Требуется огромное количество энергии.
 block.alloy-smelter.description = Объединяет титан, свинец, кремний и медь для производства кинетического сплава.
-block.cryofluidmixer.description = Смешивает воду и мелкий титаноВый порошок титана в криогеннную жидкость. Необходим для использования в ториевом реакторе.
+block.cryofluidmixer.description = Смешивает воду и мелкий титановый порошок титана в криогеннную жидкость. Необходим для использования в ториевом реакторе.
-block.blast-mixer.description = Раздавливает и смешивает скопления спор с пиратитом для получения взрывчатого вещества.
+block.blast-mixer.description = Раздавливает и смешивает скопления спор с пиротитом для получения взрывчатого вещества.
-block.pyratite-mixer.description = Смешивает уголь, свинец и песок в легковоспламеняющийся пиратит.
+block.pyratite-mixer.description = Смешивает уголь, свинец и песок в легковоспламеняющийся пиротит.
 block.melter.description = Расплавляет металлолом в шлак для дальнейшей обработки или использования в башнях «Волна».
 block.separator.description = Разделяет шлак на его минеральные компоненты. Выводит охлажденный результат.
 block.spore-press.description = Сжимает капсулы спор под сильным давлением для синтеза масла.
@@ -931,17 +945,17 @@ block.power-void.description = Аннулирует всю энергию, вв
 block.power-source.description = Бесконечно Выводит энергию. Только песочница.
 block.item-source.description = Бесконечно Выводит элементы. Только песочница.
 block.item-void.description = Уничтожает любые предметы. Только песочница.
-block.liquid-source.description = Бесконечно Выводит жидкости. Только песочница.
+block.liquid-source.description = Бесконечно выводит жидкости. Только песочница.
-block.copper-wall.description = ДешёВый защитный блок.\nПолезно для защиты ядра и турелей в перВые несколько волн.
+block.copper-wall.description = Дешёвый защитный блок.\nПолезно для защиты ядра и турелей в первые несколько волн.
-block.copper-wall-large.description = ДешёВый защитный блок.\nПолезно для защиты ядра и турелей в перВые несколько волн.\nРазмещается на нескольких плитках.
+block.copper-wall-large.description = Дешёвый защитный блок.\nПолезно для защиты ядра и турелей в первые несколько волн.\nРазмещается на нескольких плитках.
 block.titanium-wall.description = Умеренно сильный защитный блок.\nОбеспечивает умеренную защиту от врагов.
 block.titanium-wall-large.description = Умеренно сильный защитный блок.\nОбеспечивает умеренную защиту от врагов.\nРазмещается на нескольких плитках.
 block.thorium-wall.description = Сильный защитный блок.\nХорошая защита от врагов.
 block.thorium-wall-large.description = Сильный защитный блок.\nХорошая защита от врагов.\nРазмещается на нескольких плитках.
-block.phase-wall.description = Стена, покрытая специальным фазоВым отражающим составом. Отражает большинство пуль при ударе.
+block.phase-wall.description = Стена, покрытая специальным фазовым отражающим составом. Отражает большинство пуль при ударе.
-block.phase-wall-large.description = Стена, покрытая специальным фазоВым отражающим составом. Отражает большинство пуль при ударе.\nРазмещается на нескольких плитках.
+block.phase-wall-large.description = Стена, покрытая специальным фазовым отражающим составом. Отражает большинство пуль при ударе.\nРазмещается на нескольких плитках.
-block.surge-wall.description = Очень прочный защитный блок.\nНакапливает заряд при контакте с пулей, Выпуская его случайным образом.
+block.surge-wall.description = Очень прочный защитный блок.\nНакапливает заряд при контакте с пулей, выпуская его случайным образом.
-block.surge-wall-large.description = Очень прочный защитный блок.\nНакапливает заряд при контакте с пулей, Выпуская его случайным образом.\nРазмещается на нескольких плитках.
+block.surge-wall-large.description = Очень прочный защитный блок.\nНакапливает заряд при контакте с пулей, выпуская его случайным образом.\nРазмещается на нескольких плитках.
 block.door.description = Маленькая дверь. Можно открыть или закрыть, нажав.
 block.door-large.description = Большая дверь. Можно открыть и закрыть, коснувшись.\nОткрывает несколько плитках.
 block.mender.description = Периодически ремонтирует блоки в непосредственной близости. Сохраняет средства защиты, восстановленные между волнами.\nОпционально использует кремний для увеличения дальности и эффективности.
@@ -953,14 +967,14 @@ block.conveyor.description = БазоВый элемент транспортн
 block.titanium-conveyor.description = Расширенный транспортный блок элемента. Перемещает предметы быстрее, чем стандартные конвейеры.
 block.junction.description = Действует как мост для двух пересекающихся конвейерных лент. Полезно в ситуациях, когда два разных конвейера перевозят разные материалы в разные места.
 block.bridge-conveyor.description = Улучшенный транспортный блок элемента. Позволяет транспортировать предметы по 3 плиткам любой местности или здания.
-block.phase-conveyor.description = Улучшенный транспортный блок элемента. Использует энергию для телепортации предметов на подключенный фазоВый конвейер по нескольким плиткам.
+block.phase-conveyor.description = Улучшенный транспортный блок элемента. Использует энергию для телепортации предметов на подключенный фазовый конвейер по нескольким плиткам.
-block.sorter.description = Сортировка элементов. Если элемент соответствует Выбору, он может пройти. В противном случае элемент Выводится слева и справа.
+block.sorter.description = Сортировка элементов. Если элемент соответствует выбору, он может пройти. В противном случае элемент выводится слева и справа.
-block.router.description = Принимает элементы в одном направлении и Выводит их до 3 других направлений в равной степени. Полезно для разделения материалов из одного источника на несколько целей.\n\n[scarlet]Никогда не используйте рядом с заводами и т.п., так как маршрутизатор будет забит Выходными предметами.[]
+block.router.description = Принимает элементы в одном направлении и выводит их до 3 других направлений в равной степени. Полезно для разделения материалов из одного источника на несколько целей.\n\n[scarlet]Никогда не используйте рядом с заводами и т.п., так как маршрутизатор будет забит выходными предметами.[]
 block.distributor.description = Расширенный маршрутизатор. Разделение элементов до 7 других направлений в равной степени.
-block.overflow-gate.description = Комбинированный разделитель и маршрутизатор. Выводится только влево и вправо, если передний путь заблокирован.
+block.overflow-gate.description = Комбинированный разделитель и маршрутизатор. выводится только влево и вправо, если передний путь заблокирован.
 block.mass-driver.description = Конечный транспортный блок элемента. Собирает несколько предметов и затем стреляет в них другому массовому водителю на большом расстоянии. Требуется сила для работы.
-block.mechanical-pump.description = ДешёВый насос с низкой производительностью, но без энергопотребления.
+block.mechanical-pump.description = Дешёвый насос с низкой производительностью, но без энергопотребления.
-block.rotary-pump.description = Продвинутый насос. Насосы более жидкие, но требуют энергию.
+block.rotary-pump.description = Продвинутый насос. Лучше чем обычный насос, но требуют энергию.
 block.thermal-pump.description = Наилучший насос.
 block.conduit.description = Основной блок транспортировки жидкости. Перемещает жидкости вперед. Используется совместно с насосами и другими трубопроводами.
 block.pulse-conduit.description = Расширенный блок транспортировки жидкости. Транспортирует жидкости быстрее и хранит больше, чем стандартные трубопроводы.
@@ -976,8 +990,8 @@ block.battery.description = Накапливает энергию как буф
 block.battery-large.description = Хранит гораздо больше энергии, чем обычная батарея.
 block.combustion-generator.description = Вырабатывает энергию путём сжигания легковоспламеняющихся материалов, таких как уголь.
 block.thermal-generator.description = Генерирует энергию, когда находится в горячих местах.
-block.turbine-generator.description = Усовершенствованный генератор сгорания. Более эффективен, но требует дополнительной воды для Выработки пара.
+block.turbine-generator.description = Усовершенствованный генератор сгорания. Более эффективен, но требует дополнительной воды для выработки пара.
-block.differential-generator.description = Генерирует большое количество энергии. Использует разницу температур между криогенной жидкостью и горящим пиратитом.
+block.differential-generator.description = Генерирует большое количество энергии. Использует разницу температур между криогенной жидкостью и горящим пиротитом.
 block.rtg-generator.description = Простой, надежный генератор. Использует тепло распадающихся радиоактивных соединений для производства энергии с низкой скоростью.
 block.solar-panel.description = Обеспечивает небольшое количество энергии от солнца.
 block.solar-panel-large.description = Значительно более эффективный вариант стандартной солнечной панели.
@@ -1012,16 +1026,17 @@ block.ripple.description = Очень мощная артиллерийская
 block.cyclone.description = Большая противовоздушная и наземная башня. Выстреливает взрывными глыбами зенитных орудий в ближайшие подразделения.
 block.spectre.description = Массивная двуствольная пушка. Стреляет крупными бронебойными пулями по воздушным и наземным целям.
 block.meltdown.description = Массивная лазерная пушка. Заряжает и стреляет постоянным лазерным лучом в ближайших врагов. Требуется охлаждающая жидкость для работы.
-block.draug-factory.description = Производит добывающих дронов.
+block.command-center.description = Командует перемещениями боевых единиц по всей карте.\nУказывает подразделениям [accent]патрулировать[] территорию, [accent]атаковать[] вражеское ядро или [accent]отступать[] к ядру/фабрике. Когда вражеское ядро не представлено, единицы будут патрулировать при команде [accent]атаки[].
+block.draug-factory.description = Производит добывающих дронов
 block.spirit-factory.description = Производит дронов, которые помогают в строительстве.
 block.phantom-factory.description = Производит улучшенных дронов, которые помогают в строительстве.
-block.wraith-factory.description = Производит быстрые и летающие боеВые единицы.
+block.wraith-factory.description = Производит быстрые и летающие боевые единицы.
-block.ghoul-factory.description = Производит тяжёлых ковроВых бомбардировщиков.
+block.ghoul-factory.description = Производит тяжёлых ковровых бомбардировщиков.
-block.revenant-factory.description = Производит тяжёлые летающие боеВые единицы.
+block.revenant-factory.description = Производит тяжёлые летающие боевые единицы.
-block.dagger-factory.description = Производит основных наземных боеВых единиц.
+block.dagger-factory.description = Производит основных наземных боевые единиц.
-block.crawler-factory.description = Производит быстрых саморозрушающихся боеВых единиц.
+block.crawler-factory.description = Производит быстрых саморозрушающихся боевые единиц.
-block.titan-factory.description = Производит продвинутые бронированне боеВые единицы.
+block.titan-factory.description = Производит продвинутые бронированне боевые единицы.
-block.fortress-factory.description = Производит тяжёлые артиллерийские боеВые единицы.
+block.fortress-factory.description = Производит тяжёлые артиллерийские боевые единицы.
 block.repair-point.description = Непрерывно лечит ближайший поврежденную боевую единицу или мех, находящийся рядом.
 block.dart-mech-pad.description = Обеспечивает превращение в базоВый атакующий мех. \nИспользуйте, нажав, стоя на нём.
 block.delta-mech-pad.description = Обеспечивает превращение в легкобронированный атакующий мех.\nИспользуйте, нажав, стоя на нём.

core/assets/bundles/bundle_se.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Map too large, potentially not enough memory for screenshot
 gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]Nytt rekord!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
 stat.built = Buildings Built:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Buildings Destroyed:[accent] {0}
 stat.deconstructed = Buildings Deconstructed:[accent] {0}
 stat.delivered = Resources Launched:
 stat.rank = Final Rank: [accent]{0}
-placeline = Du har valt ett block.\nDu kan[accent] placera i en linje[] genom att[accent] hålla ner ett finger i några sekunder[] och sedan dra åt ett håll.\n\n[scarlet]GÖR DET.
-removearea = Du har valt borttagningsläget.\nDu kan[accent] ta bort block inom en rektangel[] genom att[accent] hålla ner ett finger i några sekunder[] och dra.\n\n[scarlet]GÖR DET.
 launcheditems = [accent]Launched Items
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} spelare online
 server.closing = [accent]Stänger server...
 server.kicked.kick = You have been kicked from the server!
 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.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.
@@ -156,6 +161,11 @@ cancel = Avbryt
 openlink = Öppna Länk
 copylink = Kopiera Länk
 back = Tillbaka
+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 = Exportera Classic-Data
 classic.export.text = Sparad data från Classic (v3.5 build 40) har hittats. Vill du exportera den här datan till telefonens hem-mapp för att använda i Mindustry Classic-appen?
 quit.confirm = Är du säker på att du vill avsluta?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Språk
+settings.data = Game Data
 settings.reset = Återställ till Standardvärden
 settings.rebind = Byt
 settings.controls = Kontroller
@@ -507,6 +518,7 @@ setting.mutemusic.name = Stäng Av Musik
 setting.sfxvol.name = Ljudeffektvolym
 setting.mutesound.name = Stäng Av Ljudeffekter
 setting.crashreport.name = Skicka Anonyma Krashrapporter
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
@@ -790,6 +803,7 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solpanel
 block.solar-panel-large.name = Stor Solpanel
 block.oil-extractor.name = Oljeextraktor
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Repair Drone Factory
 block.phantom-factory.name = Phantom Builder Drone Factory
@@ -1012,6 +1026,7 @@ block.ripple.description = An extremely poweful artillery turret. Shoots cluster
 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.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_tk.properties

@@ -16,6 +16,11 @@ screenshot.invalid = Map too large, potentially not enough memory for screenshot
 gameover = Cekirdegin yok edildi.
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]Yeni Yuksek skor!
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
 stat.built = Buildings Built:[accent] {0}
@@ -23,8 +28,6 @@ stat.destroyed = Buildings Destroyed:[accent] {0}
 stat.deconstructed = Buildings Deconstructed:[accent] {0}
 stat.delivered = Resources Launched:
 stat.rank = Final Rank: [accent]{0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
 launcheditems = [accent]Launched Items
 map.delete = Su haritayi silmek istediginden emin misin? "[accent]{0}[]"?
 level.highscore = Yuksek Skor: [accent]{0}
@@ -63,9 +66,11 @@ players.single = {0} oyuncu cevrimici
 server.closing = [accent]Oyun kapaniyor.
 server.kicked.kick = Oyundan cikarildin
 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.recentKick = Oyundan cikarilmistin.\nBaglanmadn once biraz bekle.
 server.kicked.nameInUse = Oyunda bu isimde bir\nkisi zaten var.
 server.kicked.nameEmpty = ismin gecerli degil.
@@ -156,6 +161,11 @@ cancel = iptal
 openlink = Linki ac
 copylink = Linki kopyala
 back = Geri don
+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
 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 = Cikmak istedigine emin misin?
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Dil
+settings.data = Game Data
 settings.reset = ilk ayarlara geri al
 settings.rebind = Geri al
 settings.controls = Kontroller
@@ -507,6 +518,7 @@ setting.mutemusic.name = Sesi kapat
 setting.sfxvol.name = Ses seviyesi
 setting.mutesound.name = Sesi kapat
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = Bir yone cevir yada tusa bas...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Sol/Sag hareket
 keybind.move_y.name = Yukari/asagi hareket
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Sec/silahi sik
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
@@ -790,6 +803,7 @@ block.blast-mixer.name = Patlayici karistiricisi
 block.solar-panel.name = gunes paneli
 block.solar-panel-large.name = genis gunes paneli
 block.oil-extractor.name = benzin ayirici
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Drone Factory
 block.phantom-factory.name = Phantom Drone Factory
@@ -1012,6 +1026,7 @@ block.ripple.description = A large artillery turret which fires several shots si
 block.cyclone.description = A large rapid fire turret.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
 block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.

core/assets/bundles/bundle_tr.properties

@@ -1,103 +1,105 @@
-credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]
+credits.text = [ROYAL]Anuken[] tarafından yapıldı - [SKY]anukendev@gmail.com[]
-credits = Credits
+credits = Jenerik
-contributors = Translators and Contributors
+contributors = Çevirmenler ve Katkıda Bulunanlar
-discord = Join the Mindustry Discord!
+discord = Mindustry'nin Discord sunucusuna Katıl!
-link.discord.description = The official Mindustry Discord chatroom
+link.discord.description = Resmi Mindustry Discord sunucusu
-link.github.description = Game source code
+link.github.description = Oyun kaynak kodu
-link.changelog.description = List of update changes
+link.changelog.description = Güncelleme değişikliklerini
-link.dev-builds.description = Unstable development builds
+link.dev-builds.description = Dengesiz oyun sürümleri
-link.trello.description = Official Trello board for planned features
+link.trello.description = Planlanan özellikler için resmi Trello Sayfası
-link.itch.io.description = itch.io page with PC downloads
+link.itch.io.description = Bilgisayar sürümleri için itch.io sayfası
-link.google-play.description = Google Play store listing
+link.google-play.description = Google Play mağaza sayfası
-link.wiki.description = Official Mindustry wiki
+link.wiki.description = Resmi Mindustry wikisi
-linkfail = Failed to open link!\nThe URL has been copied to your clipboard.
+linkfail = Link açılamadı!\nURL kopyalandı.
-screenshot = Screenshot saved to {0}
+screenshot = Ekran görüntüsü {0} 'na kaydedildi
-screenshot.invalid = Map too large, potentially not enough memory for screenshot.
+screenshot.invalid = Harita çok büyük, ekran görüntüsü için potansiyel olarak yeterli bellek yok.
-gameover = Game Over
+gameover = Kaybettin
-gameover.pvp = The[accent] {0}[] team is victorious!
+gameover.pvp = [accent] {0}[] Takımı kazandı!
-highscore = [accent]New highscore!
+highscore = [accent]Yeni rekor!
-
+load.sound = Sounds
-stat.wave = Waves Defeated:[accent] {0}
+load.map = Maps
-stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
+load.image = Images
-stat.built = Buildings Built:[accent] {0}
+load.content = Content
-stat.destroyed = Buildings Destroyed:[accent] {0}
+load.system = System
-stat.deconstructed = Buildings Deconstructed:[accent] {0}
+stat.wave = Yenilen Dalgalar:[accent] {0}
-stat.delivered = Resources Launched:
+stat.enemiesDestroyed = Yok Edilen Düşmanlar:[accent] {0}
-stat.rank = Final Rank: [accent]{0}
+stat.built = İnşa Edilen Yapılar:[accent] {0}
-
+stat.destroyed = Yok Edilen Yapılar:[accent] {0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\n\n[scarlet]DO IT.
+stat.deconstructed = Yıkılan Yapılar:[accent] {0}
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\n\n[scarlet]DO IT.
+stat.delivered = Gönderilen Kaynaklar:
-
+stat.rank = Rütbe: [accent]{0}
-launcheditems = [accent]Launched Items
+launcheditems = [accent]Gönderilen Kaynaklar
-map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
+map.delete = "[accent]{0}[]"Haritasını silmek istediğine emin misin?
-level.highscore = High Score: [accent]{0}
+level.highscore = Rekor: [accent]{0}
-level.select = Level Select
+level.select = Seviye Seçimi
-level.mode = Gamemode:
+level.mode = Oyun Modu:
-showagain = Don't show again next session
+showagain = Bir daha gösterme
-coreattack = < Core is under attack! >
+coreattack = < Çekirdek saldırı altında! >
-nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
+nearpoint = [[ [scarlet]İNİŞ PİSTİNDEN AYRIL[] ]\nimha riski yüksek
-database = Core Database
+database = Çekirdek Veritabanı
-savegame = Save Game
+savegame = Oyunu Kaydet
-loadgame = Load Game
+loadgame = Oyunu Yükle
-joingame = Join Game
+joingame = Oyuna Katıl
-addplayers = Add/Remove Players
+addplayers = Oyuncu Ekle/Kaldır
-customgame = Custom Game
+customgame = Özel Oyun
-newgame = New Game
+newgame = Yeni Oyun
-none = <none>
+none = <yok>
-minimap = Minimap
+minimap = Harita
-close = Close
+close = Kapat
 website = Website
-quit = Quit
+quit = Çık
-maps = Maps
+maps = Haritalar
-continue = Continue
+continue = Devam et
-maps.none = [lightgray]No maps found!
+maps.none = [lightgray]Harita Bulunamadı!
-about.button = About
+about.button = Hakkında
-name = Name:
+name = İsim:
-noname = Pick a[accent] player name[] first.
+noname = Bir[accent] kullanıcı adı[] seçmelisin.
-filename = File Name:
+filename = Dosya Adı:
-unlocked = New content unlocked!
+unlocked = Yeni içerik açıldı!
-completed = [accent]Completed
+completed = [accent]Tamamlandı
-techtree = Tech Tree
+techtree = Yetenek Ağacı
-research.list = [lightgray]Research:
+research.list = [lightgray]Araştır:
-research = Research
+research = Araştır
-researched = [lightgray]{0} researched.
+researched = [lightgray]{0} Araştırıldı.
-players = {0} players online
+players = {0} oyuncu çevrimiçi
-players.single = {0} player online
+players.single = {0} oyuncu çevrimiçi
-server.closing = [accent]Closing server...
+server.closing = [accent]Sunucu kapanıyor...
-server.kicked.kick = You have been kicked from the server!
+server.kicked.kick = Sunucudan atıldın!
-server.kicked.serverClose = Server closed.
+server.kicked.serverClose = Sunucu kapandı.
-server.kicked.clientOutdated = Outdated client! Update your game!
+server.kicked.vote = You have been vote-kicked. Goodbye.
-server.kicked.serverOutdated = Outdated server! Ask the host to update!
+server.kicked.clientOutdated = Geçersiz sürüm! Oyununu güncelle!
-server.kicked.banned = You are banned on this server.
+server.kicked.serverOutdated = Geçersiz sunucu!\nKurucudan oyununu güncellemesini iste!
-server.kicked.recentKick = You have been kicked recently.\nWait before connecting again.
+server.kicked.banned = Bu sunucudan yasaklandın.
-server.kicked.nameInUse = There is someone with that name\nalready on this server.
+server.kicked.typeMismatch = This server is not compatible with your build type.
-server.kicked.nameEmpty = Your chosen name is invalid.
+server.kicked.recentKick = Yakın bir zamanda bir sunucudan atıldın.\nBağlanmadan önce biraz bekle.
-server.kicked.idInUse = You are already on this server! Connecting with two accounts is not permitted.
+server.kicked.nameInUse = Sunucuda zaten o isimde biri var.
-server.kicked.customClient = This server does not support custom builds. Download an official version.
+server.kicked.nameEmpty = İsmin geçersiz.
+server.kicked.idInUse = Zaten bu sunucudasın! İki hesapla bir sunucuya bağlanamazsın.
+server.kicked.customClient = Bu sunucu özel sürümleri kabul etmiyor. Resmi bir sürüm indir.
 server.kicked.gameover = Game over!
-server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
+server.versions = Senin versiyon:[accent] {0}[]\nSunucunun versiyonu:[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
+hostserver = Çok Oyunculu Oyun Aç
-hostserver.mobile = Host\nGame
+hostserver.mobile = Oyun\nKur
-host = Host
+host = Kur
-hosting = [accent]Opening server...
+hosting = [accent]Sunucu açılıyor...
-hosts.refresh = Refresh
+hosts.refresh = Yenile
-hosts.discovering = Discovering LAN games
+hosts.discovering = LAN oyunu aranıyor
-server.refreshing = Refreshing server
+server.refreshing = Sunucular yenileniyor
-hosts.none = [lightgray]No local games found!
+hosts.none = [lightgray]LAN oyunu bulunamadı!
-host.invalid = [scarlet]Can't connect to host.
+host.invalid = [scarlet]Kurucuya bağlanılamıyor.
-trace = Trace Player
+trace = Oyuncuyu takip et
-trace.playername = Player name: [accent]{0}
+trace.playername = Oyuncu İsmi: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = Unique ID: [accent]{0}
+trace.id = Özel ID: [accent]{0}
-trace.mobile = Mobile Client: [accent]{0}
+trace.mobile = Mobil Sürüm: [accent]{0}
-trace.modclient = Custom Client: [accent]{0}
+trace.modclient = Özel Sürüm: [accent]{0}
-invalidid = Invalid client ID! Submit a bug report.
+invalidid = Geçersiz Sürüm ID'si! Bir hata raporu gönder.
-server.bans = Bans
+server.bans = Yasaklar
-server.bans.none = No banned players found!
+server.bans.none = Yasaklanmış oyuncu bulunamadı!
-server.admins = Admins
+server.admins = Yetkililer
-server.admins.none = No admins found!
+server.admins.none = Yetkili bulunamadı!
 server.add = Add Server
 server.delete = Are you sure you want to delete this server?
 server.edit = Edit Server
@@ -159,6 +161,11 @@ cancel = Cancel
 openlink = Open Link
 copylink = Copy Link
 back = Back
+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
 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 = Are you sure you want to quit?
@@ -253,7 +260,6 @@ 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.selectmap = Select a map to load:
-
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
 toolmode.replaceall = Replace All
@@ -268,7 +274,6 @@ toolmode.fillteams = Fill Teams
 toolmode.fillteams.description = Fill teams instead of blocks.
 toolmode.drawteams = Draw Teams
 toolmode.drawteams.description = Draw teams instead of blocks.
-
 filters.empty = [lightgray]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
@@ -300,7 +305,6 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
-
 width = Width:
 height = Height:
 menu = Menu
@@ -318,7 +322,6 @@ tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Map Editor
 donate = Donate
-
 abandon = Abandon
 abandon.text = This zone and all its resources will be lost to the enemy.
 locked = Locked
@@ -344,7 +347,6 @@ zone.objective.survival = Survive
 zone.objective.attack = Destroy Enemy Core
 add = Add...
 boss.health = Boss Health
-
 connectfail = [crimson]Connection error:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
 error.invalidaddress = Invalid address.
@@ -355,7 +357,6 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
-
 zone.groundZero.name = Ground Zero
 zone.desertWastes.name = Desert Wastes
 zone.craters.name = The Craters
@@ -370,7 +371,6 @@ zone.saltFlats.name = Salt Flats
 zone.impact0078.name = Impact 0078
 zone.crags.name = Crags
 zone.fungalPass.name = Fungal Pass
-
 zone.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
 zone.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
 zone.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
@@ -385,8 +385,8 @@ zone.nuclearComplex.description = A former facility for the production and proce
 zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
-
 settings.language = Language
+settings.data = Game Data
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
 settings.controls = Controls
@@ -438,7 +438,6 @@ blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
 blocks.ammo = Ammo
-
 bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
@@ -451,7 +450,6 @@ bar.heat = Heat
 bar.power = Power
 bar.progress = Build Progress
 bar.spawned = Units: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] damage
 bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary
@@ -463,7 +461,6 @@ bullet.freezing = [stat]freezing
 bullet.tarred = [stat]tarred
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
 bullet.reload = [stat]{0}[lightgray]x fire rate
-
 unit.blocks = blocks
 unit.powersecond = power units/second
 unit.liquidsecond = liquid units/second
@@ -521,6 +518,7 @@ setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -541,6 +539,7 @@ keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
@@ -573,7 +572,6 @@ mode.pvp.description = Fight against other players locally.\n[gray]Requires at l
 mode.attack.name = Attack
 mode.attack.description = Destroy the enemy's base. No waves.\n[gray]Requires a red core in the map to play.
 mode.custom = Custom Rules
-
 rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Waves
@@ -600,7 +598,6 @@ rules.title.resourcesbuilding = Resources & Building
 rules.title.player = Players
 rules.title.enemy = Enemies
 rules.title.unit = Units
-
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
@@ -662,7 +659,6 @@ mech.buildspeed = [lightgray]Building Speed: {0}%
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viscosity: {0}
 liquid.temperature = [lightgray]Temperature: {0}
-
 block.sand-boulder.name = Sand Boulder
 block.grass.name = Grass
 block.salt.name = Salt
@@ -807,6 +803,7 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Repair Drone Factory
 block.phantom-factory.name = Phantom Builder Drone Factory
@@ -889,8 +886,6 @@ tutorial.deposit = Deposit items into blocks by dragging from your ship to the d
 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.
-
-
 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.
 item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
@@ -1031,6 +1026,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.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_uk_UA.properties

@@ -1,5 +1,5 @@
 credits.text = Створив [ROYAL]Anuken[] — [SKY]anukendev@gmail.com[]\n\nЄ питання по грі або проблеми з перекладом?\nЙдіть в офіційний сервер discord Mindustry у канал #український.\nПерекладач: [blue]Prosta4ok_ua[green]#[yellow]6336
-credits = Автори
+credits = Творці
 contributors = Перекладачі та помічники
 discord = Приєднуйтесь до нашого Discord!
 link.discord.description = Офіційний Discord-сервер Mindustry
@@ -7,7 +7,7 @@ link.github.description = Вихідний код гри
 link.changelog.description = Список змін
 link.dev-builds.description = Нестабільні версії
 link.trello.description = Офіційна дошка Trello для запланованих функцій
-link.itch.io.description = Itch.io сторінка з веб-версією і завантаженнями
+link.itch.io.description = Завантаж гру на Itch.io
 link.google-play.description = Скачати для Android з Google Play
 link.wiki.description = Офіційна вікі
 linkfail = Не вдалося відкрити посилання!\nURL-адреса була скопійована у буфер обміну.
@@ -16,6 +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}
@@ -23,8 +28,6 @@ stat.destroyed = Будівель знищено:[accent] {0}
 stat.deconstructed = Будівель декоструйовано[accent] {0}
 stat.delivered = Ресурсів видобуто:
 stat.rank = Фінальний рахунок: [accent]{0}
-placeline = Ви вибрали блок.\nВи можете [accent]будувати в лінію[] [accent]утримуючи палець протягом декількох секунд[] і потім перетягуючи його.\n\n[scarlet]ЗРОБИ ЦЕ.
-removearea = Ви вибрали режим видалення.\nВи можете [accent]видаляти блоки в обраній області[],[accent]утримуючи палець кілька секунд[] і потім перетягуючи його.\n\n[scarlet]ЗРОБИ ЦЕ.
 launcheditems = [accent]Запущені предмети
 map.delete = Ви впевнені, що хочете видалити мапу «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
@@ -47,38 +50,40 @@ website = Веб-сайт
 quit = Вихід
 maps = Мапи
 continue = Продовжити
-maps.none = [LIGHT_GRAY]Мап не знайдено!
+maps.none = [lightgray]Мап не знайдено!
 about.button = Про гру
 name = Ім’я:
 noname = Спочатку придумайте[accent] собі ім’я[].
 filename = Ім’я файлу:
 unlocked = Новий контент розблоковано!
 completed = [accent]Завершено
-techtree = Технологічне дерево
+techtree = Дерево технологій
-research.list = [LIGHT_GRAY]Дослідження:
+research.list = [lightgray]Дослідження:
 research = Дослідження
-researched = [LIGHT_GRAY]{0} досліджено.
+researched = [lightgray]{0} досліджено.
 players = Гравців на сервері: {0}
 players.single = {0} гравець на сервері
-server.closing = [accent]Закриття серверу...
+server.closing = [accent]Закриття серверу…
 server.kicked.kick = Ви були вигнані з сервера!
 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.recentKick = Нещодавно Вас вигнали. \nПочекайте трохи перед наступним підключенням.
 server.kicked.nameInUse = На цьому сервері є хтось з таким ім’ям.
 server.kicked.nameEmpty = Ваше ім’я має містити принаймні один символ або цифру.
 server.kicked.idInUse = Ви вже на цьому сервері! Підключення двох облікових записів не допускається.
 server.kicked.customClient = Цей сервер не підтримує користувальницькі збірки. Завантажте офіційну версію.
 server.kicked.gameover = Гра завершена!
-server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
+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 доступ до вашої локальної мережі в налаштуваннях брандмауера. Зауважте, що публічні мережі іноді не дозволяють виявити сервер.
+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[LIGHT_GRAY] Примітка. Тут немає автоматичного глобального списку серверів; якщо ви хочете підключитися до когось через IP, вам доведеться попросити створювача серверу дати свій ip.
+join.info = Тут Ви можете ввести [accent]IP серверу[] для підключення або знайти сервери у [accent]локальній мережі[] для підключення до них.\nПідтримується локальна мережа(LAN) і широкосмугова мережа(WAN).\n\n[lightgray] Примітка. Тут немає автоматичного глобального списку серверів; якщо ви хочете підключитися до когось через IP, вам доведеться попросити створювача серверу дати свій ip.
 hostserver = Запустити багатокористувальницький сервер
 hostserver.mobile = Запустити\nсервер
 host = Сервер
-hosting = [accent]Відкриття серверу...
+hosting = [accent]Відкриття серверу…
 hosts.refresh = Оновити
 hosts.discovering = Пошук локальних ігор
 server.refreshing = Оновлення серверу
@@ -92,37 +97,37 @@ trace.mobile = Мобільний клієнт: [accent]{0}
 trace.modclient = Користувацький клієнт: [accent]{0}
 invalidid = Невірний ідентифікатор клієнта! Надішліть звіт про помилку.
 server.bans = Блокування
-server.bans.none = Заблокованих гравців нема!
+server.bans.none = Заблокованих гравців немає!
 server.admins = Адміністратори
-server.admins.none = Адміністраторів нема!
+server.admins.none = Адміністраторів немає!
 server.add = Додати сервер
 server.delete = Ви впевнені, що хочете видалити цей сервер?
 server.edit = Редагувати сервер
 server.outdated = [crimson]Застарілий сервер![]
 server.outdated.client = [crimson]Застарілий клієнт![]
 server.version = [lightgray]Версія: {0}
-server.custombuild = [yellow]Користувальницька збірка
+server.custombuild = [yellow]Користувацька збірка
-confirmban = Ви впевнені, що хочете заблокувати цього гравця?
+confirmban = Ви дійсно хочете заблокувати цього гравця?
-confirmkick = Ви впевнені, що хочете викинути цього гравця?
+confirmkick = Ви дійсно хочете викинути цього гравця?
-confirmunban = Ви впевнені, що хочете розблокувати цього гравця?
+confirmunban = Ви дійсно хочете розблокувати цього гравця?
-confirmadmin = Ви впевнені, що хочете зробити цього гравця адміністратором?
+confirmadmin = Ви дійсно хочете зробити цього гравця адміністратором?
-confirmunadmin = Ви впевнені, що хочете видалити статус адміністратора з цього гравця?
+confirmunadmin = Ви дійсно хочете видалити статус адміністратора з цього гравця?
 joingame.title = Приєднатися до гри
 joingame.ip = IP:
 disconnect = Відключено.
 disconnect.data = Не вдалося завантажити дані світу!
-connecting = [accent]Підключення...
+connecting = [accent]Підключення…
-connecting.data = [accent]Завантаження даних світу...
+connecting.data = [accent]Завантаження даних світу…
 server.port = Порт:
 server.addressinuse = Ця адреса вже використовується!
 server.invalidport = Недійсний номер порту!
 server.error = [crimson]Помилка створення серверу: [accent]{0}
-save.old = Це збереження для старої версії гри, і його більше не можна використовувати.\n\n [LIGHT_GRAY]Зворотна сумісність буде реалізована у фінальній версії 4.0.
+save.old = Це збереження для старої версії гри, і його більше не можна використовувати.\n\n [lightgray]Зворотна сумісність буде реалізована у фінальній версії 4.0.
 save.new = Нове збереження
 save.overwrite = Ви впевнені, що хочете перезаписати цей слот для збереження?
 overwrite = Перезаписати
 save.none = Збережень не знайдено!
-saveload = [accent]Збереження...
+saveload = [accent]Збереження…
 savefail = Не вдалося зберегти гру!
 save.delete.confirm = Ви впевнені, що хочете видалити це збереження?
 save.delete = Видалити
@@ -156,23 +161,28 @@ cancel = Скасувати
 openlink = Відкрити посилання
 copylink = Скопіювати посилання
 back = Назад
+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 = Експортувати класичні дані
-classic.export.text = Класичне (версія 3.5 збірка 40) збереження або мапа були знайдені. Ви хочете експортувати ці дані в домашню папку телефону, для використання у додатку Mindustry Classic?
+classic.export.text = Класичне (версія 3.5 збірка 40) збереження або мапа були знайдені. Ви хочете експортувати ці дані в домашню теку телефону, для використання у додатку Mindustry Classic?
 quit.confirm = Ви впевнені, що хочете вийти?
 quit.confirm.tutorial = Ви впевнені, що хочете вийти з навчання?
-loading = [accent]Завантаження...
+loading = [accent]Завантаження…
-saving = [accent]Збереження...
+saving = [accent]Збереження…
 wave = [accent]Хвиля {0}
 wave.waiting = Хвиля через {0}
-wave.waveInProgress = [LIGHT_GRAY]Хвиля триває
+wave.waveInProgress = [lightgray]Хвиля триває
-waiting = Очікування...
+waiting = Очікування…
-waiting.players = Очікування гравців...
+waiting.players = Очікування гравців…
-wave.enemies = [LIGHT_GRAY]{0} ворог. залишилося
+wave.enemies = [lightgray]{0} ворог. залишилося
-wave.enemy = [LIGHT_GRAY]{0} ворог залишився
+wave.enemy = [lightgray]{0} ворог залишився
 loadimage = Завантажити зображення
 saveimage = Зберегти зображення
 unknown = Невідомо
-custom = Користувальницька
+custom = Користувацька
 builtin = Вбудована
 map.delete.confirm = Ви впевнені, що хочете видалити цю мапу? Цю дію неможливо скасувати!
 map.random = [accent]Випадкова мапа
@@ -195,25 +205,25 @@ editor.newmap = Нова мапа
 waves.title = Хвилі
 waves.remove = Видалити
 waves.never = <ніколи>
-waves.every = Кожен
+waves.every = кожен
 waves.waves = хвиля(і)
 waves.perspawn = за появу
 waves.to = до
 waves.boss = Бос
 waves.preview = Попередній перегляд
-waves.edit = Редагувати ...
+waves.edit = Редагувати …
 waves.copy = Копіювати у буфер обміну
 waves.load = Завантажити з буфера обміну
 waves.invalid = Недійсні хвилі у буфері обміну.
 waves.copied = Хвилі скопійовані.
-waves.none = Вороги не були встановлені.\nЗазначимо, що пуста хвиля буде автоматично замінена звичайною хвилею.
+waves.none = Вороги не були встановлені.\nЗазначимо, що пусті хвилі будуть автоматично замінені звичайною хвилею.
-editor.default = [LIGHT_GRAY]<За замовчуванням>
+editor.default = [lightgray]<За замовчуванням>
-edit = Редагувати...
+edit = Редагувати…
 editor.name = Назва:
 editor.spawn = Створити бойову одиницю
 editor.removeunit = Видалити бойову одиницю
 editor.teams = Команди
-editor.errorload = Помилка завантаження зображення:[accent] {0}
+editor.errorload = Помилка завантаження зображення:\n[accent] {0}
 editor.errorsave = Помилка збереження зображення:\n[accent]{0}
 editor.errorimage = Це зображення, а не мапа. Не змінюйте розширення, очікуючи, що це запрацює.\n\nЯкщо Ви хочете імпортувати застарілку мапу, то використовуйте кнопку «Імпортувати застаріле зображення» у редакторі.
 editor.errorlegacy = Ця мапа занадто стара і використовує попередній формат мапи, який більше не підтримується.
@@ -230,14 +240,14 @@ editor.saved = Збережено!
 editor.save.noname = Ваша мапа не має імені! Встановіть його в «Інформація про мапу».
 editor.save.overwrite = Ваша мапа перезаписує вбудовану мапу! Виберіть інше ім’я в «Інформація про мапу».
 editor.import.exists = [scarlet]Неможливо імпортувати:[] вбудована мапа з назвою «{0}» вже існує!
-editor.import = Імпорт...
+editor.import = Імпорт…
 editor.importmap = Імпортувати мапу
 editor.importmap.description = Імпортувати вже існуючу мапу
 editor.importfile = Імпортувати файл
 editor.importfile.description = Імпортувати зовнішній файл мапи
 editor.importimage = Імпортувати застаріле зображення
 editor.importimage.description = Імпорт із зображенням місцевості
-editor.export = Експорт...
+editor.export = Експорт…
 editor.exportfile = Експорт файлу
 editor.exportfile.description = Експортувати файл мапи
 editor.exportimage = Експорт зображення місцевості
@@ -251,20 +261,20 @@ editor.overwrite = [accent]Попередження!\nЦе перезапису
 editor.overwrite.confirm = [scarlet]Попередження![] Мапа з такою назвою вже існує. Ви впевнені, що хочете переписати її?
 editor.selectmap = Виберіть мапу для завантаження:
 toolmode.replace = Замінити
-toolmode.replace.description = Малює тільки на суцільних блоках.
+toolmode.replace.description = Малює тільки\nна суцільних блоках.
 toolmode.replaceall = Замінити все
 toolmode.replaceall.description = Замінює усі блоки на мапі.
 toolmode.orthogonal = Ортогональна
-toolmode.orthogonal.description = Малює лише ортогональні лінії.
+toolmode.orthogonal.description = Малює лише\nортогональні лінії.
 toolmode.square = Прямокутник
 toolmode.square.description = Прямокутна кисть.
 toolmode.eraseores = Видалення руд
 toolmode.eraseores.description = Видалити тільки руди.
 toolmode.fillteams = Змінити блок в команді
-toolmode.fillteams.description = Змінити блок в команді.
+toolmode.fillteams.description = Змінює належність\nблоків до команди.
 toolmode.drawteams = Змінити команду блока
-toolmode.drawteams.description = Змінює блок команди.
+toolmode.drawteams.description = Змінює належність\nблока до команди.
-filters.empty = [LIGHT_GRAY]Немає фільтрів! Додайте хоча б один за допомогою кнопки нижче.
+filters.empty = [lightgray]Немає фільтрів! Додайте хоча б один за допомогою кнопки нижче.
 filter.distort = Спотворення
 filter.noise = Шум
 filter.median = Медіана
@@ -273,18 +283,18 @@ filter.blend = Змішування
 filter.defaultores = Руди за замовчуванням
 filter.ore = Руда
 filter.rivernoise = Річковий шум
-filter.mirror = Дзеркало
+filter.mirror = Відображення
 filter.clear = Очистити
 filter.option.ignore = Ігнорувати
-filter.scatter = Розпилювач
+filter.scatter = Сіяч
 filter.terrain = Ландшафт
-filter.option.scale = Масштаб
+filter.option.scale = Масштаб фільтра
 filter.option.chance = Шанс
-filter.option.mag = Величина
+filter.option.mag = Сила застосування
-filter.option.threshold = Спад
+filter.option.threshold = Граничний порог
-filter.option.circle-scale = Кругова шкала
+filter.option.circle-scale = Масштаб круга
-filter.option.octaves = Октави
+filter.option.octaves = Циклічність застосування
-filter.option.falloff = Спад
+filter.option.falloff = Спад цикличности
 filter.option.angle = Вугол
 filter.option.block = Блок
 filter.option.floor = Поверхня
@@ -292,7 +302,7 @@ filter.option.flooronto = Цільова поверхня
 filter.option.wall = Стіна
 filter.option.ore = Руда
 filter.option.floor2 = Друга поверхня
-filter.option.threshold2 = Вторинний спад
+filter.option.threshold2 = Вторинний граничний порог
 filter.option.radius = Радіус
 filter.option.percentile = Спад
 width = Ширина:
@@ -315,27 +325,27 @@ donate = Пожертву\nвання
 abandon = Покинути
 abandon.text = Ця зона і всі її ресурси будуть втрачені.
 locked = Заблоковано
-complete = [LIGHT_GRAY]Досягнута:
+complete = [lightgray]Досягнута:
 zone.requirement = Хвиля {0} у зоні {1}
-resume = Відновити зону:\n[LIGHT_GRAY]{0}
+resume = Відновити зону:\n[lightgray]{0}
-bestwave = [LIGHT_GRAY]Найкраща хвиля: {0}
+bestwave = [lightgray]Найкраща хвиля: {0}
 launch = < ЗАПУСК >
 launch.title = Запуск вдалий
-launch.next = [LIGHT_GRAY]наступна можливість на {0}-тій хвилі
+launch.next = [lightgray]наступна можливість на {0}-тій хвилі
 launch.unable2 = [scarlet]ЗАПУСК неможливий.[]
 launch.confirm = Це видалить всі ресурси у Вашому ядрі.\nВи не зможете повернутися до цієї бази.
 launch.skip.confirm = Якщо Ви пропустите зараз, Ви не зможете не запускати до більш пізніх хвиль.
 uncover = Розкрити
 configure = Вивантажити конфігурацію
-configure.locked = [LIGHT_GRAY]Можливість розблокувати вивантаження ресурсів буде доступна на {0}-тій хвилі.
+configure.locked = [lightgray]Можливість розблокувати вивантаження ресурсів буде доступна на {0}-тій хвилі.
-zone.unlocked = Зона «[LIGHT_GRAY]{0}» тепер розблокована.
+zone.unlocked = Зона «[lightgray]{0}» тепер розблокована.
 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 = Додати...
+add = Додати…
 boss.health = Здоров’я босу
 connectfail = [crimson]Помилка підключення: [accent]{0}
 error.unreachable = Сервер не доступний.
@@ -346,7 +356,7 @@ error.alreadyconnected = Ви вже підключилися.
 error.mapnotfound = Файл мапи не знайдено
 error.io = Мережева помилка введення-виведення
 error.any = Невідома мережева помилка
-error.bloom = Не вдалося ініціалізувати світіння.\nВаш пристрій, мабуть, не підтримує це.
+error.bloom = Не вдалося ініціалізувати цвітіння.\nВаш пристрій, мабуть, не підтримує це.
 zone.groundZero.name = Нульова земля
 zone.desertWastes.name = Пустельні відходи
 zone.craters.name = Кратери
@@ -376,13 +386,14 @@ zone.fungalPass.description = Перехідна зона між високим
 zone.impact0078.description = <вставити опис тут>
 zone.crags.description = <вставити опис тут>
 settings.language = Мова
+settings.data = Game Data
 settings.reset = Скинути за замовчуванням
 settings.rebind = Зміна
 settings.controls = Керування
 settings.game = Гра
 settings.sound = Звук
 settings.graphics = Графіка
-settings.cleardata = Очистити дані...
+settings.cleardata = Очистити дані…
 settings.clear.confirm = Ви впевнені, що хочете очистити ці дані?\nЦя дія не може бути скасовано!
 settings.clearall.confirm = [scarlet]УВАГА![]\nЦе очистить всі дані, включаючи збереження, мапи, розблоковане та налаштування керування.\nПісля того, як ви натиснете ОК, гра видалить усі дані та автоматично закриється.
 settings.clearunlocks = Очистити розблоковане
@@ -397,7 +408,7 @@ attackpvponly = [scarlet]Наявне тільки у режимах атаки/
 blocks.input = Вхід
 blocks.output = Вихід
 blocks.booster = Прискорювач
-block.unknown = [LIGHT_GRAY]???
+block.unknown = [lightgray]???
 blocks.powercapacity = Місткість енергії
 blocks.powershot = Енергія/постріл
 blocks.damage = Шкода
@@ -474,7 +485,7 @@ setting.shadows.name = Тіні
 setting.linear.name = Лінійна фільтрація
 setting.animatedwater.name = Анімована вода
 setting.animatedshields.name = Анімовані щити
-setting.antialias.name = Згладжування[LIGHT_GRAY] (потребує перезапуску)[]
+setting.antialias.name = Згладжування[lightgray] (потребує перезапуску)[]
 setting.indicators.name = Показувати у сторону ворогів та союзників
 setting.autotarget.name = Авто-стрільба
 setting.keyboard.name = Миш+Керування з клавіатури
@@ -495,11 +506,11 @@ setting.sensitivity.name = Чутливість контролера
 setting.saveinterval.name = Інтервал збереження
 setting.seconds = {0} сек.
 setting.fullscreen.name = Повноекранний режим
-setting.borderlesswindow.name = Вікно без полів[LIGHT_GRAY] (може потребувати перезапуску)
+setting.borderlesswindow.name = Вікно без полів[lightgray] (може потребувати перезапуску)
 setting.fps.name = Показувати FPS
 setting.vsync.name = Вертикальна синхронізація
 setting.lasers.name = Показувати енергію лазерів
-setting.pixelate.name = Пікселізація[LIGHT_GRAY] (вимикає анімації)
+setting.pixelate.name = Пікселізація[lightgray] (вимикає анімації)
 setting.minimap.name = Показувати міні-мапу
 setting.musicvol.name = Гучність музики
 setting.ambientvol.name = Звуки навколишнього середовища
@@ -507,9 +518,10 @@ setting.mutemusic.name = Заглушити музику
 setting.sfxvol.name = Гучність звукових ефектів
 setting.mutesound.name = Заглушити звук
 setting.crashreport.name = Відсилати анонімні звіти про аварійне завершення гри
+setting.savecreate.name = Auto-Create Saves
 setting.chatopacity.name = Непрозорість чату
 setting.playerchat.name = Відображати чат у грі
-uiscale.reset = Масштаб користувальницького інтерфейсу було змінено.\nНатисніть «ОК» для підтверждення цього масшатабу.\n[scarlet]Повернення налаштувань і вихід через[accent] {0}[] ...
+uiscale.reset = Масштаб користувальницького інтерфейсу було змінено.\nНатисніть «ОК» для підтверждення цього масшатабу.\n[scarlet]Повернення налаштувань і вихід через[accent] {0}[] …
 uiscale.cancel = Скасувати & Вийти
 setting.bloom.name = Світіння
 keybind.title = Налаштування керування
@@ -522,11 +534,12 @@ command.retreat = Відступити
 command.patrol = Патрулювати
 keybind.gridMode.name = Вибрати блок
 keybind.gridModeShift.name = Вибрати категорію
-keybind.press = Натисніть клавішу...
+keybind.press = Натисніть клавішу…
-keybind.press.axis = Натисніть клавішу...
+keybind.press.axis = Натисніть клавішу…
 keybind.screenshot.name = Зняток мапи
 keybind.move_x.name = Рух по осі x
-keybind.move_y.name = Рух по осі x
+keybind.move_y.name = Рух по осі y
+keybind.fullscreen.name = Повноекранний
 keybind.select.name = Вибір/Постріл
 keybind.diagonal_placement.name = Діагональне розміщення
 keybind.pick.name = Вибрати блок
@@ -570,13 +583,13 @@ rules.unithealthmultiplier = Множник здоров’я бойов. од.
 rules.playerhealthmultiplier = Множник здоров’я гравця
 rules.playerdamagemultiplier = Множник шкоди гравця
 rules.unitdamagemultiplier = Множник шкоди бойових одиниць
-rules.enemycorebuildradius = Радіус захисту для ворожого ядра:[LIGHT_GRAY] (блоків)
+rules.enemycorebuildradius = Радіус захисту для ворожого ядра:[lightgray] (блоків)
-rules.respawntime = Час відродження:[LIGHT_GRAY] (sec)
+rules.respawntime = Час відродження:[lightgray] (sec)
-rules.wavespacing = Інтервал хвиль:[LIGHT_GRAY] (sec)
+rules.wavespacing = Інтервал хвиль:[lightgray] (sec)
 rules.buildcostmultiplier = Множник затрат на будівництво
 rules.buildspeedmultiplier = Множник швидкості будування
 rules.waitForWaveToEnd = Хвилі чекають на ворогів
-rules.dropzoneradius = Радіус зони висадки:[LIGHT_GRAY] (блоків)
+rules.dropzoneradius = Радіус зони висадки:[lightgray] (блоків)
 rules.respawns = Максимальна кількість відроджень за хвилю
 rules.limitedRespawns = Обмеження відроджень
 rules.title.waves = Хвилі
@@ -631,21 +644,21 @@ mech.trident-ship.name = Тризубець
 mech.trident-ship.weapon = Бомби
 mech.glaive-ship.name = Спис
 mech.glaive-ship.weapon = Вогняний кулемет
-item.explosiveness = [LIGHT_GRAY]Вибухонебезпечність: {0}%
+item.explosiveness = [lightgray]Вибухонебезпечність: {0}%
-item.flammability = [LIGHT_GRAY]Вогненебезпечність: {0}%
+item.flammability = [lightgray]Вогненебезпечність: {0}%
-item.radioactivity = [LIGHT_GRAY]Радіоактивність: {0}%
+item.radioactivity = [lightgray]Радіоактивність: {0}%
-unit.health = [LIGHT_GRAY]Здоров’я: {0}
+unit.health = [lightgray]Здоров’я: {0}
-unit.speed = [LIGHT_GRAY]Швидкість: {0}
+unit.speed = [lightgray]Швидкість: {0}
-mech.weapon = [LIGHT_GRAY]Зброя: {0}
+mech.weapon = [lightgray]Зброя: {0}
-mech.health = [LIGHT_GRAY]Здоров’я: {0}
+mech.health = [lightgray]Здоров’я: {0}
-mech.itemcapacity = [LIGHT_GRAY]Місткість елементів: {0}
+mech.itemcapacity = [lightgray]Місткість елементів: {0}
-mech.minespeed = [LIGHT_GRAY]Швидкість видобутку: {0}%
+mech.minespeed = [lightgray]Швидкість видобутку: {0}%
-mech.minepower = [LIGHT_GRAY]Потужність видобутку: {0}
+mech.minepower = [lightgray]Потужність видобутку: {0}
-mech.ability = [LIGHT_GRAY]Здібність: {0}
+mech.ability = [lightgray]Здібність: {0}
-mech.buildspeed = [LIGHT_GRAY]Швидкість будування: {0}%
+mech.buildspeed = [lightgray]Швидкість будування: {0}%
-liquid.heatcapacity = [LIGHT_GRAY]Теплоємність: {0}
+liquid.heatcapacity = [lightgray]Теплоємність: {0}
-liquid.viscosity = [LIGHT_GRAY]В’язкість: {0}
+liquid.viscosity = [lightgray]В’язкість: {0}
-liquid.temperature = [LIGHT_GRAY]Температура: {0}
+liquid.temperature = [lightgray]Температура: {0}
 block.sand-boulder.name = Пісочний валун
 block.grass.name = Трава
 block.salt.name = Сіль
@@ -672,7 +685,7 @@ block.thruster.name = Штовхач
 block.kiln.name = Піч
 block.graphite-press.name = Графітний прес
 block.multi-press.name = Мульти-прес
-block.constructing = {0}\n[LIGHT_GRAY](В процесі)
+block.constructing = {0}\n[lightgray](В процесі)
 block.spawn.name = Місце появи ворога
 block.core-shard.name = Ядро «Осколок»
 block.core-foundation.name = Ядро «Штаб»
@@ -790,6 +803,7 @@ block.blast-mixer.name = Мішалка вибухонебезпечного з
 block.solar-panel.name = Сонячна панель
 block.solar-panel-large.name = Велика сонячна панель
 block.oil-extractor.name = Нафтова вежа
+block.command-center.name = Командний центр
 block.draug-factory.name = Завод дронів «Драугр»
 block.spirit-factory.name = Завод дронів-ремонтників «Привид»
 block.phantom-factory.name = Завод дронів-будівників «Фантом»
@@ -1012,6 +1026,7 @@ block.ripple.description = Надзвичайно потужна артилер
 block.cyclone.description = Велика протиповітряна та протиземна башта. Підпалює вибухонебезпечними грудками скупчення ворогів.
 block.spectre.description = Масивна двоствольна гармата. Стріляє великими бронебійними кулями в повітряні та наземні цілі.
 block.meltdown.description = Масивна лазерна гармата. Заряджає і стріляє стійким лазерним променем у сусідніх ворогів. Для роботи потрібен теплоносій.
+block.command-center.description = Наказує бойовим одиницям пересуватися по всій мапі.\nНаявні команди: патрулювання, атакувати вороже ядро, відступити до ядра/заводу. Якщо ворожого ядра немає, то бойові одиниці будуть патрулювати за замовчуванням, коли була застосована команда атакувати.
 block.draug-factory.description = Виробляє дронів, які видобувають ресурси.
 block.spirit-factory.description = Виробляє дронів, які ремонтують блоки.
 block.phantom-factory.description = Виробляє дронів, які допомогають у будівництві.

core/assets/bundles/bundle_zh_CN.properties

@@ -16,6 +16,11 @@ screenshot.invalid = 地图太大，可能没有足够的内存用于截图。
 gameover = 你的核心被摧毁了！
 gameover.pvp = [accent] {0}[] 队获胜!
 highscore = [accent]新纪录！
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = 战胜的波数：[accent]{0}
 stat.enemiesDestroyed = 消灭的敌人：[accent]{0}
 stat.built = 建造的建筑：[accent]{0}
@@ -23,8 +28,6 @@ stat.destroyed = 摧毁的建筑：[accent]{0}
 stat.deconstructed = 拆除的建筑：[accent]{0}
 stat.delivered = 发射的资源：
 stat.rank = 最终等级：[accent]{0}
-placeline = 你选择了一个方块。\n你可以[accent]长按几秒钟[]并向一个方向拖动来[accent]直线放置方块[]。\n试试看吧。
-removearea = 你选择了拆除模式。\n你可以[accent]长按几秒钟[]并拖动来[accent]删除矩形内的方块[]。\n试试看吧。
 launcheditems = [accent]发射的资源
 map.delete = 确定要删除 "[accent]{0}[]" 地图吗？
 level.highscore = 最高分：[accent]{0}
@@ -43,7 +46,7 @@ newgame = 新游戏
 none = <无>
 minimap = 小地图
 close = 关闭
-website = Website
+website = 官网
 quit = 退出
 maps = 地图
 continue = 继续
@@ -63,16 +66,18 @@ players.single = {0}玩家在线
 server.closing = [accent]正在关闭服务器……
 server.kicked.kick = 你被踢出服务器了！
 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.recentKick = 你刚刚被踢出服务器。\n请稍后重新连接！
 server.kicked.nameInUse = 你的名字与服务器中的一个人重复了。
 server.kicked.nameEmpty = 无效的名字！
 server.kicked.idInUse = 你已在这个服务器上！不允许用两个账号连接。
 server.kicked.customClient = 这个服务器不支持定制版本。下载官方版本。
 server.kicked.gameover = 游戏结束！
-server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
+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地址。
 hostserver = 创建服务器
@@ -88,18 +93,18 @@ trace = 跟踪玩家
 trace.playername = 玩家名称：[accent]{0}
 trace.ip = IP地址：[accent]{0}
 trace.id = 唯一的ID：[accent]{0}
-trace.mobile = Mobile Client: [accent]{0}
+trace.mobile = 移动客户端：[accent]{0}
 trace.modclient = 定制版客户端：[accent]{0}
 invalidid = 无效的客户端ID！提交一个错误报告。
 server.bans = 黑名单
-server.bans.none = 没有找到被拉黑的玩家！
+server.bans.none = 没有被拉黑的玩家！
 server.admins = 管理员
-server.admins.none = 没有找到管理员！
+server.admins.none = 没有管理员！
 server.add = 添加服务器
 server.delete = 你确定要删除这个服务器吗？
 server.edit = 编辑服务器
-server.outdated = [crimson]过旧的服务器！[]
+server.outdated = [crimson]服务器过旧！[]
-server.outdated.client = [crimson]过旧的客户端！[]
+server.outdated.client = [crimson]客户端过旧！[]
 server.version = [lightgray]版本：{0} {1}
 server.custombuild = [yellow]定制版
 confirmban = 确认拉黑这名玩家？
@@ -117,7 +122,7 @@ server.port = 端口：
 server.addressinuse = 地址已经在使用中！
 server.invalidport = 无效的端口号！
 server.error = [crimson]创建服务器错误：[accent]{0}
-save.old = 这个存档属于旧版本游戏，不再被使用。\n\n[LIGHT_GRAY]存档向下兼容将在完整的 4.0 版本中实现。
+save.old = 这个存档属于旧版本游戏，不再被使用。\n\n[LIGHT_GRAY]存档向下兼容将在完整的4.0版本中实现。
 save.new = 新存档
 save.overwrite = 你确定你要覆盖这个存档位吗？
 overwrite = 覆盖
@@ -156,10 +161,15 @@ cancel = 取消
 openlink = 打开链接
 copylink = 复制链接
 back = 返回
-classic.export = Export Classic Data
+data.export = Export 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?
+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 = 导出老版本数据
+classic.export.text = [accent]Mindustry []刚刚有了一个重要的更新。\n检测到此为老版本(v3.5 build 40)的存档或地图。是否要将这些保存导出到手机的主文件夹中，以便在 Mindustry 老版本应用程序中使用？
 quit.confirm = 确定退出？
-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 = 你确定不玩教程就开始游戏？\n教程可以通过[accent]设置->游戏->重新游玩教程[]来再次游玩。
 loading = [accent]加载中……
 saving = [accent]保存中……
 wave = [accent]波次 {0}
@@ -229,7 +239,7 @@ editor.savemap = 保存地图
 editor.saved = 已保存！
 editor.save.noname = 你的地图没有名字！在“地图信息”菜单里设置一个。
 editor.save.overwrite = 你的地图覆盖了一个内建的地图！在“地图信息”菜单里重新设置一个不同的名称。
-editor.import.exists = [scarlet]无法导入:[]名为‘{0}’的内建地图已存在！
+editor.import.exists = [scarlet]无法导入：[]名为‘{0}’的内建地图已存在！
 editor.import = 导入……
 editor.importmap = 导入地图
 editor.importmap.description = 导入一个已经存在的地图
@@ -308,7 +318,7 @@ ping = 延迟：{0}毫秒
 language.restart = 为了使语言设置生效请重启游戏。
 settings = 设置
 tutorial = 教程
-tutorial.retake = Re-Take Tutorial
+tutorial.retake = 重新游玩教程
 editor = 编辑器
 mapeditor = 地图编辑器
 donate = 打赏
@@ -322,12 +332,12 @@ bestwave = [LIGHT_GRAY]最高波次：{0}
 launch = < 发射 >
 launch.title = 发射成功
 launch.next = [LIGHT_GRAY]下一个发射机会在第 {0} 波
-launch.unable2 = [scarlet]Unable to LAUNCH.[]
+launch.unable2 = [scarlet]无法发射[]
-launch.confirm = 您将发射核心中所有资源。\n此地图将被重置。
+launch.confirm = 您将发射核心中所有资源。\n此地图将重置。
-launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
+launch.skip.confirm = 如果你现在跳过，在后来的波次前你将无法发射。
 uncover = 解锁
 configure = 设定发射资源数量
-configure.locked = [LIGHT_GRAY]到达第 {0} 波\n才设定发射资源。
+configure.locked = [LIGHT_GRAY]到达第 {0} 波\n才能设定发射资源。
 zone.unlocked = [LIGHT_GRAY]{0} 已解锁。
 zone.requirement.complete = 已达到第{0}波。\n达到解锁{1}的需求。
 zone.config.complete = 已达到第{0}波。\n允许携带发射的资源进入此地区。
@@ -360,7 +370,7 @@ zone.tarFields.name = 石油田
 zone.saltFlats.name = 盐碱荒滩
 zone.impact0078.name = 0078号冲击
 zone.crags.name = 悬崖
-zone.fungalPass.name = Fungal Pass
+zone.fungalPass.name = 真菌通道
 zone.groundZero.description = 重新开始的最佳位置。敌人威胁很小，资源少。\n尽可能收集多的铅和铜。\n行动。
 zone.frozenForest.description = 即使在这里，靠近山脉的地方，孢子也已经扩散。寒冷的温度不可能永远容纳它们。\n\n此行动须投入电力。建造燃烧发电机并学会使用修理者。
 zone.desertWastes.description = 这些废物是巨大的，不可预测的，并且与废弃的结构交错在一起。燃烧它以获取动力或合成石墨。\n\n[lightgray]无法保证此着陆位置。
@@ -368,14 +378,15 @@ zone.saltFlats.description = 在沙漠的郊区有盐滩。在这个地方几乎
 zone.craters.description = 水在这个火山口积聚，这是旧战争的遗迹。夺下该区域。收集沙子来冶炼玻璃。用水泵抽水冷却炮塔和钻头。
 zone.ruinousShores.description = 穿过荒地，就是海岸线。曾经这个地方安置了一个海岸防御阵列。现在剩下的不多了，只有最基本的防御结构仍然毫发无损，其他一切都被销毁了。\n继续向外扩展。继续研究科技。
 zone.stainedMountains.description = 在更远的内陆地区是山脉，但没有被孢子污染。\n在这一地区分布着丰富的钛。学习如何使用它。\n\n这里敌人的存在更大。不要给他们时间派出最强的部队。
-zone.overgrowth.description = 这个地区生长过度，靠近孢子的来源。\n敌人在这里建立了一个前哨站。建造尖刀单位来摧毁它并找回丢失的东西。
+zone.overgrowth.description = 这个地区靠近孢子的来源，生长过度。\n敌人在这里建立了一个前哨站。建造尖刀单位来摧毁它并找回丢失的东西。
 zone.tarFields.description = 位于山脉和沙漠之间的产油区的郊区是少数几个有可用焦油储量的地区之一。\n尽管被废弃，但附近仍有一些危险的敌军。不要低估它们。\n\n[lightgray]如果可能，研究石油加工技术。
 zone.desolateRift.description = 非常危险的区域。资源丰富但空间小。破坏风险高。尽快离开，不要被敌人的攻击间隔太长所愚弄。
-zone.nuclearComplex.description = 以前生产和加工钍的设施已变成废墟。\n[浅灰色]研究钍及其多种用途。\n\n敌人在这里大量存在，不断侦察入侵者。
+zone.nuclearComplex.description = 以前生产和加工钍的设施已变成废墟。\n[lightgray]研究钍及其多种用途。\n\n敌人在这里大量存在，不断侦察入侵者。
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
+zone.fungalPass.description = 介于高山和低矮孢子丛生的土地之间的过渡地带。这里有一个小型的敌方侦察基地。\n侦察它。\n使用尖刀和爬行者单位来消灭两个核心。
 zone.impact0078.description = <在此处插入说明>
 zone.crags.description = <在此处插入说明>
 settings.language = 语言
+settings.data = Game Data
 settings.reset = 恢复默认
 settings.rebind = 重新绑定
 settings.controls = 控制
@@ -424,10 +435,10 @@ blocks.maxunits = 最大单位数量
 blocks.health = 生命值
 blocks.buildtime = 建造时间
 blocks.inaccuracy = 误差
-blocks.shots = 发射数
+blocks.shots = 每秒发射数
 blocks.reload = 重新装弹
 blocks.ammo = 子弹
-bar.drilltierreq = Better Drill Required
+bar.drilltierreq = 需要更好的钻头
 bar.drillspeed = 挖掘速度：{0}/s
 bar.efficiency = 效率：{0}%
 bar.powerbalance = 能量：{0}
@@ -471,17 +482,17 @@ 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.antialias.name = 抗锯齿[LIGHT_GRAY]（需要重新启动）[]
 setting.indicators.name = 队友指示器
 setting.autotarget.name = 自动射击
 setting.keyboard.name = 鼠标+键盘操控
 setting.fpscap.name = 最大FPS
 setting.fpscap.none = 无
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI缩放比例[lightgray] (需要重新启动)[]
+setting.uiscale.name = UI缩放比例[lightgray](需要重新启动)[]
 setting.swapdiagonal.name = 自动铺设
 setting.difficulty.training = 训练
 setting.difficulty.easy = 简单
@@ -499,14 +510,15 @@ setting.borderlesswindow.name = 无边框窗口[LIGHT_GRAY] (可能需要重启)
 setting.fps.name = 显示 FPS
 setting.vsync.name = 垂直同步
 setting.lasers.name = 显示能量射线
-setting.pixelate.name = 像素画面 [LIGHT_GRAY](可能会降低性能)
+setting.pixelate.name = 像素画面 [LIGHT_GRAY](禁用动画)
 setting.minimap.name = 显示小地图
 setting.musicvol.name = 音乐音量
-setting.ambientvol.name = Ambient Volume
+setting.ambientvol.name = 环境体积
 setting.mutemusic.name = 静音
 setting.sfxvol.name = 音效音量
 setting.mutesound.name = 静音
 setting.crashreport.name = 发送匿名崩溃报告
+setting.savecreate.name = Auto-Create Saves
 setting.chatopacity.name = 聊天界面透明度
 setting.playerchat.name = 显示游戏内聊天界面
 uiscale.reset = UI缩放比例已经改变。\n按下“确定”来确定缩放比例\n[accent]{0}[]秒后[scarlet]退出并恢复设定。
@@ -527,7 +539,8 @@ keybind.press.axis = 按一下轴或键……
 keybind.screenshot.name = 地图截图
 keybind.move_x.name = 水平移动
 keybind.move_y.name = 垂直移动
-keybind.select.name = 选择
+keybind.fullscreen.name = 切换全屏
+keybind.select.name = 选择/射击
 keybind.diagonal_placement.name = 自动铺设
 keybind.pick.name = 选择方块
 keybind.break_block.name = 破坏方块
@@ -576,7 +589,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 = 波次
@@ -635,7 +648,7 @@ item.explosiveness = [LIGHT_GRAY]爆炸性：{0}
 item.flammability = [LIGHT_GRAY]易燃性：{0}
 item.radioactivity = [LIGHT_GRAY]放射性：{0}
 unit.health = [LIGHT_GRAY]生命值：{0}
-unit.speed = [LIGHT_GRAY]速度：{0}有
+unit.speed = [LIGHT_GRAY]速度：{0}
 mech.weapon = [LIGHT_GRAY]武器：{0}
 mech.health = [LIGHT_GRAY]生命值： {0}
 mech.itemcapacity = [LIGHT_GRAY]物品容量：{0}
@@ -731,7 +744,7 @@ block.duo.name = 双管炮
 block.scorch.name = 火焰炮
 block.scatter.name = 分裂炮
 block.hail.name = 冰雹炮
-block.lancer.name = 激光矛
+block.lancer.name = 蓝瑟炮
 block.conveyor.name = 传送带
 block.titanium-conveyor.name = 钛传送带
 block.junction.name = 连接点
@@ -790,6 +803,7 @@ block.blast-mixer.name = 爆炸混合器
 block.solar-panel.name = 太阳能电池
 block.solar-panel-large.name = 大型太阳能电池
 block.oil-extractor.name = 石油钻井
+block.command-center.name = 指挥中心
 block.draug-factory.name = 德鲁格采矿机工厂
 block.spirit-factory.name = 幽灵修理机工厂
 block.phantom-factory.name = 鬼怪建造机工厂
@@ -852,26 +866,26 @@ unit.chaos-array.name = 混沌者
 unit.eradicator.name = 根除者
 unit.lich.name = 尸鬼
 unit.reaper.name = 死神
-tutorial.next = [lightgray]<Tap to continue>
+tutorial.next = [lightgray]<点击以继续>
-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.intro = 你进入了[scarlet] Mindustry 教程[]。\n[accent]采集铜矿[]以开始。点击附近的一处铜矿。\n\n[accent]{0}/{1} 铜
-tutorial.drill = 手动采矿效率低.\n[accent] 钻头 []可以自动采矿.\n放一个在铜矿上吧.
+tutorial.drill = 手动采矿效率低。\n[accent]钻头[]可以自动采矿。\n放一个在铜矿上吧。\n点击右下角的钻头菜单。\n选择[accent]机械钻头[]。\n单击将其放置在铜矿上。\n[accent]右键单击[]来停止。
-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.drill.mobile = 手动采矿效率低。\n[accent]钻头[]可以自动采矿。\n点击右下角的钻头菜单。\n选择[accent]机械钻头[]。\n点击将其放在铜矿上，点击[accent]对号[]来确定。\n点击[accent]叉号[]来取消。
-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.blockinfo = 每个方块具有不同的数据。每个钻头只能开采某些矿石。\n要检查块的信息和统计信息，[accent]在菜单中点击问号。[]\n\n[accent]现在查看机械钻头的数据吧。[]
-tutorial.conveyor = [accent]传送带[] 可以把物资传送到核心.\n请造一个传送线，从钻头到核心.
+tutorial.conveyor = [accent]传送带[]可以把物资传送到核心。\n请从钻头到核心间造一条传送带。
-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.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.drillturret = 双管炮需要[accent]铜[]作弹药来射击。\n可以放一个钻头在炮塔附近供应铜。
-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 = 在战斗中，您可以[accent]暂停游戏[]。\n暂停时您可以规划建筑物。\n\n按[accent]空格[]暂停。
-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.pause.mobile = 在战斗中，您可以[accent]暂停游戏[]。\n暂停时您可以规划建筑物。\n\n[accent]点击左上角的按钮以暂停。
-tutorial.unpause = Now press space again to unpause.
+tutorial.unpause = 现在再次按空格以继续。
-tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.unpause.mobile = 现在再次点击以继续。
-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 = 方块经常需要拆除。\n[accent]按住鼠标右键[]来拆除选中的方块。[]\n\n[accent]使用范围拆除来拆除核心左侧的废墙。
-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.breaking.mobile = 方块经常需要拆除。\n[accent]选择拆除模式[]，点击方块以拆除。\n[accent]长按几秒[]并拖动来范围拆除。\n点击对号来确定。\n\n[accent]使用范围拆除来拆除核心左侧的废墙。
-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.withdraw = 有时，从方块中取出物品是必要的。\n[accent]点击有物品的方块[]，然后[accent]点击在方框中的物品[]。\n可以通过[accent]点击或长按[]来取出物品。\n\n[accent]从核心中取出一些铜[]。
-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.deposit = 将物品从机甲拖向方块来放下物品。\n\n[accent]将铜放回核心[]。
-tutorial.waves = [LIGHT_GRAY]敌人[] 来了.\n\n保护基地，防御2波攻击. 造更多的炮塔.
+tutorial.waves = [lightgray]敌人[]来了。\n\n保护核心，防御2波攻击。造更多的炮塔。[accent]点击[]以射击。\n建造更多的炮塔和钻头，并采更多的矿。
-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.waves.mobile = [lightgray]敌人[]来了。\n\n保护核心，防御2波攻击。造更多的炮塔。你的机甲将对敌人自动开火。\n建造更多的炮塔和钻头，并采更多的矿。
-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 = 特定波次中，你可以[accent]发射核心[]，[accent]携带核心中所有资源[]离开所有的建筑。\n资源可用来研究科技。\n\n[accent]点击发射按钮。
 item.copper.description = 一种有用的结构材料。在各种类型的方块中广泛使用。
 item.lead.description = 一种基本的起始材料。被广泛用于电子设备和液体运输方块。 
 item.metaglass.description = 一种超级强硬的复合玻璃。通常用来传送和收藏液体。
@@ -893,7 +907,7 @@ liquid.slag.description = 各种不同类型的熔融金属混合在一起的液
 liquid.oil.description = 用于先进材料生产的液体。可以转换成煤作为燃料，或作为武器喷射和放火。
 liquid.cryofluid.description = 一种由水和钛制成的惰性、无腐蚀性的液体。具有极高的热容量。广泛用作冷却剂。
 mech.alpha-mech.description = 标准控制机甲。基于尖刀单位，具有升级的装甲和建筑能力。比Dart有更多的伤害输出。
-mech.delta-mech.description = 一种快速，轻便的机甲，一击即退。对结构造成的伤害很小，但可以用弧形闪电武器很快杀死大量敌方单位。
+mech.delta-mech.description = 一种快速，轻便的机甲，一击即退。对结构造成的伤害很小，但可以用弧形闪电武器快速杀死大量敌方单位。
 mech.tau-mech.description = 后勤机甲。治疗友军。可以熄灭火焰并治疗一定范围内的友军。
 mech.omega-mech.description = 一种装甲厚重的机甲，用于在前线攻击。它的护甲可以阻挡高达90%的伤害。
 mech.dart-ship.description = 标准飞船。快速轻便，但攻击能力低，采矿速度慢。
@@ -907,10 +921,10 @@ unit.dagger.description = 一种最基本的地面机甲。生产成本低。在
 unit.crawler.description = 一种地面装置，由一个框架和绑在上面的烈性炸药组成。不是特别耐用。与敌人接触后爆炸。
 unit.titan.description = 一种先进的装甲地面部队。攻击地面和空中目标。配备两个微型灼烧级火焰喷射器。
 unit.fortress.description = 一种重型炮兵机甲。装备两门改进型冰雹炮，用于对敌军建筑物和部队进行远程攻击。
-unit.eruptor.description = 一种用来拆除建筑物的重型机甲。在敌人的防御工事上发射一股熔渣，将它们熔化并点燃挥发物。
+unit.eruptor.description = 一种用来拆除建筑物的重型机甲。在敌人的防御工事上发射矿渣，将它们熔化并点燃挥发物。
 unit.wraith.description = 一种快速、一击即退的拦截器机甲。目标是发电机。
 unit.ghoul.description = 一种地毯式轰炸机。通过敌人的结构进行攻击，并瞄准关键的基础设施。
-unit.revenant.description = 一种发射导弹的重型飞行机甲
+unit.revenant.description = 一种发射导弹的重型飞行机甲。
 block.graphite-press.description = 把大块的煤压缩成纯石墨片。
 block.multi-press.description = 石墨压缩机的升级版。利用水和电力快速高效地处理煤炭。
 block.silicon-smelter.description = 用高纯度的焦炭来加工沙子以生产硅。
@@ -920,7 +934,7 @@ block.phase-weaver.description = 用放射性钍和大量沙子生产相织物
 block.alloy-smelter.description = 用钛，铅，硅和铜生产浪涌合金。
 block.cryofluidmixer.description = 水和钛结合到低温流体中，冷却效率更高。
 block.blast-mixer.description = 用油将硫转化为不易燃但更具爆炸性的爆炸化合物。
-block.pyratite-mixer.description = 用煤，铅和沙子混合成高度易燃的硫。
+block.pyratite-mixer.description = 将煤，铅和沙子混合成高度易燃的硫。
 block.melter.description = 将废料熔化成矿渣，以便进一步加工或用于炮塔子弹。
 block.separator.description = 从矿渣中提取有用的矿物。
 block.spore-press.description = 压缩孢子荚得到石油。
@@ -955,63 +969,64 @@ block.junction.description = 两条交叉传送带的桥梁。适用于两条不
 block.bridge-conveyor.description = 高级项目传输块。允许在跨越任何地形或建筑物上运输物品，最多跨越3个块。
 block.phase-conveyor.description = 高级传送带。使用电力将物品传送到距离几个块的相位传送带上。
 block.sorter.description = 对物品进行分类。如果物品与所选种类，则允许其通过。否则，物品将从左边和右边输出。
-block.router.description = 从一个方向接受物品，并将它们平均输出到最多3个其他方向。用于将材料从一个源分割为多个目标。
+block.router.description = 从一个方向接受物品，并将它们平均输出到最多3个其他方向。用于将材料分成多份。
-block.distributor.description = 一个高级路由器，可以将物品分成最多7个方向。
+block.distributor.description = 一个高级路由器，可以将物品向最多7个方向输出。
 block.overflow-gate.description = 分离器和路由器的组合，如果前面被挡住，则向从左和右输出。
-block.mass-driver.description = 终极传送带。收集几件物品，然后将它们射向长距离外的另一个批量传送带。
+block.mass-driver.description = 终极传送带。收集物品后将它们射向远处的另一个质量驱动器。
 block.mechanical-pump.description = 一种输出速度慢但没有功耗的廉价泵。
-block.rotary-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 = 存储大量液体。当存在对材料的非恒定需求或作为冷却重要块的安全措施时，将其用于创建缓冲区。
 block.liquid-junction.description = 作为两个交叉管道的桥梁。适用于两种不同导管将不同液体输送到不同位置的情况。
 block.bridge-conduit.description = 高级液体传输块。允许在任何地形或建筑物的最多3个块上运输液体。
 block.phase-conduit.description = 高级液体传输块。使用电力将液体传送到多个块上的连接相管道。
-block.power-node.description = 连接节点传输电源。最多可连接四个电源，用电器或节点。节点将从任何相邻块接收电力或向其供电。
+block.power-node.description = 将电源传输到连接的节点。节点将接收来自或向任何相邻块供电。
-block.power-node-large.description = 传输径大于电源节点，最多可连接六个电源，接收器或节点。
+block.power-node-large.description = 具有更大范围和更多连接点的高级能量节点。
 block.surge-tower.description = 具有较少可用连接的远程电源节点。
 block.battery.description = 储存电力，当储存有能量时，可在电力短缺时提供电力。
 block.battery-large.description = 比普通电池容量更大。
-block.combustion-generator.description = 通过燃烧油或易燃材料产生电力。
+block.combustion-generator.description = 燃烧煤等易燃材料发电。
 block.thermal-generator.description = 当放置在热的地方时发电。
-block.turbine-generator.description = 比燃烧发电机更有效，但需要额外的水。
+block.turbine-generator.description = 先进的燃烧发电机，效率更高，但需要额外的水来产生蒸汽。
-block.differential-generator.description = 产生大量的能量。利用低温流体和燃烧的硫之间的温差。
+block.differential-generator.description = 利用低温流体和燃烧的硫之间的温差产生大量的能量。
-block.rtg-generator.description = 一种放射性同位素热电发电机，它不需要冷却，但功率低于钍反应堆。
+block.rtg-generator.description = 简单可靠的发电机。利用衰变放射性化合物的热量以缓慢的速度产生能量。
 block.solar-panel.description = 标准太阳能面板，提供少量电力。
 block.solar-panel-large.description = 比标准太阳能电池板提供更好的电源，但构建起来要贵得多。
 block.thorium-reactor.description = 高放射性钍产生大量电力。需要持续冷却。如果供应的冷却剂量不足，会剧烈爆炸。
-block.impact-reactor.description = 一种先进的发电机，能够以最高效率产生大量的电力。需要大量的电源输入才能启动进程。
+block.impact-reactor.description = 一种先进的发电机，能够以最高效率产生大量的电力。需要大量的电源输入才能启动。
-block.mechanical-drill.description = 便宜的钻头。放置在适当的块上时，无限期地以缓慢的速度输出物品。
+block.mechanical-drill.description = 一种便宜的钻头。放置在适当的块上时，以缓慢的速度无限期地输出物品。只能开采基本资源。
-block.pneumatic-drill.description = 一种改进的钻头，它更快，能够利用气压处理更硬的材料。
+block.pneumatic-drill.description = 一种改进的钻头，能开采钛。采矿速度比机械钻快。
-block.laser-drill.description = 通过激光技术更快地钻孔，但需要电源。此外，这种钻头可以回收放射性钍。
+block.laser-drill.description = 通过激光技术更快开采，但需要电力。这种钻头可以回收放射性钍。
 block.blast-drill.description = 终极钻头，需要大量电力。
-block.water-extractor.description = 从地下提取水。当附近没有湖泊时使用它。
+block.water-extractor.description = 从地下提取水。当附近没有直接的水来源时使用它。
 block.cultivator.description = 将微小浓度的孢子培养成工业用的孢子荚。
 block.oil-extractor.description = 使用大量的电力从沙子中提取石油。当附近没有直接的石油来源时使用它。
 block.core-shard.description = 核心第一代。一旦被摧毁，与该地区的所有联系都将失去。不要让这种情况发生。
 block.core-foundation.description = 核心第二代。有更好的装甲。可以存储更多资源。
 block.core-nucleus.description = 核心第三代，也是最后一代。装甲非常好。存储大量资源。
-block.vault.description = 存储大量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。 [LIGHT_GRAY]卸载器[]可用于从仓库中获取物品。
+block.vault.description = 存储大量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。[LIGHT_GRAY]卸载器[]可用于从仓库中获取物品。
-block.container.description = 存储少量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。 [LIGHT_GRAY]卸载器[]可用于从容器中获取物品。
+block.container.description = 存储少量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。[LIGHT_GRAY]卸载器[]可用于从容器中获取物品。
 block.unloader.description = 物品从容器，仓库或核心卸载到传送带上或直接卸载到相邻的块中。可以通过点击卸载器来更改要卸载的项目类型。
 block.launch-pad.description = 不通过核心发射物体。
 block.launch-pad-large.description = 发射台的改进版。存储更多物体。启动频率更高。
 block.duo.description = 小而便宜的炮塔。对地高效。
 block.scatter.description = 不可或缺的防空炮塔，向空中单位发射铅或废料。
 block.scorch.description = 小型炮塔，燃烧任何靠近它的地面敌人。近距离非常有效。
-block.hail.description = 小型，远程炮台。
+block.hail.description = 小型远程炮台。
 block.wave.description = 中型快速炮塔，射出液体泡泡。有液体输入时自动灭火。
 block.lancer.description = 中型对地炮塔。遇敌时会充能并发射强有力的的能量束。
 block.arc.description = 小型炮塔，发射电弧。
 block.swarmer.description = 中型炮塔，对空对地，发射跟踪爆炸导弹。
-block.salvo.description = 双管炮的升级。中型，齐射射击。
+block.salvo.description = 双管炮的升级版。中型，齐射射击。
 block.fuse.description = 大型炮塔，发射三道刺穿敌人的短程光束。
 block.ripple.description = 大型远程炮台，非常强力，向远处的敌人投射一簇弹药。
 block.cyclone.description = 大型快速炮塔，对空对地，向周围敌人发射爆炸弹。
 block.spectre.description = 超大型炮塔，对空对地，一次射出两颗强大的穿甲子弹。
 block.meltdown.description = 超大型激光炮塔，充能之后持续发射光束，需要冷却剂。
+block.command-center.description = 在地图上向盟军发出移动命令。\n使用部队巡逻、攻击敌军核心或撤退到核心/工厂。当没有敌人核心时，部队默认在攻击命令下巡逻。
 block.draug-factory.description = 生产德鲁格釆矿机。
 block.spirit-factory.description = 生产幽灵修理机。
 block.phantom-factory.description = 生产鬼怪建造机。
@@ -1023,10 +1038,10 @@ block.crawler-factory.description = 生产快速自毁单元。
 block.titan-factory.description = 生产先进的装甲地面单位。
 block.fortress-factory.description = 生产重型地面火炮部队。
 block.repair-point.description = 连续治疗附近最近的受损单位。
-block.dart-mech-pad.description = 离开你当前的装置，换成一个基本攻击机甲。\n站在上面时双击切换。
+block.dart-mech-pad.description = 离开你当前的装置，换成一个基本攻击机甲。\n站在上面时点击切换。
-block.delta-mech-pad.description = 离开你当前的装置并换成一个快速，轻装甲的机械装置，用于快速攻击。\n站在上面时双击切换。
+block.delta-mech-pad.description = 离开你当前的装置并换成一个快速，轻装甲的机械装置，用于快速攻击。\n站在上面时点击切换。
-block.tau-mech-pad.description = 离开你当前的装置并换成一个可以治愈友方建筑物和单位的支撑机械。\n站在上面时双击切换。
+block.tau-mech-pad.description = 离开你当前的装置并换成一个可以治愈友方建筑物和单位的后勤机甲。\n站在上面时点击切换。
-block.omega-mech-pad.description = 离开你当前的装置并换成一个笨重且装甲良好的机甲，用于前线攻击。\n站在上面时双击切换。
+block.omega-mech-pad.description = 离开你当前的装置并换成一个笨重且装甲良好的机甲，用于前线攻击。\n站在上面时点击切换。
-block.javelin-ship-pad.description = 离开你当前的装置，换成一个强大而快速的截击机，用闪电武器。\n站在上面时双击切换。
+block.javelin-ship-pad.description = 离开你当前的装置，换成一个强大而快速的截击机，用闪电武器。\n站在上面时点击切换。
-block.trident-ship-pad.description = 离开你当前的装置，换成一个装甲合理的重型轰炸机。\n站在上面时双击切换。
+block.trident-ship-pad.description = 离开你当前的装置，换成一个装甲合理的重型轰炸机。\n站在上面时点击切换。
-block.glaive-ship-pad.description = 离开现有的装置，换成装甲良好的大型武装直升机。\n站在上面时双击切换。
+block.glaive-ship-pad.description = 离开现有的装置，换成装甲良好的大型武装直升机。\n站在上面时点击切换。

core/assets/bundles/bundle_zh_TW.properties

@@ -16,6 +16,11 @@ screenshot.invalid = 地圖太大了，可能沒有足夠的內存用於截圖
 gameover = 遊戲結束
 gameover.pvp = [accent]{0}[]隊獲勝！
 highscore = [accent]新的高分紀錄！
+load.sound = Sounds
+load.map = Maps
+load.image = Images
+load.content = Content
+load.system = System
 stat.wave = 打敗的波次：[accent]{0}
 stat.enemiesDestroyed = 摧毀的敵人：[accent]{0}
 stat.built = 建設的建築：[accent]{0}
@@ -23,8 +28,6 @@ stat.destroyed = 摧毀的建築：[accent]{0}
 stat.deconstructed = 移除的建築：[accent]{0}
 stat.delivered = 發射的資源：
 stat.rank = 最終排名：[accent]{0}
-placeline = 你選擇了一個方塊。\n[accent]按住你的手指幾秒鐘[]並拖動以[accent]直線放置方塊[]。\n試試吧。
-removearea = 你選擇了移除模式。\n[accent]按住你的手指幾秒鐘[]並拖動以[accent]移除矩形中的方塊[]。\n試試吧。
 launcheditems = [accent]發射了的物品
 map.delete = 確認要刪除「[accent]{0}[]」地圖嗎？
 level.highscore = 最高分：[accent]{0}
@@ -63,9 +66,11 @@ players.single = {0}個線上玩家
 server.closing = [accent]正在關閉伺服器……
 server.kicked.kick = 您已被踢出伺服器！
 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.recentKick = 您已經從伺服器被踢除。\n請稍後再進行連線。
 server.kicked.nameInUse = 伺服器中已經\n有人有相同的名稱了。
 server.kicked.nameEmpty = 你的名稱必須至少包含一個字母或數字。
@@ -156,6 +161,11 @@ cancel = 取消
 openlink = 開啟連結
 copylink = 複製連結
 back = 返回
+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
 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 = 您確定要退出嗎？
@@ -376,6 +386,7 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = 語言
+settings.data = Game Data
 settings.reset = 重設為預設設定
 settings.rebind = 重新綁定
 settings.controls = 操作
@@ -507,6 +518,7 @@ setting.mutemusic.name = 靜音
 setting.sfxvol.name = 音效音量
 setting.mutesound.name = 靜音
 setting.crashreport.name = 發送匿名崩潰報告
+setting.savecreate.name = Auto-Create Saves
 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...
@@ -527,6 +539,7 @@ keybind.press.axis = 按一下軸心或鍵……
 keybind.screenshot.name = 地圖截圖
 keybind.move_x.name = 水平移動
 keybind.move_y.name = 垂直移動
+keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = 選取
 keybind.diagonal_placement.name = 對角線放置
 keybind.pick.name = 選擇方塊
@@ -790,6 +803,7 @@ block.blast-mixer.name = 爆炸混合器
 block.solar-panel.name = 太陽能板
 block.solar-panel-large.name = 大型太陽能板
 block.oil-extractor.name = 石油鑽井
+block.command-center.name = Command Center
 block.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = 輕型無人機工廠
 block.phantom-factory.name = 幻影無人機工廠
@@ -1012,6 +1026,7 @@ block.ripple.description = 一種一次射出幾發子彈的大型火砲。
 block.cyclone.description = 一種快速射擊的大型砲塔。
 block.spectre.description = 一種一次射出兩顆強大的子彈的大型砲塔。
 block.meltdown.description = 一種射出強大的遠程光束的大型砲塔。
+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.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = 生產輕型無人機，用於開採礦石和修復方塊。
 block.phantom-factory.description = 生產高級的無人機，比輕型無人機明顯更有效。

core/assets/contributors

@@ -72,3 +72,6 @@ Dominik
 Arkanic
 Potion
 Markus G
+itskatt
+Agent-Laevain
+AzariasB

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

@@ -0,0 +1,183 @@
+package io.anuke.mindustry;
+
+import io.anuke.arc.*;
+import io.anuke.arc.assets.*;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.math.*;
+import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.core.*;
+import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.gen.*;
+import io.anuke.mindustry.graphics.*;
+import io.anuke.mindustry.maps.*;
+
+import static io.anuke.arc.Core.*;
+import static io.anuke.mindustry.Vars.*;
+
+public abstract class ClientLauncher extends ApplicationCore implements Platform{
+    private static final int loadingFPS = 20;
+
+    private float smoothProgress;
+    private long lastTime;
+    private long beginTime;
+    private boolean finished = false;
+
+    @Override
+    public void setup(){
+        Vars.platform = this;
+        Log.setUseColors(false);
+        beginTime = Time.millis();
+
+        Time.setDeltaProvider(() -> {
+            float result = Core.graphics.getDeltaTime() * 60f;
+            return (Float.isNaN(result) || Float.isInfinite(result)) ? 1f : Mathf.clamp(result, 0.0001f, 60f / 10f);
+        });
+
+        batch = new SpriteBatch();
+        assets = new AssetManager();
+        assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader());
+        atlas = TextureAtlas.blankAtlas();
+
+        UI.loadSystemCursors();
+
+        assets.load(new Vars());
+
+        UI.loadDefaultFont();
+
+        assets.load(new AssetDescriptor<>("sprites/sprites.atlas", TextureAtlas.class)).loaded = t -> atlas = (TextureAtlas)t;
+
+        assets.loadRun("maps", Map.class, () -> maps.loadPreviews());
+
+        Musics.load();
+        Sounds.load();
+
+        assets.loadRun("contentcreate", Content.class, () -> {
+            content.createContent();
+            content.loadColors();
+        });
+
+        add(logic = new Logic());
+        add(control = new Control());
+        add(renderer = new Renderer());
+        add(ui = new UI());
+        add(netServer = new NetServer());
+        add(netClient = new NetClient());
+
+        assets.loadRun("contentinit", ContentLoader.class, () -> {
+            content.init();
+            content.load();
+        });
+    }
+
+    @Override
+    public void add(ApplicationListener module){
+        super.add(module);
+
+        //autoload modules when necessary
+        if(module instanceof Loadable){
+            assets.load((Loadable)module);
+        }
+    }
+
+    @Override
+    public void resize(int width, int height){
+        super.resize(width, height);
+
+        if(!assets.isFinished()){
+            Draw.proj().setOrtho(0, 0, width, height);
+        }
+    }
+
+    @Override
+    public void update(){
+        if(!finished){
+            drawLoading();
+            if(assets.update(1000 / loadingFPS)){
+                Log.info("Total time to load: {0}", Time.timeSinceMillis(beginTime));
+                for(ApplicationListener listener : modules){
+                    listener.init();
+                }
+                finished = true;
+                Events.fire(new ClientLoadEvent());
+            }
+        }else{
+            super.update();
+        }
+
+        int targetfps = Core.settings.getInt("fpscap", 120);
+
+        if(targetfps > 0 && targetfps <= 240){
+            long target = (1000 * 1000000) / targetfps; //target in nanos
+            long elapsed = Time.timeSinceNanos(lastTime);
+            if(elapsed < target){
+                try{
+                    Thread.sleep((target - elapsed) / 1000000, (int)((target - elapsed) % 1000000));
+                }catch(InterruptedException ignored){
+                    //ignore
+                }
+            }
+        }
+
+        lastTime = Time.nanos();
+    }
+
+    @Override
+    public void init(){
+        setup();
+    }
+
+    @Override
+    public void resume(){
+        if(finished){
+            super.resume();
+        }
+    }
+
+    @Override
+    public void pause(){
+        if(finished){
+            super.pause();
+        }
+    }
+
+    void drawLoading(){
+        smoothProgress = Mathf.lerpDelta(smoothProgress, assets.getProgress(), 0.1f);
+
+        Core.graphics.clear(Pal.darkerGray);
+        Draw.proj().setOrtho(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());
+
+        float height = UnitScl.dp.scl(50f);
+
+        Draw.color(Color.BLACK);
+        Fill.poly(graphics.getWidth()/2f, graphics.getHeight()/2f, 6, Mathf.dst(graphics.getWidth()/2f, graphics.getHeight()/2f) * smoothProgress);
+        Draw.reset();
+
+        float w = graphics.getWidth()*0.6f;
+
+        Draw.color(Color.BLACK);
+        Fill.rect(graphics.getWidth()/2f, graphics.getHeight()/2f, w, height);
+
+        Draw.color(Pal.accent);
+        Fill.crect(graphics.getWidth()/2f-w/2f, graphics.getHeight()/2f - height/2f, w * smoothProgress, height);
+
+        for(int i : Mathf.signs){
+            Fill.tri(graphics.getWidth()/2f + w/2f*i, graphics.getHeight()/2f + height/2f, graphics.getWidth()/2f + w/2f*i, graphics.getHeight()/2f - height/2f, graphics.getWidth()/2f + w/2f*i + height/2f*i, graphics.getHeight()/2f);
+        }
+
+        if(assets.isLoaded("outline")){
+            BitmapFont font = assets.get("outline");
+            font.draw((int)(assets.getProgress() * 100) + "%", graphics.getWidth() / 2f, graphics.getHeight() / 2f + UnitScl.dp.scl(10f), Align.center);
+            font.draw(bundle.get("loading", "").replace("[accent]", ""), graphics.getWidth() / 2f, graphics.getHeight() / 2f + height / 2f + UnitScl.dp.scl(20), Align.center);
+
+            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";
+                font.draw(bundle.get("load." + key, ""), graphics.getWidth() / 2f, graphics.getHeight() / 2f - height / 2f - UnitScl.dp.scl(10f), Align.center);
+            }
+        }
+        Draw.flush();
+    }
+}

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

@@ -1,72 +0,0 @@
-package io.anuke.mindustry;
-
-import io.anuke.arc.*;
-import io.anuke.arc.math.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.core.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.io.*;
-
-import static io.anuke.mindustry.Vars.*;
-
-public class Mindustry extends ApplicationCore{
-    private long lastTime;
-
-    @Override
-    public void setup(){
-        Time.setDeltaProvider(() -> {
-            float result = Core.graphics.getDeltaTime() * 60f;
-            return (Float.isNaN(result) || Float.isInfinite(result)) ? 1f : Mathf.clamp(result, 0.0001f, 60f / 10f);
-        });
-
-        Time.mark();
-        UI.loadSystemCursors();
-
-        Vars.init();
-        Log.setUseColors(false);
-        BundleLoader.load();
-        Musics.load();
-        Sounds.load();
-
-        content.load();
-        content.loadColors();
-
-        add(logic = new Logic());
-        add(world = new World());
-        add(control = new Control());
-        add(renderer = new Renderer());
-        add(ui = new UI());
-        add(netServer = new NetServer());
-        add(netClient = new NetClient());
-    }
-
-    @Override
-    public void update(){
-        super.update();
-
-        int targetfps = Core.settings.getInt("fpscap", 120);
-
-        if(targetfps > 0 && targetfps <= 240){
-            long target = (1000 * 1000000) / targetfps; //target in nanos
-            long elapsed = Time.timeSinceNanos(lastTime);
-            if(elapsed < target){
-                try{
-                    Thread.sleep((target - elapsed) / 1000000, (int)((target - elapsed) % 1000000));
-                }catch(InterruptedException ignored){
-                    //ignore
-                }
-            }
-        }
-
-        lastTime = Time.nanos();
-    }
-
-    @Override
-    public void init(){
-        super.init();
-
-        Log.info("Time to load [total]: {0}", Time.elapsed());
-        Events.fire(new ClientLoadEvent());
-    }
-}

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

@@ -1,36 +1,39 @@
 package io.anuke.mindustry;
 
+import io.anuke.arc.Application.*;
 import io.anuke.arc.*;
-import io.anuke.arc.Application.ApplicationType;
+import io.anuke.arc.assets.*;
-import io.anuke.arc.files.FileHandle;
+import io.anuke.arc.files.*;
-import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.*;
-import io.anuke.arc.util.Structs;
+import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.ai.*;
 import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.bullet.Bullet;
+import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.entities.effect.Fire;
+import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.effect.Puddle;
+import io.anuke.mindustry.entities.impl.*;
-import io.anuke.mindustry.entities.impl.EffectEntity;
+import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.traits.SyncTrait;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.gen.Serialization;
+import io.anuke.mindustry.input.*;
+import io.anuke.mindustry.maps.*;
 import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity;
+import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
 
-import java.nio.charset.Charset;
+import java.nio.charset.*;
-import java.util.Arrays;
+import java.util.*;
-import java.util.Locale;
+
+import static io.anuke.arc.Core.settings;
 
 @SuppressWarnings("unchecked")
-public class Vars{
+public class Vars implements Loadable{
     /** Whether to load locales.*/
     public static boolean loadLocales = true;
     /** IO buffer size. */
     public static final int bufferSize = 8192;
-    /** global charset */
+    /** global charset, since Android doesn't support the Charsets class */
     public static final Charset charset = Charset.forName("UTF-8");
     /** main application name, capitalized */
     public static final String appName = "Mindustry";
@@ -115,10 +118,14 @@ public class Vars{
     public static FileHandle screenshotDirectory;
     /** data subdirectory used for custom mmaps */
     public static FileHandle customMapDirectory;
+    /** data subdirectory used for custom mmaps */
+    public static FileHandle mapPreviewDirectory;
     /** tmp subdirectory for map conversion */
     public static FileHandle tmpDirectory;
     /** data subdirectory used for saves */
     public static FileHandle saveDirectory;
+    /** data subdirectory used for plugins */
+    public static FileHandle pluginDirectory;
     /** old map file extension, for conversion */
     public static final String oldMapExtension = "mmap";
     /** map file extension */
@@ -135,15 +142,22 @@ public class Vars{
     public static EntityCollisions collisions;
     public static DefaultWaves defaultWaves;
     public static LoopControl loops;
+    public static Platform platform;
+
+    public static World world;
+    public static Maps maps;
+    public static WaveSpawner spawner;
+    public static BlockIndexer indexer;
+    public static Pathfinder pathfinder;
 
     public static Control control;
     public static Logic logic;
     public static Renderer renderer;
     public static UI ui;
-    public static World world;
     public static NetServer netServer;
     public static NetClient netClient;
 
+    public static Entities entities;
     public static EntityGroup<Player> playerGroup;
     public static EntityGroup<TileEntity> tileGroup;
     public static EntityGroup<Bullet> bulletGroup;
@@ -157,6 +171,12 @@ public class Vars{
     /** all local players, currently only has one player. may be used for local co-op in the future */
     public static Player player;
 
+    @Override
+    public void loadAsync(){
+        loadSettings();
+        init();
+    }
+
     public static void init(){
         Serialization.init();
 
@@ -179,29 +199,32 @@ public class Vars{
         Version.init();
 
         content = new ContentLoader();
-        if(!headless){
-            content.setVerbose();
-        }
-
         loops = new LoopControl();
         defaultWaves = new DefaultWaves();
         collisions = new EntityCollisions();
+        world = new World();
 
-        playerGroup = Entities.addGroup(Player.class).enableMapping();
+        maps = new Maps();
-        tileGroup = Entities.addGroup(TileEntity.class, false);
+        spawner = new WaveSpawner();
-        bulletGroup = Entities.addGroup(Bullet.class).enableMapping();
+        indexer = new BlockIndexer();
-        effectGroup = Entities.addGroup(EffectEntity.class, false);
+        pathfinder = new Pathfinder();
-        groundEffectGroup = Entities.addGroup(DrawTrait.class, false);
+
-        puddleGroup = Entities.addGroup(Puddle.class).enableMapping();
+        entities = new Entities();
-        shieldGroup = Entities.addGroup(ShieldEntity.class, false);
+        playerGroup = entities.add(Player.class).enableMapping();
-        fireGroup = Entities.addGroup(Fire.class).enableMapping();
+        tileGroup = entities.add(TileEntity.class, false);
+        bulletGroup = entities.add(Bullet.class).enableMapping();
+        effectGroup = entities.add(EffectEntity.class, false);
+        groundEffectGroup = entities.add(DrawTrait.class, false);
+        puddleGroup = entities.add(Puddle.class).enableMapping();
+        shieldGroup = entities.add(ShieldEntity.class, false);
+        fireGroup = entities.add(Fire.class).enableMapping();
         unitGroups = new EntityGroup[Team.all.length];
 
         for(Team team : Team.all){
-            unitGroups[team.ordinal()] = Entities.addGroup(BaseUnit.class).enableMapping();
+            unitGroups[team.ordinal()] = entities.add(BaseUnit.class).enableMapping();
         }
 
-        for(EntityGroup<?> group : Entities.getAllGroups()){
+        for(EntityGroup<?> group : entities.all()){
             group.setRemoveListener(entity -> {
                 if(entity instanceof SyncTrait && Net.client()){
                     netClient.addRemovedEntity((entity).getID());
@@ -216,14 +239,61 @@ public class Vars{
         ios = Core.app.getType() == ApplicationType.iOS;
         android = Core.app.getType() == ApplicationType.Android;
 
-        Core.settings.setAppName(appName);
-
         dataDirectory = Core.settings.getDataDirectory();
         screenshotDirectory = dataDirectory.child("screenshots/");
         customMapDirectory = dataDirectory.child("maps/");
+        mapPreviewDirectory = dataDirectory.child("previews/");
         saveDirectory = dataDirectory.child("saves/");
         tmpDirectory = dataDirectory.child("tmp/");
+        pluginDirectory = dataDirectory.child("plugins/");
 
-        Events.fire(new AppLoadEvent());
+        maps.load();
+    }
+
+    public static void loadSettings(){
+        Core.settings.setAppName(appName);
+        Core.settings.defaults("locale", "default");
+        Core.keybinds.setDefaults(Binding.values());
+        Core.settings.load();
+
+        UnitScl.dp.setProduct(settings.getInt("uiscale", 100) / 100f);
+
+        if(!loadLocales) return;
+
+        try{
+            //try loading external bundle
+            FileHandle handle = Core.files.local("bundle");
+
+            Locale locale = Locale.ENGLISH;
+            Core.bundle = I18NBundle.createBundle(handle, locale);
+
+            Log.info("NOTE: external translation bundle has been loaded.");
+            if(!headless){
+                Time.run(10f, () -> ui.showInfo("Note: You have successfully loaded an external translation bundle."));
+            }
+        }catch(Throwable e){
+            //no external bundle found
+
+            FileHandle handle = Core.files.internal("bundles/bundle");
+
+            Locale locale;
+            String loc = Core.settings.getString("locale");
+            if(loc.equals("default")){
+                locale = Locale.getDefault();
+            }else{
+                Locale lastLocale;
+                if(loc.contains("_")){
+                    String[] split = loc.split("_");
+                    lastLocale = new Locale(split[0], split[1]);
+                }else{
+                    lastLocale = new Locale(loc);
+                }
+
+                locale = lastLocale;
+            }
+
+            Locale.setDefault(locale);
+            Core.bundle = I18NBundle.createBundle(handle, locale);
+        }
     }
 }

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

@@ -24,7 +24,7 @@ public class BlockIndexer{
     private final static int quadrantSize = 16;
 
     /** Set of all ores that are being scanned. */
-    private final ObjectSet<Item> scanOres = ObjectSet.with(Item.getAllOres().toArray(Item.class));
+    private final ObjectSet<Item> scanOres = new ObjectSet<>();
     private final ObjectSet<Item> itemSet = new ObjectSet<>();
     /** Stores all ore quadtrants on the map. */
     private ObjectMap<Item, ObjectSet<Tile>> ores;
@@ -57,6 +57,8 @@ public class BlockIndexer{
         });
 
         Events.on(WorldLoadEvent.class, event -> {
+            scanOres.clear();
+            scanOres.addAll(Item.getAllOres());
             damagedTiles = new ObjectSet[Team.all.length];
             flagMap = new ObjectSet[Team.all.length][BlockFlag.all.length];
 

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

@@ -16,8 +16,7 @@ import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
 
-import static io.anuke.mindustry.Vars.state;
+import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.Vars.world;
 
 public class Pathfinder{
     private static final long maxUpdate = Time.millisToNanos(4);
@@ -117,7 +116,7 @@ public class Pathfinder{
             path.lastSearchTime = Time.millis();
 
             //add all targets to the frontier
-            for(Tile other : world.indexer.getEnemy(team, BlockFlag.target)){
+            for(Tile other : indexer.getEnemy(team, BlockFlag.target)){
                 path.weights[other.x][other.y] = 0;
                 path.searches[other.x][other.y] = (short)path.search;
                 path.frontier.addFirst(other.pos());

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

@@ -1690,8 +1690,8 @@ public class Blocks implements ContentList{
             type = UnitTypes.crawler;
             produceTime = 300;
             size = 2;
-            maxSpawn = 8;
+            maxSpawn = 6;
-            consumes.power(0.4f);
+            consumes.power(0.5f);
             consumes.items(new ItemStack(Items.coal, 10));
         }};
 

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

@@ -5,6 +5,7 @@ import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 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.effect.*;
@@ -85,7 +86,7 @@ public class Mechs implements ContentList{
                     Effects.shake(1f, 1f, player);
                     Effects.effect(Fx.landShock, player);
                     for(int i = 0; i < 8; i++){
-                        Time.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Pal.lancerLaser, 17f, player.x, player.y, Mathf.random(360f), 14));
+                        Time.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Pal.lancerLaser, 17f * Vars.state.rules.playerDamageMultiplier, player.x, player.y, Mathf.random(360f), 14));
                     }
                 }
             }
@@ -286,7 +287,7 @@ public class Mechs implements ContentList{
                 float scl = scld(player);
                 if(Mathf.chance(Time.delta() * (0.15 * scl))){
                     Effects.effect(Fx.hitLancer, Pal.lancerLaser, player.x, player.y);
-                    Lightning.create(player.getTeam(), Pal.lancerLaser, 10f,
+                    Lightning.create(player.getTeam(), Pal.lancerLaser, 10f * Vars.state.rules.playerDamageMultiplier,
                     player.x + player.velocity().x, player.y + player.velocity().y, player.rotation, 14);
                 }
             }

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

@@ -1,16 +1,14 @@
 package io.anuke.mindustry.core;
 
 import io.anuke.arc.collection.*;
-import io.anuke.arc.function.Consumer;
+import io.anuke.arc.function.*;
-import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.*;
-import io.anuke.arc.graphics.Pixmap;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Log;
 import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.bullet.BulletType;
+import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.world.LegacyColorMapper;
 
 import static io.anuke.arc.Core.files;
 
@@ -21,8 +19,6 @@ import static io.anuke.arc.Core.files;
 @SuppressWarnings("unchecked")
 public class ContentLoader{
     private boolean loaded = false;
-    private boolean verbose = false;
-
     private ObjectMap<String, MappableContent>[] contentNameMap = new ObjectMap[ContentType.values().length];
     private Array<Content>[] contentMap = new Array[ContentType.values().length];
     private MappableContent[][] temporaryMapper;
@@ -45,12 +41,8 @@ public class ContentLoader{
         new LegacyColorMapper(),
     };
 
-    public void setVerbose(){
-        verbose = true;
-    }
-
     /** Creates all content types. */
-    public void load(){
+    public void createContent(){
         if(loaded){
             Log.info("Content already loaded, skipping.");
             return;
@@ -65,8 +57,6 @@ public class ContentLoader{
             list.load();
         }
 
-        int total = 0;
-
         for(ContentType type : ContentType.values()){
 
             for(Content c : contentMap[type.ordinal()]){
@@ -77,7 +67,6 @@ public class ContentLoader{
                     }
                     contentNameMap[type.ordinal()].put(name, (MappableContent)c);
                 }
-                total++;
             }
         }
 
@@ -91,25 +80,32 @@ public class ContentLoader{
             }
         }
 
-        if(verbose){
+        loaded = true;
+    }
+
+    /** Logs content statistics.*/
+    public void logContent(){
         Log.info("--- CONTENT INFO ---");
         for(int k = 0; k < contentMap.length; k++){
             Log.info("[{0}]: loaded {1}", ContentType.values()[k].name(), contentMap[k].size);
         }
-            Log.info("Total content loaded: {0}", total);
+        Log.info("Total content loaded: {0}", Array.with(ContentType.values()).mapInt(c -> contentMap[c.ordinal()].size).sum());
         Log.info("-------------------");
     }
 
-        loaded = true;
+    /** Calls Content#init() on everything. Use only after all modules have been created.*/
+    public void init(){
+        initialize(Content::init);
     }
 
-    public void initialize(Consumer<Content> callable){
+    /** Calls Content#load() on everything. Use only after all modules have been created on the client.*/
-        initialize(callable, false);
+    public void load(){
+        initialize(Content::load);
     }
 
     /** Initializes all content with the specified function. */
-    public void initialize(Consumer<Content> callable, boolean override){
+    private void initialize(Consumer<Content> callable){
-        if(initialization.contains(callable) && !override) return;
+        if(initialization.contains(callable)) return;
 
         for(ContentType type : ContentType.values()){
             for(Content content : contentMap[type.ordinal()]){
@@ -136,12 +132,8 @@ public class ContentLoader{
         pixmap.dispose();
     }
 
-    public void verbose(boolean verbose){
-        this.verbose = verbose;
-    }
-
     public void dispose(){
-        //clear all content, currently not needed
+        //clear all content, currently not used
     }
 
     public void handleContent(Content content){
@@ -171,7 +163,7 @@ public class ContentLoader{
                 return null;
             }
             if(temporaryMapper[type.ordinal()].length <= id || temporaryMapper[type.ordinal()][id] == null){
-                return getByID(type, 0); //default value is always ID 0
+                return (T)contentMap[type.ordinal()].get(0); //default value is always ID 0
             }
             return (T)temporaryMapper[type.ordinal()][id];
         }

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

@@ -1,23 +1,23 @@
 package io.anuke.mindustry.core;
 
 import io.anuke.arc.*;
+import io.anuke.arc.assets.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.input.*;
 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.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.input.*;
-import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.dialogs.*;
@@ -25,6 +25,8 @@ import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.storage.*;
 
 import java.io.*;
+import java.text.*;
+import java.util.*;
 
 import static io.anuke.arc.Core.*;
 import static io.anuke.mindustry.Vars.*;
@@ -35,10 +37,10 @@ import static io.anuke.mindustry.Vars.*;
  * Should <i>not</i> handle any logic-critical state.
  * This class is not created in the headless server.
  */
-public class Control implements ApplicationListener{
+public class Control implements ApplicationListener, Loadable{
-    public final Saves saves;
+    public Saves saves;
-    public final MusicControl music;
+    public MusicControl music;
-    public final Tutorial tutorial;
+    public Tutorial tutorial;
     public InputHandler input;
 
     private Interval timer = new Interval(2);
@@ -46,40 +48,9 @@ public class Control implements ApplicationListener{
     private boolean wasPaused = false;
 
     public Control(){
-        batch = new SpriteBatch();
-        saves = new Saves();
-        tutorial = new Tutorial();
-        music = new MusicControl();
-
-        UnitScl.dp.setProduct(settings.getInt("uiscale", 100) / 100f);
-
-        Core.input.setCatch(KeyCode.BACK, true);
-
-        content.initialize(Content::init);
-        Core.atlas = new TextureAtlas("sprites/sprites.atlas");
-        Draw.scl = 1f / Core.atlas.find("scale_marker").getWidth();
-        content.initialize(Content::load, true);
-
-        data.load();
-
-        Core.settings.setAppName(appName);
-        Core.settings.defaults(
-            "ip", "localhost",
-            "color-0", Color.rgba8888(playerColors[8]),
-            "color-1", Color.rgba8888(playerColors[11]),
-            "color-2", Color.rgba8888(playerColors[13]),
-            "color-3", Color.rgba8888(playerColors[9]),
-            "name", "",
-            "lastBuild", 0
-        );
-
-        createPlayer();
-
-        saves.load();
-
         Events.on(StateChangeEvent.class, event -> {
             if((event.from == State.playing && event.to == State.menu) || (event.from == State.menu && event.to != State.menu)){
-                Time.runTask(5f, Platform.instance::updateRPC);
+                Time.runTask(5f, platform::updateRPC);
             }
         });
 
@@ -95,7 +66,7 @@ public class Control implements ApplicationListener{
             Core.app.post(() -> Core.app.post(() -> {
                 if(Net.active() && player.getClosestCore() != null){
                     //set to closest core since that's where the player will probably respawn; prevents camera jumps
-                    Core.camera.position.set(player.getClosestCore());
+                    Core.camera.position.set(player.isDead() ? player.getClosestCore() : player);
                 }else{
                     //locally, set to player position since respawning occurs immediately
                     Core.camera.position.set(player);
@@ -177,12 +148,30 @@ public class Control implements ApplicationListener{
         Events.on(ZoneConfigureCompleteEvent.class, e -> {
             ui.hudfrag.showToast(Core.bundle.format("zone.config.complete", e.zone.configureWave));
         });
-
-        if(android){
-            Sounds.empty.loop(0f, 1f, 0f);
-
-            checkClassicData();
     }
+
+    @Override
+    public void loadAsync(){
+        saves = new Saves();
+        tutorial = new Tutorial();
+        music = new MusicControl();
+
+        Draw.scl = 1f / Core.atlas.find("scale_marker").getWidth();
+
+        Core.input.setCatch(KeyCode.BACK, true);
+
+        data.load();
+
+        Core.settings.defaults(
+        "ip", "localhost",
+        "color-0", Color.rgba8888(playerColors[8]),
+        "name", "",
+        "lastBuild", 0
+        );
+
+        createPlayer();
+
+        saves.load();
     }
 
     //checks for existing 3.5 app data, android only
@@ -192,7 +181,7 @@ public class Control implements ApplicationListener{
                 settings.getBoolOnce("classic-backup-check", () -> {
                     app.post(() -> app.post(() -> ui.showConfirm("$classic.export", "$classic.export.text", () -> {
                         try{
-                            Platform.instance.requestExternalPerms(() -> {
+                            platform.requestExternalPerms(() -> {
                                 FileHandle external = files.external("MindustryClassic");
                                 if(files.local("mindustry-maps").exists()){
                                     files.local("mindustry-maps").copyTo(external);
@@ -231,7 +220,9 @@ public class Control implements ApplicationListener{
             player.add();
         }
 
+        Events.on(ClientLoadEvent.class, e -> {
             Core.input.addProcessor(input);
+        });
     }
 
     public void playMap(Map map, Rules rules){
@@ -240,6 +231,9 @@ public class Control implements ApplicationListener{
             world.loadMap(map, rules);
             state.rules = rules;
             logic.play();
+            if(settings.getBool("savecreate") && !world.isInvalidMap()){
+                control.saves.addSave(map.name() + " " + new SimpleDateFormat("MMM dd h:mm", Locale.getDefault()).format(new Date()));
+            }
         });
     }
 
@@ -341,7 +335,7 @@ public class Control implements ApplicationListener{
 
     @Override
     public void init(){
-        Platform.instance.updateRPC();
+        platform.updateRPC();
 
         //play tutorial on stop
         if(!settings.getBool("playedtutorial", false)){
@@ -382,11 +376,18 @@ public class Control implements ApplicationListener{
                 dialog.show();
             }));
         }
+
+        if(android){
+            Sounds.empty.loop(0f, 1f, 0f);
+            checkClassicData();
+        }
     }
 
     @Override
     public void update(){
         saves.update();
+        //update and load any requested assets
+        assets.update();
 
         input.updateController();
 
@@ -426,7 +427,7 @@ public class Control implements ApplicationListener{
 
             //auto-update rpc every 5 seconds
             if(timer.get(0, 60 * 5)){
-                Platform.instance.updateRPC();
+                platform.updateRPC();
             }
 
             if(Core.input.keyTap(Binding.pause) && !scene.hasDialog() && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){
@@ -452,7 +453,7 @@ public class Control implements ApplicationListener{
             }
 
             if(!scene.hasDialog() && !scene.root.getChildren().isEmpty() && !(scene.root.getChildren().peek() instanceof Dialog) && Core.input.keyTap(KeyCode.BACK)){
-                Platform.instance.hide();
+                platform.hide();
             }
         }
     }

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

@@ -101,15 +101,15 @@ public class Logic implements ApplicationListener{
         state.rules = new Rules();
         state.stats = new Stats();
 
+        entities.clear();
         Time.clear();
-        Entities.clear();
         TileEntity.sleepingEntities = 0;
 
         Events.fire(new ResetEvent());
     }
 
     public void runWave(){
-        world.spawner.spawnEnemies();
+        spawner.spawnEnemies();
         state.wave++;
         state.wavetime = world.isZone() && world.getZone().isBossWave(state.wave) ? state.rules.waveSpacing * state.rules.bossWaveMultiplier :
         world.isZone() && world.getZone().isLaunchWave(state.wave) ? state.rules.waveSpacing * state.rules.launchWaveMultiplier : state.rules.waveSpacing;
@@ -195,20 +195,20 @@ public class Logic implements ApplicationListener{
                 }
 
                 if(!headless){
-                    Entities.update(effectGroup);
+                    effectGroup.update();
-                    Entities.update(groundEffectGroup);
+                    groundEffectGroup.update();
                 }
 
                 if(!state.isEditor()){
                     for(EntityGroup group : unitGroups){
-                        Entities.update(group);
+                        group.update();
                     }
 
-                    Entities.update(puddleGroup);
+                    puddleGroup.update();
-                    Entities.update(shieldGroup);
+                    shieldGroup.update();
-                    Entities.update(bulletGroup);
+                    bulletGroup.update();
-                    Entities.update(tileGroup);
+                    tileGroup.update();
-                    Entities.update(fireGroup);
+                    fireGroup.update();
                 }else{
                     for(EntityGroup<?> group : unitGroups){
                         group.updateEvents();
@@ -217,11 +217,11 @@ public class Logic implements ApplicationListener{
                 }
 
 
-                Entities.update(playerGroup);
+                playerGroup.update();
 
                 //effect group only contains item transfers in the headless version, update it!
                 if(headless){
-                    Entities.update(effectGroup);
+                    effectGroup.update();
                 }
 
                 if(!state.isEditor()){
@@ -234,7 +234,7 @@ public class Logic implements ApplicationListener{
                     collisions.collideGroups(bulletGroup, playerGroup);
                 }
 
-                world.pathfinder.update();
+                pathfinder.update();
             }
 
             if(!Net.client() && !world.isInvalidMap() && !state.isEditor()){

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

@@ -7,11 +7,11 @@ import io.anuke.arc.collection.IntSet;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.RandomXS128;
 import io.anuke.arc.util.*;
+import io.anuke.arc.util.CommandHandler.*;
 import io.anuke.arc.util.io.ReusableByteInStream;
 import io.anuke.arc.util.serialization.Base64Coder;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.entities.Entities;
 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
 import io.anuke.mindustry.entities.traits.SyncTrait;
@@ -83,7 +83,7 @@ public class NetClient implements ApplicationListener{
             c.versionType = Version.type;
             c.color = Color.rgba8888(player.color);
             c.usid = getUsid(packet.addressTCP);
-            c.uuid = Platform.instance.getUUID();
+            c.uuid = platform.getUUID();
 
             if(c.uuid == null){
                 ui.showError("$invalidid");
@@ -101,7 +101,7 @@ public class NetClient implements ApplicationListener{
             connecting = false;
             state.set(State.menu);
             logic.reset();
-            Platform.instance.updateRPC();
+            platform.updateRPC();
 
             if(quiet) return;
 
@@ -151,15 +151,38 @@ public class NetClient implements ApplicationListener{
             throw new ValidateException(player, "Player has sent a message above the text limit.");
         }
 
+        //check if it's a command
+        CommandResponse response = netServer.clientCommands.handleMessage(message, player);
+        if(response.type == ResponseType.noCommand){ //no command to handle
             //server console logging
             Log.info("&y{0}: &lb{1}", player.name, message);
 
             //invoke event for all clients but also locally
             //this is required so other clients get the correct name even if they don't know who's sending it yet
             Call.sendMessage(message, colorizeName(player.id, player.name), player);
+        }else{
+            //log command to console but with brackets
+            Log.info("<&y{0}: &lm{1}&lg>", player.name, message);
+
+            //a command was sent, now get the output
+            if(response.type != ResponseType.valid){
+                String text;
+
+                //send usage
+                if(response.type == ResponseType.manyArguments){
+                    text = "[scarlet]Too many arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
+                }else if(response.type == ResponseType.fewArguments){
+                    text = "[scarlet]Too few arguments. Usage:[lightgray] " + response.command.text + "[gray] " + response.command.paramText;
+                }else{ //unknown command
+                    text = "[scarlet]Unknown command. Check [lightgray]/help[scarlet].";
                 }
 
-    private static String colorizeName(int id, String name){
+                player.sendMessage(text);
+            }
+        }
+    }
+
+    public static String colorizeName(int id, String name){
         Player player = playerGroup.getByID(id);
         if(name == null || player == null) return null;
         return "[#" + player.color.toString().toUpperCase() + "]" + name;
@@ -195,7 +218,7 @@ public class NetClient implements ApplicationListener{
 
     @Remote(variants = Variant.both)
     public static void onWorldDataBegin(){
-        Entities.clear();
+        entities.clear();
         netClient.removed.clear();
         logic.reset();
 
@@ -229,7 +252,7 @@ public class NetClient implements ApplicationListener{
             netClient.byteStream.setBytes(Net.decompressSnapshot(data, dataLen));
             DataInputStream input = netClient.dataStream;
 
-            EntityGroup group = Entities.getGroup(groupID);
+            EntityGroup group = entities.get(groupID);
 
             //go through each entity
             for(int j = 0; j < amount; j++){
@@ -333,7 +356,7 @@ public class NetClient implements ApplicationListener{
         ui.join.hide();
         Net.setClientLoaded(true);
         Core.app.post(Call::connectConfirm);
-        Time.runTask(40f, Platform.instance::updateRPC);
+        Time.runTask(40f, platform::updateRPC);
         Core.app.post(() -> ui.loadfrag.hide());
     }
 
@@ -346,7 +369,7 @@ public class NetClient implements ApplicationListener{
         quiet = false;
         lastSent = 0;
 
-        Entities.clear();
+        entities.clear();
         ui.chatfrag.clearMessages();
     }
 

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

@@ -4,18 +4,17 @@ import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.Events;
-import io.anuke.arc.collection.IntMap;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.ObjectSet;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Colors;
 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.*;
+import io.anuke.arc.util.CommandHandler.*;
 import io.anuke.arc.util.io.*;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.entities.Entities;
 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
 import io.anuke.mindustry.entities.traits.Entity;
@@ -47,6 +46,7 @@ public class NetServer implements ApplicationListener{
     private final static float correctDist = 16f;
 
     public final Administration admins = new Administration();
+    public final CommandHandler clientCommands = new CommandHandler("/");
 
     /** Maps connection IDs to players. */
     private IntMap<Player> connections = new IntMap<>();
@@ -111,7 +111,7 @@ public class NetServer implements ApplicationListener{
             }
 
             if(packet.versionType == null || ((packet.version == -1 || !packet.versionType.equals(Version.type)) && Version.build != -1 && !admins.allowsCustomClients())){
-                kick(id, KickReason.customClient);
+                kick(id, !Version.type.equals(packet.versionType) ? KickReason.typeMismatch : KickReason.customClient);
                 return;
             }
 
@@ -184,7 +184,7 @@ public class NetServer implements ApplicationListener{
 
             sendWorldData(player, id);
 
-            Platform.instance.updateRPC();
+            platform.updateRPC();
         });
 
         Net.handleServer(InvokePacket.class, (id, packet) -> {
@@ -192,6 +192,147 @@ public class NetServer implements ApplicationListener{
             if(player == null) return;
             RemoteReadServer.readPacket(packet.writeBuffer, packet.type, player);
         });
+
+        registerCommands();
+    }
+
+    private void registerCommands(){
+        clientCommands.<Player>register("help", "[page]", "Lists all commands.", (args, player) -> {
+            if(args.length > 0 && !Strings.canParseInt(args[0])){
+                player.sendMessage("[scarlet]'page' must be a number.");
+                return;
+            }
+            int commandsPerPage = 6;
+            int page = args.length > 0 ? Strings.parseInt(args[0]) : 1;
+            int pages = Mathf.ceil((float)clientCommands.getCommandList().size / commandsPerPage);
+
+            page --;
+
+            if(page > pages || page < 0){
+                player.sendMessage("[scarlet]'page' must be a number between[orange] 1[] and[orange] " + pages + "[scarlet].");
+                return;
+            }
+
+            StringBuilder result = new StringBuilder();
+            result.append(Strings.format("[orange]-- Commands Page[lightgray] {0}[gray]/[lightgray]{1}[orange] --\n\n", (page+1), pages));
+
+            for(int i = commandsPerPage * page; i < Math.min(commandsPerPage * (page + 1), clientCommands.getCommandList().size); i++){
+                Command command = clientCommands.getCommandList().get(i);
+                result.append("[orange] /").append(command.text).append("[white] ").append(command.paramText).append("[lightgray] - ").append(command.description).append("\n");
+            }
+            player.sendMessage(result.toString());
+        });
+
+        clientCommands.<Player>register("t", "<message...>", "Send a message only to your teammates.", (args, player) -> {
+            playerGroup.all().each(p -> p.getTeam() == player.getTeam(), o -> o.sendMessage(args[0], player, "[#" + player.getTeam().color.toString() + "]<T>" + NetClient.colorizeName(player.id, player.name)));
+        });
+
+        //duration of a a kick in seconds
+        int kickDuration = 10 * 60;
+
+        class VoteSession{
+            Player target;
+            ObjectSet<String> voted = new ObjectSet<>();
+            ObjectMap<Player, VoteSession> map;
+            Timer.Task task;
+            int votes;
+
+            public VoteSession(ObjectMap<Player, VoteSession> map, Player target){
+                this.target = target;
+                this.map = map;
+                this.task = Timer.schedule(() -> {
+                    if(!checkPass()){
+                        Call.sendMessage(Strings.format("[lightgray]Vote failed. Not enough votes to kick[orange] {0}[lightgray].", target.name));
+                    }
+                    map.remove(target);
+                    task.cancel();
+                }, 60 * 1.5f);
+            }
+
+            boolean checkPass(){
+                if(votes >= votesRequired() && target.isAdded() && target.con.isConnected()){
+                    Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] {0}[orange] will be kicked from the server.", target.name));
+                    admins.getInfo(target.uuid).lastKicked = Time.millis() + kickDuration*1000;
+                    kick(target.con.id, KickReason.vote);
+                    return true;
+                }
+                return false;
+            }
+        }
+
+        //cooldown between votes
+        int voteTime = 60 * 10;
+        Timekeeper vtime = new Timekeeper(voteTime);
+        //current kick sessions
+        ObjectMap<Player, VoteSession> currentlyKicking = new ObjectMap<>();
+
+        clientCommands.<Player>register("votekick", "[player...]", "Vote to kick a player, with a cooldown.", (args, player) -> {
+            if(playerGroup.size() < 3){
+                player.sendMessage("[scarlet]At least 3 players are needed to start a votekick.");
+                return;
+            }
+
+            if(currentlyKicking.values().toArray().contains(v -> v.voted.contains(player.uuid) || v.voted.contains(admins.getInfo(player.uuid).lastIP))){
+                player.sendMessage("[scarlet]You've already voted. Sit down.");
+                return;
+            }
+
+            if(args.length == 0){
+                StringBuilder builder = new StringBuilder();
+                builder.append("[orange]Players to kick: \n");
+                for(Player p : playerGroup.all()){
+                    if(p.isAdmin || p.con == null || p == player) continue;
+
+                    builder.append("[lightgray] ").append(p.name).append("[accent] (#").append(p.con.id).append(")\n");
+                }
+                player.sendMessage(builder.toString());
+            }else{
+                Player found;
+                if(args[0].length() > 1 && args[0].startsWith("#") && Strings.canParseInt(args[0].substring(1))){
+                    int id = Strings.parseInt(args[0].substring(1));
+                    found = playerGroup.find(p -> p.con != null && p.con.id == id);
+                }else{
+                    found = playerGroup.find(p -> p.name.equalsIgnoreCase(args[0]));
+                }
+
+                if(found != null){
+                    if(player == found){
+                        player.sendMessage("[scarlet]If you're interested in kicking yourself, just leave.");
+                    }else if(found.isAdmin){
+                        player.sendMessage("[scarlet]Did you really expect to be able to kick an admin?");
+                    }else{
+                        if(!currentlyKicking.containsKey(found) && !vtime.get()){
+                            player.sendMessage("[scarlet]You must wait " + voteTime/60 + " minutes between votekicks.");
+                            return;
+                        }
+
+                        VoteSession session = currentlyKicking.getOr(found, () -> new VoteSession(currentlyKicking, found));
+                        session.votes ++;
+                        session.voted.addAll(player.uuid, admins.getInfo(player.uuid).lastIP);
+
+                        Call.sendMessage(Strings.format("[orange]{0}[lightgray] has voted to kick[orange] {1}[].[accent] ({2}/{3})\n[lightgray]Type[orange] /votekick #{4}[] to agree.",
+                            player.name, found.name, session.votes, votesRequired(), found.con.id));
+                        session.checkPass();
+                        vtime.reset();
+                    }
+                }else{
+                    player.sendMessage("[scarlet]No player[orange]'" + args[0] + "'[scarlet] found.");
+                }
+            }
+        });
+
+        clientCommands.<Player>register("sync", "Re-synchronize world state.", (args, player) -> {
+            if(player.isLocal){
+                player.sendMessage("[scarlet]Re-synchronizing as the host is pointless.");
+            }else{
+                Call.onWorldDataBegin(player.con.id);
+                netServer.sendWorldData(player, player.con.id);
+            }
+        });
+    }
+
+    public int votesRequired(){
+        return playerGroup.size() * 2 / 3;
     }
 
     public Team assignTeam(Player current, Iterable<Player> players){
@@ -423,10 +564,10 @@ public class NetServer implements ApplicationListener{
 
         Player player = connections.get(con.id);
 
-        if(player != null && (reason == KickReason.kick || reason == KickReason.banned) && player.uuid != null){
+        if(player != null && (reason == KickReason.kick || reason == KickReason.banned || reason == KickReason.vote) && player.uuid != null){
             PlayerInfo info = admins.getInfo(player.uuid);
             info.timesKicked++;
-            info.lastKicked = Time.millis();
+            info.lastKicked = Math.max(Time.millis(), info.lastKicked);
         }
 
         Call.onKick(connection, reason);
@@ -456,7 +597,7 @@ public class NetServer implements ApplicationListener{
         viewport.setSize(player.con.viewWidth, player.con.viewHeight).setCenter(player.con.viewX, player.con.viewY);
 
         //check for syncable groups
-        for(EntityGroup<?> group : Entities.getAllGroups()){
+        for(EntityGroup<?> group : entities.all()){
             if(group.isEmpty() || !(group.all().get(0) instanceof SyncTrait)) continue;
 
             //make sure mapping is enabled for this group

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

@@ -11,18 +11,15 @@ import io.anuke.arc.util.serialization.Base64Coder;
 
 import static io.anuke.mindustry.Vars.mobile;
 
-public abstract class Platform{
+public interface Platform{
-    /** Each separate game platform should set this instance to their own implementation. */
-    public static Platform instance = new Platform(){
-    };
 
     /** Add a text input dialog that should show up after the field is tapped. */
-    public void addDialog(TextField field){
+    default void addDialog(TextField field){
         addDialog(field, 16);
     }
 
     /** See addDialog(). */
-    public void addDialog(TextField field, int maxLength){
+    default void addDialog(TextField field, int maxLength){
         if(!mobile) return; //this is mobile only, desktop doesn't need dialogs
 
         field.tapped(() -> {
@@ -40,21 +37,21 @@ public abstract class Platform{
     }
 
     /** Request external read/write perms. Run callback when complete.*/
-    public void requestExternalPerms(Runnable callback){
+    default void requestExternalPerms(Runnable callback){
         callback.run();
     }
 
     /** Update discord RPC. */
-    public void updateRPC(){
+    default void updateRPC(){
     }
 
     /** Whether donating is supported. */
-    public boolean canDonate(){
+    default boolean canDonate(){
         return false;
     }
 
     /** Must be a base64 string 8 bytes in length. */
-    public String getUUID(){
+    default String getUUID(){
         String uuid = Core.settings.getString("uuid", "");
         if(uuid.isEmpty()){
             byte[] result = new byte[8];
@@ -68,7 +65,7 @@ public abstract class Platform{
     }
 
     /** Only used for iOS or android: open the share menu for a map or save. */
-    public void shareFile(FileHandle file){
+    default void shareFile(FileHandle file){
     }
 
     /**
@@ -79,18 +76,18 @@ public abstract class Platform{
      * @param open Whether to open or save files
      * @param filetype File extension to filter
      */
-    public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, Predicate<String> filetype){
+    default void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, Predicate<String> filetype){
     }
 
     /** Hide the app. Android only. */
-    public void hide(){
+    default void hide(){
     }
 
     /** Forces the app into landscape mode. Currently Android only. */
-    public void beginForceLandscape(){
+    default void beginForceLandscape(){
     }
 
     /** Stops forcing the app into landscape orientation. Currently Android only. */
-    public void endForceLandscape(){
+    default void endForceLandscape(){
     }
 }

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

@@ -43,9 +43,6 @@ public class Renderer implements ApplicationListener{
 
     public Renderer(){
         camera = new Camera();
-        if(settings.getBool("bloom")){
-            setupBloom();
-        }
         Shaders.init();
 
         Effects.setScreenShakeProvider((intensity, duration) -> {
@@ -93,6 +90,13 @@ public class Renderer implements ApplicationListener{
         clearColor = new Color(0f, 0f, 0f, 1f);
     }
 
+    @Override
+    public void init(){
+        if(settings.getBool("bloom")){
+            setupBloom();
+        }
+    }
+
     @Override
     public void update(){
         //TODO hack, find source of this bug
@@ -205,9 +209,9 @@ public class Renderer implements ApplicationListener{
 
         blocks.floor.drawFloor();
 
-        draw(groundEffectGroup, e -> e instanceof BelowLiquidTrait);
+        groundEffectGroup.draw(e -> e instanceof BelowLiquidTrait);
-        draw(puddleGroup);
+        puddleGroup.draw();
-        draw(groundEffectGroup, e -> !(e instanceof BelowLiquidTrait));
+        groundEffectGroup.draw(e -> !(e instanceof BelowLiquidTrait));
 
         blocks.processBlocks();
 
@@ -244,8 +248,8 @@ public class Renderer implements ApplicationListener{
             bloom.capture();
         }
 
-        draw(bulletGroup);
+        bulletGroup.draw();
-        draw(effectGroup);
+        effectGroup.draw();
 
         Draw.flush();
         if(bloom != null && !pixelator.enabled()){
@@ -253,15 +257,15 @@ public class Renderer implements ApplicationListener{
         }
 
         overlays.drawBottom();
-        draw(playerGroup, p -> true, Player::drawBuildRequests);
+        playerGroup.draw(p -> true, Player::drawBuildRequests);
 
-        if(Entities.countInBounds(shieldGroup) > 0){
+        if(shieldGroup.countInBounds() > 0){
             if(settings.getBool("animatedshields") && Shaders.shield != null){
                 Draw.flush();
                 shieldBuffer.begin();
                 graphics.clear(Color.CLEAR);
-                Entities.draw(shieldGroup);
+                shieldGroup.draw();
-                Entities.draw(shieldGroup, shield -> true, shield -> ((ShieldEntity)shield).drawOver());
+                shieldGroup.draw(shield -> true, ShieldEntity::drawOver);
                 Draw.flush();
                 shieldBuffer.end();
                 Draw.shader(Shaders.shield);
@@ -270,13 +274,13 @@ public class Renderer implements ApplicationListener{
                 Draw.color();
                 Draw.shader();
             }else{
-                Entities.draw(shieldGroup, shield -> true, shield -> ((ShieldEntity)shield).drawSimple());
+                shieldGroup.draw(shield -> true, ShieldEntity::drawSimple);
             }
         }
 
         overlays.drawTop();
 
-        draw(playerGroup, p -> !p.isDead() && !p.isLocal, Player::drawName);
+        playerGroup.draw(p -> !p.isDead() && !p.isLocal, Player::drawName);
 
         Draw.color();
         Draw.flush();
@@ -293,12 +297,12 @@ public class Renderer implements ApplicationListener{
 
         for(EntityGroup<? extends BaseUnit> group : unitGroups){
             if(!group.isEmpty()){
-                draw(group, unit -> !unit.isDead(), draw::accept);
+                group.draw(unit -> !unit.isDead(), draw::accept);
             }
         }
 
         if(!playerGroup.isEmpty()){
-            draw(playerGroup, unit -> !unit.isDead(), draw::accept);
+            playerGroup.draw(unit -> !unit.isDead(), draw::accept);
         }
 
         Draw.color();
@@ -310,12 +314,12 @@ public class Renderer implements ApplicationListener{
 
         for(EntityGroup<? extends BaseUnit> group : unitGroups){
             if(!group.isEmpty()){
-                draw(group, unit -> unit.isFlying() && !unit.isDead(), baseUnit -> baseUnit.drawShadow(trnsX, trnsY));
+                group.draw(unit -> unit.isFlying() && !unit.isDead(), baseUnit -> baseUnit.drawShadow(trnsX, trnsY));
             }
         }
 
         if(!playerGroup.isEmpty()){
-            draw(playerGroup, unit -> unit.isFlying() && !unit.isDead(), player -> player.drawShadow(trnsX, trnsY));
+            playerGroup.draw(unit -> unit.isFlying() && !unit.isDead(), player -> player.drawShadow(trnsX, trnsY));
         }
 
         Draw.color();
@@ -327,29 +331,17 @@ public class Renderer implements ApplicationListener{
 
             if(group.count(p -> p.isFlying() == flying) + playerGroup.count(p -> p.isFlying() == flying && p.getTeam() == team) == 0 && flying) continue;
 
-            draw(unitGroups[team.ordinal()], u -> u.isFlying() == flying && !u.isDead(), Unit::drawUnder);
+            unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawUnder);
-            draw(playerGroup, p -> p.isFlying() == flying && p.getTeam() == team && !p.isDead(), Unit::drawUnder);
+            playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team && !p.isDead(), Unit::drawUnder);
 
-            draw(unitGroups[team.ordinal()], u -> u.isFlying() == flying && !u.isDead(), Unit::drawAll);
+            unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawAll);
-            draw(playerGroup, p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawAll);
+            playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawAll);
 
-            draw(unitGroups[team.ordinal()], u -> u.isFlying() == flying && !u.isDead(), Unit::drawOver);
+            unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawOver);
-            draw(playerGroup, p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawOver);
+            playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawOver);
         }
     }
 
-    public <T extends DrawTrait> void draw(EntityGroup<T> group){
-        draw(group, t -> true, DrawTrait::draw);
-    }
-
-    public <T extends DrawTrait> void draw(EntityGroup<T> group, Predicate<T> toDraw){
-        draw(group, toDraw, DrawTrait::draw);
-    }
-
-    public <T extends DrawTrait> void draw(EntityGroup<T> group, Predicate<T> toDraw, Consumer<T> drawer){
-        Entities.draw(group, toDraw, drawer);
-    }
-
     public void scaleCamera(float amount){
         targetscale += amount;
         clampScale();

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

@@ -3,8 +3,14 @@ package io.anuke.mindustry.core;
 import io.anuke.arc.*;
 import io.anuke.arc.Graphics.*;
 import io.anuke.arc.Graphics.Cursor.*;
+import io.anuke.arc.assets.*;
+import io.anuke.arc.assets.loaders.*;
+import io.anuke.arc.assets.loaders.resolvers.*;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.files.*;
 import io.anuke.arc.freetype.*;
 import io.anuke.arc.freetype.FreeTypeFontGenerator.*;
+import io.anuke.arc.freetype.FreetypeFontLoader.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
@@ -31,8 +37,8 @@ import io.anuke.mindustry.ui.fragments.*;
 import static io.anuke.arc.scene.actions.Actions.*;
 import static io.anuke.mindustry.Vars.*;
 
-public class UI implements ApplicationListener{
+public class UI implements ApplicationListener, Loadable{
-    private FreeTypeFontGenerator generator;
+    private Skin skin;
 
     public MenuFragment menufrag;
     public HudFragment hudfrag;
@@ -67,9 +73,24 @@ public class UI implements ApplicationListener{
     public Cursor drillCursor, unloadCursor;
 
     public UI(){
-        Skin skin = new Skin(Core.atlas);
+        skin = new Skin();
-        generateFonts(skin);
+        setupFonts();
+    }
+
+    @Override
+    public void loadAsync(){
+
+    }
+
+    @Override
+    public void loadSync(){
+        //TODO type-safe skin files
+        skin.addRegions(Core.atlas);
         loadExtraStyle(skin);
+        skin.add("outline", Core.assets.get("outline"));
+        skin.getFont("outline").getData().markupEnabled = true;
+        skin.getFont("default").getData().markupEnabled = true;
+        skin.getFont("default").setOwnsTexture(false);
         skin.load(Core.files.internal("sprites/uiskin.json"));
 
         for(BitmapFont font : skin.getAll(BitmapFont.class).values()){
@@ -97,6 +118,11 @@ public class UI implements ApplicationListener{
         loadExtraCursors();
     }
 
+    @Override
+    public Array<AssetDescriptor> getDependencies(){
+        return Array.with(new AssetDescriptor<>(Control.class), new AssetDescriptor<>("outline", BitmapFont.class), new AssetDescriptor<>("default", BitmapFont.class), new AssetDescriptor<>("chat", BitmapFont.class));
+    }
+
     /** Called from a static context to make the cursor appear immediately upon startup.*/
     public static void loadSystemCursors(){
         SystemCursor.arrow.set(Core.graphics.newCursor("cursor"));
@@ -106,6 +132,30 @@ public class UI implements ApplicationListener{
         Core.graphics.restoreCursor();
     }
 
+    /** Called from a static context for use in the loading screen.*/
+    public static void loadDefaultFont(){
+        FileHandleResolver resolver = new InternalFileHandleResolver();
+        Core.assets.setLoader(FreeTypeFontGenerator.class, new FreeTypeFontGeneratorLoader(resolver));
+        Core.assets.setLoader(BitmapFont.class, null, new FreetypeFontLoader(resolver){
+            @Override
+            public BitmapFont loadSync(AssetManager manager, String fileName, FileHandle file, FreeTypeFontLoaderParameter parameter){
+                if(fileName.equals("outline")){
+                    parameter.fontParameters.borderWidth = UnitScl.dp.scl(2f);
+                    parameter.fontParameters.spaceX -= parameter.fontParameters.borderWidth;
+                }
+                parameter.fontParameters.size = fontParameter().size;
+                return super.loadSync(manager, fileName, file, parameter);
+            }
+        });
+
+        FreeTypeFontParameter param = new FreeTypeFontParameter(){{
+            borderColor = Color.DARK_GRAY;
+            incremental = true;
+        }};
+
+        Core.assets.load("outline", BitmapFont.class, new FreeTypeFontLoaderParameter("fonts/font.ttf", param));
+    }
+
     void loadExtraStyle(Skin skin){
         AtlasRegion region = Core.atlas.find("flat-down-base");
         int[] splits = region.splits;
@@ -130,29 +180,22 @@ public class UI implements ApplicationListener{
         unloadCursor = Core.graphics.newCursor("unload");
     }
 
-    void generateFonts(Skin skin){
+    public void setupFonts(){
-        generator = new FreeTypeFontGenerator(Core.files.internal("fonts/font.ttf"));
+        String fontName = "fonts/font.ttf";
 
-        FreeTypeFontParameter param = new FreeTypeFontParameter(){{
+        FreeTypeFontParameter param = fontParameter();
+
+        Core.assets.load("default", BitmapFont.class, new FreeTypeFontLoaderParameter(fontName, param)).loaded = f -> skin.add("default", f);
+        Core.assets.load("chat", BitmapFont.class, new FreeTypeFontLoaderParameter(fontName, param)).loaded = f -> skin.add("chat", f);
+    }
+
+    static FreeTypeFontParameter fontParameter(){
+        return new FreeTypeFontParameter(){{
             size = (int)(UnitScl.dp.scl(18f));
             shadowColor = Color.DARK_GRAY;
             shadowOffsetY = 2;
             incremental = true;
         }};
-
-        FreeTypeFontParameter outlined = new FreeTypeFontParameter(){{
-            size = param.size;
-            borderColor = Color.DARK_GRAY;
-            borderWidth = UnitScl.dp.scl(2f);
-            spaceX -= borderWidth;
-            incremental = true;
-        }};
-
-        skin.add("outline", generator.generateFont(outlined));
-        skin.add("default", generator.generateFont(param));
-        skin.add("chat", generator.generateFont(param));
-        skin.getFont("default").getData().markupEnabled = true;
-        skin.getFont("default").setOwnsTexture(false);
     }
 
     @Override
@@ -232,7 +275,7 @@ public class UI implements ApplicationListener{
 
     @Override
     public void dispose(){
-        generator.dispose();
+        //generator.dispose();
     }
 
     public void loadAnd(Runnable call){
@@ -253,7 +296,7 @@ public class UI implements ApplicationListener{
             TextField field = cont.addField(def, t -> {
             }).size(170f, 50f).get();
             field.setFilter((f, c) -> field.getText().length() < textLength && filter.acceptChar(f, c));
-            Platform.instance.addDialog(field);
+            platform.addDialog(field);
             buttons.defaults().size(120, 54).pad(4);
             buttons.addButton("$ok", () -> {
                 confirmed.accept(field.getText());

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

@@ -6,10 +6,8 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.ai.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.io.*;
@@ -23,11 +21,7 @@ import io.anuke.mindustry.world.blocks.*;
 
 import static io.anuke.mindustry.Vars.*;
 
-public class World implements ApplicationListener{
+public class World{
-    public final Maps maps = new Maps();
-    public final BlockIndexer indexer = new BlockIndexer();
-    public final WaveSpawner spawner = new WaveSpawner();
-    public final Pathfinder pathfinder = new Pathfinder();
     public final Context context = new Context();
 
     private Map currentMap;
@@ -36,17 +30,7 @@ public class World implements ApplicationListener{
     private boolean generating, invalidMap;
 
     public World(){
-        maps.load();
-    }
 
-    @Override
-    public void init(){
-        maps.loadLegacyMaps();
-    }
-
-    @Override
-    public void dispose(){
-        maps.dispose();
     }
 
     public boolean isInvalidMap(){
@@ -194,7 +178,7 @@ public class World implements ApplicationListener{
             addDarkness(tiles);
         }
 
-        Entities.getAllGroups().each(group -> group.resize(-finalWorldBounds, -finalWorldBounds, tiles.length * tilesize + finalWorldBounds * 2, tiles[0].length * tilesize + finalWorldBounds * 2));
+        entities.all().each(group -> group.resize(-finalWorldBounds, -finalWorldBounds, tiles.length * tilesize + finalWorldBounds * 2, tiles[0].length * tilesize + finalWorldBounds * 2));
 
         generating = false;
         Events.fire(new WorldLoadEvent());

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

@@ -19,7 +19,6 @@ import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.io.*;
@@ -92,12 +91,12 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 createDialog("$editor.import",
                 "$editor.importmap", "$editor.importmap.description", "icon-load-map", (Runnable)loadDialog::show,
                 "$editor.importfile", "$editor.importfile.description", "icon-file", (Runnable)() ->
-                Platform.instance.showFileChooser("$editor.loadmap", "Map Files", file -> ui.loadAnd(() -> {
+                platform.showFileChooser("$editor.loadmap", "Map Files", file -> ui.loadAnd(() -> {
-                    world.maps.tryCatchMapError(() -> {
+                    maps.tryCatchMapError(() -> {
                         if(MapIO.isImage(file)){
                             ui.showInfo("$editor.errorimage");
                         }else if(file.extension().equalsIgnoreCase(oldMapExtension)){
-                            editor.beginEdit(world.maps.makeLegacyMap(file));
+                            editor.beginEdit(maps.makeLegacyMap(file));
                         }else{
                             editor.beginEdit(MapIO.createMap(file, true));
                         }
@@ -105,7 +104,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 }), true, FileChooser.anyMapFiles),
 
                 "$editor.importimage", "$editor.importimage.description", "icon-file-image", (Runnable)() ->
-                Platform.instance.showFileChooser("$loadimage", "Image Files", file ->
+                platform.showFileChooser("$loadimage", "Image Files", file ->
                 ui.loadAnd(() -> {
                     try{
                         Pixmap pixmap = new Pixmap(file);
@@ -121,7 +120,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
             Cell cell = t.addImageTextButton("$editor.export", "icon-save-map", isize, () -> {
                 if(!ios){
-                    Platform.instance.showFileChooser("$editor.savemap", "Map Files", file -> {
+                    platform.showFileChooser("$editor.savemap", "Map Files", file -> {
                         file = file.parent().child(file.nameWithoutExtension() + "." + mapExtension);
                         FileHandle result = file;
                         ui.loadAnd(() -> {
@@ -141,7 +140,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                         try{
                             FileHandle result = Core.files.local(editor.getTags().get("name", "unknown") + "." + mapExtension);
                             MapIO.writeMap(result, editor.createMap(result));
-                            Platform.instance.shareFile(result);
+                            platform.shareFile(result);
                         }catch(Exception e){
                             ui.showError(Core.bundle.format("editor.errorsave", Strings.parseException(e, true)));
                             Log.err(e);
@@ -210,7 +209,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
         shown(() -> {
 
             saved = true;
-            if(!Core.settings.getBool("landscape")) Platform.instance.beginForceLandscape();
+            if(!Core.settings.getBool("landscape")) platform.beginForceLandscape();
             editor.clearOp();
             Core.scene.setScrollFocus(view);
             if(!shownWithMap){
@@ -221,13 +220,13 @@ public class MapEditorDialog extends Dialog implements Disposable{
             }
             shownWithMap = false;
 
-            Time.runTask(10f, Platform.instance::updateRPC);
+            Time.runTask(10f, platform::updateRPC);
         });
 
         hidden(() -> {
             editor.clearOp();
-            Platform.instance.updateRPC();
+            platform.updateRPC();
-            if(!Core.settings.getBool("landscape")) Platform.instance.endForceLandscape();
+            if(!Core.settings.getBool("landscape")) platform.endForceLandscape();
         });
     }
 
@@ -286,11 +285,11 @@ public class MapEditorDialog extends Dialog implements Disposable{
             infoDialog.show();
             Core.app.post(() -> ui.showError("$editor.save.noname"));
         }else{
-            Map map = world.maps.all().find(m -> m.name().equals(name));
+            Map map = maps.all().find(m -> m.name().equals(name));
             if(map != null && !map.custom){
                 handleSaveBuiltin(map);
             }else{
-                world.maps.saveMap(editor.getTags());
+                maps.saveMap(editor.getTags());
                 ui.showInfoFade("$editor.saved");
             }
         }

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

@@ -72,7 +72,7 @@ public class MapGenerateDialog extends FloatingDialog{
             }).size(160f, 64f);
         }else{
             buttons.addButton("$settings.reset", () -> {
-                filters.set(world.maps.readFilters(""));
+                filters.set(maps.readFilters(""));
                 rebuildFilters();
                 update();
             }).size(160f, 64f);
@@ -304,7 +304,7 @@ public class MapGenerateDialog extends FloatingDialog{
         }
 
         selection.cont.addButton("$filter.defaultores", () -> {
-            world.maps.addDefaultOres(filters);
+            maps.addDefaultOres(filters);
             rebuildFilters();
             update();
             selection.hide();

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

@@ -4,13 +4,10 @@ import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.mindustry.*;
-import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.io.*;
 import io.anuke.mindustry.ui.dialogs.*;
 
-import static io.anuke.mindustry.Vars.world;
-
 public class MapInfoDialog extends FloatingDialog{
     private final MapEditor editor;
     private final WaveInfoDialog waveInfo;
@@ -70,7 +67,7 @@ public class MapInfoDialog extends FloatingDialog{
             t.row();
             t.add("$editor.generation").padRight(8).left();
             t.addButton("$edit",
-                () -> generate.show(world.maps.readFilters(editor.getTags().get("genfilters", "")),
+                () -> generate.show(Vars.maps.readFilters(editor.getTags().get("genfilters", "")),
                 filters -> editor.getTags().put("genfilters", JsonIO.write(filters)))
             ).left().width(200f);
 
@@ -78,9 +75,9 @@ public class MapInfoDialog extends FloatingDialog{
             description.change();
             author.change();
 
-            Platform.instance.addDialog(name, 50);
+            Vars.platform.addDialog(name, 50);
-            Platform.instance.addDialog(author, 50);
+            Vars.platform.addDialog(author, 50);
-            Platform.instance.addDialog(description, 1000);
+            Vars.platform.addDialog(description, 1000);
             t.margin(16f);
         });
     }

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

@@ -1,14 +1,14 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.function.Consumer;
+import io.anuke.arc.function.*;
 import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.Table;
+import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.arc.util.Scaling;
+import io.anuke.arc.util.*;
-import io.anuke.mindustry.maps.Map;
+import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.ui.BorderImage;
+import io.anuke.mindustry.ui.*;
-import io.anuke.mindustry.ui.dialogs.FloatingDialog;
+import io.anuke.mindustry.ui.dialogs.*;
 
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.maps;
 
 public class MapLoadDialog extends FloatingDialog{
     private Map selected = null;
@@ -17,7 +17,6 @@ public class MapLoadDialog extends FloatingDialog{
         super("$editor.loadmap");
 
         shown(this::rebuild);
-        rebuild();
 
         TextButton button = new TextButton("$load");
         button.setDisabled(() -> selected == null);
@@ -35,8 +34,8 @@ public class MapLoadDialog extends FloatingDialog{
 
     public void rebuild(){
         cont.clear();
-        if(world.maps.all().size > 0){
+        if(maps.all().size > 0){
-            selected = world.maps.all().first();
+            selected = maps.all().first();
         }
 
         ButtonGroup<TextButton> group = new ButtonGroup<>();
@@ -52,7 +51,7 @@ public class MapLoadDialog extends FloatingDialog{
         ScrollPane pane = new ScrollPane(table, "horizontal");
         pane.setFadeScrollBars(false);
 
-        for(Map map : world.maps.all()){
+        for(Map map : maps.all()){
 
             TextButton button = new TextButton(map.name(), "toggle");
             button.add(new BorderImage(map.texture, 2f).setScaling(Scaling.fit)).size(16 * 4f);
@@ -64,7 +63,7 @@ public class MapLoadDialog extends FloatingDialog{
             if(++i % maxcol == 0) table.row();
         }
 
-        if(world.maps.all().size == 0){
+        if(maps.all().size == 0){
             table.add("$maps.none").center();
         }else{
             cont.add("$editor.loadmap");

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

@@ -8,7 +8,7 @@ import io.anuke.arc.graphics.Texture;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Disposable;
+import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.graphics.IndexedRenderer;

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

@@ -1,14 +1,12 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.function.Consumer;
+import io.anuke.arc.function.*;
-import io.anuke.arc.scene.ui.TextButton;
+import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.TextField;
+import io.anuke.mindustry.*;
-import io.anuke.mindustry.core.Platform;
+import io.anuke.mindustry.maps.*;
-import io.anuke.mindustry.maps.Map;
+import io.anuke.mindustry.ui.dialogs.*;
-import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 
 import static io.anuke.mindustry.Vars.ui;
-import static io.anuke.mindustry.Vars.world;
 
 public class MapSaveDialog extends FloatingDialog{
     private TextField field;
@@ -19,12 +17,12 @@ public class MapSaveDialog extends FloatingDialog{
         field = new TextField();
         listener = cons;
 
-        Platform.instance.addDialog(field);
+        Vars.platform.addDialog(field);
 
         shown(() -> {
             cont.clear();
             cont.label(() -> {
-                Map map = world.maps.byName(field.getText());
+                Map map = Vars.maps.byName(field.getText());
                 if(map != null){
                     if(map.custom){
                         return "$editor.overwrite";
@@ -69,7 +67,7 @@ public class MapSaveDialog extends FloatingDialog{
         if(field.getText().isEmpty()){
             return true;
         }
-        Map map = world.maps.byName(field.getText());
+        Map map = Vars.maps.byName(field.getText());
         return map != null && !map.custom;
     }
 }

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

@@ -52,13 +52,13 @@ public class WaveInfoDialog extends FloatingDialog{
             dialog.cont.defaults().size(210f, 64f);
             dialog.cont.addButton("$waves.copy", () -> {
                 ui.showInfoFade("$waves.copied");
-                Core.app.setClipboardText(world.maps.writeWaves(groups));
+                Core.app.setClipboardText(maps.writeWaves(groups));
                 dialog.hide();
             }).disabled(b -> groups == null);
             dialog.cont.row();
             dialog.cont.addButton("$waves.load", () -> {
                 try{
-                    groups = world.maps.readWaves(Core.app.getClipboardText());
+                    groups = maps.readWaves(Core.app.getClipboardText());
                     buildGroups();
                 }catch(Exception e){
                     ui.showError("$waves.invalid");

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

@@ -1,89 +1,33 @@
 package io.anuke.mindustry.entities;
 
-import io.anuke.arc.Core;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.collection.Array;
+import io.anuke.mindustry.entities.traits.*;
-import io.anuke.arc.collection.IntMap;
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.function.Predicate;
-import io.anuke.arc.graphics.Camera;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.traits.Entity;
-
-import static io.anuke.mindustry.Vars.collisions;
 
+/** Simple container for managing entity groups.*/
 public class Entities{
-    private static final Array<EntityGroup<?>> groupArray = new Array<>();
+    private final Array<EntityGroup<?>> groupArray = new Array<>();
-    private static final IntMap<EntityGroup<?>> groups = new IntMap<>();
-    private static final Rectangle viewport = new Rectangle();
-    private static final boolean clip = true;
-    private static int count = 0;
 
-    public static void clear(){
+    public void clear(){
         for(EntityGroup group : groupArray){
             group.clear();
         }
     }
 
-    public static EntityGroup<?> getGroup(int id){
+    public EntityGroup<?> get(int id){
-        return groups.get(id);
+        return groupArray.get(id);
     }
 
-    public static Array<EntityGroup<?>> getAllGroups(){
+    public Array<EntityGroup<?>> all(){
         return groupArray;
     }
 
-    public static <T extends Entity> EntityGroup<T> addGroup(Class<T> type){
+    public <T extends Entity> EntityGroup<T> add(Class<T> type){
-        return addGroup(type, true);
+        return add(type, true);
     }
 
-    public static <T extends Entity> EntityGroup<T> addGroup(Class<T> type, boolean useTree){
+    public <T extends Entity> EntityGroup<T> add(Class<T> type, boolean useTree){
-        EntityGroup<T> group = new EntityGroup<>(type, useTree);
+        EntityGroup<T> group = new EntityGroup<>(groupArray.size, type, useTree);
-        groups.put(group.getID(), group);
         groupArray.add(group);
         return group;
     }
-
-    public static void update(EntityGroup<?> group){
-        group.updateEvents();
-
-        if(group.useTree()){
-            collisions.updatePhysics(group);
-        }
-
-        for(Entity e : group.all()){
-            e.update();
-        }
-    }
-
-    public static int countInBounds(EntityGroup<?> group){
-        count = 0;
-        draw(group, e -> true, e -> count++);
-        return count;
-    }
-
-    public static void draw(EntityGroup<?> group){
-        draw(group, e -> true);
-    }
-
-    public static <T extends DrawTrait> void draw(EntityGroup<?> group, Predicate<T> toDraw){
-        draw(group, toDraw, DrawTrait::draw);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T extends DrawTrait> void draw(EntityGroup<?> group, Predicate<T> toDraw, Consumer<T> cons){
-        if(clip){
-            Camera cam = Core.camera;
-            viewport.set(cam.position.x - cam.width / 2, cam.position.y - cam.height / 2, cam.width, cam.height);
-        }
-
-        for(Entity e : group.all()){
-            if(!(e instanceof DrawTrait) || !toDraw.test((T)e) || !e.isAdded()) continue;
-            DrawTrait draw = (DrawTrait)e;
-
-            if(!clip || viewport.overlaps(draw.getX() - draw.drawSize()/2f, draw.getY() - draw.drawSize()/2f, draw.drawSize(), draw.drawSize())){
-                cons.accept((T)e);
-            }
-        }
-    }
 }

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

@@ -1,30 +1,34 @@
 package io.anuke.mindustry.entities;
 
-import io.anuke.arc.collection.Array;
+import io.anuke.arc.*;
-import io.anuke.arc.collection.IntMap;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.function.Consumer;
+import io.anuke.arc.function.*;
-import io.anuke.arc.function.Predicate;
+import io.anuke.arc.graphics.*;
-import io.anuke.arc.math.geom.QuadTree;
+import io.anuke.arc.math.geom.*;
-import io.anuke.arc.math.geom.Rectangle;
+import io.anuke.mindustry.entities.traits.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.entities.traits.Entity;
 
+import static io.anuke.mindustry.Vars.collisions;
+
+/** Represents a group of a certain type of entity.*/
+@SuppressWarnings("unchecked")
 public class EntityGroup<T extends Entity>{
-    private static int lastid;
     private final boolean useTree;
     private final int id;
     private final Class<T> type;
-    private final Array<T> entityArray = new Array<>(false, 16);
+    private final Array<T> entityArray = new Array<>(false, 32);
-    private final Array<T> entitiesToRemove = new Array<>(false, 16);
+    private final Array<T> entitiesToRemove = new Array<>(false, 32);
-    private final Array<T> entitiesToAdd = new Array<>(false, 16);
+    private final Array<T> entitiesToAdd = new Array<>(false, 32);
     private IntMap<T> map;
     private QuadTree tree;
     private Consumer<T> removeListener;
     private Consumer<T> addListener;
 
-    public EntityGroup(Class<T> type, boolean useTree){
+    private final Rectangle viewport = new Rectangle();
+    private int count = 0;
+
+    public EntityGroup(int id, Class<T> type, boolean useTree){
         this.useTree = useTree;
-        this.id = lastid++;
+        this.id = id;
         this.type = type;
 
         if(useTree){
@@ -32,6 +36,46 @@ public class EntityGroup<T extends Entity>{
         }
     }
 
+    public void update(){
+        updateEvents();
+
+        if(useTree()){
+            collisions.updatePhysics(this);
+        }
+
+        for(Entity e : all()){
+            e.update();
+        }
+    }
+
+    public int countInBounds(){
+        count = 0;
+        draw(e -> true, e -> count++);
+        return count;
+    }
+
+    public void draw(){
+        draw(e -> true);
+    }
+
+    public void draw(Predicate<T> toDraw){
+        draw(toDraw, t -> ((DrawTrait)t).draw());
+    }
+
+    public void draw(Predicate<T> toDraw, Consumer<T> cons){
+        Camera cam = Core.camera;
+        viewport.set(cam.position.x - cam.width / 2, cam.position.y - cam.height / 2, cam.width, cam.height);
+
+        for(Entity e : all()){
+            if(!(e instanceof DrawTrait) || !toDraw.test((T)e) || !e.isAdded()) continue;
+            DrawTrait draw = (DrawTrait)e;
+
+            if(viewport.overlaps(draw.getX() - draw.drawSize()/2f, draw.getY() - draw.drawSize()/2f, draw.drawSize(), draw.drawSize())){
+                cons.accept((T)e);
+            }
+        }
+    }
+
     public boolean useTree(){
         return useTree;
     }

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

@@ -68,13 +68,13 @@ public class Units{
 
     /** Returns the neareset damaged tile. */
     public static TileEntity findDamagedTile(Team team, float x, float y){
-        Tile tile = Geometry.findClosest(x, y, world.indexer.getDamaged(team));
+        Tile tile = Geometry.findClosest(x, y, indexer.getDamaged(team));
         return tile == null ? null : tile.entity;
     }
 
     /** Returns the neareset ally tile in a range. */
     public static TileEntity findAllyTile(Team team, float x, float y, float range, Predicate<Tile> pred){
-        return world.indexer.findTile(team, x, y, range, pred);
+        return indexer.findTile(team, x, y, range, pred);
     }
 
     /** Returns the neareset enemy tile in a range. */
@@ -82,7 +82,7 @@ public class Units{
         if(team == Team.derelict) return null;
 
         for(Team enemy : state.teams.enemiesOf(team)){
-            TileEntity entity = world.indexer.findTile(enemy, x, y, range, pred);
+            TileEntity entity = indexer.findTile(enemy, x, y, range, pred);
             if(entity != null){
                 return entity;
             }

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

@@ -101,9 +101,8 @@ public interface BuilderTrait extends Entity, TeamTrait{
             unit.rotation = Mathf.slerpDelta(unit.rotation, unit.angleTo(entity), 0.4f);
         }
 
-        //deconstructing is 2x as fast
         if(current.breaking){
-            entity.deconstruct(unit, core, 2f / entity.buildCost * Time.delta() * getBuildPower(tile) * state.rules.buildSpeedMultiplier);
+            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);
         }

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

@@ -84,12 +84,12 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
     }
 
     public boolean isCommanded(){
-        return world.indexer.getAllied(team, BlockFlag.comandCenter).size != 0 && world.indexer.getAllied(team, BlockFlag.comandCenter).first().entity instanceof CommandCenterEntity;
+        return indexer.getAllied(team, BlockFlag.comandCenter).size != 0 && indexer.getAllied(team, BlockFlag.comandCenter).first().entity instanceof CommandCenterEntity;
     }
 
     public UnitCommand getCommand(){
         if(isCommanded()){
-            return world.indexer.getAllied(team, BlockFlag.comandCenter).first().<CommandCenterEntity>entity().command;
+            return indexer.getAllied(team, BlockFlag.comandCenter).first().<CommandCenterEntity>entity().command;
         }
         return null;
     }
@@ -145,12 +145,12 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
     }
 
     public void targetClosestAllyFlag(BlockFlag flag){
-        Tile target = Geometry.findClosest(x, y, world.indexer.getAllied(team, flag));
+        Tile target = Geometry.findClosest(x, y, indexer.getAllied(team, flag));
         if(target != null) this.target = target.entity;
     }
 
     public void targetClosestEnemyFlag(BlockFlag flag){
-        Tile target = Geometry.findClosest(x, y, world.indexer.getEnemy(team, flag));
+        Tile target = Geometry.findClosest(x, y, indexer.getEnemy(team, flag));
         if(target != null) this.target = target.entity;
     }
 

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

@@ -13,7 +13,7 @@ import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.meta.*;
 
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 public abstract class FlyingUnit extends BaseUnit{
     protected float[] weaponAngles = {0, 0};
@@ -97,7 +97,7 @@ public abstract class FlyingUnit extends BaseUnit{
             if(retarget()){
                 target = getSpawner();
 
-                Tile repair = Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair));
+                Tile repair = Geometry.findClosest(x, y, indexer.getAllied(team, BlockFlag.repair));
                 if(repair != null && damaged()) FlyingUnit.this.target = repair.entity;
                 if(target == null) target = getClosestCore();
             }

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

@@ -14,7 +14,7 @@ import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
 
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 public abstract class GroundUnit extends BaseUnit{
     protected static Vector2 vec = new Vector2();
@@ -223,7 +223,7 @@ public abstract class GroundUnit extends BaseUnit{
     protected void moveToCore(){
         Tile tile = world.tileWorld(x, y);
         if(tile == null) return;
-        Tile targetTile = world.pathfinder.getTargetTile(team, tile);
+        Tile targetTile = pathfinder.getTargetTile(team, tile);
 
         if(tile == targetTile) return;
 
@@ -246,7 +246,7 @@ public abstract class GroundUnit extends BaseUnit{
 
         Tile tile = world.tileWorld(x, y);
         if(tile == null) return;
-        Tile targetTile = world.pathfinder.getTargetTile(enemy, tile);
+        Tile targetTile = pathfinder.getTargetTile(enemy, tile);
         TileEntity core = getClosestCore();
 
         if(tile == targetTile || core == null || dst(core) < 120f) return;

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

@@ -14,6 +14,7 @@ import io.anuke.arc.util.*;
 import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.*;
@@ -731,7 +732,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
                         target = Units.closestTarget(team, x, y, getWeapon().bullet.range(), u -> u.getTeam() != Team.derelict, u -> u.getTeam() != Team.derelict);
 
                         if(mech.canHeal && target == null){
-                            target = Geometry.findClosest(x, y, world.indexer.getDamaged(Team.sharded));
+                            target = Geometry.findClosest(x, y, indexer.getDamaged(Team.sharded));
                             if(target != null && dst(target) > getWeapon().bullet.range()){
                                 target = null;
                             }else if(target != null){
@@ -774,6 +775,31 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
 
     //region utility methods
 
+    public void sendMessage(String text){
+        if(isLocal){
+            if(Vars.ui != null){
+                Log.info("add " + text);
+                Vars.ui.chatfrag.addMessage(text, null);
+            }
+        }else{
+            Call.sendMessage(con.id, text, null, null);
+        }
+    }
+
+    public void sendMessage(String text, Player from){
+        sendMessage(text, from, NetClient.colorizeName(from.id, from.name));
+    }
+
+    public void sendMessage(String text, Player from, String fromName){
+        if(isLocal){
+            if(Vars.ui != null){
+                Vars.ui.chatfrag.addMessage(text, fromName);
+            }
+        }else{
+            Call.sendMessage(con.id, text, fromName, from);
+        }
+    }
+
     /** Resets all values of the player. */
     public void reset(){
         resetNoAdd();

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

@@ -52,7 +52,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
             tile.entity.health = health;
 
             if(tile.entity.damaged()){
-                world.indexer.notifyTileDamaged(tile.entity);
+                indexer.notifyTileDamaged(tile.entity);
             }
         }
     }
@@ -171,7 +171,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
         }
 
         if(preHealth >= maxHealth() - 0.00001f && health < maxHealth() && world != null){ //when just damaged
-            world.indexer.notifyTileDamaged(this);
+            indexer.notifyTileDamaged(this);
         }
     }
 

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

@@ -256,7 +256,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
         //apply knockback based on spawns
         if(getTeam() != waveTeam){
             float relativeSize = state.rules.dropZoneRadius + getSize()/2f + 1f;
-            for(Tile spawn : world.spawner.getGroundSpawns()){
+            for(Tile spawn : spawner.getGroundSpawns()){
                 if(withinDst(spawn.worldx(), spawn.worldy(), relativeSize)){
                     velocity.add(Tmp.v1.set(this).sub(spawn.worldx(), spawn.worldy()).setLength(0.1f + 1f - dst(spawn) / relativeSize).scl(0.45f * Time.delta()));
                 }

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

@@ -7,7 +7,7 @@ import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
 
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 public abstract class BaseDrone extends FlyingUnit{
     public final UnitState retreat = new UnitState(){
@@ -20,7 +20,7 @@ public abstract class BaseDrone extends FlyingUnit{
                 state.set(getStartState());
             }else if(!targetHasFlag(BlockFlag.repair)){
                 if(retarget()){
-                    Tile repairPoint = Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair));
+                    Tile repairPoint = Geometry.findClosest(x, y, indexer.getAllied(team, BlockFlag.repair));
                     if(repairPoint != null){
                         target = repairPoint;
                     }else{
@@ -49,7 +49,7 @@ public abstract class BaseDrone extends FlyingUnit{
 
     @Override
     public void behavior(){
-        if(health <= maxHealth() * type.retreatPercent && !state.is(retreat) && Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair)) != null){
+        if(health <= maxHealth() * type.retreatPercent && !state.is(retreat) && Geometry.findClosest(x, y, indexer.getAllied(team, BlockFlag.repair)) != null){
             setState(retreat);
         }
     }

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

@@ -14,7 +14,7 @@ import io.anuke.mindustry.world.Tile;
 
 import java.io.*;
 
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 /** A drone that only mines.*/
 public class MinerDrone extends BaseDrone implements MinerTrait{
@@ -46,7 +46,7 @@ public class MinerDrone extends BaseDrone implements MinerTrait{
                 setState(drop);
             }else{
                 if(retarget() && targetItem != null){
-                    target = world.indexer.findClosestOre(x, y, targetItem);
+                    target = indexer.findClosestOre(x, y, targetItem);
                 }
 
                 if(target instanceof Tile){
@@ -174,6 +174,6 @@ public class MinerDrone extends BaseDrone implements MinerTrait{
         if(entity == null){
             return;
         }
-        targetItem = Structs.findMin(type.toMine, world.indexer::hasOre, (a, b) -> -Integer.compare(entity.items.get(a), entity.items.get(b)));
+        targetItem = Structs.findMin(type.toMine, indexer::hasOre, (a, b) -> -Integer.compare(entity.items.get(a), entity.items.get(b)));
     }
 }

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

@@ -19,7 +19,7 @@ public abstract class Content{
      */
     public abstract ContentType getContentType();
 
-    /** Called after all content is created. Do not use to load regions or texture data! */
+    /** Called after all content and modules are created. Do not use to load regions or texture data! */
     public void init(){
     }
 

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

@@ -32,11 +32,6 @@ public class EventType{
 
     }
 
-    /** Called when the core app is first loaded. */
-    public static class AppLoadEvent{
-
-    }
-
     public static class DisposeEvent{
 
     }

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

@@ -20,7 +20,6 @@ public enum Gamemode{
         rules.respawnTime = 0f;
     }),
     attack(rules -> {
-        rules.enemyCheat = true;
         rules.unitDrops = true;
         rules.attackMode = true;
         rules.waves = true;

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

@@ -2,11 +2,16 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
+import io.anuke.arc.files.*;
+import io.anuke.arc.util.io.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.type.*;
 
+import java.io.*;
+import java.util.zip.*;
+
 import static io.anuke.mindustry.Vars.*;
 
 /** Stores player unlocks. Clientside only. */
@@ -29,6 +34,43 @@ public class GlobalData{
         });
     }
 
+    public void exportData(FileHandle file) throws IOException{
+        Array<FileHandle> files = new Array<>();
+        files.add(Core.settings.getSettingsFile());
+        files.addAll(customMapDirectory.list());
+        files.addAll(saveDirectory.list());
+        String base = Core.settings.getDataDirectory().path();
+
+        try(OutputStream fos = file.write(false, 2048); ZipOutputStream zos = new ZipOutputStream(fos)){
+            for(FileHandle add : files){
+                zos.putNextEntry(new ZipEntry(add.path().substring(base.length())));
+                Streams.copyStream(add.read(), zos);
+                zos.closeEntry();
+            }
+
+        }
+    }
+
+    public void importData(FileHandle file){
+        FileHandle zipped = new ZipFileHandle(file);
+
+        FileHandle base = Core.settings.getDataDirectory();
+        if(!base.child("settings.bin").exists()){
+            throw new IllegalArgumentException("Not valid save data.");
+        }
+
+        //purge existing data
+        for(FileHandle f : base.list()){
+            if(f.isDirectory()){
+                f.deleteDirectory();
+            }else{
+                f.delete();
+            }
+        }
+
+        zipped.walk(f -> f.copyTo(base.child(f.path())));
+    }
+
     public void modified(){
         modified = true;
     }

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

@@ -14,15 +14,12 @@ import static io.anuke.mindustry.Vars.*;
 
 /** Controls playback of multiple music tracks.*/
 public class MusicControl{
-    private static final float finTime = 120f, foutTime = 120f, musicInterval = 60 * 60 * 3f, musicChance = 0.45f, musicWaveChance = 0.35f;
+    private static final float finTime = 120f, foutTime = 120f, musicInterval = 60 * 60 * 3f, musicChance = 0.5f, musicWaveChance = 0.4f;
 
     /** normal, ambient music, plays at any time */
     public final Array<Music> ambientMusic = Array.with(Musics.game1, Musics.game3, Musics.game4, Musics.game6);
     /** darker music, used in times of conflict  */
     public final Array<Music> darkMusic = Array.with(Musics.game2, Musics.game5, Musics.game7);
-    /** all music, both dark and ambient */
-    public final Array<Music> allMusic = Array.withArrays(ambientMusic, darkMusic);
-
     private Music lastRandomPlayed;
     private Interval timer = new Interval();
     private @Nullable Music current;
@@ -88,7 +85,7 @@ public class MusicControl{
         }
 
         //dark based on enemies
-        return Mathf.chance(state.enemies() / 70f);
+        return Mathf.chance(state.enemies() / 70f + 0.1f);
     }
 
     /** Plays and fades in a music track. This must be called every frame.

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

@@ -1,30 +1,31 @@
 package io.anuke.mindustry.game;
 
-import io.anuke.arc.Core;
+import io.anuke.arc.*;
-import io.anuke.arc.Events;
+import io.anuke.arc.assets.*;
 import io.anuke.arc.collection.*;
-import io.anuke.arc.files.FileHandle;
+import io.anuke.arc.files.*;
+import io.anuke.arc.graphics.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.core.GameState.State;
+import io.anuke.arc.util.async.*;
-import io.anuke.mindustry.game.EventType.StateChangeEvent;
+import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.io.SaveIO;
+import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.io.SaveIO.SaveException;
+import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.io.SaveMeta;
+import io.anuke.mindustry.io.SaveIO.*;
 import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.type.Zone;
+import io.anuke.mindustry.type.*;
 
-import java.io.IOException;
+import java.io.*;
-import java.text.SimpleDateFormat;
+import java.text.*;
-import java.util.Date;
+import java.util.*;
 
-import static io.anuke.mindustry.Vars.saveExtension;
+import static io.anuke.mindustry.Vars.*;
-import static io.anuke.mindustry.Vars.state;
 
 public class Saves{
     private int nextSlot;
     private Array<SaveSlot> saves = new Array<>();
     private IntMap<SaveSlot> saveMap = new IntMap<>();
     private SaveSlot current;
+    private AsyncExecutor previewExecutor = new AsyncExecutor(1);
     private boolean saving;
     private float time;
 
@@ -32,6 +33,8 @@ public class Saves{
     private long lastTimestamp;
 
     public Saves(){
+        Core.assets.setLoader(Texture.class, ".spreview", new SavePreviewLoader());
+
         Events.on(StateChangeEvent.class, event -> {
             if(event.to == State.menu){
                 totalPlaytime = 0;
@@ -162,6 +165,7 @@ public class Saves{
 
     public class SaveSlot{
         public final int index;
+        boolean requestedPreview;
         SaveMeta meta;
 
         public SaveSlot(int index){
@@ -174,6 +178,7 @@ public class Saves{
                 meta = SaveIO.getMeta(index);
                 current = this;
                 totalPlaytime = meta.timePlayed;
+                savePreview();
             }catch(Exception e){
                 throw new SaveException(e);
             }
@@ -191,6 +196,41 @@ public class Saves{
             }
 
             totalPlaytime = prev;
+            savePreview();
+        }
+
+        private void savePreview(){
+            if(Core.assets.isLoaded(loadPreviewFile().path())){
+                Core.assets.unload(loadPreviewFile().path());
+            }
+            previewExecutor.submit(() -> {
+                try{
+                    previewFile().writePNG(renderer.minimap.getPixmap());
+                    requestedPreview = false;
+                }catch(Throwable t){
+                    t.printStackTrace();
+                }
+            });
+        }
+
+        public Texture previewTexture(){
+            if(!previewFile().exists()){
+                return null;
+            }else if(Core.assets.isLoaded(loadPreviewFile().path())){
+                return Core.assets.get(loadPreviewFile().path());
+            }else if(!requestedPreview){
+                Core.assets.load(new AssetDescriptor<>(loadPreviewFile(), Texture.class));
+                requestedPreview = true;
+            }
+            return null;
+        }
+
+        private FileHandle previewFile(){
+            return mapPreviewDirectory.child("save_slot_" + index + ".png");
+        }
+
+        private FileHandle loadPreviewFile(){
+            return previewFile().sibling(previewFile().name() + ".spreview");
         }
 
         public boolean isHidden(){
@@ -214,7 +254,7 @@ public class Saves{
         }
 
         public String getName(){
-            return Core.settings.getString("save-" + index + "-name", "untittled");
+            return Core.settings.getString("save-" + index + "-name", "untitled");
         }
 
         public void setName(String name){
@@ -270,6 +310,10 @@ public class Saves{
                 current = null;
             }
 
+            if(Core.assets.isLoaded(loadPreviewFile().path())){
+                Core.assets.unload(loadPreviewFile().path());
+            }
+
             saveSlots();
         }
     }

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

@@ -161,7 +161,7 @@ public class Tutorial{
             }
         },
         deposit(() -> event("deposit")),
-        waves(() -> state.wave > 2 && state.enemies() <= 0 && !world.spawner.isSpawning()){
+        waves(() -> state.wave > 2 && state.enemies() <= 0 && !spawner.isSpawning()){
             void begin(){
                 state.rules.waveTimer = true;
                 logic.runWave();

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

@@ -85,4 +85,6 @@ public class Drawf{
         float oy = 17f / 63f * length;
         Draw.rect(Core.atlas.find("shape-3"), x, y - oy + length / 2f, width, length, width / 2f, oy, rotation - 90);
     }
+
+
 }

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

@@ -36,6 +36,10 @@ public class MinimapRenderer implements Disposable{
         Events.on(TileChangeEvent.class, event -> Core.app.post(() -> update(event.tile)));
     }
 
+    public Pixmap getPixmap(){
+        return pixmap;
+    }
+
     public Texture getTexture(){
         return texture;
     }

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

@@ -96,7 +96,7 @@ public class OverlayRenderer{
         Lines.stroke(2f);
         Draw.color(Color.GRAY, Color.LIGHT_GRAY, Mathf.absin(Time.time(), 8f, 1f));
 
-        for(Tile tile : world.spawner.getGroundSpawns()){
+        for(Tile tile : spawner.getGroundSpawns()){
             if(tile.withinDst(player.x, player.y, state.rules.dropZoneRadius + spawnerMargin)){
                 Draw.alpha(Mathf.clamp(1f - (player.dst(tile) - state.rules.dropZoneRadius) / spawnerMargin));
                 Lines.dashCircle(tile.worldx(), tile.worldy(), state.rules.dropZoneRadius);

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

@@ -55,7 +55,7 @@ public class Pixelator implements Disposable{
         Draw.rect(Draw.wrap(buffer.getTexture()), Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height);
         Draw.blend();
 
-        renderer.draw(playerGroup, p -> !p.isDead() && !p.isLocal, Player::drawName);
+        playerGroup.draw(p -> !p.isDead() && !p.isLocal, Player::drawName);
 
         Core.camera.position.set(px, py);
         Core.settings.put("animatedwater", hadWater);