Merge

.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

.gitignore

@@ -19,6 +19,7 @@ logs/
 /tools/build/
 /tests/build/
 /server/build/
+changelog
 saves/
 core/assets/saves/
 /core/assets/saves/
@@ -37,6 +38,7 @@ packr-out/
 config/
 changelog
 *.gif
+/core/assets/saves/
 
 version.properties
 

.travis.yml

@@ -1,28 +1,43 @@
 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
-    skip_cleanup: true
-    draft: false
-    api_key:
-      secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
-    file:
-    - desktop/build/libs/Mindustry.jar
-    - server/build/libs/server-release.jar
-    on:
-      repo: Anuken/Mindustry
-      tags: true
-  - provider: script
-    script: bash update_wiki.sh
-    on:
-      repo: Anuken/Mindustry
-      tags: true
+- provider: releases
+  skip_cleanup: true
+  draft: false
+  api_key:
+    secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
+  file:
+  - desktop/build/libs/Mindustry.jar
+  - server/build/libs/server-release.jar
+  on:
+    repo: Anuken/Mindustry
+    tags: true
+- 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'
-    compileSdkVersion 28
+    buildToolsVersion '29.0.2'
+    compileSdkVersion 29
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -70,27 +70,15 @@ android{
     }
 
     defaultConfig{
-        def vfile = file('../core/assets/version.properties')
-
-        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(" ", "-")}"
-        }
+        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(" ", "-")}"
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 28
-        versionCode code
+        targetSdkVersion 29
+        
         versionName versionNameResult
+        versionCode vcode
     }
 
     compileOptions{

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

@@ -131,7 +131,7 @@ public class AndroidLauncher extends AndroidApplication{
         config.hideStatusBar = true;
         Net.setClientProvider(new ArcNetClient());
         Net.setServerProvider(new ArcNetServer());
-        initialize(new Mindustry(), config);
+        initialize(new ClientLauncher(), 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))",
-                path.substring(path.lastIndexOf("/") + 1) + "/" + fname, (path.substring(path.lastIndexOf("/") + 1) + "/" + fname).replace(".ogg", ".mp3"));
+            String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname;
+
+            //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'
@@ -120,6 +122,7 @@ allprojects{
                 props.load(new FileInputStream(pfile))
 
                 String buildid = getBuildVersion()
+                println("Compiling with build: '$buildid'")
 
                 props["type"] = versionType
                 props["number"] = versionNumber
@@ -203,6 +206,7 @@ project(":core"){
 
     task preGen{
         generateLocales()
+        writeVersion()
     }
 
     dependencies{
@@ -233,6 +237,7 @@ project(":core"){
 
         compileJava.dependsOn(preGen)
 
+        compile "org.lz4:lz4-java:1.4.1"
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
         compile arcModule("extensions:arcnet")
@@ -298,7 +303,6 @@ project(":net"){
 
     dependencies{
         compile project(":core")
-        compile "org.lz4:lz4-java:1.4.1"
     }
 }
 

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}
@@ -25,9 +31,6 @@ 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.\n\n[scarlet]DO IT.
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\n\n[scarlet]DO IT.
-
 launcheditems = [accent]Launched Items
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
@@ -66,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.
@@ -160,6 +165,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?
@@ -388,6 +398,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
@@ -522,6 +533,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...
@@ -542,6 +554,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
@@ -808,6 +821,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
@@ -1032,6 +1046,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_cs.properties

@@ -43,6 +43,7 @@ newgame = New Game
 none = <none>
 minimap = Minimap
 close = Zavřít
+website = Website
 quit = Ukončit
 maps = Mapy
 continue = Pokračovat
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Tvé jméno je neplatné.
 server.kicked.idInUse = Již jsi na tomhle serveru připojen! Připojování se dvěma účty není povoleno.
 server.kicked.customClient = Tento server nepodporuje vlastní verze hry. Stáhni si oficiální verzi.
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = [accent]hostitel[] hostuje server na portu [scarlet]6567[]. \nKdokoliv na stejné [LIGHT_GRAY]wifi nebo místní síti[] by měl vidět server ve svém listu serverů.\n\nJestli chcete aby se uživatelé připojovali odkudkoliv pomocí IP, [accent]přesměrování portů[] je nutné.\n\n[LIGHT_GRAY]Poznámka: Jestli někdo má problém s připojením ke své LAN hře, ujistěte se že má Mindustry povolený přístup k místní síti v nastavení Firewallu.
 join.info = Tady můžeš vložit [accent]IP serveru[] ke kterému se chceš připojit, nebo objevit [accent]Servery Místní sítě[] ke kterým se chceš připojit.\nLAN i Multiplayer jsou podporovány.\n\n[LIGHT_GRAY]Poznámka: Není žádný globální seznam serverů; Pokud se budeš chtít připojit k někomu pomocí IP, budeš jí muset znát od hostitele.
 hostserver = Hostovat hru
@@ -154,7 +156,10 @@ cancel = Zrušit
 openlink = Otevřít Odkaz
 copylink = Zkopírovat Odkaz
 back = Zpět
+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 ?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Načítám...
 saving = [accent]Ukládám...
 wave = [accent]Vlna {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Ore
@@ -302,6 +308,7 @@ ping = Odezva: {0}ms
 language.restart = Prosím restartuj hru aby se provedla změna jazyka!
 settings = Nastavení
 tutorial = Tutoriál
+tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Editor map
 donate = Darovat
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Best: {0}
 launch = Launch
 launch.title = Launch Successful
 launch.next = [LIGHT_GRAY]next opportunity at wave {0}
-launch.unable = [scarlet]Unable to LAUNCH.[] Enemies.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Reach wave {0}\nto configure loadout.
@@ -352,6 +360,7 @@ zone.tarFields.name = Tar Fields
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = Jazyk
@@ -417,6 +427,7 @@ blocks.inaccuracy = Nepřesnost/výchylka
 blocks.shots = Střely
 blocks.reload = Střely za sekundu
 blocks.ammo = Ammo
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}
@@ -491,6 +502,7 @@ setting.lasers.name = Ukázat laser energie
 setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
 setting.minimap.name = Ukázat minimapu
 setting.musicvol.name = Hlasitost hudby
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Ztišit hudbu
 setting.sfxvol.name = SFX hlasitost
 setting.mutesound.name = Ztišit zvuky
@@ -819,9 +831,10 @@ block.container.name = Kontejnér
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 team.blue.name = modrá
-team.red.name = červená
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = oranžová
-team.none.name = šedá
+team.derelict.name = derelict
 team.green.name = zelená
 team.purple.name = fialová
 unit.spirit.name = Spirit Dron
@@ -839,27 +852,26 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Tvá mise tady je vyhladit [LIGHT_GRAY] nepřítele[].\n\nZačneš tím že[accent] budeš těžit měd[]. Klikni na měděnou rudu poblíž tvého jádra pro těžbu.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Manuální zěžba je neefektivní.\n[accent]Vrty []budou těžit automaticky.\npolož jeden na měděnou rudu.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]Dopravníky[] jsou zapotřebí k dopravě materiálu k jádru.\nVytvoř řadu dopravníku od vrtu až k jádru.
-tutorial.morecopper = Je za potřebí více mědi.\n\nBuď ho můžeš natěžit manuáně nebo polož více vrtů.
+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.turret = Defenzivní stavby musí být postaveny za účelem obrany vůči[LIGHT_GRAY] nepříteli[].\nPostav střílnu Duo blízko svého jádra.
 tutorial.drillturret = Duo střílny požadují[accent] měd jako střelivo []ke střelbě.\nPolož vrt blízko střílny pro zásobování mědí.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = [LIGHT_GRAY] nepřítel[] je přibližuje.\n\nBraň své jádro po dobu dvou vln, postav více střílen.
-tutorial.lead = Více rud je zde dostupných. Najdi a těž[accent] Olovo[].\n\nPřetáhni od tvojí jednotky k jádru pro přesun materiálu.
-tutorial.smelter = Měd a olovo jsou slabé materiály.\nLepší[accent] hustá slitina[] může být vytvořena v peci.\n\npostav si jednu pec.
-tutorial.densealloy = Pec teď bude produkovat slitinu.\nVyráběj si ji.\nZvyš počet produkce pokud je nutno.
-tutorial.siliconsmelter = Jádro teď vytvoří[accent] spirit drona[] pro těžení a opravu bloků.\n\nTovárny pro ostatní jednotky mohou být vytvořeny za pomocí [accent] Křemíku.\nPostav Křemíkovou pec.
-tutorial.silicondrill = Křemík vyžaduje[accent] uhlí[] a[accent] písek[].\nZačni tím že položíš pár vrtů.
-tutorial.generator = Tato technologie vyžaduje energii k provozu.\nVytvoř[accent] spalovací generátor[]k produkci energie.
-tutorial.generatordrill = Spalovací generátory vyžadujou palivo.\nZásobuj ho uhlím z vrtu.
-tutorial.node = Energie vyžaduje přenos.\nVytvoř[accent] energetický uzel[] vedle svého generátoru pro přenos energie.
-tutorial.nodelink = Energie může být přenášena zkrz kontakt s energetickými bloky a generátory, nebo propojením zkrze energetické uzly.\n\nPropoj energii kliknutím na uzel a následným výběrem generátoru a křemíkovou pecí.
-tutorial.silicon = Křemík se teď produkuje. Vyráběj si.\n\nJe doporučeno zvýšit produkci.
-tutorial.daggerfactory = Postav[accent] Továrnu na Dagger mechy.[]\n\nToto bude využito pro konstrukci útočné síly.
-tutorial.router = Továrny potřebujou k provozu materiál.\nPolož na dopravník směrovač pro oddělení části nákladu k továrně.
-tutorial.dagger = Propoj energetické uzly s továrnou.\nJakmile jsou požadavky splněny, Mechy se začnou stavět.\n\nPokládej vrty, generátory a dopravníky dle libosti.
-tutorial.battle = [LIGHT_GRAY] Nepřítel[] prozradil lokaci svého jádra.\nZnič ho svými bojovými jednotkami.
+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 = Užitečný strukturální materiál. Používá se rozsáhle v ostatních typech bloků.
 item.lead.description = Základní počáteční materiál. Požívá se rozsáhle v elektronice a v blocích pro transport tekutin.
 item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = Pokročilá, obrněná pozemní jednotka. Útočí jak na pozemní tak vzdušné nepřátelské jednotky.
 unit.fortress.description = Težká, pozemní artilérní jednotka.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = Rychlý, udeř a uteč stíhací letoun.
 unit.ghoul.description = Těžký, kobercový bombardér.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Redukuje písek s vysoce čistým koksem za účelem výroby křemíku.

core/assets/bundles/bundle_es.properties

@@ -43,6 +43,7 @@ newgame = New Game
 none = <no hay>
 minimap = Minimap
 close = Cerrar
+website = Website
 quit = Salir
 maps = Mapas
 continue = Continuar
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Tu nombre debe por lo menos contener un carácter o n
 server.kicked.idInUse = ¡Ya estás en el servidor! Conectarse con dos cuentas no está permitido.
 server.kicked.customClient = Este servidor no soporta versiones personalizadas. Descarga una versión oficial.
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = El botón [accent]host[] hostea un servidor en el puerto [scarlet]6567[]. \nCualquier persona en la misma [LIGHT_GRAY]wifi o red local[] debería poder ver tu servidor en la lista de servidores.\n\nSi quieres que cualquier persona se pueda conectar de cualquier lugar por IP, la [accent]asignación de puertos[] es requerida.\n\n[LIGHT_GRAY]Nota: Si alguien experimenta problemas conectándose a tu partida LAN, asegúrate de permitir a Mindustry acceso a tu red local mediante la configuración de tu firewall.
 join.info = Aquí, puedes escribir la [accent]IP de un server[] para conectarte, o descubrir servidores de [accent]red local[] para conectarte.\nLAN y WAN es soportado para jugar en multijugador.\n\n[LIGHT_GRAY]Nota: No hay una lista automática global de servidores; si quieres conectarte por IP, tendrás que preguntarle al anfitrión por la IP.
 hostserver = Hostear Servidor
@@ -154,7 +156,10 @@ cancel = Cancelar
 openlink = Abrir Enlace
 copylink = Copiar Enlace
 back = Atrás
+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 = ¿Estás seguro de querer salir de la partida?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Cargando...
 saving = [accent]Guardando...
 wave = [accent]Horda {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Ore
@@ -302,6 +308,7 @@ ping = Ping: {0} ms
 language.restart = Por favor reinicie el juego para que los cambios del lenguaje surjan efecto.
 settings = Ajustes
 tutorial = Tutorial
+tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Editor de Mapa
 donate = Donar
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Best: {0}
 launch = Launch
 launch.title = Launch Successful
 launch.next = [LIGHT_GRAY]next opportunity at wave {0}
-launch.unable = [scarlet]Unable to LAUNCH.[] Enemies.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Reach wave {0}\nto configure loadout.
@@ -352,6 +360,7 @@ zone.tarFields.name = Tar Fields
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = Lenguaje
@@ -417,6 +427,7 @@ blocks.inaccuracy = Imprecisión
 blocks.shots = Disparos
 blocks.reload = Recarga
 blocks.ammo = Ammo
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}
@@ -491,6 +502,7 @@ setting.lasers.name = Mostrar Energía de los Láseres
 setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
 setting.minimap.name = Mostrar Minimapa
 setting.musicvol.name = Volumen de la Música
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Silenciar Musica
 setting.sfxvol.name = Volumen de los efectos de sonido
 setting.mutesound.name = Silenciar Sonido
@@ -819,9 +831,10 @@ block.container.name = Contenedor
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 team.blue.name = Azul
-team.red.name = Rojo
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = Naranja
-team.none.name = Gris
+team.derelict.name = derelict
 team.green.name = Verde
 team.purple.name = Púrpura
 unit.spirit.name = Dron Espíritu
@@ -839,27 +852,26 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Tu objetivo aquí es erradicar el[LIGHT_GRAY] enemy[].\n\nComienza[accent]minando copper[]. Toca una veta de cobre cerca de tu núcleo para hacer esto.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Minar manualmente es ineficiente.\nLos [accent]taladros pueden minar automáticamente.\nColoca uno en una veta de cobre.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = Los [accent]Conveyors[] se usan para transportar objetos al núcleo.\nConstruye una línea de transportadores del taladro al núcleo.
-tutorial.morecopper = Se requiere más cobre.\n\nMínalo manualmente o coloca más taladros.
+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.turret = Se tiene que construir estructuras defensivas para repeler el [LIGHT_GRAY]enemy[].\nConstruye una torreta dúo cerca de tu base.
 tutorial.drillturret = Los dúos requieren[accent] copper ammo[]para disparar.\nColoca un taladro junto a la torre para darle cobre.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = El[LIGHT_GRAY] enemy[] se acerca.\n\nDefiende tu núcleo 2 hordas. Construye más torretas.
-tutorial.lead = Hay más minerales disponibles. Explora y mna[accent] lead[].\n\n Desliza de tu unidad al núcleo para transferir recursos.
-tutorial.smelter = El cobre y el plomo son metales débiles. Una[accent] Dense Alloy[] superior puede ser creada en una fundición.\n\nConstruye una.
-tutorial.densealloy = La fundición ahora producirá la aleación.\nObtén algunas.\nMejora la producción si es necesario.
-tutorial.siliconsmelter = El núcleo creará ahora un[accent] spirit drone[] para minar y reparar bloques.\n\nHay fábricas que crean otras unidades con[accent] silicona.\nCrea una fundición de silicona.
-tutorial.silicondrill = La silicona requiere[accent] coal[] y[accent]sand[].\nEmpieza haciendo taladros.
-tutorial.generator = Esta tecnología requiere energía.\nCrea un[accent] combustion generator[] para generarla.
-tutorial.generatordrill = Los generadores de combustión requieren combustible.\nProporciónalo carbón de un taladro.
-tutorial.node = La energía requiere ser transportada.\nCrea un[accent] power node[] junto al generador de combustión para transferir su energía.
-tutorial.nodelink = La energía puede ser transferida mediante colocando bloques de energía y generadores juntos, o por nodos conectados.\n\nConecta energía tocando el nodo y seleccionando el generador y la fundición de silicona.
-tutorial.silicon = La silicona está siendo producida. Obtén algo de silicona.\n\nEs recomendado mejorar la producción.
-tutorial.daggerfactory = Construye una[accent] dagger mech factory[].\n\nEsto se usará para crear unidades terrestres de ataque.
-tutorial.router = Las fábricas necesitan recursos para funcionar.\nCrea un enrutador para separar recursos del transportador.
-tutorial.dagger = Conecta nodos de energía a la fábrica.\nUna vez las necesidades se cumplan, una unidad será creada.\n\nCrea taladros, generadores y transportadores según necesites.
-tutorial.battle = El[LIGHT_GRAY] enemy[] ha revelado su núcleo.\nDestrúyelo con tu nave y tus unidades de combate.
+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 = Un útil material estructural. Usado extensivamente en todo tipo de bloques.
 item.lead.description = Un material básico. Usado extensivamente en electrónicos y bloques de transferencia de líquidos.
 item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = Una unidad blindada de terreno, avanzada. Ataca blancos de aire y de terreno.
 unit.fortress.description = Una unidad terrestre pesada de artillería.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = Una unidad interceptora rápida.
 unit.ghoul.description = Una unidad bombardera pesada. Usa compuesto explosivo o pirotita como munición.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduce arena con coque de alta pureza para producir silicona.

core/assets/bundles/bundle_et.properties

@@ -4,6 +4,7 @@ contributors = Tõlkijad ja panustajad
 discord = Liituge Mindustry Discordi serveriga!
 link.discord.description = Mindustry ametlik Discordi server
 link.github.description = Github mängu koodiga
+link.changelog.description = List of update changes
 link.dev-builds.description = Selle mängu pooleli olevad versioonid
 link.trello.description = Ametlik Trello leht plaanitud funktsioonide listiga
 link.itch.io.description = itch.io leht selle mängu arvuti versioonidega
@@ -15,7 +16,6 @@ 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!
-
 stat.wave = Raund:[accent] {0}
 stat.enemiesDestroyed = Vaenlasi hävitatud:[accent] {0}
 stat.built = Ehitisi ehitatud:[accent] {0}
@@ -23,10 +23,8 @@ 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}
@@ -35,7 +33,6 @@ level.mode = Mänguviisi valik:
 showagain = Ära näita järgmine kord
 coreattack = < TUUMA RÜNNATAKSE! >\nMAYDAY MAYDAY
 nearpoint = [[ [scarlet]LAHKU VAENLASTE LANGEMISE ALALT VIIVITAMATA[] ]\npeatselt hävinemine
-outofbounds = [[ PIIRIDEST VÄLJAS ]\n[]enese hävitamine {0}
 database = Tuuma Andmebaas
 savegame = Salvesta
 loadgame = Lae Mäng
@@ -46,6 +43,7 @@ newgame = Uus Mäng
 none = <puudub>
 minimap = Kaart
 close = Sule
+website = Website
 quit = Lahku
 maps = Maailmad
 continue = Jätka
@@ -74,6 +72,7 @@ server.kicked.nameEmpty = Sinu valitud nimi ei sobi.
 server.kicked.idInUse = Sa juba oled selles serveris! Kahe kasutajaga liitumine on keelatud.
 server.kicked.customClient = See server ei luba modifitseeritud mängu versioone. Lae alla ametlik versioon.
 server.kicked.gameover = Mäng läbi!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = [accent]Hosti[] nupp avab serveri pordil [scarlet]6567[]. \nIgaüks samas [LIGHT_GRAY]wifis või kohtvõrgus[] peaks nägema sinu serverit enda serverite nimekirjas.\n\nKui sa tahad, et inimesed saaksid kõikjalt IP aadressi abil liituda, [accent]portide edasisuunamine[] on vajalik.\n\n[LIGHT_GRAY]Märkus: Kui kellelgi on probleeme sinu LAN-mänguga liitumisel, siis tee kindlaks, et sul on Mindustry lubatud oma kohtvõrgus tulemüüri seadetes.
 join.info = Siin saad lisada [accent]serveri IP aadressi[] millega liituda, või leida [accent]kohtvõrgu[] servereid millega liituda.\nNii LAN kui ka WAN mitmikmängu toetatakse.\n\n[LIGHT_GRAY]Märkus: Ei ole olemas automaatset üldist serverite listi; kui sa tahad kellegagi liituda IP-aadressiga on sul vaja omaniku IP-aadressi.
 hostserver = Hosti Mäng
@@ -98,7 +97,6 @@ server.admins = Administraatorid
 server.admins.none = Administraatoreid ei leitud!
 server.add = Lisa Server
 server.delete = Oled kindel, et soovid serveri kustutada?
-server.hostname = Omanik: {0}
 server.edit = Kohanda Serverit
 server.outdated = [crimson]Aegunud Server![]
 server.outdated.client = [crimson]Aegunud Versioon[]
@@ -158,14 +156,10 @@ cancel = Tühista
 openlink = Ava Link
 copylink = Kopeeri Link
 back = Tagasi
+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?
-changelog.title = Muudatused
-changelog.loading = Getting changelog...
-changelog.error.android = [accent]Note that the changelog sometimes does not work on Android 4.4 and below!\nThis is due to an internal Android bug.
-changelog.error.ios = [accent]The changelog is currently not supported in iOS.
-changelog.error = [scarlet]Error getting changelog!\nCheck your internet connection.
-changelog.current = [yellow][[Current version]
-changelog.latest = [accent][[Latest version]
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Laadimine...
 saving = [accent]Salvestamine...
 wave = [accent]Raund {0}
@@ -195,7 +189,9 @@ editor.author = Autor:
 editor.description = Kirjeldus:
 editor.waves = Raundid:
 editor.rules = Rules:
+editor.generation = Generation:
 editor.ingame = Edit In-Game
+editor.newmap = New Map
 waves.title = Raundid
 waves.remove = Eemalda
 waves.never = <never>
@@ -210,13 +206,13 @@ waves.copy = Copy to Clipboard
 waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Raundid kopeeritud.
+waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]<Default>
 edit = Muuda...
 editor.name = Nimi:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
 editor.teams = Tiimid
-editor.elevation = Elevation
 editor.errorload = Error loading file:\n[accent]{0}
 editor.errorsave = Error saving file:\n[accent]{0}
 editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
@@ -254,11 +250,32 @@ 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
+toolmode.replaceall.description = Replace all blocks in map.
+toolmode.orthogonal = Orthogonal
+toolmode.orthogonal.description = Draws only orthogonal lines.
+toolmode.square = Square
+toolmode.square.description = Square brush.
+toolmode.eraseores = Erase Ores
+toolmode.eraseores.description = Erase only ores.
+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 = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
+filter.median = Median
+filter.oremedian = Ore Median
+filter.blend = Blend
+filter.defaultores = Default Ores
 filter.ore = Maak
 filter.rivernoise = River Noise
+filter.mirror = Mirror
+filter.clear = Clear
+filter.option.ignore = Ignore
 filter.scatter = Scatter
 filter.terrain = Terrain
 filter.option.scale = Scale
@@ -268,16 +285,21 @@ filter.option.threshold = Threshold
 filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
+filter.option.angle = Angle
 filter.option.block = Plokk
 filter.option.floor = Põrand
+filter.option.flooronto = Target Floor
 filter.option.wall = Sein
 filter.option.ore = Maak
 filter.option.floor2 = Teine Korrus
 filter.option.threshold2 = Secondary Threshold
+filter.option.radius = Radius
+filter.option.percentile = Percentile
 width = Laius:
 height = Kõrgus:
 menu = Menüü
 play = Mängi
+campaign = Campaign
 load = Lae
 save = Salvesta
 fps = FPS: {0}
@@ -286,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Please restart your game for the language settings to take effect.
 settings = Sätted
 tutorial = Õpetus
+tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Map Editor
 donate = Anneta
@@ -299,8 +322,9 @@ bestwave = [LIGHT_GRAY]Best Wave: {0}
 launch = < LAUNCH >
 launch.title = Launch Successful
 launch.next = [LIGHT_GRAY]next opportunity at wave {0}
-launch.unable = [scarlet]Unable to LAUNCH.[] {0} Enemies.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Unlock configuring loadout: Wave {0}.
@@ -308,6 +332,9 @@ zone.unlocked = [LIGHT_GRAY]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
 zone.resources = Resources Detected:
+zone.objective = [lightgray]Objective: [accent]{0}
+zone.objective.survival = Survive
+zone.objective.attack = Destroy Enemy Core
 add = Lisa...
 boss.health = Bossi Elud
 connectfail = [crimson]Failed to connect to server:\n\n[accent]{0}
@@ -319,6 +346,7 @@ error.alreadyconnected = Already connected.
 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
@@ -329,7 +357,24 @@ zone.desolateRift.name = Desolate Rift
 zone.nuclearComplex.name = Nuclear Production Complex
 zone.overgrowth.name = Overgrowth
 zone.tarFields.name = Tar Fields
-
+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.
+zone.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+zone.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+zone.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+zone.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+zone.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = Keel
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
@@ -343,17 +388,19 @@ settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, inclu
 settings.clearunlocks = Clear Unlocks
 settings.clearall = Clear All
 paused = [accent]< Paused >
-yes =Jah
+yes = Jah
 no = Ei
 info.title = Info
 error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
+attackpvponly = [scarlet]Only available in Attack/PvP modes
 blocks.input = Sisend
 blocks.output = Väljund
 blocks.booster = Booster
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = Power Capacity
 blocks.powershot = Power/Shot
+blocks.damage = Damage
 blocks.targetsair = Targets Air
 blocks.targetsground = Targets Ground
 blocks.itemsmoved = Move Speed
@@ -380,7 +427,7 @@ blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
 blocks.ammo = Laskemoon
-
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}/s
@@ -393,7 +440,6 @@ bar.power = Energia
 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
 bullet.homing = [stat]homing
@@ -404,7 +450,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
@@ -426,14 +471,17 @@ category.shooting = Tulistamine
 category.optional = Optional Enhancements
 setting.landscape.name = Lock Landscape
 setting.shadows.name = Varjud
+setting.linear.name = Linear Filtering
 setting.animatedwater.name = Animeeritud Vesi
 setting.animatedshields.name = Animeeritud Kilbid
 setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
+setting.keyboard.name = Mouse+Keyboard Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
+setting.uiscale.name = UI Scaling[lightgray] (require restart)[]
 setting.swapdiagonal.name = Always Diagonal Placement
 setting.difficulty.training = Treening
 setting.difficulty.easy = Lihtne
@@ -454,13 +502,18 @@ setting.lasers.name = Näita Energia Lasereid
 setting.pixelate.name = Pixelate[LIGHT_GRAY] (disables animations)
 setting.minimap.name = Näita Kaarti
 setting.musicvol.name = Heli tase
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Vaigista muusika
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display In-Game Chat
+uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
+uiscale.cancel = Cancel & Exit
+setting.bloom.name = Bloom
 keybind.title = Rebind Keys
+keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
 category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
@@ -506,10 +559,10 @@ mode.pvp.description = Fight against other players locally.
 mode.attack.name = Attack
 mode.attack.description = Destroy the enemy's base. No waves.
 mode.custom = Kohandatud Reeglid
-
 rules.infiniteresources = Infinite Resources
 rules.wavetimer = Wave Timer
 rules.waves = Raundi
+rules.attack = Attack Mode
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.unitdrops = Unit Drops
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
@@ -532,43 +585,27 @@ rules.title.resourcesbuilding = Resources & Building
 rules.title.player = Mängijad
 rules.title.enemy = Vastased
 rules.title.unit = Units
-
 content.item.name = Asjad
 content.liquid.name = Vedelikud
 content.unit.name = Units
 content.block.name = Plokid
 content.mech.name = Mechs
 item.copper.name = Vask
-item.copper.description = A useful structure material. Used extensively in all types of blocks.
 item.lead.name = Plii
-item.lead.description = A basic starter material. Used extensively in electronics and liquid transportation blocks.
 item.coal.name = Süsi
-item.coal.description = A common and readily available fuel.
 item.graphite.name = Grafiit
 item.titanium.name = Titaanium
-item.titanium.description = A rare super-light metal used extensively in liquid transportation, drills and aircraft.
 item.thorium.name = Toorium
-item.thorium.description = A dense, radioactive metal used as structural support and nuclear fuel.
 item.silicon.name = Silikoon
-item.silicon.description = An extremely useful semiconductor, with applications in solar panels and many complex electronics.
 item.plastanium.name = Plastaanium
-item.plastanium.description = A light, ductile material used in advanced aircraft and fragmentation ammunition.
 item.phase-fabric.name = Faasriie
-item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
 item.surge-alloy.name = Surge Alloy
-item.surge-alloy.description = An advanced alloy with unique electrical properties.
 item.spore-pod.name = Spore Pod
-item.spore-pod.description = Used for conversion into oil, explosives and fuel.
 item.sand.name = Liiv
-item.sand.description = A common material that is used extensively in smelting, both in alloying and as a flux.
 item.blast-compound.name = Blast Compound
-item.blast-compound.description = A volatile compound used in bombs and explosives. While it can burned as fuel, this is not advised.
 item.pyratite.name = Pyratite
-item.pyratite.description = An extremely flammable substance used in incendiary weapons.
 item.metaglass.name = Metaglass
-item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
 item.scrap.name = Scrap
-item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
 liquid.water.name = Vesi
 liquid.slag.name = Slag
 liquid.oil.name = Nafta
@@ -576,31 +613,23 @@ liquid.cryofluid.name = Cryofluid
 mech.alpha-mech.name = Alpha
 mech.alpha-mech.weapon = Heavy Repeater
 mech.alpha-mech.ability = Regeneration
-mech.alpha-mech.description = The standard mech. Has decent speed and damage output.
 mech.delta-mech.name = Delta
 mech.delta-mech.weapon = Arc Generator
 mech.delta-mech.ability = Discharge
-mech.delta-mech.description = A fast, lightly-armored mech made for hit-and-run attacks. Does little damage against structures, but can kill large groups of enemy units very quickly with its arc lightning weapons.
 mech.tau-mech.name = Tau
 mech.tau-mech.weapon = Restruct Laser
 mech.tau-mech.ability = Repair Burst
-mech.tau-mech.description = The support mech. Heals allied blocks by shooting at them. Can heal allies in a radius with its repair ability.
 mech.omega-mech.name = Omega
 mech.omega-mech.weapon = Swarm Missiles
 mech.omega-mech.ability = Armored Configuration
-mech.omega-mech.description = A bulky and well-armored mech, made for front-line assaults. Its armor ability can block up to 90% of incoming damage.
 mech.dart-ship.name = Dart
 mech.dart-ship.weapon = Repeater
-mech.dart-ship.description = The standard ship. Reasonably fast and light, but has little offensive capability and low mining speed.
 mech.javelin-ship.name = Javelin
-mech.javelin-ship.description = A hit-and-run strike ship. While initially slow, it can accelerate to great speeds and fly by enemy outposts, dealing large amounts of damage with its lightning ability and missiles.
 mech.javelin-ship.weapon = Burst Missiles
 mech.javelin-ship.ability = Discharge Booster
 mech.trident-ship.name = Trident
-mech.trident-ship.description = A heavy bomber. Reasonably well armored.
 mech.trident-ship.weapon = Bomb Bay
 mech.glaive-ship.name = Glaive
-mech.glaive-ship.description = A large, well-armored gunship. Equipped with an incendiary repeater. Good acceleration and maximum speed.
 mech.glaive-ship.weapon = Flame Repeater
 item.explosiveness = [LIGHT_GRAY]Explosiveness: {0}%
 item.flammability = [LIGHT_GRAY]Flammability: {0}%
@@ -617,7 +646,7 @@ mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
-
+block.sand-boulder.name = Sand Boulder
 block.grass.name = Grass
 block.salt.name = Salt
 block.saltrocks.name = Salt Rocks
@@ -628,6 +657,7 @@ block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
 block.rock.name = Kivi
 block.snowrock.name = Lumekivi
+block.snow-pine.name = Snow Pine
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
@@ -640,7 +670,6 @@ block.scrap-wall-huge.name = Huge Scrap Wall
 block.scrap-wall-gigantic.name = Gigantic Scrap Wall
 block.thruster.name = Thruster
 block.kiln.name = Kiln
-block.kiln.description = Smelts sand and lead into metaglass. Requires small amounts of power.
 block.graphite-press.name = Graphite Press
 block.multi-press.name = Multi-Press
 block.constructing = {0} [LIGHT_GRAY](Constructing)
@@ -709,9 +738,7 @@ block.junction.name = Junction
 block.router.name = Router
 block.distributor.name = Distributor
 block.sorter.name = Sorter
-block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
 block.overflow-gate.name = Overflow Gate
-block.overflow-gate.description = A combination splitter and router that only outputs to the left and right if the front path is blocked.
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Pulverizer
@@ -763,6 +790,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.draug-factory.name = Draug Miner Drone Factory
 block.spirit-factory.name = Spirit Drone Factory
 block.phantom-factory.name = Phantom Drone Factory
 block.wraith-factory.name = Wraith Fighter Factory
@@ -801,58 +829,113 @@ block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.container.name = Container
 block.launch-pad.name = Launch Pad
-block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished.
 block.launch-pad-large.name = Large Launch Pad
 team.blue.name = sinine
-team.red.name = punane
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = oranž
-team.none.name = hall
+team.derelict.name = derelict
 team.green.name = roheline
 team.purple.name = lilla
 unit.spirit.name = Spirit Drone
-unit.spirit.description = The starter drone unit. Spawns in the core by default. Automatically mines ores and repairs blocks.
+unit.draug.name = Draug Miner Drone
 unit.phantom.name = Phantom Drone
-unit.phantom.description = An advanced drone unit. Automatically mines ores and repairs blocks. Significantly more effective than a spirit drone.
 unit.dagger.name = Dagger
-unit.dagger.description = A basic ground unit. Useful in swarms.
 unit.crawler.name = Crawler
 unit.titan.name = Titan
-unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets.
 unit.ghoul.name = Ghoul Bomber
-unit.ghoul.description = A heavy carpet bomber.
 unit.wraith.name = Wraith Fighter
-unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.fortress.name = Fortress
-unit.fortress.description = A heavy artillery ground unit.
 unit.revenant.name = Revenant
 unit.eruptor.name = Eruptor
 unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
-tutorial.morecopper = More copper is required.\n\nEither mine it manually, or place more drills.
+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.turret = Defensive structures must be built to repel the[LIGHT_GRAY] enemy[].\nBuild a duo turret near your base.
 tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = The[LIGHT_GRAY] enemy[] approaches.\n\nDefend your core for 2 waves. Build more turrets.
-tutorial.lead = More ores are available. Explore and mine[accent] lead[].\n\nDrag from your unit to the core to transfer resources.
-tutorial.smelter = Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one.
-tutorial.densealloy = The smelter will now produce alloy.\nGet some.\nImprove the production if necessary.
-tutorial.siliconsmelter = The core will now create a[accent] spirit drone[] for mining and repairing blocks.\n\nFactories for other units can be created with [accent] silicon.\nMake a silicon smelter.
-tutorial.silicondrill = Silicon requires[accent] coal[] and[accent] sand[].\nStart by making drills.
-tutorial.generator = This technology requires power.\nCreate a[accent] combustion generator[] for it.
-tutorial.generatordrill = Combustion generators need fuel.\nFuel it with coal from a drill.
-tutorial.node = Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.
-tutorial.nodelink = Power can be transferred through contacting power blocks and generators, or by linked power nodes.\n\nLink power by tapping the node and selecting the generator and silicon smelter.
-tutorial.silicon = Silicon is being produced. Get some.\n\nImproving the production system is advised.
-tutorial.daggerfactory = Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs.
-tutorial.router = Factories need resources to function.\nCreate a router to split conveyor resources.
-tutorial.dagger = Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
-tutorial.battle = The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.
+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 = A useful structure 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.
+item.graphite.description = Mineralized carbon, used for ammunition and electrical insulation.
+item.sand.description = A common material that is used extensively in smelting, both in alloying and as a flux.
+item.coal.description = A common and readily available fuel.
+item.titanium.description = A rare super-light metal used extensively in liquid transportation, drills and aircraft.
+item.thorium.description = A dense, radioactive metal used as structural support and nuclear fuel.
+item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
+item.silicon.description = An extremely useful semiconductor, with applications in solar panels and many complex electronics.
+item.plastanium.description = A light, ductile material used in advanced aircraft and fragmentation ammunition.
+item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
+item.surge-alloy.description = An advanced alloy with unique electrical properties.
+item.spore-pod.description = Used for conversion into oil, explosives and fuel.
+item.blast-compound.description = A volatile compound used in bombs and explosives. While it can burned as fuel, this is not advised.
+item.pyratite.description = An extremely flammable substance used in incendiary weapons.
+liquid.water.description = Sageli kasutatud jahutamiseks ja jäätme töötluseks.
+liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
+liquid.oil.description = Seda saab põleteda, õhku lasta või kasutada jahutamiseks. 
+liquid.cryofluid.description = Kõige efektiivsem vedelik asjade maha jahutamiseks.
+mech.alpha-mech.description = The standard mech. Has decent speed and damage output.
+mech.delta-mech.description = A fast, lightly-armored mech made for hit-and-run attacks. Does little damage against structures, but can kill large groups of enemy units very quickly with its arc lightning weapons.
+mech.tau-mech.description = The support mech. Heals allied blocks by shooting at them. Can heal allies in a radius with its repair ability.
+mech.omega-mech.description = A bulky and well-armored mech, made for front-line assaults. Its armor ability can block up to 90% of incoming damage.
+mech.dart-ship.description = The standard ship. Reasonably fast and light, but has little offensive capability and low mining speed.
+mech.javelin-ship.description = A hit-and-run strike ship. While initially slow, it can accelerate to great speeds and fly by enemy outposts, dealing large amounts of damage with its lightning ability and missiles.
+mech.trident-ship.description = A heavy bomber. Reasonably well armored.
+mech.glaive-ship.description = A large, well-armored gunship. Equipped with an incendiary repeater. Good acceleration and maximum speed.
+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.spirit.description = The starter drone unit. Spawns in the core by default. Automatically mines ores and repairs blocks.
+unit.phantom.description = An advanced drone unit. Automatically mines ores and repairs blocks. Significantly more effective than a spirit drone.
+unit.dagger.description = A basic ground unit. Useful in swarms.
+unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
+unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets.
+unit.fortress.description = A heavy artillery ground unit.
+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 = A fast, hit-and-run interceptor unit.
+unit.ghoul.description = A heavy carpet bomber.
+unit.revenant.description = A heavy, hovering missile array.
+block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
+block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
+block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.
+block.kiln.description = Smelts sand and lead into metaglass. Requires small amounts of power.
+block.plastanium-compressor.description = Produces plastanium from oil and titanium.
+block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand.
+block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
+block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
+block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound.
+block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
+block.melter.description = Melts down scrap into slag for further processing or usage in turrets.
+block.separator.description = Extracts useful minerals from slag.
+block.spore-press.description = Compresses spore pods into oil.
+block.pulverizer.description = Crushes scrap into sand. Useful when there is a lack of natural sand.
+block.coal-centrifuge.description = Solidifes oil into chunks of coal.
+block.incinerator.description = Gets rid of any excess item or liquid.
+block.power-void.description = Hävitab kõik materjalid, mis sinna lähevad. Ainult liivakastis.
+block.power-source.description = Annab välja lõpmatult elektrit. Ainult liivakastis.
+block.item-source.description = Annab välja lõpmatult materjale. Ainult liivakastis.
+block.item-void.description = Hävitab kõik materjalid, mis sinna lähevad elektrit kasutamata. Ainult liivakastis.
+block.liquid-source.description = Annab välja lõpmatult vedelikke. Ainult liivakastis.
 block.copper-wall.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.
 block.copper-wall-large.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.\nSpans multiple tiles.
+block.titanium-wall.description = A moderately strong defensive block.\nProvides moderate protection from enemies.
+block.titanium-wall-large.description = A moderately strong defensive block.\nProvides moderate protection from enemies.\nSpans multiple tiles.
 block.thorium-wall.description = A strong defensive block.\nGood protection from enemies.
 block.thorium-wall-large.description = A strong defensive block.\nGood protection from enemies.\nSpans multiple tiles.
 block.phase-wall.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.
@@ -861,54 +944,45 @@ block.surge-wall.description = The strongest defensive block.\nHas a small chanc
 block.surge-wall-large.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.\nSpans multiple tiles.
 block.door.description = A small door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.
 block.door-large.description = A large door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.\nSpans multiple tiles.
+block.mender.description = Periodically repairs blocks in its vicinity. Keeps defenses repaired in-between waves.\nOptionally uses silicon to boost range and efficiency.
 block.mend-projector.description = Periodically heals blocks in its vicinity.
 block.overdrive-projector.description = Increases the speed of nearby buildings like drills and conveyors.
 block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage through bullets.
 block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
-block.duo.description = A small, cheap turret. Useful against ground units.
-block.scatter.description = A medium-sized anti-air turret. Sprays clumps of lead or scrap flak at enemy units.
-block.arc.description = A small close-range turret which shoots electricity in a random arc towards the enemy.
-block.hail.description = A small artillery turret.
-block.lancer.description = A medium-sized turret which shoots charged electricity beams.
-block.wave.description = A medium-sized rapid-fire turret which shoots liquid bubbles.
-block.salvo.description = A medium-sized turret which fires shots in salvos.
-block.swarmer.description = A medium-sized turret which shoots burst missiles.
-block.ripple.description = A large artillery turret which fires several shots simultaneously.
-block.cyclone.description = A large rapid fire turret.
-block.fuse.description = A large turret which shoots powerful short-range beams.
-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.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into turrets or crafters. Rotatable.
 block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
-block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
 block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
+block.bridge-conveyor.description = Arenenud transpordi ehitis. Lubab transportida materjale üle iga pinnase ja ehitise 3 ruudu kaugusele.
+block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
+block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
+block.router.description = Võtab vastu materjale ühest suunast ja annab neid võrdselt välja kolmes suunas. Kasulik ühest allikast tulevate materjalide jagamisel mitmeks.
+block.distributor.description = Arenenud jagaja, mis jagab materjale kuni 7 suunas.
+block.overflow-gate.description = A combination splitter and router that only outputs to the left and right if the front path is blocked.
 block.mass-driver.description = Ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range.
-block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.
-block.plastanium-compressor.description = Produces plastanium from oil and titanium.
-block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand.
-block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
-block.pulverizer.description = Crushes scrap into sand. Useful when there is a lack of natural sand.
-block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
-block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound.
-block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
-block.melter.description = Melts down scrap into slag for further processing or usage in turrets.
-block.incinerator.description = Gets rid of any excess item or liquid.
-block.spore-press.description = Compresses spore pods into oil.
-block.separator.description = Extracts useful minerals from slag.
+block.mechanical-pump.description = Odav ja aeglane pump, mis ei vaja elektrit.
+block.rotary-pump.description = Kahekordistab kiiruse kasutades elektrit.     
+block.thermal-pump.description = Ülim pump.
+block.conduit.description = Basic liquid transport block. Works like a conveyor, but with liquids. Best used with extractors, pumps or other conduits.
+block.pulse-conduit.description = Advanced liquid transport block. Transports liquids faster and stores more than standard conduits.
+block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. Useful for splitting the liquids from one source to multiple targets.
+block.liquid-tank.description = Hoiustab suure hulga vedelikke. Use it for creating buffers when there is a non-constant demand of materials or as a safeguard for cooling vital blocks.
+block.liquid-junction.description = Töötab kui sild kahele ristuvale torule. Kasulik situatsioonides kui kaks erinevat toru viivad kahte erinevat vedelikku eri kohtadesse.
+block.bridge-conduit.description = Arenenud vedeliku transport. Lubab transportida vedelikke üle iga pinnase ja ehitise 3 ruudu kaugusele.
+block.phase-conduit.description = Advanced liquid transport block. Uses power to teleport liquids to a connected phase conduit over several tiles.
 block.power-node.description = Transmits power to connected nodes. Up to four power sources, sinks or nodes can be connected. The node will receive power from or supply power to any adjacent blocks.
 block.power-node-large.description = Has a larger radius than the power node and connects to up to six power sources, sinks or nodes.
+block.surge-tower.description = An extremely long-range power node with fewer available connections.
 block.battery.description = Stores power whenever there is an abundance and provides power whenever there is a shortage, as long as there is capacity left.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning oil or flammable materials.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
 block.thermal-generator.description = Generates power when placed in hot locations.
+block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
+block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
 block.solar-panel.description = Provides a small amount of power from the sun.
 block.solar-panel-large.description = Provides much better power supply than a standard solar panel, but is also much more expensive to build.
 block.thorium-reactor.description = Generates huge amounts of power from highly radioactive thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. Power output depends on fullness, with base power generated at full capacity.
-block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
-block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader.
-block.container.description = Stores a small amount of items of each type. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the container.
-block.vault.description = Stores a large amount of items of each type. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the vault.
+block.impact-reactor.description = An advanced generator, capable of creating massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
 block.mechanical-drill.description = A cheap drill. When placed on appropriate tiles, outputs items at a slow pace indefinitely.
 block.pneumatic-drill.description = An improved drill which is faster and able to process harder materials by making use of air pressure.
 block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Additionally, radioactive thorium can be retrieved with this drill.
@@ -916,40 +990,43 @@ block.blast-drill.description = The ultimate drill. Requires large amounts of po
 block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby.
 block.cultivator.description = Cultivates tiny concentrations of spores into industry-ready pods.
 block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby.
-block.trident-ship-pad.description = Leave your current vessel and change into a reasonably well armored heavy bomber.\nUse the pad by double tapping while standing on it.
-block.javelin-ship-pad.description = Leave your current vessel and change into a strong and fast interceptor with lightning weapons.\nUse the pad by double tapping while standing on it.
-block.glaive-ship-pad.description = Leave your current vessel and change into a large, well-armored gunship.\nUse the pad by double tapping while standing on it.
-block.tau-mech-pad.description = Leave your current vessel and change into a support mech which can heal friendly buildings and units.\nUse the pad by double tapping while standing on it.
-block.delta-mech-pad.description = Leave your current vessel and change into a fast, lightly-armored mech made for hit-and-run attacks.\nUse the pad by double tapping while standing on it.
-block.omega-mech-pad.description = Leave your current vessel and change into a bulky and well-armored mech, made for front-line assaults.\nUse the pad by double tapping while standing on it.
+block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen.
+block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
+block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.vault.description = Stores a large amount of items of each type. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the vault.
+block.container.description = Stores a small amount of items of each type. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the container.
+block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader.
+block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished.
+block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
+block.duo.description = A small, cheap turret. Useful against ground units.
+block.scatter.description = A medium-sized anti-air turret. Sprays clumps of lead or scrap flak at enemy units.
+block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
+block.hail.description = A small artillery turret.
+block.wave.description = A medium-sized rapid-fire turret which shoots liquid bubbles.
+block.lancer.description = A medium-sized turret which shoots charged electricity beams.
+block.arc.description = A small close-range turret which shoots electricity in a random arc towards the enemy.
+block.swarmer.description = A medium-sized turret which shoots burst missiles.
+block.salvo.description = A medium-sized turret which fires shots in salvos.
+block.fuse.description = A large turret which shoots powerful short-range beams.
+block.ripple.description = A large artillery turret which fires several shots simultaneously.
+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.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.
 block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
 block.ghoul-factory.description = Produces heavy carpet bombers.
-block.dagger-factory.description = Produces basic ground units.
-block.titan-factory.description = Produces advanced, armored ground units.
-
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.revenant-factory.description = Produces heavy laser air units.
+block.dagger-factory.description = Produces basic ground units.
+block.crawler-factory.description = Produces fast self-destructing swarm units.
+block.titan-factory.description = Produces advanced, armored ground units.
+block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
-block.conduit.description = Basic liquid transport block. Works like a conveyor, but with liquids. Best used with extractors, pumps or other conduits.
-block.pulse-conduit.description = Advanced liquid transport block. Transports liquids faster and stores more than standard conduits.
-block.phase-conduit.description = Advanced liquid transport block. Uses power to teleport liquids to a connected phase conduit over several tiles.
-block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. Useful for splitting the liquids from one source to multiple targets.
-block.liquid-tank.description = Hoiustab suure hulga vedelikke. Use it for creating buffers when there is a non-constant demand of materials or as a safeguard for cooling vital blocks.
-block.liquid-junction.description = Töötab kui sild kahele ristuvale torule. Kasulik situatsioonides kui kaks erinevat toru viivad kahte erinevat vedelikku eri kohtadesse.
-block.bridge-conduit.description = Arenenud vedeliku transport. Lubab transportida vedelikke üle iga pinnase ja ehitise 3 ruudu kaugusele.
-block.mechanical-pump.description = Odav ja aeglane pump, mis ei vaja elektrit.
-block.rotary-pump.description = Kahekordistab kiiruse kasutades elektrit.     
-block.thermal-pump.description = Ülim pump.
-block.router.description = Võtab vastu materjale ühest suunast ja annab neid võrdselt välja kolmes suunas. Kasulik ühest allikast tulevate materjalide jagamisel mitmeks.
-block.distributor.description = Arenenud jagaja, mis jagab materjale kuni 7 suunas.
-block.bridge-conveyor.description = Arenenud transpordi ehitis. Lubab transportida materjale üle iga pinnase ja ehitise 3 ruudu kaugusele.
-block.item-source.description = Annab välja lõpmatult materjale. Ainult liivakastis.
-block.liquid-source.description = Annab välja lõpmatult vedelikke. Ainult liivakastis.
-block.item-void.description = Hävitab kõik materjalid, mis sinna lähevad elektrit kasutamata. Ainult liivakastis.
-block.power-source.description = Annab välja lõpmatult elektrit. Ainult liivakastis.
-block.power-void.description = Hävitab kõik materjalid, mis sinna lähevad. Ainult liivakastis.
-liquid.water.description = Sageli kasutatud jahutamiseks ja jäätme töötluseks.
-liquid.oil.description = Seda saab põleteda, õhku lasta või kasutada jahutamiseks. 
-liquid.cryofluid.description = Kõige efektiivsem vedelik asjade maha jahutamiseks.
+block.dart-mech-pad.description = Provides transformation into a basic attack mech.\nUse by tapping while standing on it.
+block.delta-mech-pad.description = Leave your current vessel and change into a fast, lightly-armored mech made for hit-and-run attacks.\nUse the pad by double tapping while standing on it.
+block.tau-mech-pad.description = Leave your current vessel and change into a support mech which can heal friendly buildings and units.\nUse the pad by double tapping while standing on it.
+block.omega-mech-pad.description = Leave your current vessel and change into a bulky and well-armored mech, made for front-line assaults.\nUse the pad by double tapping while standing on it.
+block.javelin-ship-pad.description = Leave your current vessel and change into a strong and fast interceptor with lightning weapons.\nUse the pad by double tapping while standing on it.
+block.trident-ship-pad.description = Leave your current vessel and change into a reasonably well armored heavy bomber.\nUse the pad by double tapping while standing on it.
+block.glaive-ship-pad.description = Leave your current vessel and change into a large, well-armored gunship.\nUse the pad by double tapping while standing on it.

core/assets/bundles/bundle_fr.properties

@@ -43,6 +43,7 @@ newgame = Nouvelle partie
 none = <vide>
 minimap = Minimap
 close = Fermer
+website = Website
 quit = Quitter
 maps = Cartes
 continue = Continuer
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Votre nom doit contenir au moins une lettre ou un chif
 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échargez une version officielle.
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = Le bouton [accent]Héberger[] héberge un serveur sur le port [scarlet]6567[]. \nN'importe qui sur le même [LIGHT_GRAY]wifi ou réseau local []devrait voir votre serveur sur leur liste des serveurs.\n\nSi vous voulez que les gens puissent s'y connecter de partout à l'aide de votre IP, [accent]le transfert de port (port forwarding)[] est demandé.\n\n[LIGHT_GRAY]Note: Si quelqu'un a des problèmes de connexion à votre partie LAN, vérifiez que vous avez autorisé l'accès à Mindustry sur votre réseau local dans les paramètres de votre pare-feu.
 join.info = Ici vous pouvez entrez [accent]l'IP d'un serveur []pour s'y connecter, ou découvrir un serveur en [accent]réseau local[].\nLe multijoueur en LAN ainsi qu'en WAN est supporté.\n\n[LIGHT_GRAY]Note: Il n'y a pas de liste de serveurs globaux automatiques; Si vous voulez vous connectez à quelqu'un par IP, il faudra d'abord demander à l'hébergeur leur IP.
 hostserver = Héberger une partie
@@ -154,7 +156,10 @@ cancel = Annuler
 openlink = Ouvrir le lien
 copylink = Copier le lien
 back = Retour
+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 partir?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Chargement...
 saving = [accent]Sauvegarde...
 wave = [accent]Vague {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]Aucun filtre! Ajoutez-en un avec les boutons ci-dess
 filter.distort = Déformation
 filter.noise = Bruit
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Minerai
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Veuillez redémarrez votre jeu pour le changement de langage prenne effet.
 settings = Paramètres
 tutorial = Tutoriel
+tutorial.retake = Re-Take Tutorial
 editor = Éditeur
 mapeditor = Éditeur de carte
 donate = Faire un\ndon
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Meilleur: {0}
 launch = Lancement
 launch.title = Lancement réussi
 launch.next = [LIGHT_GRAY] Prochaine opportunité à la vague {0}
-launch.unable = [scarlet]Impossible d'effectuer le lancement.[] Ennemis.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = Cela va transférer tous tes ressources dans votre coeur.\nTu ne vas pas pouvoir retourner à cette base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Découvrir
 configure = Configurer le transfert des ressources.
 configure.locked = [LIGHT_GRAY]Atteigner la vague {0}\npour configurer le transfert des ressources
@@ -352,6 +360,7 @@ zone.tarFields.name = Tar Fields
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = Langage
@@ -417,6 +427,7 @@ blocks.inaccuracy = Précision
 blocks.shots = Tir
 blocks.reload = Tirs/Seconde
 blocks.ammo = Munitions
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Vitesse de forage: {0}/s
 bar.efficiency = Efficacité: {0}%
 bar.powerbalance = Énergie: {0}
@@ -491,6 +502,7 @@ setting.lasers.name = Afficher les rayons des lasers
 setting.pixelate.name = Pixeliser[LIGHT_GRAY] (disables animations)
 setting.minimap.name = Montrer la minimap
 setting.musicvol.name = Volume de la musique
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Couper la musique
 setting.sfxvol.name = Volume des SFX
 setting.mutesound.name = Couper les SFX
@@ -819,9 +831,10 @@ block.container.name = Conteneur
 block.launch-pad.name = Plateforme de lancement
 block.launch-pad-large.name = Grande plateforme de lancement
 team.blue.name = Bleu
-team.red.name = Rouge
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = Orange
-team.none.name = Gris
+team.derelict.name = derelict
 team.green.name = Vert
 team.purple.name = Violet
 unit.spirit.name = Drone spirituel
@@ -839,27 +852,26 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Votre mission, si vous l'acceptez est de détruire [LIGHT_GRAY]l'ennemi[].\n\nCommencez par [accent] miner du cuivre[]. Appuyer sur un filon de cuivre proche de votre base pour faire ceci.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = 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.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]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.morecopper = Plus de cuivre est demandé .\n\nRécupérez le soit manuellement soit construisez plus de foreuses.
+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.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.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = Les [LIGHT_GRAY]ennemies[] approchent.\n\nDéfendez votre base pour 2 vagues. Construisez plus de tourelles.
-tutorial.lead = Plus de minerais sont forables. Explorez et minez du[accent] Plomb[].\n\nRamenez votre unité à la base pour transférer les ressources.
-tutorial.smelter = Le cuivre et le plomb sont des métaux fragiles.\nUn alliage de qualité supérieure peut être créé dans une fonderie, l'[accent] alliage lourd [].\n\n Construisez-en un.
-tutorial.densealloy = La fonderie va maintenant produire de l'alliage lourd.\nObtenez-en .\nVous pouvez aussi améliorer la production si nécessaire .
-tutorial.siliconsmelter = La base va maintenant créer un[accent] drone spirituel[] pour miner et réparer les blocs.\n\nDes usines pour faire d'autres unités peuvent être faites avec du [accent] silicone.\nFaites une fonderie de silicone .
-tutorial.silicondrill = Faire du silicone demande [accent] du charbon[] et[accent] du sable [].\nCommencez par construire des foreuses .
-tutorial.generator = Cette technologie requiert de l'énergie pour fonctionner.\nFaites un [accent]générateur à combustion[] pour en produire.
-tutorial.generatordrill = Les générateurs à combustion ont besoin de carburant.\n Donnez-lui du charbon comme carburant avec une foreuse.
-tutorial.node = L'énergie doit être transportée .\nCréez un [accent] Transmetteur energétique[] à côté de votre générateur à combustion pour transférer son énergie.
-tutorial.nodelink = L'énergie peut être transféré à l'aide de blocs utilisant de l'énergie ou des générateurs, ou encore par des Transmetteurs énergétiques reliés.\n\nReliez des transmetteurs en appuyant dessus puis en sélectionnant le générateur et la fonderie de silicone.
-tutorial.silicon = Du silicone est maintenant produit. Obtenez-en.\n\nAugmenter la production est recommandé.
-tutorial.daggerfactory = Construire [accent]une usine de "Poignards" []est recommandé .\n\nElle sera utilisée pour produire des unités d'attaque.
-tutorial.router = Les usines ont besoin de ressources pour fonctionner.\nCréez un routeur pour séparer les objets.
-tutorial.dagger = Reliez des transmetteurs énergétiques à l'usine.\nUne fois que les conditions seront remplies , un mécha sera créé.\nConstruisez autant de foreuses, de générateurs et de tapis roulants que nécessaire.
-tutorial.battle = [LIGHT_GRAY]L'Ennemi[] a révélé sa base .\nDétruisez la avec votre unité et des méchas "Poignard".
+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 = 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 vitre super-résistant. Utilisé largement pour le transport et le stockage de liquides.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = Une unité terrestre cuirassée avancée. Attaque les unités terrestres comme aériennes.
 unit.fortress.description = Une unité terrestre d'artillerie lourde .
 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.chaos-array.description = 
-unit.eradicator.description = 
 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 = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Utilise du sable, du charbon et de l'énergie afin de produire du silicone.

core/assets/bundles/bundle_fr_BE.properties

@@ -4,7 +4,7 @@ contributors = Traducteurs et contributeurs
 discord = Rejoignez le discord de Mindustry !
 link.discord.description = Le discord officiel de Mindustry
 link.github.description = Code source du jeu
-link.changelog.description = List of update changes
+link.changelog.description = Liste des modifications de mise à jour
 link.dev-builds.description = Versions instables de développement
 link.trello.description = Planning Trello officiel pour les fonctionnalités planifiées.
 link.itch.io.description = Page web itch.io avec les versions ordinateurs téléchargeables et la version web
@@ -43,6 +43,7 @@ newgame = Nouvelle partie
 none = <Vide>
 minimap = Minimap
 close = Fermer
+website = Website
 quit = Quitter
 maps = Cartes
 continue = Continue
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Votre nom doit contenir au moins une lettre ou un chif
 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}[]
 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
@@ -154,7 +156,10 @@ cancel = Annuler
 openlink = Ouvrir le lien
 copylink = Copier le lien
 back = Retour
+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?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Chargement...
 saving = [accent]Sauvegarde...
 wave = [accent]Vague {0}
@@ -186,7 +191,7 @@ editor.waves = Vagues:
 editor.rules = Règles:
 editor.generation = Generation:
 editor.ingame = Modifier en jeu
-editor.newmap = New Map
+editor.newmap = Nouvelle carte
 waves.title = Vagues
 waves.remove = Retirer
 waves.never = <jamais>
@@ -201,7 +206,7 @@ waves.copy = Copier dans le Presse-papiers
 waves.load = Coller depuis le Presse-papiers
 waves.invalid = Vagues invalides dans le Presse-papiers.
 waves.copied = Vagues copiées.
-waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+waves.none = Aucun ennemi défini.\nNotez que les dispositions vides seront automatiquement remplacées par la dispositions par défaut.
 editor.default = [LIGHT_GRAY]<Par défaut>
 edit = Modifier...
 editor.name = Nom:
@@ -245,31 +250,32 @@ editor.mapname = Nom de la carte:
 editor.overwrite = [accent]Attention!\nCela écrasera une carte existante.
 editor.overwrite.confirm = [scarlet]Attention ![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir la réécrire?
 editor.selectmap = Sélectionnez une carte à charger:
-toolmode.replace = Replace
-toolmode.replace.description = Draws only on solid blocks.
-toolmode.replaceall = Replace All
-toolmode.replaceall.description = Replace all blocks in map.
-toolmode.orthogonal = Orthogonal
-toolmode.orthogonal.description = Draws only orthogonal lines.
-toolmode.square = Square
-toolmode.square.description = Square brush.
-toolmode.eraseores = Erase Ores
-toolmode.eraseores.description = Erase only ores.
-toolmode.fillteams = Fill Teams
-toolmode.fillteams.description = Fill teams instead of blocks.
-toolmode.drawteams = Draw Teams
-toolmode.drawteams.description = Draw teams instead of blocks.
+toolmode.replace = Remplacer
+toolmode.replace.description = Dessine uniquement sur des blocs pleins.
+toolmode.replaceall = Remplacer tout
+toolmode.replaceall.description = Remplacez tous les blocs de la carte.
+toolmode.orthogonal = Orthogonale
+toolmode.orthogonal.description = Dessine uniquement des lignes orthogonales.
+toolmode.square = Carré
+toolmode.square.description = Pinceau carré.
+toolmode.eraseores = Effacer les minerais
+toolmode.eraseores.description = N'effacez que les minerais.
+toolmode.fillteams = Remplir les équipes
+toolmode.fillteams.description = Remplissez les équipes au lieu de blocs.
+toolmode.drawteams = Tirage au sort des équipes
+toolmode.drawteams.description = Dessinez des équipes au lieu de blocs.
 filters.empty = [LIGHT_GRAY]Aucun filtre! Ajoutez-en un avec les boutons ci-dessous.
 filter.distort = Déformation
 filter.noise = Bruit
 filter.median = Median
-filter.blend = Blend
-filter.defaultores = Default Ores
+filter.oremedian = Ore Median
+filter.blend = Mélange
+filter.defaultores = Minerais par défaut
 filter.ore = Minerai
 filter.rivernoise = Bruit des rivières
-filter.mirror = Mirror
-filter.clear = Clear
-filter.option.ignore = Ignore
+filter.mirror = Miroir
+filter.clear = Nettoyer
+filter.option.ignore = Ignorer
 filter.scatter = Dispersement
 filter.terrain = Terrain
 filter.option.scale = Échelle
@@ -282,7 +288,7 @@ filter.option.falloff = Diminution
 filter.option.angle = Angle
 filter.option.block = Bloc
 filter.option.floor = Sol
-filter.option.flooronto = Target Floor
+filter.option.flooronto = Sible au sol
 filter.option.wall = Mur
 filter.option.ore = Minerai
 filter.option.floor2 = Sol secondaire
@@ -293,7 +299,7 @@ width = Largeur:
 height = Hauteur:
 menu = Menu
 play = Jouer
-campaign = Campaign
+campaign = Campagne
 load = Charger
 save = Sauvegarder
 fps = FPS: {0}
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Veuillez redémarrez votre jeu pour le changement de langage prenne effet.
 settings = Paramètres
 tutorial = Tutoriel
+tutorial.retake = Re-Take Tutorial
 editor = Éditeur
 mapeditor = Éditeur de carte
 donate = Faire un\ndon
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Meilleur: {0}
 launch = Lancement
 launch.title = Lancement réussi
 launch.next = [LIGHT_GRAY]Prochaine opportunité à la vague {0}
-launch.unable = [scarlet]Impossible d'effectuer le lancement.[] Ennemis.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = Cela lancera toutes les ressources dans votre noyau.\nVous ne pourrez pas revenir à cette base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Découvrir
 configure = Configurer le transfert des ressources.
 configure.locked = [LIGHT_GRAY]Atteigner la vague {0}\npour configurer le transfert des ressources.
@@ -326,7 +334,7 @@ zone.config.complete = Vague {0} atteinte:\nConfiguration du transfert débloqu
 zone.resources = Ressources détectées:
 zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
-zone.objective.attack = Destroy Enemy Core
+zone.objective.attack = Détruire la base ennemi
 add = Ajouter...
 boss.health = Vie du BOSS
 connectfail = [crimson]Échec de la connexion au serveur: [accent]{0}
@@ -338,7 +346,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 = Failed to initialize bloom.\nYour device may not support it.
+error.bloom = Échec d'initialisation de la floraison.\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
@@ -349,22 +357,24 @@ zone.desolateRift.name = Fissure abandonnée
 zone.nuclearComplex.name = Complexe nucléaire
 zone.overgrowth.name = Surcroissance
 zone.tarFields.name = Champs de goudron
-zone.saltFlats.name = Salt Flats
+zone.saltFlats.name = Salière
 zone.impact0078.name = Impact 0078
 zone.crags.name = Crags
-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 fridgid 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.
-zone.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
-zone.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
-zone.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
-zone.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
-zone.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build dagger units. Destroy it. Reclaim that which was lost.
-zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
-zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
-zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+zone.fungalPass.name = Fungal Pass
+zone.groundZero.description = L'emplacement optimal pour recommencer. Faible menace ennemie. Peu de ressources.\nRassemblez autant de plomb et de cuivre que possible.\nAllons-y
+zone.frozenForest.description = Même ici, plus près des montagnes, les spores se sont propagées. Les températures glaciales ne peuvent pas les contenir pour toujours.\n\nCommencez l'aventure au pouvoir. Construire des générateurs de combustion. Apprenez à utiliser les réparations.
+zone.desertWastes.description = Ces déchets sont vastes, imprévisibles, et sillonné de structures du secteur désaffectés.\nLe charbon est présent dans la région. Brulez-le pour obtenir de l'énergie ou synthétisez du graphite.\n\n[lightgray]Ce lieu d'atterrissage ne peut être garanti.
+zone.saltFlats.description = Aux abords du désert se trouvent les marais salants. Peu de ressources peuvent être trouvées à cet endroit.\n\nL'ennemi a érigé un complexe de stockage de ressources ici. Éradiquer leur base. Ne laisser rien debout.
+zone.craters.description = L'eau s'est accumulée dans ce cratère, vestige des guerres anciennes. Récupérer la zone. Recueillir du sable. Créé du Métaverre. Pomper de l'eau pour refroidir les tourelles et les perceuses.
+zone.ruinousShores.description = Passé les déchets, c'est le rivage. Une fois, cet endroit a abrité un réseau de défense côtière. Il n'en reste pas beaucoup. Seules les structures de défense les plus élémentaires restent indemnes, tout le reste étant réduit à néant.\nContinuer l'expansion vers l'extérieur. Redécouvrez la technologie.
+zone.stainedMountains.description = Plus à l'intérieur des terres se trouvent les montagnes, non polluées par les spores.\nExtraire le titane abondant dans cette zone. Et apprennez comment l'utiliser.\n\nLa présence de l'ennemi est plus grande ici. Ne leur donnez pas le temps d'envoyer leurs unités les plus fortes.
+zone.overgrowth.description = Cette zone est envahie par la végétation, plus proche de la source des spores.\nL'ennemi a établi un avant-poste ici. Construire des unités de poignard. Detruis-le. Et repprennez ce qui a été perdu !
+zone.tarFields.description = La périphérie d'une zone de production de pétrole, entre les montagnes et le désert. Une des rares zones avec des réserves de goudron utilisables.\nBien qu'abandonnée, cette zone a des forces ennemies dangereuses à proximité. Ne les sous-estimez pas.\n\n[lightgray]Rechercher la technologie de traitement de pétrole si possible.
+zone.desolateRift.description = Une zone extrêmement dangereuse. Ressources abondantes, mais peu d'espace. Risque élevé de destruction. Pars le plus vite possible.\nNe vous laissez pas berner par le long espacement entre les attaques ennemies.
+zone.nuclearComplex.description = Une ancienne installation de production et de traitement de thorium, réduite à néant.\n[lightgray]Recherche sur le thorium et ses nombreuses utilisations.\n\nL'ennemi est présent ici en grand nombre, recherchant constamment des assaillants.
+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 = <insérer la description ici>
+zone.crags.description = <insérer la description ici>
 settings.language = Langage
 settings.reset = Valeur par défaut.
 settings.rebind = Réatttribuer
@@ -383,7 +393,7 @@ no = Non
 info.title = Info
 error.title = [crimson]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
-attackpvponly = [scarlet]Only available in Attack/PvP modes
+attackpvponly = [scarlet]Uniquement disponible dans les modes Attaque/PvP
 blocks.input = Ressource(s) requise(s)
 blocks.output = Ressource(s) produite(s)
 blocks.booster = Booster
@@ -417,6 +427,7 @@ blocks.inaccuracy = Précision
 blocks.shots = Tirs
 blocks.reload = Tirs/Seconde
 blocks.ammo = Munition
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Vitesse de forage: {0}/s
 bar.efficiency = Efficacité: {0}%
 bar.powerbalance = Énergie: {0}
@@ -436,7 +447,7 @@ bullet.shock = [stat]choc
 bullet.frag = [stat]frag
 bullet.knockback = [stat]{0}[lightgray]recul
 bullet.freezing = [stat]gel
-bullet.tarred = [stat]tarred
+bullet.tarred = [stat]goudronné
 bullet.multiplier = [stat]{0}[lightgray]x multiplicateur de munitions
 bullet.reload = [stat]{0}[lightgray]x vitesse de rechargement
 unit.blocks = Blocs
@@ -466,11 +477,11 @@ setting.animatedshields.name = Boucliers Animés
 setting.antialias.name = Antialias[LIGHT_GRAY] (demande le redémarrage de l'appareil)[]
 setting.indicators.name = Indicateurs d'alliés
 setting.autotarget.name = Visée automatique
-setting.keyboard.name = Mouse+Keyboard Controls
+setting.keyboard.name = Contrôles Souris + Clavier
 setting.fpscap.name = Max FPS
 setting.fpscap.none = Vide
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI Scaling[lightgray] (require restart)[]
+setting.uiscale.name = Mise à l'échelle de l'interface[lightgray] (nécessite un redémarrage)[]
 setting.swapdiagonal.name = Autoriser le placement des blocs en diagonal
 setting.difficulty.training = Entraînement
 setting.difficulty.easy = Facile
@@ -491,17 +502,18 @@ setting.lasers.name = Afficher les rayons des lasers
 setting.pixelate.name = Pixélisé [LIGHT_GRAY](peut diminuer les performances)[]
 setting.minimap.name = Montrer la minimap
 setting.musicvol.name = Volume de la musique
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Couper la musique
 setting.sfxvol.name = Volume des SFX
 setting.mutesound.name = Couper les SFX
 setting.crashreport.name = Envoyer des rapports d'incident anonymement.
 setting.chatopacity.name = Opacité du tchat
 setting.playerchat.name = Afficher le tchat en jeu
-uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
-uiscale.cancel = Cancel & Exit
-setting.bloom.name = Bloom
+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
 keybind.title = Paramétrer les touches
-keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
+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
 category.view.name = Voir
 category.multiplayer.name = Multijoueur
@@ -634,7 +646,7 @@ mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Capacité Thermique {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
 liquid.temperature = [LIGHT_GRAY]Température: {0}
-block.sand-boulder.name = Sand Boulder
+block.sand-boulder.name = Sable rocheux
 block.grass.name = Herbe
 block.salt.name = Sel
 block.saltrocks.name = Roches de sel
@@ -744,7 +756,7 @@ block.battery-large.name = Batterie large
 block.combustion-generator.name = Générateur à combustion
 block.turbine-generator.name = Générateur à turbine
 block.differential-generator.name = Générateur différentiel
-block.impact-reactor.name = Impact Reactor
+block.impact-reactor.name = Réacteur à impact
 block.mechanical-drill.name = Foreuse mécanique
 block.pneumatic-drill.name = Foreuse à vérin
 block.laser-drill.name = Foreuse Laser
@@ -778,7 +790,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.draug-factory.name = Draug Miner Drone Factory
+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"
 block.wraith-factory.name = Usine de "Combattants spectraux"
@@ -819,13 +831,14 @@ block.container.name = Conteneur
 block.launch-pad.name = Rampe de lancement
 block.launch-pad-large.name = Grande rampe de lancement
 team.blue.name = Bleu
-team.red.name = Rouge
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = Orange
-team.none.name = Gris
+team.derelict.name = derelict
 team.green.name = Vert
 team.purple.name = Violet
 unit.spirit.name = Drone spirituel
-unit.draug.name = Draug Miner Drone
+unit.draug.name = Drone draug miner
 unit.phantom.name = Drone Fantôme
 unit.dagger.name = Poignard
 unit.crawler.name = Chenille
@@ -839,31 +852,30 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Votre mission, si vous l'acceptez est de détruire [LIGHT_GRAY]l'ennemi[].\n\nCommencez par [accent] miner du cuivre[]. Appuyer sur un filon de cuivre proche de votre base pour faire ceci.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = 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.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]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.morecopper = Plus de cuivre est demandé .\n\nRécupérez le soit manuellement soit construisez plus de foreuses.
+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.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.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = Les [LIGHT_GRAY]ennemies[] approchent.\n\nDéfendez votre base pour 2 vagues. Construisez plus de tourelles.
-tutorial.lead = Plus de minerais sont forables. Explorez et minez du[accent] Plomb[].\n\nRamenez votre unité à la base pour transférer les ressources.
-tutorial.smelter = Le cuivre et le plomb sont des métaux fragiles.\nUn alliage de qualité supérieure peut être créé dans une fonderie, l'[accent] alliage lourd [].\n\n Construisez-en un.
-tutorial.densealloy = La fonderie va maintenant produire de l'alliage lourd.\nObtenez-en .\nVous pouvez aussi améliorer la production si nécessaire .
-tutorial.siliconsmelter = La base va maintenant créer un[accent] drone spirituel[] pour miner et réparer les blocs.\n\nDes usines pour faire d'autres unités peuvent être faites avec du [accent] silicone.\nFaites une fonderie de silicone .
-tutorial.silicondrill = Faire du silicone demande [accent] du charbon[] et[accent] du sable [].\nCommencez par construire des foreuses .
-tutorial.generator = Cette technologie requiert de l'énergie pour fonctionner.\nFaites un [accent]générateur à combustion[] pour en produire.
-tutorial.generatordrill = Les générateurs à combustion ont besoin de carburant.\n Donnez-lui du charbon comme carburant avec une foreuse.
-tutorial.node = L'énergie doit être transportée .\nCréez un [accent] Transmetteur energétique[] à côté de votre générateur à combustion pour transférer son énergie.
-tutorial.nodelink = L'énergie peut être transféré à l'aide de blocs utilisant de l'énergie ou des générateurs, ou encore par des Transmetteurs énergétiques reliés.\n\nReliez des transmetteurs en appuyant dessus puis en sélectionnant le générateur et la fonderie de silicone.
-tutorial.silicon = Du silicone est maintenant produit. Obtenez-en.\n\nAugmenter la production est recommandé.
-tutorial.daggerfactory = Construire [accent]une usine de "Poignards" []est recommandé .\n\nElle sera utilisée pour produire des unités d'attaque.
-tutorial.router = Les usines ont besoin de ressources pour fonctionner.\nCréez un routeur pour séparer les objets.
-tutorial.dagger = Reliez des transmetteurs énergétiques à l'usine.\nUne fois que les conditions seront remplies , un mécha sera créé.\nConstruisez autant de foreuses, de générateurs et de tapis roulants que nécessaire.
-tutorial.battle = [LIGHT_GRAY]L'Ennemi[] a révélé sa base.\nDétruisez la avec votre unité et des méchas "Poignard".
+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 = 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.
-item.graphite.description = Mineralized carbon, used for ammunition and electrical insulation.
+item.graphite.description = Carbone minéralisé, utilisé pour les munitions et l’isolation électrique.
 item.sand.description = Un matériau commun utilisé largement dans la fonte, à la fois dans l'alliage et comme un flux.
 item.coal.description = Un carburant commun et facile à obtenir.
 item.titanium.description = Un métal rare super-léger largement utilisé dans le transport de liquides et d'objets ainsi que dans les foreuses de haut-niveau et l'aviation
@@ -877,7 +889,7 @@ item.spore-pod.description = Utilisé pour l'obtention d'huile, d'explosifs et d
 item.blast-compound.description = Un composé volatile utilisé dans les bombes et les explosifs. Bien qu'il puisse être utilisé comme carburant, ce n'est pas conseillé.
 item.pyratite.description = Une substance extrêmement inflammable utilisée dans les armes incendiaires.
 liquid.water.description = Couramment utilisé pour les machines de refroidissement et le traitement des déchets.
-liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
+liquid.slag.description = Différents types de métaux en fusion mélangés. Peut être séparé en ses minéraux constitutifs ou pulvérisé sur les unités ennemies comme une arme.
 liquid.oil.description = Peut être brûlé, explosé ou utilisé comme liquide de refroidissement.
 liquid.cryofluid.description = Le liquide de refroidissement le plus efficace.
 mech.alpha-mech.description = Le mécha standard. A une vitesse et des dégâts décents; Il peut aussi créer jusqu'à 3 drones pour des faire des dégâts supplémentaires.
@@ -888,23 +900,19 @@ mech.dart-ship.description = Le vaisseau standard. Raisonnablement rapide et lé
 mech.javelin-ship.description = Un vaisseau qui bien que lent au départ peut accélerer pour atteindre de très grandes vitesses et voler jusqu'au avant-postes ennemis, faisant d'énormes dégâts avec ses arc électriques obtenus à vitesse maximum et ses missiles.
 mech.trident-ship.description = Un bombardier lourd raisonnablement cuirassé
 mech.glaive-ship.description = Un grand vaisseau de combat cuirassé. Equipé avec un fusil automatique à munitions incendiaires. Il a aussi une bonne accéleration ainsi qu'une bonne vitesse maximale.
-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 = Un drone minier primitif. Pas cher à produire. Consommable. Extraction automatique de cuivre et de plomb dans les environs. Fournit les ressources minées à la base la plus proche.
 unit.spirit.description = L'unité de soutien de départ. Apparaît dans la base par défaut. Mine automatiquement les minerais, récupère les objets au sol et répare les blocs.
 unit.phantom.description = Une unité de soutien avancée. Mine automatiquement les minerais, récupère les objets au sol et répare les blocs. Bien plus efficace qu'un drone spirituel.
 unit.dagger.description = Une unité terrestre de base. Utile en essaims.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
+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 = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.chaos-array.description = 
-unit.eradicator.description = 
+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.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 = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
-block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
-block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
+unit.revenant.description = Un arsenal de missiles lourd et planant.
+block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite.
+block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
 block.silicon-smelter.description = Réduit le sable avec du coke* très pur afin de produire du silicium. (*Coke produit à partir de charbon:REF)
 block.kiln.description = Fait fondre le sable et le plomb en métaverre. Nécessite de petites quantités d'énergie.
 block.plastanium-compressor.description = Produit du plastanium à partir de pétrole et de titane.
@@ -917,7 +925,7 @@ block.melter.description = Chauffe la pierre à des températures très élevée
 block.separator.description = Exposer la pierre à la pression de l'eau afin d'obtenir différents minéraux contenus dans la pierre.
 block.spore-press.description = Comprime les gousses de spores en huile.
 block.pulverizer.description = Brise la pierre en sable. Utile en cas de manque de sable naturel.
-block.coal-centrifuge.description = Solidifes oil into chunks of coal.
+block.coal-centrifuge.description = Solidifie le pétrole en morceaux de charbon.
 block.incinerator.description = Se débarrasse de tout article ou liquide en excès.
 block.power-void.description = Annule toute l'énergie qui y est introduite. Bac à sable seulement.
 block.power-source.description = Débit infini d'énergie. Bac à sable seulement.
@@ -926,17 +934,17 @@ block.item-void.description = Détruit tous les objets qui y entrent sans utilis
 block.liquid-source.description = Débit infini de liquides. Bac à sable seulement.
 block.copper-wall.description = Un bloc défensif bon marché.\nUtile pour protéger le noyau et les tourelles lors des premières vagues.
 block.copper-wall-large.description = Un bloc défensif bon marché.\nUtile pour protéger le noyau et les tourelles lors des premières vagues.\nS'étend sur plusieurs tuiles.
-block.titanium-wall.description = A moderately strong defensive block.\nProvides moderate protection from enemies.
-block.titanium-wall-large.description = A moderately strong defensive block.\nProvides moderate protection from enemies.\nSpans multiple tiles.
+block.titanium-wall.description = Un bloc défensif modérément fort.\nFournit une protection modérée contre les ennemis.
+block.titanium-wall-large.description = Un bloc défensif modérément fort.\nFournit une protection modérée contre les ennemis.\nS'étend sur plusieurs tuiles.
 block.thorium-wall.description = Un puissant bloc défensif.\nBonne protection contre les ennemis.
 block.thorium-wall-large.description = Un puissant bloc défensif.\nBonne protection contre les ennemis.\nS'étend sur plusieurs tuiles.
 block.phase-wall.description = Pas aussi fort qu'un mur de thorium, mais détournera les balles à moins qu'elles ne soient trop puissantes.
 block.phase-wall-large.description = Pas aussi fort qu'un mur de thorium, mais détournera les balles à moins qu'elles ne soient trop puissantes.\nS'étend sur plusieurs tuiles.
 block.surge-wall.description = Le bloc défensif le plus puissant.\nPeu de chances de déclencher des éclairs en direction de l'attaquant.
 block.surge-wall-large.description = Le bloc défensif le plus puissant.\nPeu de chances de déclencher des éclairs en direction de l'attaquant.\nS'étend sur plusieurs tuiles.
-block.door.description = Une petite porte qui peut être ouverte et fermée en tapotant dessus.\nSi elle est ouverte, les ennemis peuvent tirer et se déplacer.
-block.door-large.description = Une grande porte qui peut être ouverte et fermée en tapotant dessus.\nSi elle est ouverte, les ennemis peuvent tirer et se déplacer.\nS'étend sur plusieurs tuiles.
-block.mender.description = Periodically repairs blocks in its vicinity. Keeps defenses repaired in-between waves.\nOptionally uses silicon to boost range and efficiency.
+block.door.description = Une petite porte qui peut être ouverte et fermée en cliquant dessus.\nSi elle est ouverte, les ennemis peuvent tirer et se déplacer.
+block.door-large.description = Une grande porte qui peut être ouverte et fermée en cliquant dessus.\nSi elle est ouverte, les ennemis peuvent tirer et se déplacer.\nS'étend sur plusieurs tuiles.
+block.mender.description = Répare périodiquement des blocs à proximité. Garder les défenses réparées entre les vagues.\nUtilise éventuellement du silicium pour augmenter la portée et l'efficacité.
 block.mend-projector.description = Guérit périodiquement les bâtiments situés à proximité.
 block.overdrive-projector.description = Augmente la vitesse des bâtiments à proximité, comme les foreuses et les convoyeurs.
 block.force-projector.description = Crée un champ de force hexagonal autour de lui-même, protégeant les bâtiments et les unités internes des dommages causés par les balles.
@@ -963,18 +971,18 @@ block.bridge-conduit.description = Bloc de transport de liquide avancé. Permet
 block.phase-conduit.description = Bloc de transport de liquide avancé. Utilise le pouvoir de téléporter des liquides vers un conduit de phase connecté sur plusieurs carreaux.
 block.power-node.description = Transmet la puissance à des noeuds connectés. Il est possible de connecter jusqu'à quatre sources d'alimentation, puits ou nœuds.\nLe nœud recevra de l’alimentation ou fournira l’alimentation à tous les blocs adjacents.
 block.power-node-large.description = Son rayon d'action est supérieur à celui du nœud d'alimentation et peut être connecté à six sources d'alimentation, puits ou nœuds au maximum.
-block.surge-tower.description = An extremely long-range power node with fewer available connections.
+block.surge-tower.description = Un nœud d'alimentation extrêmement longue portée avec moins de connexions disponibles.
 block.battery.description = Stocke l’énergie chaque fois qu’il ya abondance et en cas de pénurie, tant qu’il reste de la capacité.
 block.battery-large.description = Stocke beaucoup plus d'énergie qu'une batterie ordinaire.
 block.combustion-generator.description = Génère de l'énergie en brûlant du pétrole ou des matériaux inflammables.
 block.thermal-generator.description = Génère une grande quantité d'énergie grâce à la lave.
 block.turbine-generator.description = Plus efficace qu'un générateur de combustion, mais nécessite de l'eau supplémentaire.
-block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
+block.differential-generator.description = Génère de grandes quantités d'énergie. Utilise la différence de température entre le cryofluide et la pyratite en combustion.
 block.rtg-generator.description = Générateur thermoélectrique à radio-isotopes ne nécessitant pas de refroidissement mais fournissant moins d'énergie qu'un réacteur à thorium.
 block.solar-panel.description = Fournit une petite quantité d'énergie grâce au soleil.
 block.solar-panel-large.description = Fournit une bien meilleure alimentation qu'un panneau solaire standard, mais coûte également beaucoup plus cher à construire.
 block.thorium-reactor.description = Génère d'énormes quantités d'énergie à partir de thorium hautement radioactif. Nécessite un refroidissement constant.\nExplose violemment si des quantités insuffisantes de liquide de refroidissement ne sont pas fournies.
-block.impact-reactor.description = An advanced generator, capable of creating massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
+block.impact-reactor.description = Un groupe électrogène avancé, capable de générer d’énormes quantités d’énergie avec une efficacité maximale.\nNécessite une entrée de puissance significative pour relancer le processus.
 block.mechanical-drill.description = Un extracteur bon marché. Lorsqu'il est placé sur des carreaux appropriés, les objets sortent à un rythme lent et indéfiniment.
 block.pneumatic-drill.description = Un extracteur améliorée, plus rapide et capable de traiter des matériaux plus durs en utilisant la pression atmosphérique.
 block.laser-drill.description = Permet de forer encore plus rapidement grâce à la technologie laser, mais nécessite de l'énergie. De plus, le thorium radioactif peut être récupéré avec cet extracteur.
@@ -982,17 +990,17 @@ block.blast-drill.description = L'extracteur ultime. Nécessite de grandes quant
 block.water-extractor.description = Extrait l'eau du sol. Utilisez-le quand il n'y a pas de lac à proximité.
 block.cultivator.description = Cultiver le sol avec de l'eau afin d'obtenir du biomatter.
 block.oil-extractor.description = Utilise de grandes quantités d'énergie pour extraire le pétrole du sable. Utilisez-le lorsqu'il n'y a pas de source directe de pétrole à proximité.
-block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen.
-block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
-block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.core-shard.description = La première version de la base centrale. Une fois détruit, tout contact avec la région est perdu. Ne laissez pas cela arriver.
+block.core-foundation.description = La deuxième version de la base centrale. Mieux blindé. Stocke plus de ressources.
+block.core-nucleus.description = La troisième et dernière version de la base centrale. Extrêmement bien blindé. Stocke des quantités massives de ressources.
 block.vault.description = Stocke une grande quantité d'objets. Utilisez-le pour créer des tampons lorsqu'il existe une demande non constante de matériaux. [LIGHT_GRAY]Un déchargeur[] peut être utilisé pour récupérer des éléments du coffre-fort.
 block.container.description = Stocke une petite quantité d'objets. Utilisez-le pour créer des tampons lorsqu'il existe une demande non constante de matériaux. [LIGHT_GRAY]Un déchargeur[] peut être utilisé pour récupérer des éléments du conteneur.
 block.unloader.description = Décharge des articles d'un conteneur, d'une chambre forte ou d'un noyau sur un convoyeur ou directement dans un bloc adjacent.\nLe type d'élément à décharger peut être modifié en tapotant sur le déchargeur.
 block.launch-pad.description = Lance des lots d'articles sans qu'il soit nécessaire de procéder à un lancement de base. Inachevé.
-block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
+block.launch-pad-large.description = Une version améliorée de la rampe de lancement. Stocke plus d'articles. Lancements plus fréquemment.
 block.duo.description = Une petite tourelle pas chère.
 block.scatter.description = Une tourelle anti-air de taille moyenne. Pulvérise des amas de plomb ou de ferraille sur les unités ennemies.
-block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
+block.scorch.description = Brûle les ennemis au sol les plus proches. Très efficace à courte portée.
 block.hail.description = Une petite tourelle d'artillerie.
 block.wave.description = Une tourelle de taille moyenne à tir rapide qui tire des bulles de liquide.
 block.lancer.description = Une tourelle de taille moyenne qui tire des faisceaux d’électricité chargés.
@@ -1006,19 +1014,19 @@ block.spectre.description = Une grande tourelle qui tire deux balles puissantes
 block.meltdown.description = Une grande tourelle qui tire de puissants faisceaux à longue portée.
 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 unités de drones avancées qui sont nettement plus efficaces qu'un drone spirituel.
+block.phantom-factory.description = Produit des drones avancés qui sont bien plus efficaces que les drones spirituels.
 block.wraith-factory.description = Produit des intercepteurs rapides qui harcèlent l'ennemi.
-block.ghoul-factory.description = Produit des tapis de bombardiers lourds.
-block.revenant-factory.description = Produit des unités terrestres laser lourdes.
-block.dagger-factory.description = Produit des unités terrestres de base.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
+block.ghoul-factory.description = Produit des bombardiers lourds.
+block.revenant-factory.description = Produit des unités terrestres lourdes avec des lasers.
+block.dagger-factory.description = Produit des unités terrestres basiques.
+block.crawler-factory.description = Produit des unités autodestructrices rapides.
 block.titan-factory.description = Produit des unités terrestres avancées et blindées.
 block.fortress-factory.description = Produit des unités terrestres d'artillerie lourde.
 block.repair-point.description = Soigne en permanence l'unité endommagée la plus proche à proximité.
-block.dart-mech-pad.description = Provides transformation into a basic attack mech.\nUse by tapping while standing on it.
-block.delta-mech-pad.description = Quittez votre vaisseau actuel et changez-vous en un méchant rapide, légèrement blindé, conçu pour les attaques à la volée.\nUtilisez la plate-forme en tapotant deux fois dessus.
-block.tau-mech-pad.description = Quittez votre vaisseau actuel et changez-vous en un centre de support capable de soigner les bâtiments et unités amis.\nUtilisez la plate-forme en tapotant deux fois dessus.
-block.omega-mech-pad.description = Quittez votre vaisseau actuel et changez-vous en un mech encombrant et bien blindé, conçu pour les assauts de première ligne.\nUtilisez la plate-forme en tapotant deux fois dessus.
-block.javelin-ship-pad.description = Quittez votre vaisseau actuel et changez-vous en un intercepteur puissant et rapide doté d’armes légères.\nUtilisez la plate-forme en tapotant deux fois dessus.
-block.trident-ship-pad.description = Quittez votre vaisseau actuel et changez-vous en un bombardier lourd raisonnablement bien blindé.\nUtilisez la plate-forme en tapotant deux fois dessus.
-block.glaive-ship-pad.description = Quittez votre vaisseau actuel et changez-vous en un grand vaisseau de combat bien blindé.\nUtilisez la plate-forme en tapotant deux fois dessus.
+block.dart-mech-pad.description = Fournit la transformation en un mech d'attaque de base.\nUtilisez en cliquant deux fois dessus.
+block.delta-mech-pad.description = Quittez votre vaisseau actuel et changez-vous en un méchant rapide, légèrement blindé, conçu pour les attaques à la volée.\nUtilisez la plate-forme en cliquant deux fois dessus.
+block.tau-mech-pad.description = Quittez votre vaisseau actuel et changez-vous en un centre de support capable de soigner les bâtiments et unités amis.\nUtilisez la plate-forme en cliquant deux fois dessus.
+block.omega-mech-pad.description = Quittez votre vaisseau actuel et changez-vous en un mech encombrant et bien blindé, conçu pour les assauts de première ligne.\nUtilisez la plate-forme en cliquant deux fois dessus.
+block.javelin-ship-pad.description = Quittez votre vaisseau actuel et changez-vous en un intercepteur puissant et rapide doté d’armes légères.\nUtilisez la plate-forme en cliquant deux fois dessus.
+block.trident-ship-pad.description = Quittez votre vaisseau actuel et changez-vous en un bombardier lourd raisonnablement bien blindé.\nUtilisez la plate-forme en cliquant deux fois dessus.
+block.glaive-ship-pad.description = Quittez votre vaisseau actuel et changez-vous en un grand vaisseau de combat bien blindé.\nUtilisez la plate-forme en cliquant deux fois dessus.

core/assets/bundles/bundle_in_ID.properties

@@ -43,6 +43,7 @@ newgame = Permainan Baru
 none = <kosong>
 minimap = Peta Kecil
 close = Tutup
+website = Website
 quit = Keluar
 maps = Maps
 continue = Lanjutkan
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Nama yang dipilih tidak valid.
 server.kicked.idInUse = Anda telah berada di server ini! Memasuki dengan dua akun tidak diizinkan.
 server.kicked.customClient = Server ini tidak mendukung versi modifikasi. Download versi resmi.
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = Tombol [accent]host[] akan membuat server sementara di port [scarlet]6567[]. \nSemua orang yang memiliki [LIGHT_GRAY]Wi-Fi atau jaringan lokal[] akan bisa melihat server anda di daftar server mereka.\n\nJika Anda ingin pemain dari mana saja memasuki servermu dengan IP, [accent]port forwarding[] dibutuhkan.\n\n[LIGHT_GRAY]Diingat: Jika seseorang mengalami masalah memasuki permainan LAN mu, pastikan Anda telah mengizinkan Mindustry akses ke jaringan lokalmu di pengaturan firewall.
 join.info = Disini, Anda bisa memasuki [accent]server IP[], atau menemukan [accent]server lokal[] untuk bermain bersama.\nLAN dan WAN mendukung permainan bersama.\n\n[LIGHT_GRAY]Diingat: Tidak ada daftar server global; jika anda ingin bergabung dengan seseorang memakai IP, Anda perlu menanyakan host tentang IP mereka.
 hostserver = Host Permainan
@@ -154,7 +156,10 @@ cancel = Batal
 openlink = Buka Tautan
 copylink = Salin Tautan
 back = Kembali
+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?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Memuat...
 saving = [accent]Menyimpan...
 wave = [accent]Gelombang {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]Tidak ada filter! Tambahkan dengan tombol dibawah.
 filter.distort = Rusakkan
 filter.noise = Kebisingan
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Sumber Daya
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Silahkan mengulang kembali permainan agar pengaturan bahasa berpengaruh.
 settings = Pengaturan
 tutorial = Tutorial
+tutorial.retake = Re-Take Tutorial
 editor = Penyunting
 mapeditor = Penyunting Peta
 donate = Donasi
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Gelombang Terbaik: {0}
 launch = < MELUNCUR >
 launch.title = Berhasil Meluncur
 launch.next = [LIGHT_GRAY]kesempatan berikutnya di gelombang {0}
-launch.unable = [scarlet]Tidak bisa MELUNCUR.[] {0} Musuh.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = Ini akan meluncurkan semua sumber daya di inti.\nAnta tidak bisa kembali lagi ke base ini.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Buka
 configure = Konfigurasi Muatan
 configure.locked = [LIGHT_GRAY]Buka konfigurasi muatan: Gelombang {0}.
@@ -352,6 +360,7 @@ zone.tarFields.name = Lahan Ter
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = Bahasa
@@ -417,6 +427,7 @@ blocks.inaccuracy = Jarak Melenceng
 blocks.shots = Tembakan
 blocks.reload = Tembakan/Detik
 blocks.ammo = Amunisi
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Kecepatan Bor: {0}/s
 bar.efficiency = Daya Guna: {0}%
 bar.powerbalance = Tenaga: {0}/s
@@ -491,6 +502,7 @@ setting.lasers.name = Tunjukkan Laser
 setting.pixelate.name = Mode Pixel[LIGHT_GRAY] (menonaktifkan animasi)
 setting.minimap.name = Tunjukkan Peta kecil
 setting.musicvol.name = Volume Musik
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Diamkan Musik
 setting.sfxvol.name = Volume SFX 
 setting.mutesound.name = Diamkan Suara
@@ -819,9 +831,10 @@ block.container.name = Kontainer
 block.launch-pad.name = Pad Peluncur
 block.launch-pad-large.name = Pad Peluncur Besar
 team.blue.name = biru
-team.red.name = merah
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = jingga
-team.none.name = abu-abu
+team.derelict.name = derelict
 team.green.name = hijau
 team.purple.name = ungu
 unit.spirit.name = Drone Spirit
@@ -839,27 +852,26 @@ unit.chaos-array.name = Satuan Kekacauan
 unit.eradicator.name = Pemusnah
 unit.lich.name = Lich
 unit.reaper.name = Maut
-tutorial.begin = Misi Anda untuk memusnahkan[LIGHT_GRAY] musuh[].\n\nMulai dengan[accent] menambang tembaga[]. Ketuk sekumpulan tembaga didekat inti untuk melakukannya.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Menambang manual tidak efisien.\n[accent]Bor []bisa menambang otomatis.\nTaruh satu di sekumpulan tembaga.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]Pengantar[] digunakan untuk transportasi item ke inti.\nJejerlah pengantar dari bor ke inti.
-tutorial.morecopper = Butuh lebih banyak tembaga.\n\nBisa menambang dengan manual, atau menambah banyaknya bor.
+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.turret = Struktur Pertahanan harus dibuat untuk menangkal [LIGHT_GRAY] musuh[].\nBangun menara "duo" dekat basemu.
 tutorial.drillturret = Menara "duo" membutuhkan[accent] amunisi tembaga []untuk menembak.\nTaruh bor didekat menara untuk mengisinya dengan tembaga.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = [LIGHT_GRAY] Musuh[] mendatang.\n\nLindungi intimu selama 2 gelombang. Bangun lebih banyak menara.
-tutorial.lead = Banyak Sumber daya yang telah terbuka. Jelajah dan tambang[accent] timah[].\n\nTarik dari unitmu ke inti untuk mengirim sumber daya.
-tutorial.smelter = Tambang dan timah adalah logam lemah.\n[accent] Paduan padat[] yang lebih unggul dibuat di peleburan.\n\nBangun satu.
-tutorial.densealloy = Peleburan sekarang akan menghasilkan paduan.\nTingkatkan Produktivitas jika dibutuhkan.
-tutorial.siliconsmelter = inti sekarang akan membuat[accent] drone spirit[] untuk menambang dan memperbaiki blok.\n\nPabrik untuk unit lain bisa dibuat dengan [accent] silikon.\nbuatlah pelebur silikon.
-tutorial.silicondrill = Silikon membutuhkan[accent] batu bara[] dan[accent] pasir[].\nMulai dengan membuat bor.
-tutorial.generator = Teknologi ini membutuhkan tenaga (listrik).\nBuatlah [accent] generator pembakar[] untuk itu.
-tutorial.generatordrill = Generator pembahan membutuhkan bahan bakar.\nIsi dengan batu bara dari bor.
-tutorial.node = listrik membutuhkan transportasi.\nBuatlah[accent] tiang listrik[] disebelah generator pembakarmu untuk mentransfer listrik.
-tutorial.nodelink = Listrik bisa ditransfer melewati blok kondusif dan generators, atau disambungkan dengan tiang listrik.\n\nSambung listrik dengan menekan salah satu tiang listrik dan menekan generator serta pelebur silikon.
-tutorial.silicon = Silikon diproduksi.\n\nDisarankan Meningkatkan produktivitas.
-tutorial.daggerfactory = Bangun[accent] pabrik robot "dagger".[]\n\nIni akan berguna untuk membuat robot penyerang.
-tutorial.router = Pabrik butuh sumber daya untuk berfungsi.\nBuatlah pengalih untuk mengalihkan pengantar sumber daya.
-tutorial.dagger = Sambungkan tiang listrik ke pabrik.\nSaat kebutuhan dicapai, robot akan diciptakan.\n\nBuatlah bor, generator dan pengantar secukupnya.
-tutorial.battle = [LIGHT_GRAY] musuh[] telah mengungkapkan inti mereka.\nHancurkan dengan unitmu dan robot dagger.
+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 = Bahan struktur yang berguna. Digunakan di semua tipe blok.
 item.lead.description = Bahan dasar di awal permainan. Digunakan di elektronik dan blok transportasi zat cair.
 item.metaglass.description = Kaca yang super-kuat. Digunakan untuk distribusi zar cair dan penyimpanan.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = Unit darat berbaja yang canggih ini menyerang target darat dan udara.
 unit.fortress.description = Unit meriam darat kelas berat.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = Unit tabrak-lari yang cepat.
 unit.ghoul.description = Pengebom kelas berat.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Mengubah pasir dengan batu bara untuk memproduksi silikon.

core/assets/bundles/bundle_it.properties

@@ -43,6 +43,7 @@ newgame = Nuova partita
 none = <Niente . . . >
 minimap = Minimapa
 close = Chiuso
+website = Website
 quit = Esci
 maps = Mappe
 continue = Continua
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Il tuo nome deve contenere almeno un carattere.
 server.kicked.idInUse = Sei già su questo server! Non è permesso connettersi con due account.
 server.kicked.customClient = Questo server non supporta le build personalizzate. Scarica la versione ufficiale dal sito.
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = Il pulsante [accent]hos [] ospita un server sulle porte [scarlet]6567[] e [scarlet]656.[] Chiunque sulla stessa [LIGHT_GRAY]connessione wifi o rete locale[] dovrebbe essere in grado di vedere il proprio server nel proprio elenco server.\n\n Se vuoi che le persone siano in grado di connettersi ovunque tramite IP, è richiesto il [accent]port forwarding[]. \n\n[LIGHT_GRAY]Nota: se qualcuno sta riscontrando problemi durante la connessione al gioco LAN, assicurati di aver consentito a Mindustry di accedere alla rete locale nelle impostazioni del firewall.
 join.info = Qui è possibile inserire un [accent]IP del server[] a cui connettersi, o scoprire [accento]un server sulla rete locale[] disponibile.\n Sono supportati sia il multiplayer LAN che WAN. \n\n[LIGHT_GRAY]Nota: non esiste un elenco di server globali automatici; se si desidera connettersi a qualcuno tramite IP, è necessario chiedere all'host il proprio IP.
 hostserver = Host Server
@@ -154,7 +156,10 @@ cancel = Annulla
 openlink = Apri Link
 copylink = Copia link
 back = Indietro
+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?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Caricamento in corso ...
 saving = [accent]Salvando  . . .
 wave = [accent]Ondata {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Modifica
 filter.noise = Interferenza
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Minerali
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Riavvia il gioco affinché il cambiamento della lingua abbia effetto.
 settings = Impostazioni
 tutorial = Tutorial
+tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Editor Mappe
 donate = Dona
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Best: {0}
 launch = Launch
 launch.title = Launch Successful
 launch.next = [LIGHT_GRAY]next opportunity at wave {0}
-launch.unable = [scarlet]Unable to LAUNCH.[] Enemies.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Reach wave {0}\nto configure loadout.
@@ -352,6 +360,7 @@ zone.tarFields.name = Tar Fields
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = Lingua
@@ -417,6 +427,7 @@ blocks.inaccuracy = Inaccuratezza
 blocks.shots = Colpi
 blocks.reload = Ricarica
 blocks.ammo = Ammo
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}
@@ -491,6 +502,7 @@ setting.lasers.name = Mostra Laser Energetici
 setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
 setting.minimap.name = Mostra minimappa
 setting.musicvol.name = Volume Musica
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Silenzia musica
 setting.sfxvol.name = Volume SFX
 setting.mutesound.name = Togli suoni
@@ -819,9 +831,10 @@ block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 team.blue.name = blue
-team.red.name = red
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = orange
-team.none.name = gray
+team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
 unit.spirit.name = Spirit Drone
@@ -839,27 +852,26 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
-tutorial.morecopper = More copper is required.\n\nEither mine it manually, or place more drills.
+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.turret = Defensive structures must be built to repel the[LIGHT_GRAY] enemy[].\nBuild a duo turret near your base.
 tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = The[LIGHT_GRAY] enemy[] approaches.\n\nDefend your core for 2 waves. Build more turrets.
-tutorial.lead = More ores are available. Explore and mine[accent] lead[].\n\nDrag from your unit to the core to transfer resources.
-tutorial.smelter = Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one.
-tutorial.densealloy = The smelter will now produce alloy.\nGet some.\nImprove the production if necessary.
-tutorial.siliconsmelter = The core will now create a[accent] spirit drone[] for mining and repairing blocks.\n\nFactories for other units can be created with [accent] silicon.\nMake a silicon smelter.
-tutorial.silicondrill = Silicon requires[accent] coal[] and[accent] sand[].\nStart by making drills.
-tutorial.generator = This technology requires power.\nCreate a[accent] combustion generator[] for it.
-tutorial.generatordrill = Combustion generators need fuel.\nFuel it with coal from a drill.
-tutorial.node = Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.
-tutorial.nodelink = Power can be transferred through contacting power blocks and generators, or by linked power nodes.\n\nLink power by tapping the node and selecting the generator and silicon smelter.
-tutorial.silicon = Silicon is being produced. Get some.\n\nImproving the production system is advised.
-tutorial.daggerfactory = Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs.
-tutorial.router = Factories need resources to function.\nCreate a router to split conveyor resources.
-tutorial.dagger = Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
-tutorial.battle = The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.
+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 = Una utile materiale styrutturale. Molto usato in tutti i blocchi.
 item.lead.description = Un materiale base, molto usato nei blocchi di trasporto.
 item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = Un'unità di terra corazzata avanzata. Utilizza carburo come munizione. Attacca sia bersagli terrestri che aerei.
 unit.fortress.description = A heavy artillery ground unit.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.ghoul.description = A heavy carpet bomber. Uses blast compound or pyratite as ammo.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coke in order to produce silicon.

core/assets/bundles/bundle_ja.properties

@@ -43,6 +43,7 @@ newgame = 新しく始める
 none = <なし>
 minimap = ミニマップ
 close = 閉じる
+website = Website
 quit = 終了
 maps = マップ
 continue = 続ける
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = 無効な名前です。
 server.kicked.idInUse = すでにサーバーに参加しています! 二つのアカウントでの同時接続は許可されていません。
 server.kicked.customClient = このサーバーはカスタムビルドをサポートしていません。公式版をダウンロードしてください。
 server.kicked.gameover = ゲームオーバー!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = [accent]ホスト[]をすると、ポート[scarlet]6567[]でサーバーが開かれまます。\n同じ[LIGHT_GRAY]WiFiやローカル上のネットワークなど[]ではサーバーリストに表示されるようになります。\n\nIPアドレスで他のところからも接続できるようにするには、[accent]ポート開放[]が必要です。\n\n注意: もしLAN上のゲームに参加できない場合、Mindustryがファイアーウォールの設定でローカルネットワークへの接続が許可されているかを確認してください。
 join.info = ここでは、[accent]サーバーのIPアドレス[]から接続したり、[accent]ローカル上[]のサーバーを探したりすることができます。\nLANやWAN上の両方のマルチプレイに対応しています。\n\n[LIGHT_GRAY]注意: 世界中のサーバーの一覧ではありません。他人のサーバーにIPアドレスで接続したい場合は、あらかじめホスト側にIPアドレスをお尋ねください。
 hostserver = ホスト
@@ -154,7 +156,10 @@ cancel = キャンセル
 openlink = リンクを開く
 copylink = リンクをコピー
 back = 戻る
+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 = 終了してもよろしいですか?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]読み込み中...
 saving = [accent]保存中...
 wave = [accent]ウェーブ {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]フィルターが設定されていません! 下
 filter.distort = ゆがみ
 filter.noise = ノイズ
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = 鉱石
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = ゲームを再起動後、言語設定が有効になります。
 settings = 設定
 tutorial = チュートリアル
+tutorial.retake = Re-Take Tutorial
 editor = エディター
 mapeditor = マップエディター
 donate = 寄附
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]最高ウェーブ: {0}
 launch = 発射
 launch.title = 発射成功
 launch.next = [LIGHT_GRAY]次の発射は ウェーブ {0}
-launch.unable = [scarlet]発射できません[] 敵によって妨害されています。
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = すべての資源がコアに搬入されます。\nもうこの基地には戻ってくることはできません。
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = 開放
 configure = 積荷の設定
 configure.locked = [LIGHT_GRAY]ウェーブ {0} を達成すると積荷を設定できるようになります。
@@ -352,6 +360,7 @@ zone.tarFields.name = ター · フィールズ
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = 言語
@@ -417,6 +427,7 @@ blocks.inaccuracy = 精度のずれ
 blocks.shots = ショット
 blocks.reload = ショット/秒
 blocks.ammo = 弾薬
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = 採掘速度: {0}/秒
 bar.efficiency = 効率: {0}%
 bar.powerbalance = 電力: {0}/秒
@@ -491,6 +502,7 @@ setting.lasers.name = 電力線を表示
 setting.pixelate.name = ピクセル化 [LIGHT_GRAY](パフォーマンスが低下する可能性があります)
 setting.minimap.name = ミニマップを表示
 setting.musicvol.name = 音楽 音量
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = 音楽をミュート
 setting.sfxvol.name = 効果音 音量
 setting.mutesound.name = 効果音をミュート
@@ -819,9 +831,10 @@ block.container.name = コンテナー
 block.launch-pad.name = 発射台
 block.launch-pad-large.name = 大型発射台
 team.blue.name = ブルー
-team.red.name = レッド
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = オレンジ
-team.none.name = グレー
+team.derelict.name = derelict
 team.green.name = グリーン
 team.purple.name = パープル
 unit.spirit.name = スピリットドローン
@@ -839,27 +852,26 @@ unit.chaos-array.name = ケアスアレー
 unit.eradicator.name = エラディケーター
 unit.lich.name = リッチ
 unit.reaper.name = リーパー
-tutorial.begin = ここでのミッションは[LIGHT_GRAY]敵[]を倒すことです。\n\nまずは、[accent]銅の採掘[]から始めましょう。コアの近くの銅鉱石の鉱脈をタップしましょう。
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = 手動で採掘するのは非効率的です。\n[accent]ドリル[]を使えば自動で採掘できます。\n銅鉱石の鉱脈の上に1つ置いてみましょう。
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]コンベアー[]はコアにアイテムを輸送することができます。\nドリルからコアまでコンベアー作りましょう。
-tutorial.morecopper = まだまだ銅が必要です。\n\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.turret = [LIGHT_GRAY]敵[]を撃退するために防衛体制を作らなければなりません。\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.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = [LIGHT_GRAY]敵[]が近づいてきます。\n\n2ウェーブの間、コアを守ってください。ターレットをもっと設置しましょう。
-tutorial.lead = 他の鉱石も使ってみましょう。[accent]鉛[]を見つけて、採掘しましょう。\n\nユニットからコアにドラッグして、資源を転送できます。
-tutorial.smelter = 銅を鉛はやわらかい金属です。\nより硬い[accent]高密度合金[]を溶鉱炉で作りましょう。
-tutorial.densealloy = 溶鉱炉で作った合金を回収しましょう。\n\nまた、必要に応じて効率化しましょう。
-tutorial.siliconsmelter = コアは、採掘やブロックの修復のために[accent]スピリットドローン[]を作成しています。\n\n他のユニットを作るには[accent]シリコン[]が必要です。\nシリコン溶鉱炉を作りましょう。
-tutorial.silicondrill = シリコンには[accent]石炭[]と[accent]砂[]が必要です。\nまず、ドリルを作りましょう。
-tutorial.generator = この技術には電力が必要です。\n[accent]火力発電機[]を作りましょう。
-tutorial.generatordrill = 火力発電機には燃料が必要です。\nドリルから石炭を補給しましょう。
-tutorial.node = 電力を送電する必要があります。\n火力発電機の隣に[accent]電源ノード[]を作って、電力を供給しましょう。
-tutorial.nodelink = 電力は隣接している電力ブロックや発電機、接続された状態の電源ノードを使って送電することができます。\n\nノードをタップしてから、発電機とシリコン溶鉱炉を選択して電力を繋げましょう。
-tutorial.silicon = シリコン溶鉱炉で製造したシリコンを回収しましょう。\n\nまた、効率化をすることをお勧めします。
-tutorial.daggerfactory = [accent]ダガーユニット製造機[]を作りましょう。\n\nこれを使うと攻撃ユニットを作ってくれます。
-tutorial.router = 生産機には電力が必要です。\nコンベアーから資源を分けるためにルーターを作りましょう。
-tutorial.dagger = 電源ノードを生産機に接続しましょう。\n要件が揃うと、ユニットを作り始めます。\n\n必要に応じて、ドリルや発電機、コンベアーを増やしましょう。
-tutorial.battle = [LIGHT_GRAY]敵[]のコアが見つかりました。\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.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 = 便利な鉱石です。様々なブロックの材料として幅広く使われています。
 item.lead.description = 一般的で手軽な鉱石です。機械や液体輸送ブロックなどに使われます。
 item.metaglass.description = とても頑丈な強化ガラスです。液体の輸送やタンクとして幅広く使われています。
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = 高度な武装地上ユニットです。空と地上の両方の敵に攻撃を行います。
 unit.fortress.description = 砲撃型の地上ユニットです。
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = 高速で突撃攻撃が可能な迎撃ユニットです。
 unit.ghoul.description = 重爆撃機です。
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = 石炭と砂からシリコンを製造します。

core/assets/bundles/bundle_ko.properties

@@ -16,7 +16,6 @@ screenshot.invalid = 맵이 너무 커서 스크린샷을 찍을 메모리가
 gameover = 게임 오버
 gameover.pvp = [accent]{0}[] 팀이 승리했습니다!
 highscore = [accent]최고점수 달성!
-
 stat.wave = 웨이브 성공:[accent]{0}
 stat.enemiesDestroyed = 파괴한 적 수:[accent]{0}
 stat.built = 건설한 건물 수:[accent]{0}
@@ -24,10 +23,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
 level.highscore = 최고 점수: [accent]{0}
@@ -75,8 +72,9 @@ 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로 다른 사람의 서버에 접속할려면 서버장에게 IP를 요청해야 합니다.[]\n\n[ROYAL]한국의 공식 서버로는 mindustry.kr의 7000,7001,7002포트와 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 = 서버 열기
@@ -208,7 +206,7 @@ waves.copy = 클립보드로 복사
 waves.load = 클립보드에서 불러오기
 waves.invalid = 클립보드의 잘못된 웨이브 데이터
 waves.copied = 웨이브 복사됨
-wave.none = 적이 설정되지 않음.\n빈 웨이브 설정값은 자동으로 기본 웨이브 설정값으로 바뀝니다.
+waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [LIGHT_GRAY]<기본값>
 edit = 편집
 editor.name = 이름:
@@ -252,7 +250,6 @@ editor.mapname = 맵 이름:
 editor.overwrite = [accept]경고!이 명령은 기존 맵을 덮어씌우게 됩니다.
 editor.overwrite.confirm = [scarlet]경고![] 이 이름을 가진 맵이 이미 있습니다. 덮어 쓰시겠습니까?
 editor.selectmap = 불러올 맵 선택:
-
 toolmode.replace = 재배치
 toolmode.replace.description = 블록을 배치합니다.
 toolmode.replaceall = 모두 재배치
@@ -267,7 +264,6 @@ toolmode.fillteams = 팀 채우기
 toolmode.fillteams.description = 블록 대신 팀 건물로 채웁니다.
 toolmode.drawteams = 팀 그리기
 toolmode.drawteams.description = 블록 대신 팀 건물을 배치합니다.
-
 filters.empty = [LIGHT_GRAY]필터가 없습니다!! 아래 버튼을 눌러 추가하세요.
 filter.distort = 왜곡
 filter.noise = 맵 전체에 타일 혹은 블럭 뿌리기
@@ -299,7 +295,6 @@ filter.option.floor2 = 2번째 바닥
 filter.option.threshold2 = 2번째 한계점
 filter.option.radius = 반경
 filter.option.percentile = 백분위수
-
 width = 넓이:
 height = 높이:
 menu = 메뉴
@@ -317,7 +312,6 @@ tutorial.retake = 튜토리얼
 editor = 편집기
 mapeditor = 맵 편집기
 donate = 기부
-
 abandon = 포기
 abandon.text = 이 구역의 모든 자원이 적에게 빼앗길 것입니다.
 locked = 잠김
@@ -328,7 +322,7 @@ bestwave = [LIGHT_GRAY]최고 점수: {0}
 launch = < 출격 >
 launch.title = 출격 성공
 launch.next = [LIGHT_GRAY]다음 출격기회는 {0} 단계에서 나타납니다.
-launch.unable2 = [scarlet]출격할 수 없습니다.[] {0}마리 남음.
+launch.unable2 = [scarlet]출격할 수 없습니다.[]
 launch.confirm = 출격하게 되면 모든 자원이 코어로 들어갑니다.\n또한 성공하기 전까지 기지로 돌아갈 수 없습니다.
 launch.skip.confirm = 만약 지금 출격하시지 않고 스킵하신다면, 다음 출격 웨이브까지 기다려야 합니다.
 uncover = 구역 개방
@@ -343,7 +337,6 @@ zone.objective.survival = 생존
 zone.objective.attack = 적 코어 파괴
 add = 추가...
 boss.health = 보스 체력
-
 connectfail = [crimson]{0}[accent] 서버에 연결하지 못했습니다.[]
 error.unreachable = 서버에 연결하지 못했습니다.\n서버 주소가 정확히 입력되었나요?
 error.invalidaddress = 잘못된 주소입니다.
@@ -354,7 +347,6 @@ error.mapnotfound = 맵 파일을 찾을 수 없습니다!
 error.io = 네트워크 I/O 오류.
 error.any = 알 수 없는 네트워크 오류.
 error.bloom = 블룸 그래픽 효과를 적용하지 못했습니다.\n당신의 기기가 이 기능을 지원하지 않는 것일 수도 있습니다.
-
 zone.groundZero.name = 전초기지
 zone.desertWastes.name = 쓰레기 사막
 zone.craters.name = 크레이터
@@ -369,7 +361,6 @@ zone.saltFlats.name = 소금 사막
 zone.impact0078.name = Impact 0078
 zone.crags.name = 협곡
 zone.fungalPass.name = 포자 지대
-
 zone.groundZero.description = 이 장소는 다시 시작하기에 최적의 환경을 지닌 장소입니다. 적은 수준의 위협이 있으며 자원의 양은 적습니다.\n가능한 한 많은 양의 구리와 납을 수집하십시오.\n출격합시다!
 zone.frozenForest.description = 이 지역도 산과 가까운 지역입니다 포자들이 흩뿌려져 있으며 극한의 추위도 포자룰 막을 수 있을거 같지 않습니다.\n전력을 통해서 모험을 시작하십시오 화력 발전소를 짓고 수리드론을 사용하는 법을 배우십시오.
 zone.desertWastes.description = 이 황무지는 끝을 알수 없을 정도로 광활합니다 그리고 십자가 형태의 버려진 구조물이 존재합니다.\n석탄이 존재하며 이를 화력발전에 쓰거나 흑연정제에 쓰십시오.\n\n[lightgray]이 지역에서의 착륙장소는 확실하지 않습니다.
@@ -384,7 +375,6 @@ zone.nuclearComplex.description = 과거 토륨의 생산, 연구와 처리를
 zone.fungalPass.description = 고산지대과 포자지대 사이의 지역입니다. 소규모의 적 정찰기지가 있으니 디거와 크롤러를 이용해 적의 코어를 파괴하십시오.
 zone.impact0078.description = [ROYAL]죄송합니다. 아직 설명이 준비되지 않았습니다.
 zone.crags.description = [ROYAL]죄송합니다. 아직 설명이 준비되지 않았습니다.
-
 settings.language = 언어
 settings.reset = 설정 초기화
 settings.rebind = 키 재설정
@@ -437,8 +427,7 @@ blocks.inaccuracy = 오차각
 blocks.shots = 발포 횟수
 blocks.reload = 재장전
 blocks.ammo = 탄약
-
-bar.drilltierreq =  드릴이 요구됨
+bar.drilltierreq = 드릴이 요구됨
 bar.drillspeed = 채광 속도 : {0}/s
 bar.efficiency = 효율성 : {0}%
 bar.powerbalance = 전력 : {0}/s
@@ -450,7 +439,6 @@ bar.heat = 발열
 bar.power = 전력
 bar.progress = 건설 진행
 bar.spawned = 유닛: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] 데미지
 bullet.splashdamage = [stat]{0}[lightgray] 범위 데미지 ~[stat] {1}[lightgray] 타일
 bullet.incendiary = [stat]방화
@@ -462,7 +450,6 @@ bullet.freezing = [stat]동결
 bullet.tarred = [stat]타르
 bullet.multiplier = [stat]{0}[lightgray]x 탄약 소모율
 bullet.reload = [stat]{0}[lightgray]x 사격 속도
-
 unit.blocks = 블록
 unit.powersecond = 전력/초
 unit.liquidsecond = 액체/초
@@ -572,7 +559,6 @@ mode.pvp.description = 실제 플레이어와 PvP를 합니다. 맵에 적어도
 mode.attack.name = 공격
 mode.attack.description = 적 기지를 파괴하세요. 맵에 빨간팀 코어가 있어야 플레이 가능합니다.
 mode.custom = 사용자 정의 규칙
-
 rules.infiniteresources = 무한 자원
 rules.wavetimer = 웨이브 타이머
 rules.waves = 웨이브
@@ -599,7 +585,6 @@ rules.title.resourcesbuilding = 자원 & 건축
 rules.title.player = 플레이어들
 rules.title.enemy = 적
 rules.title.unit = 유닛
-
 content.item.name = 아이템
 content.liquid.name = 액체
 content.unit.name = 유닛
@@ -613,7 +598,7 @@ item.titanium.name = 티타늄
 item.thorium.name = 토륨
 item.silicon.name = 실리콘
 item.plastanium.name = 플라스터늄
-item.phase-fabric.name = 현상 구조체
+item.phase-fabric.name = 메타
 item.surge-alloy.name = 서지 합금
 item.spore-pod.name = 포자 포드
 item.sand.name = 모래
@@ -661,7 +646,6 @@ mech.buildspeed = [LIGHT_GRAY]건설 속도: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]발열 용량: {0}
 liquid.viscosity = [LIGHT_GRAY]점도: {0}
 liquid.temperature = [LIGHT_GRAY]온도: {0}
-
 block.sand-boulder.name = 사암
 block.grass.name = 잔디
 block.salt.name = 소금
@@ -737,8 +721,8 @@ block.copper-wall.name = 구리 벽
 block.copper-wall-large.name = 대형 구리 벽
 block.titanium-wall.name = 티타늄 벽
 block.titanium-wall-large.name = 대형 티타늄 벽
-block.phase-wall.name = 위상 벽
-block.phase-wall-large.name = 대형 위상 벽
+block.phase-wall.name = 메타 벽
+block.phase-wall-large.name = 대형 메타 벽
 block.thorium-wall.name = 토륨 벽
 block.thorium-wall-large.name = 대형 토륨 벽
 block.door.name = 문
@@ -756,7 +740,7 @@ block.distributor.name = 대형 분배기
 block.sorter.name = 필터
 block.overflow-gate.name = 오버플로 게이트
 block.silicon-smelter.name = 실리콘 제련소
-block.phase-weaver.name = 현상구조체 합성기
+block.phase-weaver.name = 메타 합성기
 block.pulverizer.name = 분쇄기
 block.cryofluidmixer.name = 냉각수 제조기
 block.melter.name = 융해기
@@ -798,9 +782,9 @@ block.wave.name = 파도
 block.swarmer.name = 스웜
 block.salvo.name = 살보
 block.ripple.name = 립플
-block.phase-conveyor.name = 위상 컨베이어
+block.phase-conveyor.name = 메타 컨베이어
 block.bridge-conveyor.name = 터널 컨베이어
-block.plastanium-compressor.name = 플라스 압축기
+block.plastanium-compressor.name = 플라스터늄 압축기
 block.pyratite-mixer.name = 파이라타이트 혼합기
 block.blast-mixer.name = 폭발물 혼합기
 block.solar-panel.name = 태양 전지판
@@ -818,7 +802,7 @@ block.fortress-factory.name = 포트리스 기체 공장
 block.revenant-factory.name = 망령 전함 공장
 block.repair-point.name = 수리 지점
 block.pulse-conduit.name = 퓨즈 파이프
-block.phase-conduit.name = 위상 파이프
+block.phase-conduit.name = 메타 파이프
 block.liquid-router.name = 액체 분배기
 block.liquid-tank.name = 물탱크
 block.liquid-junction.name = 액체 교차기
@@ -888,20 +872,18 @@ tutorial.deposit = 자원을 다시 블록에 넣을수도 있습니다.\n\n[acc
 tutorial.waves = [LIGHT_GRAY]적[]이 접근합니다.\n당신의 기체는 적을 향해 클릭하여 공격할 수 있습니다. 또한, 구리를 더 캐내고 포탑을 더 지어서 방어를 강화하세요.\n\n[accent]2단계 동안 코어를 보호하세요.[]
 tutorial.waves.mobile = [LIGHT_GRAY]적[]이 접근합니다.\n당신의 기체는 적을 자동조준하지만, 원하는 적을 클릭하여 공격하고 싶은 대상을 바꿀 수 있습니다.\n구리를 더 캐내고 포탑을 더 지어서 방어를 강화하세요.\n\n[accent]2단계동안 코어를 방어하세요.[]
 tutorial.launch = 특정 단계에 도달하면 [accent]출격[]이 가능합니다.\n[accent]출격[]을 하게되면 해당 지역의 코어에 들어있는 자원들을 캠페인의 자원 창고로 보내지만, 해당 지역의 [accent]모든 것들[]은 날라가게 되니 주의하세요.
-
-
 item.copper.description = 모든 종류의 블록에서 광범위하게 사용되는 자원입니다.
 item.lead.description = 쉽게 구할 수 있으며, 전자 및 액체 수송 블록에서 광범위하게 사용되는 자원입니다.
-item.metaglass.description = 초강력 유리 화합물. 액체 분배 및 저장에 광범위하게 사용됩니다.
+item.metaglass.description = 초강력 유리 화합물. 액체 분배 및 저장에 광범위하게 사용됩니다.\n\n[royal]빨리 생산할수록 게임이 편해집니다.
 item.graphite.description = 탄약 및 전기 절연에 사용되는 광물질화 탄소.
-item.sand.description = 고밀도 합금을 제작할 때 사용되는 일반적인 재료입니다.
+item.sand.description = 고티어 합금을 제작할 때 사용되는 일반적인 재료입니다.
 item.coal.description = 흔하고 쉽게 구할 수 있는 연료.
 item.titanium.description = 파이프 재료나 고급 드릴, 비행기/기체 등에서 재료로 사용되는 자원입니다.
 item.thorium.description = 건물의 재료, 터렛의 탄약 또는 핵연료로 사용되는 방사성 금속입니다.
-item.scrap.description = 오래된 건물과 유닛의 남은 잔해. 미량의 많은 금속이 포함되어 있습니다.
-item.silicon.description = 매우 유용한 반도체로, 기체를 만들거나 태양 전지판 등 전자 건물에 사용할 수 있습니다.
+item.scrap.description = 오래된 건물과 유닛의 남은 잔해. 미량의 다양한 금속들이 포함되어 있습니다.
+item.silicon.description = 매우 유용한 물질로, 기체를 만들거나 태양 전지판 등 전자 건물에 사용할 수 있습니다.\n\n[royal]이 것이 생산되면 발전속도가 급속도로 빨라집니다.
 item.plastanium.description = 고급 항공기 및 분열 탄약에 사용되는 가벼운 연성 재료.
-item.phase-fabric.description = 최첨단 전자 제품과 자기수리 기술에 사용되는 거의 무중력에 가까운 물질입니다.
+item.phase-fabric.description = 최첨단 전자 제품과 자기수리 기술에 사용되는 거의 무중력에 가까운 물질입니다.\n\n[royal]직물이면서 직물이 아니랍니다.
 item.surge-alloy.description = 순간적으로 전압이 증가하는 전기 특성을 가진 고급 합금입니다.
 item.spore-pod.description = 석유를 만들거나 탄약과 합성해 연료로 전환하는데 사용됩니다.
 item.blast-compound.description = 터렛 및 건설의 재료로 사용되는 휘발성 폭발물.\n연료로도 사용할 수 있지만, 별로 추천하지는 않습니다.
@@ -929,16 +911,12 @@ unit.eruptor.description = 지상 유닛. 광재를 넣은 파도와 같은 무
 unit.wraith.description = 적 핵심 건물 및 유닛을 집중적으로 공격하는 방식을 사용하는 전투기 입니다.
 unit.ghoul.description = 무겁고 튼튼한 지상 폭격기 입니다.\n주로 적 건물로 이동하여 엄청난 폭격을 가합니다.
 unit.revenant.description = 플래이어가 생산가능한 최종 공중 전투기. 폭발물을 쓰는 스웜 포탑과 같은 무기를 사용합니다.
-unit.chaos-array.description = 지상 중간보스 유닛. 설금을 넣은 사이클론과 같은 무기를 장착했습니다.
-unit.eradicator.description = 지상 최종보스 유닛. 토륨을 넣은 스펙터와 같은 무기를 장착했습니다.
-unit.lich.description = 공중 중간보스 유닛. 리치와 같은 무기를 장착했으나 공격속도가 좀 더 빠릅니다.
-unit.reaper.description = 최종보스 유닛. 박멸과 같은 무기를 장착했고, 공격속도가 좀 더 빠르며, 매우 단단합니다.
 block.graphite-press.description = 석탄 덩어리를 흑연으로 압축합니다.
 block.multi-press.description = 흑연 압축기의 상향 버전입니다. 물과 전력을 이용해 석탄을 빠르고 효율적으로 압축합니다.
-block.silicon-smelter.description = 고순도 석탄으로 모래를 줄여 실리콘을 생산합니다.
+block.silicon-smelter.description = 석탄과 모래를 사용해 실리콘을 생산합니다.
 block.kiln.description = 모래와 납을 사용해 강화유리를 만듭니다. 소량의 전력이 필요합니다.
-block.plastanium-compressor.description = 석유와 티타늄으로 플라스틱을 생산합니다.
-block.phase-weaver.description = 방사능 토륨과 많은 량의 모래에서 상직물을 생산합니다.
+block.plastanium-compressor.description = 석유와 티타늄으로 플라스터늄을 생산합니다.
+block.phase-weaver.description = 토륨과 많은 량의 모래로 메타를 합성합니다.
 block.alloy-smelter.description = 티타늄, 납, 실리콘, 구리로부터 서지 합금을 생산합니다.
 block.cryofluidmixer.description = 물과 티타늄을 냉각에 훨씬 더 효과적인 냉동액으로 결합시킵니다.
 block.blast-mixer.description = 포자를 사용하여 파이라타이트를 폭발성 화합물로 변환시킵니다.
@@ -961,7 +939,7 @@ block.titanium-wall-large.description = 티타늄 벽 4개를 뭉친 블럭입
 block.thorium-wall.description = 쉬운 생산이 가능한 마지막 방어벽입니다.
 block.thorium-wall-large.description = 토륨 벽 4개를 뭉친 블럭입니다.
 block.phase-wall.description = 토륨 벽만큼 강하지 않지만 벽을 향해 날아오는 총알이 너무 강력하지 않으면 총알을 튕겨냅니다.
-block.phase-wall-large.description = 위상 벽 4개를 뭉친 블럭입니다.
+block.phase-wall-large.description = 메타 벽 4개를 뭉친 블럭입니다.
 block.surge-wall.description = 공격을 받으면 낮은 확률로 공격자에게 전격 공격을 합니다.
 block.surge-wall-large.description = 설금 벽 4개를 뭉친 블럭입니다.
 block.door.description = 눌러서 열고 닫을 수 있는 문.\n만약 문이 열리면, 적들은 총을 쏘며 문을 통과할 수 있습니다.
@@ -1001,8 +979,8 @@ block.thermal-generator.description = 건설가능한 열이 있는 타일 위
 block.turbine-generator.description = 화력 발전기보다 효율적이지만, 액체가 추가적으로 필요합니다.\n\n[ROYAL]3*2<7.8
 block.differential-generator.description = 냉각수와 파이라타이트의 온도 차를 이용해 안정적으로 원자로에 버금가는 양의 전기를 생산합니다. 
 block.rtg-generator.description = 방사성동위원소 열전기 발전기\n토륨또는 현상 구조체를 사용하며, 냉각이 필요없는 발전을 하지만 토륨 원자로에 비해 발전량이 매우 적습니다.
-block.solar-panel.description = 태양광으로 극소량의 전기을 생산합니다.
-block.solar-panel-large.description = 일반 태양 전지판보다 훨씬 나은 발전량이 많지만, 건축비도 훨씬 비쌉니다.
+block.solar-panel.description = 태양광으로 극소량의 전기을 생산합니다.\n\n[royal]??? : [][yellow]PRAISE THE SUN [T]/
+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]구리와 납은 광부 드론으로 대체가 가능합니다.
@@ -1015,23 +993,23 @@ block.oil-extractor.description = 대량의 전력과 물을 사용하여 모래
 block.core-shard.description = 코어의 1단계 형태입니다.\n이것이 파괴되면 플레이하고 있는 지역과의 연결이 끊어지니 적의 공격에 파괴되지 않도록 주의하세요.\n[ROYAL]연결이 끊긴다는 말은 게임오버와 일맥상통합니다.
 block.core-foundation.description = 코어의 2단계 형태입니다.\n첫 번째 코어보다 더 튼튼하고 더 많은 자원을 저장할 수 있습니다.\n\n[ROYAL]크기도 좀 더 큽니다.
 block.core-nucleus.description = 코어의 3단계이자 마지막 형태입니다.\n최고로 튼튼하며 막대한 양의 자원들을 저장할 수 있습니다.
-block.vault.description = 각종 대량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 금고에서 물건을 회수할 수 있습니다.
-block.container.description = 각종 소량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 컨테이너에서 자원을 회수할 수 있습니다.
+block.vault.description = 각종 대량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 창고에서 물건을 회수할 수 있습니다.\n\n[royal]포탑의 탄약, ☆핵융합로의 폭발물☆, 원자로 냉각수의 티타늄등 여러 자원들의 여분을 미리 저장하여 혹시모를 사태를 예방하세요.
+block.container.description = 각종 소량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 컨테이너에서 자원을 회수할 수 있습니다.\n\n[royal]또는 컨테이너를 클릭하고 자원을 눌러 자원을 강탈해갈수도 있습니다.
 block.unloader.description = 컨테이너, 창고 또는 코어에서 인접한 블록으로 자원을 출하합니다. 출하시킬 자원의 종류는 언로더를 눌러 지정할 수 있습니다.
-block.launch-pad.description = 출격할 필요 없이 자원을 수송시킵시다.
+block.launch-pad.description = 출격할 필요 없이 자원을 수송시킵시다.\n\n[royal]아ㅏㅏ 코어에 출격패드 연결하고 잠수타지 마라잉? 손모가지 날아가뿌릴라!
 block.launch-pad-large.description = 출격 패드의 강화버전\n더 많은 자원을 더 자주 출격시킵니다.\n\n[ROYAL]크기도 더 크다죠
 block.duo.description = 소형 포탑입니다.\n가장 기본적인 포탑으로 약한 탄환을 발사합니다.
-block.scatter.description = 중형 대공 포탑입니다. 납이나 고철 덩어리를 적에게 쏩니다.
-block.scorch.description = 화염방사포탑. 사거리가 짧기 때문인지 지상유닛 상대로는 최고의 공격력을 보여줍니다.
+block.scatter.description = 중형 대공 포탑입니다.\n납이나 고철 덩어리를 적에게 쏩니다.
+block.scorch.description = 소형 포탑입니다.\n지상의 적을 매우 강력한 화염으로 지져버립니다. 사거리가 짧고 지상만 공격 가능한 것 때문인지 지상유닛 상대로는 최고의 공격력을 보여줍니다.\n\n[royal]너무 빨리 모든 것을 태우다보니 건물에는 불이 안 붙더군요.
 block.hail.description = 소형 포탑입니다.\n장거리로 포탄을 발사합니다.
 block.wave.description = 중형 포탑입니다. 대상에게 포탑에 공급된 액체를 발사합니다. 물또는 냉각수가 공급되면 자동으로 불을 끕니다.
 block.lancer.description = 중형 포탑입니다.\n적을 레이저로 관통합니다.
-block.arc.description = 소형 포탑입니다.\n적을 전기로 지집니다.
+block.arc.description = 소형 포탑입니다.\n적을 전기로 지집니다.\n\n[royal]63 : JSA!!\n88 : 이젠..아니야...
 block.swarmer.description = 중형 포탑입니다.\n지상과 공중 적 모두를 공격하는 유도 미사일 포탑입니다.
 block.salvo.description = 중형 포탑입니다.\n3연발 탄환을 발사합니다.
+block.fuse.description = 대형 포탑입니다.\n강력한 단거리 빔을 쏩니다.
 block.ripple.description = 대형 포탑입니다.\n여러 발의 사격을 동시에 합니다.
 block.cyclone.description = 대형 포탑입니다.\n초고속으로 사격합니다.
-block.fuse.description = 대형 포탑입니다.\n강력한 단거리 빔을 쏩니다.
 block.spectre.description = 초대형 포탑입니다.\n한 번에 두 발의 강력한 총알을 쏩니다.
 block.meltdown.description = 초대형 포탑.\n장거리의 강력한 열광선을 발사합니다.
 block.draug-factory.description = 구리와 납을 캐는 채광 드론을 생산합니다.\n\n[ROYAL]이 드론은 영혼을 가지고 있습니다.
@@ -1040,8 +1018,8 @@ block.phantom-factory.description = 건설을 도와주는 빌더 드론을 생
 block.wraith-factory.description = 빠른 뺑소니 요격기 유닛을 생산합니다.\n\n[ROYAL]?:저거 안죽어요??\n??:님 인터넷을 확인해보셈\n?:아 왠지 기체가 이상한 곳을 조준하더라..
 block.ghoul-factory.description = 중탄두 폭격기를 생산합니다.\n\n[ROYAL]적 위를 유령처럼 맴돕니다.
 block.revenant-factory.description = 중량의 폭발물 스웜 포대를 가진 전함을 생산합니다.\n\n[ROYAL]캠페인과 사용자 정의 게임에서 ai가 다른 대표적인 유닛이라죠.
-block.crawler-factory.description = 자폭하는 지상 유닛을 생산합니다.\n\n[ROYAL]
 block.dagger-factory.description = 기본 지상 유닛을 생산합니다.\n\n[ROYAL]원래대로라면 대거라 읽어야 되지만 총을 쏜다는 것이 이상하기도 해서 한국 커뮤니티에서는 그냥 디거라 부른다죠. 그게 좀 더 입에 붙잖아요?
+block.crawler-factory.description = 자폭하는 지상 유닛을 생산합니다.\n\n[ROYAL]개복치.
 block.titan-factory.description = 화염방사기를 장착한 지상유닛를 생산합니다.\n\n[ROYAL]최강이 될 수도, 최약이 될 수도 있습니다.
 block.fortress-factory.description = 중대포 지상유닛를 생산합니다.
 block.repair-point.description = 주변에서 가장 가까운 손상된 유닛을 지속적으로 치료합니다.\n\n[ROYAL]이 것으로 플래이어는 지속적인 교전이 가능해집니다.

core/assets/bundles/bundle_nl.properties

@@ -43,6 +43,7 @@ newgame = New Game
 none = <none>
 minimap = Minimap
 close = Close
+website = Website
 quit = Quit
 maps = Maps
 continue = Continue
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Your chosen name is invalid.
 server.kicked.idInUse = You are already on this server! Connecting with two accounts is not permitted.
 server.kicked.customClient = This server does not support custom builds. Download an official version.
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings.
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[LIGHT_GRAY]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
 hostserver = Host Game
@@ -154,7 +156,10 @@ cancel = Cancel
 openlink = Open Link
 copylink = Copy Link
 back = Back
+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?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Loading...
 saving = [accent]Saving...
 wave = [accent]Wave {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Ore
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Please restart your game for the language settings to take effect.
 settings = Settings
 tutorial = Tutorial
+tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Map Editor
 donate = Donate
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Best Wave: {0}
 launch = < LAUNCH >
 launch.title = Launch Successful
 launch.next = [LIGHT_GRAY]next opportunity at wave {0}
-launch.unable = [scarlet]Unable to LAUNCH.[] {0} Enemies.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Unlock configuring loadout:\nWave {0}.
@@ -352,6 +360,7 @@ zone.tarFields.name = Tar Fields
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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
@@ -417,6 +427,7 @@ 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}%
 bar.powerbalance = Power: {0}
@@ -491,6 +502,7 @@ setting.lasers.name = Show Power Lasers
 setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
 setting.minimap.name = Show Minimap
 setting.musicvol.name = Music Volume
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
@@ -819,9 +831,10 @@ block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 team.blue.name = blue
-team.red.name = red
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = orange
-team.none.name = gray
+team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
 unit.spirit.name = Spirit Drone
@@ -839,27 +852,26 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
-tutorial.morecopper = More copper is required.\n\nEither mine it manually, or place more drills.
+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.turret = Defensive structures must be built to repel the[LIGHT_GRAY] enemy[].\nBuild a duo turret near your base.
 tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = The[LIGHT_GRAY] enemy[] approaches.\n\nDefend your core for 2 waves. Build more turrets.
-tutorial.lead = More ores are available. Explore and mine[accent] lead[].\n\nDrag from your unit to the core to transfer resources.
-tutorial.smelter = Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one.
-tutorial.densealloy = The smelter will now produce alloy.\nGet some.\nImprove the production if necessary.
-tutorial.siliconsmelter = The core will now create a[accent] spirit drone[] for mining and repairing blocks.\n\nFactories for other units can be created with [accent] silicon.\nMake a silicon smelter.
-tutorial.silicondrill = Silicon requires[accent] coal[] and[accent] sand[].\nStart by making drills.
-tutorial.generator = This technology requires power.\nCreate a[accent] combustion generator[] for it.
-tutorial.generatordrill = Combustion generators need fuel.\nFuel it with coal from a drill.
-tutorial.node = Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.
-tutorial.nodelink = Power can be transferred through contacting power blocks and generators, or by linked power nodes.\n\nLink power by tapping the node and selecting the generator and silicon smelter.
-tutorial.silicon = Silicon is being produced. Get some.\n\nImproving the production system is advised.
-tutorial.daggerfactory = Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs.
-tutorial.router = Factories need resources to function.\nCreate a router to split conveyor resources.
-tutorial.dagger = Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
-tutorial.battle = The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.
+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 = A useful structure 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.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets.
 unit.fortress.description = A heavy artillery ground unit.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.ghoul.description = A heavy carpet bomber.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.

core/assets/bundles/bundle_nl_BE.properties

@@ -4,7 +4,7 @@ contributors = Vertalers en medewerkers
 discord = Sluit je aan bij de Mindustry discord server!
 link.discord.description = De officiële Mindustry discord chatroom
 link.github.description = Broncode
-link.changelog.description = List of update changes
+link.changelog.description = Lijst met updatewijzigingen
 link.dev-builds.description = Onstabiele versies
 link.trello.description = Officiële Trello voor geplande toevoegingen.
 link.itch.io.description = Itch.io pagina met de PC downloads en online versie
@@ -23,8 +23,8 @@ stat.destroyed = Gebouwen vernietigd:[accent] {0}
 stat.deconstructed = Gebouwen afgebroken:[accent] {0}
 stat.delivered = Gronstoffen meegenomen:
 stat.rank = Eindresultaat: [accent]{0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\n\n[scarlet]DO IT.
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\n\n[scarlet]DO IT.
+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}
@@ -43,6 +43,7 @@ newgame = Nieuw spel
 none = <geen>
 minimap = Kaartje
 close = Sluit
+website = Website
 quit = Verlaat
 maps = Kaarten
 continue = Ga verder
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Je gekozen naam is ongeldig.
 server.kicked.idInUse = Je bent al verbonden met de server! Verbinden met 2 clients tegelijk is verboden.
 server.kicked.customClient = Deze server ondersteunt geen aangepaste versies (mods). Download een officiële versie.
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = Ook De [accent]host[] knop hosts een server op poort [scarlet]6567[]. \nIedereen die verbonden is met dezelfde [LIGHT_GRAY]wifi of lokaal netwerk[] zou je server moeten zien in zijn server lijst.\n\nAls je wil dat personen kunnen verbinden met je server van ergens anders via IP. Dan is [accent]port forwarding[] is nodig.\n\n[LIGHT_GRAY]Nota: Als iemand problemen heeft met het verbinden tot je LAN spel, zorg dan dat mindustry toestemming heeft tot je lokale netwerk in de Firewall instellingen. 
 join.info = Hier kan je een [accent]server IP[] invullen waarmee je wil verbinden. Je kan hier ook verbinden met servers op je [accent]lokale netwerk[]. LAN en WAN multiplayer wordt ondersteund.\n\n[LIGHT_GRAY]Belangrijk: er is geen automatische globale server lijst; als je met iemand wil verbinden via een IP adres moet je zijn/haar IP adres vragen. 
 hostserver = Host Game
@@ -136,40 +138,43 @@ selectslot = Selecteer een save.
 slot = [accent]Slot {0}
 save.corrupted = [accent]Save file corrupted or invalid!\nIf you have just updated your game, this is probably a change in the save format and [scarlet]not[] a bug.
 empty = <empty>
-on = On
-off = Off
+on = Aan
+off = Uit
 save.autosave = Autosave: {0}
 save.map = Map: {0}
-save.wave = Wave {0}
-save.difficulty = Difficulty: {0}
+save.wave = Golf {0}
+save.difficulty = Moeilijkheid: {0}
 save.date = Last Saved: {0}
 save.playtime = Playtime: {0}
-warning = Warning.
-confirm = Confirm
-delete = Delete
+warning = Waarschuwing.
+confirm = Bevestig
+delete = Verwijder
 ok = OK
 open = Open
-customize = Customize
-cancel = Cancel
+customize = Pas aan
+cancel = Annuleer
 openlink = Open Link
-copylink = Copy Link
-back = Back
-quit.confirm = Are you sure you want to quit?
-loading = [accent]Loading...
-saving = [accent]Saving...
-wave = [accent]Wave {0}
-wave.waiting = [LIGHT_GRAY]Wave in {0}
+copylink = Kopiëer Link
+back = Terug
+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?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
+loading = [accent]Aan het laden...
+saving = [accent]Aan het opslaan...
+wave = [accent]Golf {0}
+wave.waiting = [LIGHT_GRAY]Golf in {0}
 wave.waveInProgress = [LIGHT_GRAY]Wave in progress
 waiting = [LIGHT_GRAY]Waiting...
-waiting.players = Waiting for players...
-wave.enemies = [LIGHT_GRAY]{0} Enemies Remaining
-wave.enemy = [LIGHT_GRAY]{0} Enemy Remaining
-loadimage = Load Image
-saveimage = Save Image
-unknown = Unknown
+waiting.players = Aan het wachten voor spelers...
+wave.enemies = [LIGHT_GRAY]{0} Vijanden Over
+wave.enemy = [LIGHT_GRAY]{0} Vijand Over
+loadimage = Laad Afbeelding
+saveimage = Sla Afbeelding Op
+unknown = Onbekend
 custom = Custom
 builtin = Built-In
-map.delete.confirm = Are you sure you want to delete this map? This action cannot be undone!
+map.delete.confirm = Weet je zeker dat je deze kaart wilt verwijderen? Deze actie kan niet ongedaan gemaakt worden!
 map.random = [accent]Random Map
 map.nospawn = This map does not have any cores for the player to spawn in! Add a[ROYAL] blue[] core to this map in the editor.
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-blue[] cores to this map in the editor.
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Ore
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Please restart your game for the language settings to take effect.
 settings = Settings
 tutorial = Tutorial
+tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Map Editor
 donate = Donate
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Best Wave: {0}
 launch = < LAUNCH >
 launch.title = Launch Successful
 launch.next = [LIGHT_GRAY]next opportunity at wave {0}
-launch.unable = [scarlet]Unable to LAUNCH.[] {0} Enemies.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Unlock configuring loadout:\nWave {0}.
@@ -352,6 +360,7 @@ zone.tarFields.name = Tar Fields
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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
@@ -417,6 +427,7 @@ 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}%
 bar.powerbalance = Power: {0}/s
@@ -491,6 +502,7 @@ setting.lasers.name = Show Power Lasers
 setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance, disables animations)
 setting.minimap.name = Show Minimap
 setting.musicvol.name = Music Volume
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
@@ -819,9 +831,10 @@ block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 team.blue.name = blue
-team.red.name = red
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = orange
-team.none.name = gray
+team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
 unit.spirit.name = Spirit Drone
@@ -839,27 +852,26 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
-tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
-tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
-tutorial.morecopper = More copper is required.\n\nEither mine it manually, or place more drills.
-tutorial.turret = Defensive structures must be built to repel the[LIGHT_GRAY] enemy[].\nBuild a duo turret near your base.
-tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
-tutorial.waves = The[LIGHT_GRAY] enemy[] approaches.\n\nDefend your core for 2 waves. Build more turrets.
-tutorial.lead = More ores are available. Explore and mine[accent] lead[].\n\nDrag from your unit to the core to transfer resources.
-tutorial.smelter = Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one.
-tutorial.densealloy = The smelter will now produce alloy.\nGet some.\nImprove the production if necessary.
-tutorial.siliconsmelter = The core will now create a[accent] spirit drone[] for mining and repairing blocks.\n\nFactories for other units can be created with [accent] silicon.\nMake a silicon smelter.
-tutorial.silicondrill = Silicon requires[accent] coal[] and[accent] sand[].\nStart by making drills.
-tutorial.generator = This technology requires power.\nCreate a[accent] combustion generator[] for it.
-tutorial.generatordrill = Combustion generators need fuel.\nFuel it with coal from a drill.
-tutorial.node = Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.
-tutorial.nodelink = Power can be transferred through contacting power blocks and generators, or by linked power nodes.\n\nLink power by tapping the node and selecting the generator and silicon smelter.
-tutorial.silicon = Silicon is being produced. Get some.\n\nImproving the production system is advised.
-tutorial.daggerfactory = Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs.
-tutorial.router = Factories need resources to function.\nCreate a router to split conveyor resources.
-tutorial.dagger = Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
-tutorial.battle = The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
+tutorial.drill = Handmatig delven is inefficiënt.\n[accent]Boren []kunnen automatisch delven.\nPlaats er een op een koperader.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
+tutorial.conveyor = [accent]Transportbanden[] worden gebruikt om artikelen naar de kern te transporteren.\nMaak een lijn van transportbanden van de boor tot de kern.
+tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
+tutorial.turret = Er moeten verdedigingsstructuren worden gebouwd om de[LIGHT_GRAY] vijand[]af te weren.\nBouw een duo geschutstoren in de buurt van je basis.
+tutorial.drillturret = Duo geschutstorens hebben[accent] koper ammunitie []nodig om te schieten.\nPlaats een boor naast de geschutstoren om het van gedolven koper te voorzien.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
+tutorial.waves = De [LIGHT_GRAY] vijand[] nadert.\n\nVerdedig jouw kern voor 2 golven. Bouw meer geschutstorens.
+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 = A useful structure 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.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets.
 unit.fortress.description = A heavy artillery ground unit.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.ghoul.description = A heavy carpet bomber.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coal in order to produce silicon.

core/assets/bundles/bundle_pl.properties

@@ -16,7 +16,6 @@ screenshot.invalid = Zrzut ekranu jest zbyt duży. Najprawdopodobniej brakuje mi
 gameover = Rdzeń został zniszczony.
 gameover.pvp = Zwyciężyła drużyna [accent]{0}[]!
 highscore = [YELLOW] Nowy rekord!
-
 stat.wave = Fale powstrzymane:[accent] {0}
 stat.enemiesDestroyed = Przeciwnicy zniszczeni:[accent] {0}
 stat.built = Budynki zbudowane:[accent] {0}
@@ -24,10 +23,8 @@ 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}
@@ -46,6 +43,7 @@ newgame = Nowa Gra
 none = <none>
 minimap = Minimapa
 close = Zamknij
+website = Website
 quit = Wyjdź
 maps = Mapy
 continue = Kontynuuj
@@ -74,6 +72,7 @@ server.kicked.nameEmpty = Wybrana przez Ciebie nazwa jest nieprawidłowa.
 server.kicked.idInUse = Jesteś już na serwerze! Używanie tego samego konta na 2 urządzeniach jest zabronione.
 server.kicked.customClient = Ten serwer nie wspomaga wersji deweloperskich. Pobierz oficjalną wersję.
 server.kicked.gameover = Koniec gry!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = Przycisk [accent]host[] hostuje serwer na porcie [scarlet]6567[] i [scarlet]6568.[]\nKtokolwiek z tym samym [LIGHT_GRAY]wifi lub hotspotem[] powinien zobaczyć twój serwer.\n\nJeśli chcesz, aby każdy z twoim IP mógł dołączyć, [accent]przekierowywanie portów[] jest potrzebne.\n\n[LIGHT_GRAY]Notka:Jeśli ktokolwiek ma problem z dołączeniem do gry, upewnij się, że udostępniłeś Mindustry dostęp do sieci.
 join.info = Tutaj możesz wpisać [accent]IP serwera[], aby dołączyć lub wyszukaj [accent]serwery w lokalnej sieci[], do których chcesz dołączyć .\nGra wieloosobowa na LAN i WAN jest wspomagana.\n\n[LIGHT_GRAY]Notka: Nie ma automatycznej listy wszystkich serwerów; jeśli chcesz dołączyć przez IP, musisz zapytać się hosta o IP.
 hostserver = Stwórz Serwer
@@ -157,7 +156,10 @@ cancel = Anuluj
 openlink = Otwórz link
 copylink = Kopiuj link
 back = Wróć
+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ść?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Ładowanie...
 saving = [accent]Zapisywanie...
 wave = [accent]Fala {0}
@@ -262,11 +264,11 @@ toolmode.fillteams = Wypełń Drużyny
 toolmode.fillteams.description = Wypełniaj drużyny zamiast bloków.
 toolmode.drawteams = Rysuj Drużyny
 toolmode.drawteams.description = Rysuj drużyny zamiast bloków.
-
 filters.empty = [LIGHT_GRAY]Brak filtrów! Dodaj jeden za pomocą przycisku poniżej.
 filter.distort = Zniekształcanie
 filter.noise = Szum
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Domyślne rudy
 filter.ore = Ruda
@@ -306,10 +308,10 @@ ping = Ping: {0}ms
 language.restart = Uruchom grę ponownie, aby ustawiony język zaczął funkcjonować.
 settings = Ustawienia
 tutorial = Poradnik
+tutorial.retake = Re-Take Tutorial
 editor = Edytor
 mapeditor = Edytor map
 donate = Wspomóż nas
-
 abandon = Opuść
 abandon.text = Ta strefa i wszystkie jej surowce będą przejęte przez przeciwników.
 locked = Zablokowane
@@ -320,8 +322,9 @@ bestwave = [LIGHT_GRAY]Najwyższa fala: {0}
 launch = < WYSTRZEL >
 launch.title = Wystrzelenie Udane
 launch.next = [LIGHT_GRAY]Następna okazja przy fali {0}
-launch.unable = [scarlet]Nie można wystrzelić![] Wykryto {0} przeciwników.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = Spowoduje to wystrzelenie wszystkich surowców w rdzeniu.\nNie będziesz mógł wrócić do tej bazy.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Odkryj
 configure = Skonfiguruj ładunek
 configure.locked = [LIGHT_GRAY]Dotrzyj do fali {0}\nAby skonfigurować ładunek.
@@ -334,7 +337,6 @@ zone.objective.survival = Przeżyj
 zone.objective.attack = Zniszcz Rdzeń Wroga
 add = Dodaj...
 boss.health = Boss Health
-
 connectfail = [crimson]Nie można połączyć się z serwerem:\n\n[accent]{0}
 error.unreachable = Serwer niedostępny.\nCzy adres jest wpisany poprawnie?
 error.invalidaddress = Niepoprawny adres.
@@ -358,7 +360,7 @@ zone.tarFields.name = Pola Smołowe
 zone.saltFlats.name = Salt Flats
 zone.impact0078.name = Uderzenie 0078
 zone.crags.name = Urwisko
-
+zone.fungalPass.name = Fungal Pass
 zone.groundZero.description = Optymalna lokalizacja, aby rozpocząć jeszcze raz. Niskie zagrożenie. Niewiele zasobów.\nZbierz jak najwięcej miedzi i ołowiu, tyle ile jest możliwe.\nPrzejdź do następnej strefy jak najszybciej.
 zone.frozenForest.description = Nawet tutaj, bliżej gór, zarodniki rozprzestrzeniły się. Niskie temperatury nie mogą ich zatrzymać na zawsze.\n\nRozpocznij przedsięwzięcie od władzy. Buduj generatory spalinowe. Naucz się korzystać z naprawiaczy.
 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.
@@ -373,7 +375,6 @@ zone.nuclearComplex.description = Dawny zakład produkcji i przetwarzania toru,
 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 = Język
 settings.reset = Przywróć domyślne
 settings.rebind = Zmień
@@ -426,7 +427,7 @@ blocks.inaccuracy = Niedokładność
 blocks.shots = Strzały
 blocks.reload = Strzałów/sekundę
 blocks.ammo = Amunicja
-
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Prędkość wiertła: {0}/s
 bar.efficiency = Efektywność: {0}%
 bar.powerbalance = Moc: {0}
@@ -438,7 +439,6 @@ bar.heat = Ciepło
 bar.power = Prąd
 bar.progress = Postęp Budowy
 bar.spawned = Jednostki: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] Obrażenia
 bullet.splashdamage = [stat]{0}[lightgray] Obrażenia obszarowe ~[stat] {1}[lightgray] kratki
 bullet.incendiary = [stat]zapalający
@@ -450,7 +450,6 @@ bullet.freezing = [stat]zamrażający
 bullet.tarred = [stat]smolny
 bullet.multiplier = [stat]{0}[lightgray]x mnożnik amunicji
 bullet.reload = [stat]{0}[lightgray]x szybkość ataku
-
 unit.blocks = Klocki
 unit.powersecond = jednostek prądu na sekundę
 unit.liquidsecond = jednostek płynów na sekundę
@@ -503,6 +502,7 @@ setting.lasers.name = Pokaż lasery zasilające
 setting.pixelate.name = Pikselacja [LIGHT_GRAY](wyłącza animacje)
 setting.minimap.name = Pokaż Minimapę
 setting.musicvol.name = Głośność muzyki
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Wycisz muzykę
 setting.sfxvol.name = Głośność dźwięków
 setting.mutesound.name = Wycisz dźwięki
@@ -559,7 +559,6 @@ mode.pvp.description = Walcz przeciwko innym graczom.
 mode.attack.name = Atak
 mode.attack.description = Brak fal, celem jest zniszczenie bazy przeciwnika.
 mode.custom = Własny tryb
-
 rules.infiniteresources = Nieskończone zasoby
 rules.wavetimer = Zegar fal
 rules.waves = Fale
@@ -586,7 +585,6 @@ rules.title.resourcesbuilding = Zasoby i Budowanie
 rules.title.player = Gracze
 rules.title.enemy = Przeciwnicy
 rules.title.unit = Jednostki
-
 content.item.name = Przedmioty
 content.liquid.name = Płyny
 content.unit.name = Jednostki
@@ -601,7 +599,7 @@ item.thorium.name = Uran
 item.silicon.name = Krzem
 item.plastanium.name = Plastan
 item.phase-fabric.name = Włókno Fazowe
-item.surge-alloy.name = Energetyczny Stop
+item.surge-alloy.name = Energon
 item.spore-pod.name = Kapsułka Zarodników
 item.sand.name = Piasek
 item.blast-compound.name = Wybuchowy związek
@@ -734,13 +732,6 @@ block.scorch.name = Płomień
 block.scatter.name = Flak
 block.hail.name = Hail
 block.lancer.name = Lancer
-block.wave.name = Wave
-block.swarmer.name = Działo Rojowe
-block.salvo.name = Działo Salwowe
-block.ripple.name = Działo falowe
-block.cyclone.name = Cyklon
-block.fuse.name = Lont
-block.shock-mine.name = Mina
 block.conveyor.name = Przenośnik
 block.titanium-conveyor.name = Tytanowy przenośnik
 block.junction.name = Węzeł
@@ -787,6 +778,10 @@ block.power-void.name = Próżnia prądu
 block.power-source.name = Nieskończony Prąd
 block.unloader.name = Wyciągacz
 block.vault.name = Magazyn
+block.wave.name = Wave
+block.swarmer.name = Działo Rojowe
+block.salvo.name = Działo Salwowe
+block.ripple.name = Działo falowe
 block.phase-conveyor.name = Fazowy Transporter
 block.bridge-conveyor.name = Most Transportowy
 block.plastanium-compressor.name = Kompresor Plastanu
@@ -798,13 +793,13 @@ block.oil-extractor.name = Ekstraktor Ropy
 block.draug-factory.name = Fabryka Dronów Draug
 block.spirit-factory.name = Fabryka Dronów Duch
 block.phantom-factory.name = Fabryka Dronów Widmo
-block.wraith-factory.name = Fabryka Wojowników Zjawa
+block.wraith-factory.name = Fabryka Wojowników Widmo
 block.ghoul-factory.name = Fabryka Bombowców Upiór
 block.dagger-factory.name = Fabryka Mechów Nóż
-block.crawler-factory.name = Fabryka Mechów Crawler
+block.crawler-factory.name = Fabryka Mechów Pełzacz
 block.titan-factory.name = Fabryka Mechów Tytan
 block.fortress-factory.name = Fabryka Mechów Fortreca
-block.revenant-factory.name = Fabryka Wojowników Potwór
+block.revenant-factory.name = Fabryka Wojowników Zjawa
 block.repair-point.name = Punkt Napraw
 block.pulse-conduit.name = Rura Pulsacyjna
 block.phase-conduit.name = Rura Fazowa
@@ -821,31 +816,35 @@ 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 Stopu Energetycznego
-block.surge-wall-large.name = Duża Ściana Stopu Energetycznego
+block.surge-wall.name = Ściana Energonu
+block.surge-wall-large.name = Duża Ściana Energonu
+block.cyclone.name = Cyklon
+block.fuse.name = Lont
+block.shock-mine.name = Mina
 block.overdrive-projector.name = Projektor Nad-prędkości
 block.force-projector.name = Projektor Pola Siłowego
 block.arc.name = Piorun
 block.rtg-generator.name = Generator RTG
 block.spectre.name = Huragan
-block.meltdown.name = Meltdown
+block.meltdown.name = Rozpad
 block.container.name = Kontener
 block.launch-pad.name = Skocznia
 block.launch-pad-large.name = Duża skocznia
 team.blue.name = niebieski
 team.crux.name = czerwony
 team.sharded.name = pomarańczowy
+team.orange.name = orange
 team.derelict.name = szary
 team.green.name = zielony
 team.purple.name = fioletowy
 unit.spirit.name = Duch
-unit.draug.name = Draug Miner Drone
+unit.draug.name = Draug
 unit.phantom.name = Widmo
 unit.dagger.name = Nóż
 unit.crawler.name = Pełzak
 unit.titan.name = Tytan
 unit.ghoul.name = Upiór
-unit.wraith.name = Zjawa
+unit.wraith.name = Widmo
 unit.fortress.name = Forteca
 unit.revenant.name = Zjawa
 unit.eruptor.name = Roztapiacz
@@ -853,32 +852,30 @@ unit.chaos-array.name = Kolejka Chaosu
 unit.eradicator.name = Niszczyciel
 unit.lich.name = Obudzony
 unit.reaper.name = Żeniec
-tutorial.begin = Twoją misją jest zniszczenie[LIGHT_GRAY] wrogów[].\n\nZacznij od[accent] wydobycia miedzi[]. Kliknij na rudę miedzi w pobliżu swojego rdzenia, aby to zrobić.
-tutorial.drill = Kopanie ręcznie nie jest efektywne.\n[accent]Wiertła []mogą kopać automatycznie.\nPostaw je na rudzie miedzi.
-tutorial.conveyor = [accent]Transportery[] są używane do przenoszenia przedmiotów do rdzenia.\nZrób linię z transporterów z wiertła do rdzenia.
-tutorial.morecopper = Potrzebne jest więcej miedzi!\nKop ręcznie, albo postaw więcej wierteł.
-tutorial.turret = Struktury obronne muszą być wybudowane, aby odpychać [LIGHT_GRAY] wrogów[].\nZbuduj podwójne działko niedaleko swojej bazy.
-tutorial.drillturret = Podwójne działko wymaga[accent] miedzi []jako amunicji, aby strzelać.\nPostaw wiertło obok działka, aby zaopatrzyć je w miedź.
-tutorial.waves = The[LIGHT_GRAY] Wrogowie[] nadciągają.\n\nObroń swój rdzeń przez dwie fale. Wybuduj więcej działek.
-tutorial.lead = Dostępne jest więcej rud - eksploruj i wydobądź[accent] ołów[].\n\nPrzeciągnij ze swojej jednostki do rdzenia, aby przenieść zasoby.
-tutorial.smelter = Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one.
-tutorial.densealloy = The smelter will now produce alloy.\nGet some.\nImprove the production if necessary.
-tutorial.siliconsmelter = The core will now create a[accent] spirit drone[] for mining and repairing blocks.\n\nFactories for other units can be created with [accent] silicon.\nMake a silicon smelter.
-tutorial.silicondrill = Silicon requires[accent] coal[] and[accent] sand[].\nStart by making drills.
-tutorial.generator = This technology requires power.\nCreate a[accent] combustion generator[] for it.
-tutorial.generatordrill = Combustion generators need fuel.\nFuel it with coal from a drill.
-tutorial.node = Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.
-tutorial.nodelink = Power can be transferred through contacting power blocks and generators, or by linked power nodes.\n\nLink power by tapping the node and selecting the generator and silicon smelter.
-tutorial.silicon = Silicon is being produced. Get some.\n\nImproving the production system is advised.
-tutorial.daggerfactory = Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs.
-tutorial.router = Factories need resources to function.\nCreate a router to split conveyor resources.
-tutorial.dagger = Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
-tutorial.battle = The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.
-
+tutorial.next = [lightgray]<Kliknij, aby kontynuować>
+tutorial.intro = Wszedłeś do[scarlet] Samouczka Mindustry.[]\nZacznij od[accent] wydobycia miedzi[]. Aby to zrobić, dotknij żyły rudy miedzi w pobliżu rdzenia.\n\n[accent]{0}/{1} miedź
+tutorial.drill = Wydobywanie ręczne jest nieefektywne.\n[accent]Wiertła []mogą kopać automatycznie.\nKliknij zakładkę wiertła w prawym dolnym rogu.\nWybierz[accent] wiertło mechaniczne[]. Umieść go na złożu miedzi, klikając.\n[accent]Kliknij prawym przyciskiem myszy[], aby przestać budować.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
+tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
+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.turret = Once an item enters your core, it can be used for building.\nKeep in mind that not all items can be used for building.\nItems that are not used for building, such as[accent] coal[] or[accent] scrap[], cannot be put into the core.\nDefensive structures must be built to repel the[lightgray] enemy[].\nBuild a[accent] duo turret[] near your base.
+tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill near the turret.\nLead conveyors into the turret to supply it with copper.\n\n[accent]Ammo delivered: 0/1
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
+tutorial.waves = 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 = Przydatny materiał budowlany. Szeroko używany w prawie każdej konstrukcji.
 item.lead.description = Podstawowy matriał. Używany w przesyle przemiotów i płynów. Nie jest on przypadkiem szkodliwy?
 item.metaglass.description = Niesamowite silne szkło. Szeroko używane w transporcie i przechowywaniu płynów.
-item.graphite.description = Mineralized carbon, used for ammunition and electrical insulation.
+item.graphite.description = Zmineralizowany węgiel, wykorzystywany do amunicji i izolacji elektrycznej.
 item.sand.description = Zwykły materiał używany pospolicie w przepalaniu, stopach i jako topnik. Dostanie piaskiem po oczach nie jest przyjemne.
 item.coal.description = Zwykły i łatwo dostępny materiał energetyczny.
 item.titanium.description = Rzadki i bardzo lekki materiał. Używany w bardzo zaawansowanym przewodnictwie, wiertłach i samolotach. Poczuj się jak Tytan!
@@ -888,15 +885,15 @@ item.silicon.description = Niesamowicie przydatny półprzewodnk uźywany w pane
 item.plastanium.description = Lekki i plastyczny materiał używany w amunicji odłamkowej i samolotach. Używany też w klockach LEGO (dlatego są niezniszczalne)!
 item.phase-fabric.description = Niewiarygodnie lekkie włókno używane w zaawansowanej elektronice i technologii samo-naprawiającej się.
 item.surge-alloy.description = Zaawansowany materiał z niesłychanymi wartościami energetycznymi.
-item.spore-pod.description = Used for conversion into oil, explosives and fuel.
-item.blast-compound.description = Lotny związek używany w pirotechnice. Może być używany jako materiał energetyczny, ale nie polecam. BOOOM!
+item.spore-pod.description = Używany do wyrobu oleju, materiałów wybuchowych i paliwa.
+item.blast-compound.description = Lotny związek używany w pirotechnice. Może być używany jako materiał energetyczny, ale nie polecam, ale i tak warto spróbować.
 item.pyratite.description = Niesamowicie palny związek używany w zbrojeniu. Nielegalny w 9 państwach.
 liquid.water.description = Powszechnie używana do schładzania budowli i przetwarzania odpadów.
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = Może się palić, eksplodować lub być używana do schładzania.
 liquid.cryofluid.description = Najefektywniejsza ciecz do schładzania budowli.
 mech.alpha-mech.description = Standardowy mech. Średnia broń i prędkość, leć potrafi stworzyć trzy małe drony do walki.
-mech.delta-mech.description = Szybki i wrażliwy mech stworzony do szybkih ataków i ucieczki. Budynką robi prawie nic, leć jest wstanie szybko rozwalić grupę wrogich jednostek piorunami.
+mech.delta-mech.description = Szybki i wrażliwy mech stworzony do szybkih ataków i ucieczki. Budynką robi prawie nic, lec jest wstanie szybko rozwalić grupę wrogich jednostek piorunami.
 mech.tau-mech.description = Mech pomocny. Naprawia budynki drużyny, strzelając w nie. Potrafi wygasić niedalekie pożary i uleczyć bliskich przyjaciół.
 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.
@@ -907,22 +904,18 @@ unit.draug.description = A primitive mining drone. Cheap to produce. Expendable.
 unit.spirit.description = Początkowy dron. Rdzeń zawsze tworzy jeden. Wydobywa surowce, naprawia budynki oraz pomaga przy budowie.
 unit.phantom.description = Zaawansowany dron. Wydobywa surowce, naprawia budynki oraz pomaga przy budowie szybciej niż dron Duch.
 unit.dagger.description = Podstawowy mech lądowy. Sam jest słaby, lecz przydatny w dużych ilościach.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
+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.fortress.description = Wielka jednostka artyleryjna lądowa.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = Szybka jednostka, stosuje taktyke uderz-uciekaj.
 unit.ghoul.description = Ciężki bombowiec.
-unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
-block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
+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 = Reduces sand with highly pure coal in order to produce silicon.
+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 = Produces plastanium from oil and titanium.
+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.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
 block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
@@ -930,27 +923,27 @@ block.blast-mixer.description = Uses oil for transforming pyratite into the less
 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 = Compresses spore pods into oil.
+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.coal-centrifuge.description = Solidifes oil into chunks of coal.
-block.incinerator.description = Gets rid of any excess item or liquid.
+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.
 block.power-source.description = Wydziela prąd w nieskończoność. Dostępny tylko w trybie sandbox.
 block.item-source.description = Wydziela przedmioty w nieskończoność. Dostępny tylko w trybie sandbox.
 block.item-void.description = Niszczy wszystkie przedmioty, które idą do tego bloku, który nie wymaga prądu. Dostępny tylko w trybie sandbox.
 block.liquid-source.description = Wydziela ciecz w nieskończoność. Dostępny tylko w trybie sandbox.
-block.copper-wall.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.
-block.copper-wall-large.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.\nSpans multiple tiles.
-block.titanium-wall.description = A moderately strong defensive block.\nProvides moderate protection from enemies.
-block.titanium-wall-large.description = A moderately strong defensive block.\nProvides moderate protection from enemies.\nSpans multiple tiles.
-block.thorium-wall.description = A strong defensive block.\nGood protection from enemies.
-block.thorium-wall-large.description = A strong defensive block.\nGood protection from enemies.\nSpans multiple tiles.
-block.phase-wall.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.
-block.phase-wall-large.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.\nSpans multiple tiles.
-block.surge-wall.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.
-block.surge-wall-large.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.\nSpans multiple tiles.
-block.door.description = A small door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.
-block.door-large.description = A large door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.\nSpans multiple tiles.
+block.copper-wall.description = Tani blok obronny.\nPrzydatny do ochrony rdzenia i wieżyczek w pierwszych kilku falach.
+block.copper-wall-large.description = Tani blok obronny.\nPrzydatny do ochrony rdzenia i wieżyczek w pierwszych kilku falach.\nObejmuje wiele kratek.
+block.titanium-wall.description = Umiarkowanie silny blok obronny.\nZapewnia umiarkowaną ochronę przed wrogami.
+block.titanium-wall-large.description = Umiarkowanie silny blok obronny.\nZapewnia umiarkowaną ochronę przed wrogami.\nObejmuje wiele kratek.
+block.thorium-wall.description = Silny blok obronny.\nDobra ochrona przed wrogami.
+block.thorium-wall-large.description = Silny blok obronny.\nDobra ochrona przed wrogami.\nObejmuje wiele kratek.
+block.phase-wall.description = Nie tak silny jak ściana toru, ale odbije pociski, chyba że będą zbyt potężne.
+block.phase-wall-large.description = Nie tak silny jak ściana toru, ale odbije pociski, chyba że będą zbyt potężne.\nObejmuje wiele kratek.
+block.surge-wall.description = Najsilniejszy blok obronny.\nMa niewielką szansę na wywołanie błyskawicy w kierunku atakującego.
+block.surge-wall-large.description = Najsilniejszy blok obronny.\nMa niewielką szansę na wywołanie błyskawicy w kierunku atakującego.\nObejmuje wiele kratek.
+block.door.description = Małe drzwi, które można otwierać i zamykać, klikając na nie.\nJeśli są otwarte, wrogowie mogą strzelać i się przemieszczać przez nie.
+block.door-large.description = Duże drzwi, które można otwierać i zamykać, klikając na nie.\nJeśli są otwarte, wrogowie mogą strzelać i się przemieszczać przez nie.\nObejmuje wiele kratek.
 block.mender.description = Periodically repairs blocks in its vicinity. Keeps defenses repaired in-between waves.\nOptionally uses silicon to boost range and efficiency.
 block.mend-projector.description = Periodically heals blocks in its vicinity.
 block.overdrive-projector.description = Increases the speed of nearby buildings like drills and conveyors.
@@ -983,19 +976,19 @@ block.battery.description = Stores power whenever there is an abundance and prov
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Wytwarza energię poprzez spalanie łatwopalnych materiałów.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.turbine-generator.description = Bardziej wydajny niż generator spalania, ale wymaga dodatkowej wody.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
 block.solar-panel.description = Provides a small amount of power from the sun.
 block.solar-panel-large.description = Provides much better power supply than a standard solar panel, but is also much more expensive to build.
 block.thorium-reactor.description = Generates huge amounts of power from highly radioactive thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. Power output depends on fullness, with base power generated at full capacity.
 block.impact-reactor.description = An advanced generator, capable of creating massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
-block.mechanical-drill.description = A cheap drill. When placed on appropriate tiles, outputs items at a slow pace indefinitely.
+block.mechanical-drill.description = Tanie wiertło. Kiedy położnone na odpowiednich polach, wysyła przedmioty w wolnym tempie.
 block.pneumatic-drill.description = An improved drill which is faster and able to process harder materials by making use of air pressure.
 block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Additionally, radioactive thorium can be retrieved with this drill.
 block.blast-drill.description = The ultimate drill. Requires large amounts of power.
-block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby.
-block.cultivator.description = Cultivates tiny concentrations of spores into industry-ready pods.
+block.water-extractor.description = Wydobywa wodę z ziemi. Użyj go, gdy w pobliżu nie ma jeziora.
+block.cultivator.description = Uprawia małe skupiska zarodników w gotowe do użytku kapsułki.
 block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby.
 block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen.
 block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
@@ -1005,23 +998,23 @@ block.container.description = Stores a small amount of items of each type. An[LI
 block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader.
 block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished.
 block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
-block.duo.description = A small, cheap turret. Useful against ground units.
-block.scatter.description = A medium-sized anti-air turret. Sprays clumps of lead or scrap flak at enemy units.
-block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
-block.hail.description = A small artillery turret.
-block.wave.description = A medium-sized rapid-fire turret which shoots liquid bubbles.
-block.lancer.description = A medium-sized turret which shoots charged electricity beams.
-block.arc.description = A small close-range turret which shoots electricity in a random arc towards the enemy.
-block.swarmer.description = A medium-sized turret which shoots burst missiles.
-block.salvo.description = A medium-sized turret which fires shots in salvos.
-block.fuse.description = A large turret which shoots powerful short-range beams.
-block.ripple.description = A large artillery turret which fires several shots simultaneously.
-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.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.
+block.duo.description = Mała, tania wieża. Przydatny przeciwko jednostkom naziemnym.
+block.scatter.description = Średniej wielkości wieża przeciwlotnicza. Rozsiewa śruty z ołowiu lub strzępy złomu na jednostki wroga.
+block.scorch.description = Spala wszystkich wrogów naziemnych w pobliżu. Bardzo skuteczny z bliskiej odległości.
+block.hail.description = Mała wieża artyleryjska, bardzo przydatna, atakuje tylko jednostki naziemne.
+block.wave.description = Średniej wielkości szybkostrzelna wieżyczka, która wystrzeliwuje płynne bąbelki. Gasi ogień jeżeli jest w niej woda lub lodociecz
+block.lancer.description = Średniej wielkości wieżyczka, która strzela naładowanymi wiązkami elektryczności.
+block.arc.description = Mała wieża bliskiego zasięgu, która wystrzeliwuje elektryczność losowym łukiem w kierunku wroga.
+block.swarmer.description = Średniej wielkości wieżyczka, która strzela rakietami wybuchowymi.
+block.salvo.description = Średniej wielkości wieża strzelająca salwami.
+block.fuse.description = Duża wieża, która strzela potężnymi wiązkami krótkiego zasięgu.
+block.ripple.description = Duża wieża artyleryjska, która strzela jednocześnie kilkoma strzałami.
+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.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.
 block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
 block.ghoul-factory.description = Produces heavy carpet bombers.
 block.revenant-factory.description = Produces heavy laser air units.

core/assets/bundles/bundle_pt_BR.properties

@@ -43,6 +43,7 @@ newgame = Novo Jogo
 none = <nenhum>
 minimap = Mini-Mapa
 close = Fechar
+website = Website
 quit = Sair
 maps = Mapas
 continue = Continuar
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = Voce deve ter pelo menos uma letra ou numero.
 server.kicked.idInUse = Voce ja esta neste servidor! Conectar com duas contas não é permitido.
 server.kicked.customClient = Este servidor não suporta construções customizadas. Baixe a versão original.
 server.kicked.gameover = Fim de jogo!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = The [accent]Hospedar[]Botão Hopeda um servidor no Host[scarlet]6567[] e [scarlet]6568.[]\nQualquer um no [LIGHT_GRAY]Wi-fi Ou Internet local[] Pode ver este servidor na lista de servidores.\n\nSe voce quer poder entrar em qualquer servidor em seu ip, [accent]port forwarding[] é requerido.\n\n[LIGHT_GRAY]Note: Se alguem esta com problemas em conectar no seu servidor lan, Tenha certeza que deixou mindustry Acessar sua internet local nas configurações de firewall
 join.info = Aqui, Você pode entar em um [accent]IP De servidor[] Para conectar, Ou descobrir [accent]Servidores[] Da rede local.\nAmbos os servidores LAN e WAN São suportados.\n\n[LIGHT_GRAY]Note: Não tem uma lista de servidores automaticos; Se você quer conectar ao IP de alguem, Você precisa pedir o IP Ao Rosteador.
 hostserver = Hospedar servidor
@@ -154,7 +156,10 @@ cancel = Cancelar
 openlink = Abrir Link
 copylink = Copiar link
 back = Voltar
+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?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Carregando...
 saving = [accent]Salvando...
 wave = [accent]Horda {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]Sem filtro! Adicione um usando o botão abaixo.
 filter.distort = Distorcedor
 filter.noise = Ruído
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Minério
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Por favor Reinicie seu jogo para a tradução tomar efeito.
 settings = Configurações
 tutorial = Tutorial
+tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Editor de mapa
 donate = Doar
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Melhor: {0}
 launch = Lançar
 launch.title = Lançamento feito com sucesso
 launch.next = [LIGHT_GRAY]próxima oportunidade na onda {0}
-launch.unable = [scarlet]Incapaz de LANÇAR.[] Enimigos.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = Isto vai lançar todos os seus recursos no seu núcleo.\nVoce não será capaz de retornar para esta base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Descobrir
 configure = Configurar carregamento
 configure.locked = [LIGHT_GRAY]Alcançe a onda {0}\npara Configurar o Loadout.
@@ -352,6 +360,7 @@ zone.tarFields.name = Campos de Tar
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = Linguagem
@@ -417,6 +427,7 @@ blocks.inaccuracy = Imprecisão
 blocks.shots = Tiros
 blocks.reload = Recarregar
 blocks.ammo = Munição
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Velocidade da furadeira: {0}/s
 bar.efficiency = Eficiencia: {0}%
 bar.powerbalance = Energia: {0}
@@ -491,6 +502,7 @@ setting.lasers.name = Mostrar lasers
 setting.pixelate.name = Pixelizado [LIGHT_GRAY](Pode diminuir a performace)
 setting.minimap.name = Mostrar minimapa
 setting.musicvol.name = Volume da Música
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Desligar Música
 setting.sfxvol.name = Volume de Efeitos
 setting.mutesound.name = Desligar Som
@@ -819,9 +831,10 @@ block.container.name = Container
 block.launch-pad.name = Plataforma de lançamento
 block.launch-pad-large.name = Plataforma de lançamento grande
 team.blue.name = Azul
-team.red.name = Vermelho
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = Laranja
-team.none.name = Cinza
+team.derelict.name = derelict
 team.green.name = Verde
 team.purple.name = Roxo
 unit.spirit.name = Drone Spirit
@@ -839,27 +852,26 @@ unit.chaos-array.name = Arraia do caos
 unit.eradicator.name = Erradicador
 unit.lich.name = Lich
 unit.reaper.name = Ceifador
-tutorial.begin = Sua missão aqui é de erradicar[LIGHT_GRAY] Inimigo[].\n\nComeçe por[accent] Minerar cobre[]. Clique numa veia de cobre perto de seu core para fazer isso.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Minerar manualmente é ineficiente.\n[accent]Mineradoras []podem minerar automaticamente.\nColoque uma numa veia de cobre.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]Esteiras[] São usadas para transportar itens até o core.\nFaça uma linha de Esteiras da mineradora até o core.
-tutorial.morecopper = Mais cobre é preciso.\n\nTanto minere manualmente, Ou coloque mais mineradoras.
+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.turret = Estruturas defensivas devem ser construidas para repelir[LIGHT_GRAY] O inimigo[].\nConstrua uma torre dupla perto de sua base.
 tutorial.drillturret = Torres duplas precisam de[accent] Cobre como munição []Para atirar.\nColoque uma mineradoura Proxima a torre Para carregar ela com cobre minerado.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = O[LIGHT_GRAY] Inimigo[] se aproxima.\n\nDefenda seu core por 2 ondas. Construa mais torres.
-tutorial.lead = Mais minerios estão disponiveis. Explore e minere[accent] Cobre[].\n\nArraste Da sua unidade até o core para transferir recursos.
-tutorial.smelter = Cobre e chumbo são materiais fracos.\nLiga densa[accent] Superior[] Pode ser feito num fundidor.\n\nConstrua um.
-tutorial.densealloy = O fundidor agora vai fazer a liga.\nPegue.\nMelhore a produção se necessario.
-tutorial.siliconsmelter = O core agora vai criar[accent] O drone Spirit[] Para minerar e consertar blocos.\n\nFabricas para outras unidades podem ser criadas usando [accent] silicio.\nFaça um fundidor de Silicio.
-tutorial.silicondrill = Silicio requer[accent] carvão[] e[accent] areia[].\nComeçe a fazer mineradouras.
-tutorial.generator = Essa tecnologia requer energia.\nCrie[accent] um gerador a combustão[] para isso.
-tutorial.generatordrill = Gerador de combustão requer combustivel.\nCarregue com carvão minerado.
-tutorial.node = Energia requer transporte.\nCrie um[accent] Nodo de energia[] Proximo do gerador de combustão.
-tutorial.nodelink = Poder pode ser transportado construindo blocos de energia e geradores, Apenas construindo nodos de Energia.\n\nLigue a energia clicando no nodo e selecionando o gerador e o fundidor de silicio.
-tutorial.silicon = Silicio esta sendo feito. Pegue.\n\nMelhorar a produção é recomendado.
-tutorial.daggerfactory = Construa uma[accent] Fabrica do meca Dagger.[]\n\nIsso vai ser feito para construi mecas de ataque.
-tutorial.router = Fabricas precisam de recursos pra construir\nCrie um roteador para espalhadar recursos da esteira.
-tutorial.dagger = Ligue os nodos de energia a fabrica.\nQuando os requerimentos forem alcançados, Um meca vai ser criado.\n\nCrie mais mineradoras, geradoras e esteiras se necessario.
-tutorial.battle = O[LIGHT_GRAY] Inimigo[] revelou seu core.\nDestrua com sua unidade e Dagger's.
+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 = Um material de estrutura util. Usado extensivamente em Maioria dos blocos.
 item.lead.description = Material de começo basico. usado intensivamente em Blocos de transporte de liquidos e eletronicos.
 item.metaglass.description = Composto de vidro super-Resistente. Extensivamente usado Para distribuição de líquido e armazem.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = Uma unidade armadurada terreste avancada. Usa carbide como munição. Ataca ambas as unidades de Aereas e terrestres.
 unit.fortress.description = Uma unidade pesada de artilharia terrestre.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = Uma unidade rapida, Interceptadora de bater e correr.
 unit.ghoul.description = Um bombardeiro pesado. Usa composto de explosão Ou piratite como munição.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduz areia a coque altamente puro Para fazer silicio.

core/assets/bundles/bundle_ru.properties

@@ -1,4 +1,4 @@
-credits.text = Создатель [ROYAL] Anuken — [SKY]anukendev@gmail.com[][]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в офф. discord-сервер Mindustry в канал #русский.\n\nПереводчики на русский язык:\n[YELLOW]Prosta4ok_ua\n[BLACK]XZimur\n[BLUE]Beryllium
+credits.text = Создатель [ROYAL]Anuken[] — [SKY]anukendev@gmail.com[]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в оф. discord-сервер Mindustry в канал #русский.\n\nПереводчики на русский язык:\n[YELLOW]Prosta4ok_ua\n[BLACK]XZimur\n[BLUE]Beryllium\nРедактор:\n[SLATE]Felix Corvus
 credits = Авторы
 contributors = Переводчики и помощники
 discord = Присоединяйтесь к нашему Discord!
@@ -7,33 +7,32 @@ 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-адрес была скопирована в буфер обмена.
+linkfail = Не удалось открыть ссылку!\nURL-адрес был скопирован в буфер обмена.
 screenshot = Cкриншот сохранён в {0}
 screenshot.invalid = Карта слишком большая, возможно, не хватает памяти для скриншота.
 gameover = Игра окончена
 gameover.pvp = [accent] {0}[] команда победила!
-highscore = [YELLOW]Новый рекорд!
+highscore = [accent]Новый рекорд!
 stat.wave = Волн отражено:[accent] {0}
 stat.enemiesDestroyed = Врагов уничтожено:[accent] {0}
 stat.built = Строений построено:[accent] {0}
 stat.destroyed = Строений уничтожено:[accent] {0}
 stat.deconstructed = Строений деконструировано:[accent] {0}
-stat.delivered = Ресурсов добыто:
+stat.delivered = Ресурсов запущено:
 stat.rank = Финальный счёт: [accent]{0}
-placeline = Вы выбрали блок.\nВы можете [accent]строить в линию[], [accent]удерживая палец в течение нескольких секунд[] и потом перетаскивая его.\n\n[scarlet]СДЕЛАЙ ЭТО.
-removearea = Вы выбрали режим удаления.\nВы можете [accent]удалять блоки в выбранной области[], [accent]удерживая палец несколько секунд[] и потом перетаскивая его.\n\n[scarlet]СДЕЛАЙ ЭТО.
-launcheditems = [accent]Запущенные предметы
+placeline = Вы Выбрали блок.\nВы можете[accent] строить в линию[],[accent] удерживая палец в течение нескольких секунд[] и потом перетаскивая его.\n\n[scarlet]СДЕЛАЙ ЭТО.
+removearea = Вы Выбрали режим удаления.\nВы можете[accent] удалять блоки в прямоугольной области[],[accent] удерживая палец несколько секунд[] и потом перетаскивая его.\n\n[scarlet]СДЕЛАЙ ЭТО.
+launcheditems = [accent]Запущенные Предметы
 map.delete = Вы действительно хотите удалить карту «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
 level.select = Выбор карты
 level.mode = Режим игры:
 showagain = Не показывать снова до следующей сессии
 coreattack = < Ядро находится под атакой! >
-nearpoint = [[ [scarlet]ПОКИНЬТЕ ЗОНУ НЕМЕДЛЕННО[] ]\nАннигиляция неизбежна.
-outofbounds = [[ ЗА ГРАНИЦАМИ ]]\n[]самоуничтожение через{0}
+nearpoint = [[ [scarlet]ПОКИНЬТЕ ТОЧКУ ВЫСАДКИ ПРОТИВНИКОВ НЕМЕДЛЕННО[] ]\nАннигиляция неизбежна.
 database = База данных ядра
 savegame = Сохранить игру
 loadgame = Загрузить игру
@@ -48,21 +47,21 @@ website = Веб-сайт
 quit = Выход
 maps = Карты
 continue = Продолжить
-maps.none = [LIGHT_GRAY]Карты не найдены!
+maps.none = [lightgray]Карты не найдены!
 about.button = Об игре
 name = Имя:
 noname = Для начала, придумайте[accent] себе имя[].
 filename = Имя файла:
 unlocked = Новый контент разблокирован!
 completed = [accent]Завершено
-techtree = Технологическое дерево
-research.list = [LIGHT_GRAY]Исследование:
+techtree = Дерево технологий
+research.list = [lightgray]Исследование:
 research = Исследование
-researched = [LIGHT_GRAY]{0} исследовано.
+researched = [lightgray]{0} исследовано.
 players = Игроков на сервере: {0}
 players.single = {0} игрок на сервере
-server.closing = [accent]Закрытие сервера...
-server.kicked.kick = Вас выгнали с сервера!
+server.closing = [accent]Закрытие сервера…
+server.kicked.kick = Вас Выгнали с сервера!
 server.kicked.serverClose = Сервер закрыт.
 server.kicked.clientOutdated = Устаревший клиент! Обновите игру!
 server.kicked.serverOutdated = Устаревший сервер! Попросите администратора сервера обновить сервер/игру!
@@ -73,18 +72,19 @@ server.kicked.nameEmpty = Ваше имя должно содержать хот
 server.kicked.idInUse = Вы уже на этом сервере! Соединение с двумя учетными записями не разрешено.
 server.kicked.customClient = Этот сервер не поддерживает пользовательские сборки. Загрузите официальную версию.
 server.kicked.gameover = Игра окончена!
-host.info = Кнопка [accent]Сервер[] размещает сервер на порте [accent]6567[].[]\nЛюбой пользователь в той же [LIGHT_GRAY]сети[] получет возможность видеть ваш сервер в своём списке серверов.\n\nЕсли вы хотите, чтобы люди могли подключаться из любого места по IP, то требуется переадресация(проброс) портов.[].\n\n[LIGHT_GRAY] Примечание. Если у кого-то возникают проблемы с подключением к вашей локальной сети, убедитесь, что вы разрешили доступ Mindustry к вашей локальной сети в настройках брандмауэра. Обратите внимание, что публичные сети иногда не позволяют обнаружение сервера.
-join.info = Здесь вы можете ввести IP-адрес [accent]сервера[]  для подключения или открыть [accent]локальную сеть [] для подключения к другим серверам.\nПоддерживается многопользовательский режим LAN и WAN.\n\n[LIGHT_GRAY] Примечание: это не является автоматическим глобальным списком серверов; если вы хотите подключиться к кому-то по IP, вам нужно будет спросить у хоста его IP-адрес.
-hostserver = Запустить многопользовательский сервер
-hostserver.mobile = Запустить\nсервер
+server.versions = Ваша версия:[accent] {0}[]\nВерсия сервера:[accent] {1}[]
+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ервер
 host = Сервер
-hosting = [accent]Открытие сервера...
+hosting = [accent]Открытие сервера…
 hosts.refresh = Обновить
 hosts.discovering = Поиск локальных игр
 server.refreshing = Обновление сервера
 hosts.none = [lightgray]Локальных игр не обнаружено!
 host.invalid = [scarlet]Не удаётся подключиться к хосту.
-trace = Слежка за игроком
+trace = Отслеживать игрока
 trace.playername = Имя игрока: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID: [accent]{0}
@@ -110,21 +110,21 @@ confirmunadmin = Вы действительно хотите убрать эт
 joingame.title = Присоединиться к игре
 joingame.ip = IP:
 disconnect = Отключено.
-disconnect.data = Не удалось загрузить данные мира!
-connecting = [accent]Подключение...
-connecting.data = [accent]Загрузка данных мира...
+disconnect.data = Ошибка при загрузке данных мира!
+connecting = [accent]Подключение…
+connecting.data = [accent]Загрузка данных мира…
 server.port = Порт:
 server.addressinuse = Данный адрес уже используется!
 server.invalidport = Неверный номер порта!
-server.error = [crimson]Ошибка создания сервера: [accent] {0}
-save.old = Это сохранение для более старой версии игры и больше не может использоваться.\n\n[LIGHT_GRAY]Совместимость сохранений будет реализована в финальной версии 4.0.
+server.error = [crimson]Ошибка создания сервера: [accent]{0}
+save.old = Это сохранение для старой версии игры и больше не может использоваться.\n\n[lightgray]Совместимость сохранений будет реализована в финальной версии 4.0.
 save.new = Новое сохранение
-save.overwrite = Вы уверены,что хотите перезаписать этот слот для сохранения?
+save.overwrite = Вы уверены, что хотите перезаписать\nэтот слот для сохранения?
 overwrite = Перезаписать
 save.none = Сохранения не найдены!
-saveload = [accent]Сохранение...
+saveload = Сохранение…
 savefail = Не удалось сохранить игру!
-save.delete.confirm = Вы уверены,что хотите удалить это сохранение?
+save.delete.confirm = Вы уверены, что хотите удалить это сохранение?
 save.delete = Удалить
 save.export = Экспортировать сохранение
 save.import.invalid = [accent]Это сохранение недействительно!
@@ -136,17 +136,17 @@ save.rename = Переименовать
 save.rename.text = Новое название:
 selectslot = Выберите сохранение.
 slot = [accent]Слот {0}
-save.corrupted = [accent]Сохранённый файл повреждён или имеет недействительный формат!\nЕсли вы только что обновили свою игру, это, вероятно, из-за изменения формата сохранения, [scarlet]и не является[] ошибкой.
+save.corrupted = [accent]Сохранённый файл повреждён или имеет недопустимый формат!\nЕсли Вы только что обновили свою игру, это, вероятно, из-за изменения формата сохранения, и [scarlet]не является[] ошибкой.
 empty = <Пусто>
 on = Вкл
 off = Выкл
 save.autosave = Автосохранение: {0}
 save.map = Карта: {0}
-save.wave = Волна: {0}
+save.wave = Волна {0}
 save.difficulty = Сложность: {0}
 save.date = Последнее сохранение: {0}
 save.playtime = Время в игре: {0}
-warning = Предупреждение
+warning = Предупреждение.
 confirm = Подтверждение
 delete = Удалить
 ok = ОК
@@ -157,18 +157,18 @@ openlink = Открыть ссылку
 copylink = Скопировать ссылку
 back = Назад
 classic.export = Экспортировать данные с классической версии?
-classic.export.text = Классическое (версия 3.5 сборка 40) сохранение или карта были обнаруженыd. Вы хотите экспортировать эти данные в домашнюю папку вашего телефона, для использования в приложении Mindustry Classic?
-quit.confirm = Вы уверены, что хотите выйти?
-quit.confirm.tutorial = Вы уверены, что хотите выйти из обучения?
-loading = [accent]Загрузка...
-saving = [accent]Сохранение...
+classic.export.text = [accent]Mindustry[] получил глобальное обновление.\nБыло обнаружено Классическое (версия 3.5 сборка 40) сохранение или карта. Вы хотите экспортировать эти сохранения в домашнюю папку вашего телефона, для использования в приложении Mindustry Classic?
+quit.confirm = Вы уверены, что хотите Выйти?
+quit.confirm.tutorial = Вы уверены, что знаете Что делаете?\nОбучение может быть повторно запущено через[accent] Настройки->Игра->Открыть обучение.[]
+loading = [accent]Загрузка…
+saving = [accent]Сохранение…
 wave = [accent]Волна {0}
-wave.waiting = [LIGHT_GRAY]Волна через {0}
-wave.waveInProgress = [LIGHT_GRAY]Волна продолжается
-waiting = Ожидание...
-waiting.players = Ожидание игроков ...
-wave.enemies = [LIGHT_GRAY]{0} противник. остался
-wave.enemy = [LIGHT_GRAY]{0} противник остался
+wave.waiting = [lightgray]Волна через {0}
+wave.waveInProgress = [lightgray]Волна продолжается
+waiting = [lightgray]Ожидание…
+waiting.players = Ожидание игроков…
+wave.enemies = [lightgray]{0} противник. осталось
+wave.enemy = [lightgray]{0} противник остался
 loadimage = Загрузить изображение
 saveimage = Сохранить изображение
 unknown = Неизвестно
@@ -176,15 +176,15 @@ custom = Пользовательская
 builtin = Встроенная
 map.delete.confirm = Вы действительно хотите удалить эту карту? Это действие не может быть отменено!
 map.random = [accent]Случайная карта
-map.nospawn = Эта карта не имеет ни одного ядра, в котором игрок может появиться! Добавьте [ROYAL]оранжевое[] ядро на эту карту в редакторе карт.
-map.nospawn.pvp = У этой карты нет вражеских ядер, в которых игрок может появиться! Добавьте [SCARLET]не оранжевое[] ядро на эту карту в редакторе.
-map.nospawn.attack = У этой карты нет вражеских ядер! Добавьте [scarlet]не синее[] ядро на эту карту в редакторе.
+map.nospawn = Эта карта не имеет ни одного ядра, в котором игрок может появиться! Добавьте[accent] оранжевое[] ядро на эту карту в редакторе.
+map.nospawn.pvp = У этой карты нет вражеских ядер, в которых игрок может появиться! Добавьте[SCARLET] не оранжевое[] ядро на эту карту в редакторе.
+map.nospawn.attack = У этой карты нет вражеских ядер для атаки игроком! Добавьте[SCARLET] красное[] ядро на эту карту в редакторе.
 map.invalid = Ошибка загрузки карты: повреждённый или недопустимый файл карты.
 editor.brush = Кисть
 editor.openin = Открыть в редакторе
 editor.oregen = Генерация руд
-editor.oregen.info = Генерация Руд:
-editor.mapinfo = Информация о карте
+editor.oregen.info = Генерация руд:
+editor.mapinfo = Параметры карты
 editor.author = Автор:
 editor.description = Описание:
 editor.waves = Волны:
@@ -195,26 +195,26 @@ 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Обратите внимание, что пустая волна будет автоматически заменена обычной волной.
-editor.default = [LIGHT_GRAY]<По умолчанию>
-edit = Редактировать...
+waves.none = Враги не были определены.\nОбратите внимание, что пустые волны будут автоматически заменены обычной волной.
+editor.default = [lightgray]<По умолчанию>
+edit = Редактировать…
 editor.name = Название:
 editor.spawn = Создать боевую единицу
 editor.removeunit = Удалить боевую единицу
 editor.teams = Команды
-editor.errorload = Ошибка загрузки изображения: [accent] {0}
-editor.errorsave = Ошибка сохранения изображения: [accent] {0}
+editor.errorload = Ошибка загрузки файла:\n[accent]{0}
+editor.errorsave = Ошибка сохранения файла:\n[accent]{0}
 editor.errorimage = Это изображение, а не карта. Не нужно менять расширение, ожидая, что это сработает.\n\nЕсли Вы хотите импортировать устаревшую карту, то используйте кнопку «Импортировать устаревшее изображение» в редакторе.
 editor.errorlegacy = Эта карта слишком старая и использует устаревший формат карты, который больше не поддерживается.
 editor.errorheader = Этот файл карты недействителен или повреждён.
@@ -227,24 +227,24 @@ editor.resize = Изменить\nразмер
 editor.loadmap = Загрузить\nкарту
 editor.savemap = Сохранить\nкарту
 editor.saved = Сохранено!
-editor.save.noname = У Вашей карты нет имени! Назовите её в «Информация о карте».
+editor.save.noname = У Вашей карты нет имени! Назовите её в меню «Информация о карте».
 editor.save.overwrite = Ваша карта не может быть записана поверх встроенной карты! Введите другое название в меню «Информация о карте»
-editor.import.exists = [scarlet]Не удалось импортировать: []карта с данным именем уже существует '{0}'!
-editor.import = Импорт...
+editor.import.exists = [scarlet]Не удалось импортировать:[] карта с именем «{0}» уже существует!
+editor.import = Импорт…
 editor.importmap = Импортировать карту
 editor.importmap.description = Импортировать уже существующую карту
 editor.importfile = Импортировать файл
-editor.importfile.description = Импортировать файл карты из вне
+editor.importfile.description = Импортировать файл карты извне
 editor.importimage = Импортировать устаревшее изображение
-editor.importimage.description = Импортировать файл с изображением ландшафта
-editor.export = Экспорт...
+editor.importimage.description = Импортировать изображение карты извне
+editor.export = Экспорт…
 editor.exportfile = Экспортировать файл
 editor.exportfile.description = Экспорт файла карты
 editor.exportimage = Экспортировать изображение ландшафта
 editor.exportimage.description = Экспортировать файл с изображением карты
-editor.loadimage = Загрузить\nизображение
-editor.saveimage = Сохранить\nизображение
-editor.unsaved = [scarlet]У вас есть несохранённые изменения![]\nВы уверены, что хотите выйти?
+editor.loadimage = Импортировать\nизображение
+editor.saveimage = Экспортировать\nизображение
+editor.unsaved = [scarlet]У вас есть несохранённые изменения![]\nВы уверены, что хотите Выйти?
 editor.resizemap = Изменить размер карты
 editor.mapname = Название карты:
 editor.overwrite = [accent]Внимание! \nЭто перезапишет уже существующую карту.
@@ -256,15 +256,15 @@ toolmode.replaceall = Заменить всё
 toolmode.replaceall.description = Заменяет все блоки на карте.
 toolmode.orthogonal = Ортогональная
 toolmode.orthogonal.description = Рисует только ортогональные линии.
-toolmode.square = Прямоугольник
-toolmode.square.description = Прямоугольная кисть.
+toolmode.square = Квадрат
+toolmode.square.description = Квадратная кисть.
 toolmode.eraseores = Стереть руды
 toolmode.eraseores.description = Стереть только руды.
 toolmode.fillteams = Изменить команду блоков
-toolmode.fillteams.description = Изменяет блоки команды.
+toolmode.fillteams.description = Изменяет принадлежность блоков к команде.
 toolmode.drawteams = Изменить команду блока
-toolmode.drawteams.description = Изменяет блок команды.
-filters.empty = [LIGHT_GRAY]Нет фильтров. Добавьте один при помощи кнопки ниже.
+toolmode.drawteams.description = Изменяет принадлежность блока к команде.
+filters.empty = [lightgray]Нет фильтров! Добавьте один при помощи кнопки ниже.
 filter.distort = Искажение
 filter.noise = Шум
 filter.median = Медиана
@@ -273,18 +273,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.threshold = Спад
-filter.option.circle-scale = Круговая шкала
-filter.option.octaves = Октавы
-filter.option.falloff = Спад
+filter.option.mag = Сила применения
+filter.option.threshold = Предельный порог
+filter.option.circle-scale = Масштаб круга
+filter.option.octaves = Цикличность применения
+filter.option.falloff = Спад цикличности
 filter.option.angle = Угол
 filter.option.block = Блок
 filter.option.floor = Поверхность
@@ -292,7 +292,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 = Ширина:
@@ -304,38 +304,38 @@ load = Загрузить
 save = Сохранить
 fps = FPS: {0}
 tps = TPS: {0}
-ping = Пинг: {0} мс
+ping = Пинг: {0}мс
 language.restart = Перезагрузите игру, чтобы языковые настройки вступили в силу.
 settings = Настройки
 tutorial = Обучение
-tutorial.retake = Открыть обучение
+tutorial.retake = Перепройти обучение
 editor = Редактор
 mapeditor = Редактор карт
 donate = Пожертво\nвать
 abandon = Покинуть
-abandon.text = Эта зона и все ресурсы будут потеряны.
+abandon.text = Эта зона и все её ресурсы будут отданы противнику.
 locked = Заблокировано
-complete = [LIGHT_GRAY]Достигнута:
+complete = [lightgray]Достигнута:
 zone.requirement = Волна {0} в зоне {1}
-resume = Возобновить зону:\n[LIGHT_GRAY]{0}
-bestwave = [LIGHT_GRAY]Наилучшая волна: {0}
+resume = Возобновить зону:\n[lightgray]{0}
+bestwave = [lightgray]Наилучшая волна: {0}
 launch = < ЗАПУСК >
 launch.title = Запуск успешен
 launch.next = [LIGHT_GRAY]Cледующая возможность на {0}-той волне
 launch.unable2 = [scarlet]ЗАПУСК невозможен.[]
 launch.confirm = Это удалит все ресурсы в Вашем ядре.\nВы не сможете вернуться на эту базу.
-launch.skip.confirm = Если вы пропустите сейчас, вы не сможете запустить до более поздних волн.
+launch.skip.confirm = Если Вы пропустите сейчас, Вы не сможете запустить до более поздних волн.
 uncover = Раскрыть
 configure = Выгрузить конфигурацию
-configure.locked = [LIGHT_GRAY]Возможность разблокировки выгрузки ресурсов будет доступна на {0}-ой волне.
+configure.locked = [LIGHT_GRAY]Возможность разблокировки Выгрузки ресурсов будет доступна на {0}-ой волне.
 zone.unlocked = Зона «[LIGHT_GRAY]{0}» теперь разблокирована.
-zone.requirement.complete = Вы достигли {0}-ой волны,\nУсловия для зоны «{1}» выполнены.
-zone.config.complete = Вы достигли {0}-ой волны,\Возможность выгрузки ресурсов теперь разблокирована.
+zone.requirement.complete = Вы достигли {0}-ой волны,\nУсловия для зоны «{1}» Выполнены.
+zone.config.complete = Вы достигли {0}-ой волны,Возможность Выгрузки ресурсов теперь разблокирована.
 zone.resources = Обнаруженные ресурсы:
 zone.objective = [lightgray]Цель: [accent]{0}
 zone.objective.survival = Выжить
 zone.objective.attack = Уничтожить вражеское ядро
-add = Добавить...
+add = Добавить…
 boss.health = Здоровье босса
 connectfail = [crimson]Ошибка подключения: [accent] {0}
 error.unreachable = Сервер недоступен.
@@ -344,7 +344,7 @@ error.timedout = Время ожидания истекло!\nУбедитесь
 error.mismatch = Ошибка пакета:\nвозможное несоответствие версии клиента/сервера. \nУбедитесь, что у Вас и у создателя сервера установлена последняя версия Mindustry!
 error.alreadyconnected = Вы уже подключены.
 error.mapnotfound = Файл карты не найден!
-error.io = Сетевая ошибка ввода-вывода.
+error.io = Сетевая ошибка ввода-Вывода.
 error.any = Неизвестная сетевая ошибка.
 error.bloom = Не удалось инициализировать цветение.\nВозможно, ваше устройство не поддерживает это.
 zone.groundZero.name = Нулевая земля
@@ -360,18 +360,19 @@ zone.tarFields.name = Дёгтяные поля
 zone.saltFlats.name = Соляные равнины
 zone.impact0078.name = Импульс 0078
 zone.crags.name = Скалы
+zone.fungalPass.name = Грибной перевал
 zone.groundZero.description = Оптимальная локация для повторных игр. Низкая вражеская угроза. Мало ресурсов.\nПолучите как можно больше меди и свинца.\nДвигайтесь дальше.
 zone.frozenForest.description = Даже здесь, ближе к горам, споры распространились. Холодные температуры не могут сдерживать их вечно. \nОтважтесь создать энергию. Постройте генераторы внутреннего сгорания. Научитесь пользоваться регенератором.
 zone.desertWastes.description = Эти отходы огромны, непредсказуемы и перекрещены с заброшенными секторальными структурами.\nУголь присутствует в регионе. Сожгите его для энергии, или синтезируйте в графит.\n\n[lightgray]Это место посадки не может быть гарантировано.
 zone.saltFlats.description = На окраине пустыни лежат соляные равнины. В этом месте можно найти немного ресурсов.\n\nВраги построили здесь ресурсный комплекс. Искорените их ядро. Оставьте ничего стоящего.
 zone.craters.description = В этом кратере скопилась вода, пережиток старых войн. Восстановите область. Соберите песок. Выплавите метастекло. Закачивайте воду для охлаждения турелей и дрелей.
 zone.ruinousShores.description = Мимо отходов, это береговая линия. Когда-то здесь находился массив береговой обороны. Не так много осталось. Только самые основные оборонительные сооружения остались невредимыми, все остальное раздроблено на металлолом.\nПродолжайте экспансию наружу. Откройте для себя технологию.
-zone.stainedMountains.description = Дальше вглубь материка лежат горы, но не  заражённые спорами.\nИзвлеките изобилие титана в этой области. Узнайте, как его использовать.\n\nВражеское присутствие здесь больше. Не дайте им время, чтобы отправлять свои сильнейшие боевые единицы.
-zone.overgrowth.description = Эта область заросла и находится ближе к источнику спор.\nВраг создал здесь форпост. Постройте боевые единицы Кинжал. Уничтожьте его. Восстановите то, что было потеряно.
+zone.stainedMountains.description = Дальше вглубь материка лежат горы, но не  заражённые спорами.\nИзвлеките изобилие титана в этой области. Узнайте, как его использовать.\n\nВражеское присутствие здесь больше. Не дайте им время, чтобы отправлять свои сильнейшие боеВые единицы.
+zone.overgrowth.description = Эта область заросла и находится ближе к источнику спор.\nВраг создал здесь форпост. Постройте боеВые единицы Кинжал. Уничтожьте его. Восстановите то, что было потеряно.
 zone.tarFields.description = Окраина зоны нефтедобычи, между горами и пустыней. Один из немногих районов с доступными запасами смолы.\nХотя область заброшенна, у неё есть некоторые опасные вражеские силы поблизости. Не стоит их недооценивать.\n\n[lightgray]Исследуйте технологию переработки нефти, если это возможно.
-zone.desolateRift.description = Чрезвычайно опасная зона. Много ресурсов, но мало места. Эвакуироваться нужно как можно скорее. Не расслабляйтесь между вражескими атаками
+zone.desolateRift.description = ЧрезВычайно опасная зона. Много ресурсов, но мало места. Эвакуироваться нужно как можно скорее. Не расслабляйтесь между вражескими атаками
 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 = Язык
@@ -381,9 +382,9 @@ settings.controls = Управление
 settings.game = Игра
 settings.sound = Звук
 settings.graphics = Графика
-settings.cleardata = Очистить данные ...
+settings.cleardata = Очистить данные…
 settings.clear.confirm = Вы действительно хотите очистить свои данные?\nЭто нельзя отменить!
-settings.clearall.confirm = [scarlet]ОСТОРОЖНО![]\nЭто уничтожит все данные, включая сохранения, карты, разблокированное и настройки управления.\nПосле того как вы нажмете ОК, игра уничтожит все данные и автоматически закроется.
+settings.clearall.confirm = [scarlet]ОСТОРОЖНО![]\nЭто уничтожит все данные, включая сохранения, карты, разблокированное и настройки управления.\nПосле того как Вы нажмете ОК, игра уничтожит все данные и автоматически закроется.
 settings.clearunlocks = Очистить разблокированное
 settings.clearall = Очистить всё
 paused = Пауза
@@ -398,7 +399,7 @@ blocks.output = Выход
 blocks.booster = Ускоритель
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = Вместимость энергии
-blocks.powershot = Энергия/выстрел
+blocks.powershot = Энергия/Выстрел
 blocks.damage = Урон
 blocks.targetsair = Воздушные цели
 blocks.targetsground = Наземные цели
@@ -418,7 +419,6 @@ blocks.speedincrease = Увеличение скорости
 blocks.range = Радиус действия
 blocks.drilltier = Добывает
 blocks.drillspeed = Базовая скорость бурения
-blocks.drilltierreq = Требуется лучший бур
 blocks.boosteffect = Ускоряющий эффект
 blocks.maxunits = Максимальное количество активных единиц
 blocks.health = Здоровье
@@ -466,7 +466,7 @@ category.general = Основные
 category.power = Энергия
 category.liquids = Жидкости
 category.items = Предметы
-category.crafting = Ввод/вывод
+category.crafting = Ввод/Вывод
 category.shooting = Стрельба
 category.optional = Дополнительные улучшения
 setting.landscape.name = Только альбомный(горизонтальный) режим
@@ -504,12 +504,12 @@ setting.minimap.name = Показать миникарту
 setting.musicvol.name = Громкость музыки
 setting.ambientvol.name = Звуки окружающей среды
 setting.mutemusic.name = Заглушить музыку
-setting.sfxvol.name = Громкость звуковых эффектов
+setting.sfxvol.name = Громкость звукоВых эффектов
 setting.mutesound.name = Заглушить звук
-setting.crashreport.name = Отправлять анонимные отчёты о вылетах
+setting.crashreport.name = Отправлять анонимные отчёты о Вылетах
 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,8 +522,8 @@ command.retreat = Отступить
 command.patrol = Патрулирование
 keybind.gridMode.name = Выбрать блок
 keybind.gridModeShift.name = Выбрать категорию
-keybind.press = Нажмите клавишу...
-keybind.press.axis = Нажмите клавишу...
+keybind.press = Нажмите клавишу…
+keybind.press.axis = Нажмите клавишу…
 keybind.screenshot.name = Скриншот карты
 keybind.move_x.name = Движение по оси x
 keybind.move_y.name = Движение по оси y
@@ -553,7 +553,7 @@ mode.help.title = Описание режимов
 mode.survival.name = Выживание
 mode.survival.description = Обычный режим. В этом режиме надо самим добывать ресурсы и сами волны идут автоматически. \n[gray]Требуются точки появления врагов для игры.
 mode.sandbox.name = Песочница
-mode.sandbox.description = Бесконечные ресурсы и нет таймера для волн, но можно самим вызвать волну.
+mode.sandbox.description = Бесконечные ресурсы и нет таймера для волн, но можно самим Вызвать волну.
 mode.pvp.name = PvP
 mode.pvp.description = Боритесь против других игроков.\n[gray]Для игры требуется как минимум 2 ядра разного цвета на карте.
 mode.attack.name = Атака
@@ -564,7 +564,7 @@ rules.wavetimer = Интервал волн
 rules.waves = Волны
 rules.attack = Режим атаки
 rules.enemyCheat = Бескон. ресурсы (ИИ)
-rules.unitdrops = Ресурсы боевых единиц
+rules.unitdrops = Ресурсы боеВых единиц
 rules.unitbuildspeedmultiplier = Множитель скорости производства боев. ед.
 rules.unithealthmultiplier = Множитель здоровья боев. ед.
 rules.playerhealthmultiplier = Множитель здоровья игрока
@@ -576,7 +576,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 = Волны
@@ -587,7 +587,7 @@ rules.title.enemy = Враги
 rules.title.unit = Бой. ед.
 content.item.name = Предметы
 content.liquid.name = Жидкости
-content.unit.name = Боевые единицы
+content.unit.name = БоеВые единицы
 content.block.name = Блоки
 content.mech.name = Мехи
 item.copper.name = Медь
@@ -606,7 +606,7 @@ item.blast-compound.name = Взрывная смесь
 item.pyratite.name = Пиротит
 item.metaglass.name = Метастекло
 item.scrap.name = Металлолом
-iquid.water.name = Вода
+liquid.water.name = Вода
 liquid.slag.name = Шлак
 liquid.oil.name = Нефть
 liquid.cryofluid.name = Криогенная жидкость
@@ -646,25 +646,24 @@ mech.buildspeed = [LIGHT_GRAY]Скорость строительства: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Теплоёмкость: {0}
 liquid.viscosity = [LIGHT_GRAY]Вязкость: {0}
 liquid.temperature = [LIGHT_GRAY]Температура: {0}
-block.sand-boulder.name = Sand Boulder
-block.grass.name = Трава
 block.sand-boulder.name = Песочный валун
+block.grass.name = Трава
 block.salt.name = Соль
 block.saltrocks.name = Соляные Камни
 block.pebbles.name = Галька
 block.tendrils.name = Щупальца
 block.sandrocks.name = Песчаные Скалы
 block.spore-pine.name = Споровая сосна
-block.sporerocks.name = Споровые камни
+block.sporerocks.name = СпороВые камни
 block.rock.name = Камень
 block.snowrock.name = Снежный камень
 block.snow-pine.name = Снежные сосны
 block.shale.name = Сланец
-block.shale-boulder.name = Сланцевый валун
+block.shale-boulder.name = СланцеВый валун
 block.moss.name = Мох
 block.shrubs.name = Кусты
-block.spore-moss.name = Споровый Мох
-block.shalerocks.name = Сланцевые Породы
+block.spore-moss.name = СпороВый Мох
+block.shalerocks.name = СланцеВые Породы
 block.scrap-wall.name = Стена из металлолома
 block.scrap-wall-large.name = Великая стена из металлолома
 block.scrap-wall-huge.name = Огромная стена из металлолома
@@ -681,7 +680,7 @@ block.core-nucleus.name = Ядро «Атом»
 block.deepwater.name = Глубоководье
 block.water.name = Вода
 block.tainted-water.name = Загрязнённая вода
-block.darksand-tainted-water.name = Тёмный песок с загрязнённой вода
+block.darksand-tainted-water.name = Тёмный песок с загрязнённой водой
 block.tar.name = Дёготь
 block.stone.name = Камень
 block.sand.name = Песок
@@ -716,7 +715,7 @@ block.dark-panel-6.name = Тёмная панель 6
 block.dark-metal.name = Тёмный металл
 block.ignarock.name = Магматические горные породы
 block.hotrock.name = Горячий камень
-block.magmarock.name = Магмовый камень
+block.magmarock.name = МагмоВый камень
 block.cliffs.name = Скалы
 block.copper-wall.name = Медная стена
 block.copper-wall-large.name = Большая медная стена
@@ -734,14 +733,14 @@ block.scatter.name = Рассеиватель
 block.hail.name = Град
 block.lancer.name = Копейщик
 block.conveyor.name = Конвейер
-block.titanium-conveyor.name = Титановый конвейер
+block.titanium-conveyor.name = ТитаноВый конвейер
 block.junction.name = Перекрёсток
 block.router.name = Маршрутизатор
 block.distributor.name = Разветвитель
 block.sorter.name = Сортировщик
 block.overflow-gate.name = Избыточный затвор
-block.silicon-smelter.name = Кремниевый плавильный завод
-block.phase-weaver.name = Фазовый ткач
+block.silicon-smelter.name = КремниеВый плавильный завод
+block.phase-weaver.name = ФазоВый ткач
 block.pulverizer.name = Измельчитель
 block.cryofluidmixer.name = Мешалка криогенной жидкости
 block.melter.name = Плавильня
@@ -783,14 +782,14 @@ block.wave.name = Волна
 block.swarmer.name = Роевик
 block.salvo.name = Залп
 block.ripple.name = Рябь
-block.phase-conveyor.name = Фазовый конвейер
+block.phase-conveyor.name = ФазоВый конвейер
 block.bridge-conveyor.name = Мостовой конвейер
-block.plastanium-compressor.name = Пластиниевый компрессор
+block.plastanium-compressor.name = ПластиниеВый компрессор
 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.draug-factory.name = Завод дронов «Драугр»
 block.spirit-factory.name = Завод ремонтных дронов «Призрак»
 block.phantom-factory.name = Завод строительных дронов «Фантом»
@@ -803,13 +802,13 @@ block.fortress-factory.name = Завод мехов «Крепость»
 block.revenant-factory.name = Завод бомбардировщиков «Потусторонний убийца»
 block.repair-point.name = Ремонтный пункт
 block.pulse-conduit.name = Импульсный трубопровод
-block.phase-conduit.name = Фазовый трубопровод
+block.phase-conduit.name = ФазоВый трубопровод
 block.liquid-router.name = Жидкостный маршрутизатор
 block.liquid-tank.name = Жидкостный резервуар
 block.liquid-junction.name = Жидкостный перекрёсток
 block.bridge-conduit.name = Мостовой трубопровод
 block.rotary-pump.name = Роторный насос
-block.thorium-reactor.name = Ториевый реактор
+block.thorium-reactor.name = ТориеВый реактор
 block.mass-driver.name = Электромагнитная катапульта
 block.blast-drill.name = Воздушная буровая установка
 block.thermal-pump.name = Термальный насос
@@ -827,7 +826,7 @@ block.force-projector.name = Силовой проектор
 block.arc.name = Дуга
 block.rtg-generator.name = Радиоизотопный термоэлектрический генератор
 block.spectre.name = Призрак
-block.meltdown.name = Катастрофа
+block.meltdown.name = Плазмотрон
 block.container.name = Склад
 block.launch-pad.name = Стартовая площадка
 block.launch-pad-large.name = Большая стартовая площадка
@@ -856,47 +855,47 @@ unit.reaper.name = Жнец
 tutorial.next = [lightgray]<Нажмите для продолжения>
 tutorial.intro = Вы начали[scarlet] обучение по Mindustry.[]\nНачните с [accent]добычи меди[]. Нажмите на медную жилу возле вашего ядра, чтобы сделать это.\n\n[accent]{0}/{1} меди
 tutorial.drill = Ручная добыча не является эффективной.\n[accent]Буры []могут добывать автоматически.\nНажмите на вкладку с изображением сверла снизу справа.\nВыберите[accent] механический бур[]. Разместите его на медной жиле нажатием.\n[accent]Нажатие по правой кнопке[] прервёт строительство.
-tutorial.drill.mobile = Ручная добыча не является эффективной.\n[accent]Буры []могут добывать автоматически.\nНажмите на вкладку с изображением сверла снизу справа.\nВыберите[accent] механический бур[]. \nРазместите его на медной жиле нажатием, затемм нажмите [accent] белую галку[] ниже, чтобы подтвердить построение выделенного.\nНажмите [accent] кнопку X[], чтобы отменить размещение.
-tutorial.blockinfo = Каждый блок имеет разные характеричстики.\nЧтобы узнать информацию о блоке и о его характеристиках,[accent] нажмите на «?», когда он выбран в меню строительства.[]\n\n[accent]Сейчас, узнайте характеристики механического бура.[]
+tutorial.drill.mobile = Ручная добыча не является эффективной.\n[accent]Буры []могут добывать автоматически.\nНажмите на вкладку с изображением сверла снизу справа.\nВыберите[accent] механический бур[]. \nРазместите его на медной жиле нажатием, затемм нажмите [accent] белую галку[] ниже, чтобы подтвердить построение Выделенного.\nНажмите [accent] кнопку X[], чтобы отменить размещение.
+tutorial.blockinfo = Каждый блок имеет разные характеристики.\nЧтобы узнать информацию о блоке и о его характеристиках,[accent] нажмите на «?», когда он Выбран в меню строительства.[]\n\n[accent]Сейчас, узнайте характеристики механического бура.[]
 tutorial.conveyor = [accent]Конвейера[] используются для транспортировки ресуров в ядро.\nСделайте линию конвейеров от бура к ядру\n[accent]Удерживайте левую кнопку мыши, чтобы разместить конвейерную линию.[]\nУдерживайте[accent] CTRL[] при постройке линии блоков, чтобы сделать её диагональной\n\n[accent]{0}/{1} конвейеров размещённых в линию\n[accent]0/1 предмет доставлен.
 tutorial.conveyor.mobile = [accent]Конвейера[] используются для транспортировки ресурсов в ядро\nСделайте линию конвейеров от бура к ядру\n[accent]Сделайте линию, удерживая палец несколько секунд в том месте, в котором Вы хотите начать линию,[] и перетяните его в нужном направлении.\n\n[accent]{0}/{1} конвейеров размещённых в линию\n[accent]0/1 предмет доставлен.
 tutorial.turret = Защитные структуры нужно строить для отражения[lightgray] противников[].\nПостройте[accent] двойную турель[] возле своего ядра.
 tutorial.drillturret = Двойным турелям нужна [accent]медь []в качестве боеприпасов.\nРазместите бур рядом с турелью.\nПроведите конвейеры к турели, чтобы снабдить её боеприпасами.\n\n[accent]Боеприпасов доставлено: 0/1
-tutorial.pause = Во время битвы Вы можете[accent] приостановить игру.[]\nВы можете планировать строительство, когда игра стоит на паузе.\n\n[accent]Нажмите ПРОБЕЛ для приостановки игры.
-tutorial.pause.mobile = Во время битвы, Вы можете[accent] приостановить игру.[]\nВы можеть планировать строительство, когда игра стоит на паузе.\n\n[accent]Нажмите кнопку сверху слева, чтобы поставить игру на паузу.
+tutorial.pause = Во время битВы Вы можете[accent] приостановить игру.[]\nВы можете планировать строительство, когда игра стоит на паузе.\n\n[accent]Нажмите ПРОБЕЛ для приостановки игры.
+tutorial.pause.mobile = Во время битВы, Вы можете[accent] приостановить игру.[]\nВы можеть планировать строительство, когда игра стоит на паузе.\n\n[accent]Нажмите кнопку сверху слева, чтобы поставить игру на паузу.
 tutorial.unpause = Теперь нажмите пробел снова для снятия паузы.
 tutorial.unpause.mobile = Теперь нажмите снова туда для снятия паузы.
-tutorial.breaking = Часто блоки нужно разрушать\n[accent]Зажмите ПКМ[], чтобы разрушить блоки в выбранной зоне.[]\n\n[accent]Разрушьте все стены из металлолома слева от вашего ядра.
-tutorial.breaking.mobile = Часто блоки нужно разрушить.\n[accent]Выберите режим деконструкции[], после чего нажмите на нужный блок, чтобы его разрушить.\nРазрушьте блоки в выбранной зоне, зажав палец на несколько секунд[], и проводя его в нужном направлении.\nНажмите на галочку, чтобы подтвердить разрушение.\n\n[accent]Разрушьте все стены из металлолома слева от вашего ядра.
+tutorial.breaking = Часто блоки нужно разрушать\n[accent]Зажмите ПКМ[], чтобы разрушить блоки в Выбранной зоне.[]\n\n[accent]Разрушьте все стены из металлолома слева от вашего ядра.
+tutorial.breaking.mobile = Часто блоки нужно разрушить.\n[accent]Выберите режим деконструкции[], после чего нажмите на нужный блок, чтобы его разрушить.\nРазрушьте блоки в Выбранной зоне, зажав палец на несколько секунд[], и проводя его в нужном направлении.\nНажмите на галочку, чтобы подтвердить разрушение.\n\n[accent]Разрушьте все стены из металлолома слева от вашего ядра.
 tutorial.withdraw = В некоторых ситуациях, необходимо забрать предметы из блоков вручную.\nЧтобы сделать это, [accent]нажмите на блок[], когда в нём находятся предметы, затем [accent]нажмите на предмет[] в инвентаре.\nМожно забрать несколько предметов [accent]нажатием с зажимом[].\n\n[accent]Заберите немного меди из ядра[]
-tutorial.deposit = Сложить предметы в блоки можно протянув от своего корабля к нужному блоку.\n\n[accent]Перенесите медь обратно в ядро[]
-tutorial.waves = [lightgray]Противники[] приближаются.\n\nЗащитите ядро от двух волн.[accent] Нажмите левую кнопку мыши[], чтобы выстрелить.\nПостройте больше турелей и буров. Добудьте больше меди.
+tutorial.deposit = Положить предметы в блоки можно перетащив от своего корабля к нужному блоку.\n\n[accent]Перенесите медь обратно в ядро[]
+tutorial.waves = [lightgray]Противники[] приближаются.\n\nЗащитите ядро от двух волн.[accent] Нажмите левую кнопку мыши[], чтобы Выстрелить.\nПостройте больше турелей и буров. Добудьте больше меди.
 tutorial.waves.mobile = [lightgray]Противники[] приближаются.\n\nЗащитите ядро от двух волн. Ваш мех будет автоматически атаковать противника.\nПостройте больше турелей и буров. Добудьте больше меди.
-tutorial.launch = Когда Вы достигаете некоторых волн, Вы можете осуществить[accent] запуск ядра[], оставив базу и[accent] перенести ресурсы из ядра.[]\nЭти ресурсы могут быть использованы для изучения новых технологий.\n\n[accent]Нажмите кнопку запуска.
+tutorial.launch = Когда Вы достигаете некоторых волн, Вы можете осуществить[accent] запуск ядра[], оставив базу и[accent] перенести ресурсы из ядра.[]\nЭти ресурсы могут быть использованы для изучения ноВых технологий.\n\n[accent]Нажмите кнопку запуска.
 item.copper.description = Самый основной строительный материал. Широко используется во всех типах блоков.
-item.lead.description = Основной стартовый материал. Широко используется в электронике и блоках для транспортировки жидкостей.
+item.lead.description = Основной стартоВый материал. Широко используется в электронике и блоках для транспортировки жидкостей.
 item.metaglass.description = Сверхпрочный сплав стекла. Широко используется для распределения и хранения жидкости.
 item.graphite.description = Минерализованный углерод, используемый для боеприпасов и электроизоляции.
-item.sand.description = Обычный материал, который широко используется при выплавке, как при легировании, так и в качестве отходов.
+item.sand.description = Обычный материал, который широко используется при Выплавке, как при легировании, так и в качестве отходов.
 item.coal.description = Окаменелое растительное вещество, образовавшееся задолго до посева. Широко используется для производства топлива и ресурсов.
 item.titanium.description = Редкий сверхлёгкий металл, широко используемый для транспортировки жидкостей, буров и авиации.
 item.thorium.description = Плотный радиоактивный металл, используемый в качестве структурной опоры и ядерного топлива.
 item.scrap.description = Остатки старых сооружений и подразделений. Содержит небольшие количества многих различных металлов.
-item.silicon.description = Чрезвычайно полезный полупроводник. Применяется в солнечных панелях, сложной электронике и самонаводящихся боеприпасах.
+item.silicon.description = ЧрезВычайно полезный полупроводник. Применяется в солнечных панелях, сложной электронике и самонаводящихся боеприпасах.
 item.plastanium.description = Лёгкий, пластичный материал, используемый в современных авиационных и осколочных боеприпасах.
 item.phase-fabric.description = Практически невесомое вещество, используемое в передовой электронике и технологиях самовосстановления.
 item.surge-alloy.description = Современный сплав с уникальными электрическими свойствами.
 item.spore-pod.description = Стручок синтетических спор, синтезированных из атмосферных концентраций для промышленных целей. Используется для превращения в нефть, взрывчатые вещества и топливо.
 item.blast-compound.description = Нестабильный соединение, используемый в бомбах и взрывчатых веществах. Синтезируется из стручков спор и других летучих веществ. Использовать в качестве топлива не рекомендуется.
-item.pyratite.description = Чрезвычайно огнеопасное вещество, используемое в зажигательном оружии.
+item.pyratite.description = ЧрезВычайно огнеопасное вещество, используемое в зажигательном оружии.
 liquid.water.description = Самая полезная жидкость. Обычно используется для охлаждения машин и переработки отходов.
-liquid.slag.description = Всевозможно различные типы расплавленного металла, смешанные вместе. Может быть разделен на составляющие его минералы или распылён на вражеских боевые единицы в качестве оружия.
+liquid.slag.description = Всевозможно различные типы расплавленного металла, смешанные вместе. Может быть разделен на составляющие его минералы или распылён на вражеских боеВые единицы в качестве оружия.
 liquid.oil.description = Жидкость, используемая в производстве современных материалов. Может быть превращена в уголь в качестве топлива или распылён и подожжён как оружие.
-liquid.cryofluid.description = Инертная, неедкая жидкость, созданная из воды и титана. Обладает чрезвычайно высокой пропускной способностью. Широко используется в качестве охлаждающей жидкости.
+liquid.cryofluid.description = Инертная, неедкая жидкость, созданная из воды и титана. Обладает чрезВычайно Высокой пропускной способностью. Широко используется в качестве охлаждающей жидкости.
 mech.alpha-mech.description = Стандартный управляемый мех. Основан на «Кинжале», с улучшенной броней и строительными возможностями. Имеет больший урон, чем «Дротик».
-mech.delta-mech.description = Быстрый, легко бронированный мех, созданный для ударов «атакуй и беги». Наносит мало урона по строениям, но может очень быстро убить большие группы вражеских орудий с помощью дуговых молний.
+mech.delta-mech.description = Быстрый, легко бронированный мех, созданный для ударов «атакуй и беги». Наносит мало урона по строениям, но может очень быстро убить большие группы вражеских орудий с помощью дугоВых молний.
 mech.tau-mech.description = Мех поддержки. Ремонтирует союзные блоки просто стреляя в них. Может лечить союзников в радиусе его ремонтирующей способности.
-mech.omega-mech.description = Громоздкий и хорошо бронированный мех, созданный для передовых атак. Его броня может блокировать до 90% входящего урона.
+mech.omega-mech.description = Громоздкий и хорошо бронированный мех, созданный для передоВых атак. Его броня может блокировать до 90% входящего урона.
 mech.dart-ship.description = Стандартный управляемый корабль. Достаточно быстрый и легкий, но мало атакующий и обладает низкой скоростью добычи.
 mech.javelin-ship.description = Корабль для тактики «атакуй и беги». Сначала он медленный, но позже может разгоняться до огромных скоростей и летать над аванпостами противника, нанося большой урон молниями и ракетами.
 mech.trident-ship.description = Тяжёлый бомбардировщик, построенный для строительства и уничтожения вражеских укреплений. Достаточно хорошо бронированный.
@@ -904,12 +903,12 @@ mech.glaive-ship.description = Большой хорошо бронирован
 unit.draug.description = Примитивный добывающий дрон. Дёшево производить. Расходуемый. Автоматически добывает медь и свинец в непосредственной близости. Поставляет добытые ресурсы в ближайшее ядро.
 unit.spirit.description = Модифицированный «Драугр», предназначенный для ремонта вместо добычи ресурсов. Автоматически ремонтирует любые поврежденные блоки в области.
 unit.phantom.description = Продвинутый дрон. Следует за пользователями. Помогает в строительстве блоков.
-unit.dagger.description = Самый основной наземный мех. Дешёвый в производстве. Очень сильный при использовании толпами.
-unit.crawler.description = Наземный блок, состоящий из урезанной рамы с высоким взрывчатым веществом, прикрепленным сверху. Не особо прочный. Взрывается при контакте с врагами.
+unit.dagger.description = Самый основной наземный мех. ДешёВый в производстве. Очень сильный при использовании толпами.
+unit.crawler.description = Наземный блок, состоящий из урезанной рамы с Высоким взрывчатым веществом, прикрепленным сверху. Не особо прочный. Взрывается при контакте с врагами.
 unit.titan.description = Продвинутый, бронированный наземный юнит. Атакует как наземные, так и воздушные цели. Оборудован двумя миниатюрными огнеметами класса «Обжигатель».
 unit.fortress.description = Тяжёлый артиллерийский мех. Оснащен двумя модифицированными пушками типа «Град» для штурма дальних объектов и подразделений противника.
 unit.eruptor.description = Тяжёлый мех, предназначенный для разрушения строений. Выстреливает поток шлака по вражеским укреплениям, плавит их и поджигает летучие вещества.
-unit.wraith.description = Быстрый перехватчик. Целевые генераторы энергии.
+unit.wraith.description = Быстрый перехватчик. ЦелеВые генераторы энергии.
 unit.ghoul.description = Тяжёлый ковровой бомбардировщик. Проникает через вражеские структуры, нацеливаясь на критическую инфраструктуру.
 unit.revenant.description = Тяжёлый, парящий массив, который вооружён ракетами.
 block.graphite-press.description = Сжимает куски угля в чистые листы графита.
@@ -919,7 +918,7 @@ 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.pyratite-mixer.description = Смешивает уголь, свинец и песок в легковоспламеняющийся пиратит.
 block.melter.description = Расплавляет металлолом в шлак для дальнейшей обработки или использования в башнях «Волна».
@@ -929,47 +928,47 @@ block.pulverizer.description = Измельчает металлолом в ме
 block.coal-centrifuge.description = Нефть превращается в куски угля.
 block.incinerator.description = Выпаривает любой лишний предмет или жидкость, которую он получает.
 block.power-void.description = Аннулирует всю энергию, введенную в него. Только песочница.
-block.power-source.description = Бесконечно выводит энергию. Только песочница.
-block.item-source.description = Бесконечно выводит элементы. Только песочница.
+block.power-source.description = Бесконечно Выводит энергию. Только песочница.
+block.item-source.description = Бесконечно Выводит элементы. Только песочница.
 block.item-void.description = Уничтожает любые предметы. Только песочница.
-block.liquid-source.description = Бесконечно выводит жидкости. Только песочница.
-block.copper-wall.description = Дешёвый защитный блок.\nПолезно для защиты ядра и турелей в первые несколько волн.
-block.copper-wall-large.description = Дешёвый защитный блок.\nПолезно для защиты ядра и турелей в первые несколько волн.\nРазмещается на нескольких плиток.
+block.liquid-source.description = Бесконечно Выводит жидкости. Только песочница.
+block.copper-wall.description = ДешёВый защитный блок.\nПолезно для защиты ядра и турелей в перВые несколько волн.
+block.copper-wall-large.description = ДешёВый защитный блок.\nПолезно для защиты ядра и турелей в перВые несколько волн.\nРазмещается на нескольких плитках.
 block.titanium-wall.description = Умеренно сильный защитный блок.\nОбеспечивает умеренную защиту от врагов.
-block.titanium-wall-large.description = Умеренно сильный защитный блок.\nОбеспечивает умеренную защиту от врагов.\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-large.description = Стена, покрытая специальным фазовым отражающим составом. Отражает большинство пуль при ударе.\nРазмещается на нескольких плиток.
-block.surge-wall.description = Очень прочный защитный блок.\nНакапливает заряд при контакте с пулей, выпуская его случайным образом.
-block.surge-wall-large.description = Очень прочный защитный блок.\nНакапливает заряд при контакте с пулей, выпуская его случайным образом.\nРазмещается на нескольких плиток.
+block.thorium-wall-large.description = Сильный защитный блок.\nХорошая защита от врагов.\nРазмещается на нескольких плитках.
+block.phase-wall.description = Стена, покрытая специальным фазоВым отражающим составом. Отражает большинство пуль при ударе.
+block.phase-wall-large.description = Стена, покрытая специальным фазоВым отражающим составом. Отражает большинство пуль при ударе.\nРазмещается на нескольких плитках.
+block.surge-wall.description = Очень прочный защитный блок.\nНакапливает заряд при контакте с пулей, Выпуская его случайным образом.
+block.surge-wall-large.description = Очень прочный защитный блок.\nНакапливает заряд при контакте с пулей, Выпуская его случайным образом.\nРазмещается на нескольких плитках.
 block.door.description = Маленькая дверь. Можно открыть или закрыть, нажав.
-block.door-large.description = Большая дверь. Можно открыть и закрыть, коснувшись.\nОткрывает несколько плиток.
+block.door-large.description = Большая дверь. Можно открыть и закрыть, коснувшись.\nОткрывает несколько плитках.
 block.mender.description = Периодически ремонтирует блоки в непосредственной близости. Сохраняет средства защиты, восстановленные между волнами.\nОпционально использует кремний для увеличения дальности и эффективности.
 block.mend-projector.description = Обновлённая версия Регенератора. Ремонт блоков в непосредственной близости.\nОпционально использует фазовую ткань для увеличения дальности и эффективности.
 block.overdrive-projector.description = Увеличивает скорость близлежащих зданий.\nОпционально использует фазовую ткань для увеличения дальности и эффективности.
 block.force-projector.description = Создает вокруг себя шестиугольное силовое поле, защищая здания и подразделения внутри от повреждений.\nПерегревается, если слишком много повреждений нанесено. Опционально требуется охлаждающая жидкость для предотвращения перегрева. Фазовая ткань может быть использована для увеличения размера щита.
 block.shock-mine.description = Наносит урон врагам, наступающим на мину. Почти невидим для врага.
-block.conveyor.description = Базовый элемент транспортного блока. Перемещает предметы вперед и автоматически складывает их в блоки. Вращающийся.
+block.conveyor.description = БазоВый элемент транспортного блока. Перемещает предметы вперед и автоматически складывает их в блоки. Вращающийся.
 block.titanium-conveyor.description = Расширенный транспортный блок элемента. Перемещает предметы быстрее, чем стандартные конвейеры.
 block.junction.description = Действует как мост для двух пересекающихся конвейерных лент. Полезно в ситуациях, когда два разных конвейера перевозят разные материалы в разные места.
-block.bridge-transpor.description = Улучшенный транспортный блок элемента. Позволяет транспортировать предметы по 3 плиткам любой местности или здания.
-block.phase-conveyor.description = Улучшенный транспортный блок элемента. Использует энергию для телепортации предметов на подключенный фазовый конвейер по нескольким плиткам.
-block.sorter.description = Сортировка элементов. Если элемент соответствует выбору, он может пройти. В противном случае элемент выводится слева и справа.
-block.router.description = Принимает элементы в одном направлении и выводит их до 3 других направлений в равной степени. Полезно для разделения материалов из одного источника на несколько целей.\n\n[scarlet]Никогда не используйте рядом с заводами и т.п., так как маршрутизатор будет забит выходными предметами.[]
+block.bridge-conveyor.description = Улучшенный транспортный блок элемента. Позволяет транспортировать предметы по 3 плиткам любой местности или здания.
+block.phase-conveyor.description = Улучшенный транспортный блок элемента. Использует энергию для телепортации предметов на подключенный фазоВый конвейер по нескольким плиткам.
+block.sorter.description = Сортировка элементов. Если элемент соответствует Выбору, он может пройти. В противном случае элемент Выводится слева и справа.
+block.router.description = Принимает элементы в одном направлении и Выводит их до 3 других направлений в равной степени. Полезно для разделения материалов из одного источника на несколько целей.\n\n[scarlet]Никогда не используйте рядом с заводами и т.п., так как маршрутизатор будет забит Выходными предметами.[]
 block.distributor.description = Расширенный маршрутизатор. Разделение элементов до 7 других направлений в равной степени.
 block.overflow-gate.description = Комбинированный разделитель и маршрутизатор. Выводится только влево и вправо, если передний путь заблокирован.
 block.mass-driver.description = Конечный транспортный блок элемента. Собирает несколько предметов и затем стреляет в них другому массовому водителю на большом расстоянии. Требуется сила для работы.
-block.mechanical-pump.description = Дешёвый насос с низкой производительностью, но без энергопотребления.
+block.mechanical-pump.description = ДешёВый насос с низкой производительностью, но без энергопотребления.
 block.rotary-pump.description = Продвинутый насос. Насосы более жидкие, но требуют энергию.
 block.thermal-pump.description = Наилучший насос.
 block.conduit.description = Основной блок транспортировки жидкости. Перемещает жидкости вперед. Используется совместно с насосами и другими трубопроводами.
 block.pulse-conduit.description = Расширенный блок транспортировки жидкости. Транспортирует жидкости быстрее и хранит больше, чем стандартные трубопроводы.
-block.liquid-router.description = Принимает жидкости из одного направления и выводит их до 3 других направлений в равной степени. Можно также хранить определенное количество жидкости. Полезно для разделения жидкостей из одного источника на несколько целей.
+block.liquid-router.description = Принимает жидкости из одного направления и Выводит их до 3 других направлений в равной степени. Можно также хранить определенное количество жидкости. Полезно для разделения жидкостей из одного источника на несколько целей.
 block.liquid-tank.description = Хранит большое количество жидкости. Используется для создания буферов в ситуациях с непостоянной потребностью в материалах или в качестве защиты для охлаждения жизненно важных блоков.
 block.liquid-junction.description = Действует как мост для двух пересекающихся каналов. Полезно в ситуациях, когда два разных трубопровода переносят разные жидкости в разные места.
 block.bridge-conduit.description = Расширенный блок транспортировки жидкости. Позволяет транспортировать жидкости до 3 плиток любой местности или здания.
-block.phase-conduit.description = Расширенный блок транспортировки жидкости. Использует энергию для телепортации жидкостей в подключенный фазовый канал по нескольким плиткам.
+block.phase-conduit.description = Расширенный блок транспортировки жидкости. Использует энергию для телепортации жидкостей в подключенный фазоВый канал по нескольким плиткам.
 block.power-node.description = Передает питание на подключенные узлы. Узел будет получать питание или поставлять питание на любые соседние блоки.
 block.power-node-large.description = Усовершенствованный силовой узел с большей дальностью и большим количеством соединений.
 block.surge-tower.description = Очень дальний узел питания с меньшим количеством доступных соединений.
@@ -977,30 +976,30 @@ 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.rtg-generator.description = Простой, надежный генератор. Использует тепло распадающихся радиоактивных соединений для производства энергии с низкой скоростью.
 block.solar-panel.description = Обеспечивает небольшое количество энергии от солнца.
 block.solar-panel-large.description = Значительно более эффективный вариант стандартной солнечной панели.
 block.thorium-reactor.description = Генерирует значительное количество энергии из тория. Требует постоянного охлаждения. Сильно взорвётся при недостаточном количестве охлаждающей жидкости. Выходная энергия зависит от наполненности, при этом базовая энергия генерируется на полную мощность.
 block.impact-reactor.description = Усовершенствованный генератор, способный создавать огромное количество энергии с максимальной эффективностью. Требуется значительное количество энергии для запуска процесса.
-block.mechanical-drill.description = Дешёвый бур. При размещении на соответствующих плитках медленные предметы выводятся бесконечно. Способен добывать только медь, свинец и уголь.
+block.mechanical-drill.description = ДешёВый бур. При размещении на соответствующих плитках медленные предметы Выводятся бесконечно. Способен добывать только медь, свинец и уголь.
 block.pneumatic-drill.description = Улучшенный бур, способная добывать титан. Добывает в более быстром темпе, чем механический бур.
 block.laser-drill.description = Позволяет сверлить еще быстрее с помощью лазерной технологии, но требует энергии. Способен добывать торий.
 block.blast-drill.description = Конечный бур. Требует большого количества энергии.
 block.water-extractor.description = Выкачивает подземные воды. Используется в местах, где нет поверхностных вод.
-block.cultivator.description = Выращивает крошечные концентрации спор в атмосфере в готовые к употреблению споры.
+block.cultivator.description = Выращивает крошечные концентрации спор в атмосфере в готоВые к употреблению споры.
 block.oil-extractor.description = Использует большое количество энергии, песка и воды для бурения на нефть.
 block.core-shard.description = Первая итерация капсулы ядра. После уничтожения весь контакт с регионом теряется. Не позволяйте этому случиться.
 block.core-foundation.description = Вторая версия ядра. Лучше бронированное. Хранит больше ресурсов.
 block.core-nucleus.description = Третья и последняя итерация капсулы ядра. Очень хорошо бронированный. Хранит огромное количество ресурсов.
 block.vault.description = Хранит большое количество предметов каждого типа. Блок разгрузчика может быть использован для извлечения предметов из хранилища.
 block.container.description = Хранит небольшое количество предметов каждого типа. Блок разгрузчика может быть использован для извлечения элементов из контейнера.
-block.unloader.description = Выгружает предметы из контейнера, хранилища или ядра на конвейер или непосредственно в соседний блок. Тип элемента, который необходимо выгрузить, можно изменить, коснувшись.
+block.unloader.description = Выгружает предметы из контейнера, хранилища или ядра на конвейер или непосредственно в соседний блок. Тип элемента, который необходимо Выгрузить, можно изменить, коснувшись.
 block.launch-pad.description = Запускает партии предметов без необходимости запуска ядра.
 block.launch-pad-large.description = Улучшенная версия стартовой площадки. Хранит больше предметов. Запускается чаще.
 block.duo.description = Маленькая, дешёвая башня. Полезна против наземных юнитов.
-block.scatter.description = Важная противовоздушная башня. Распыляет комки свинца или металлолома вражеских подразделений.
+block.scatter.description = Важная противовоздушная башня. Распыляет комки свинца или металлолома на вражеские подразделения.
 block.scorch.description = Сжигает любых наземных врагов рядом с ним. Высокоэффективен на близком расстоянии.
 block.hail.description = Маленькая дальнобойная артиллерийская башня.
 block.wave.description = Башня среднего размера. Стреляет потоками жидкости по врагам. Автоматически тушит пожары при подаче воды.
@@ -1016,15 +1015,15 @@ block.meltdown.description = Массивная лазерная пушка. З
 block.draug-factory.description = Производит добывающих дронов.
 block.spirit-factory.description = Производит дронов, которые помогают в строительстве.
 block.phantom-factory.description = Производит улучшенных дронов, которые помогают в строительстве.
-block.wraith-factory.description = Производит быстрые и летающие боевые единицы.
-block.ghoul-factory.description = Производит тяжёлых ковровых бомбардировщиков.
-block.revenant-factory.description = Производит тяжёлые летающие боевые единицы.
-block.dagger-factory.description = Производит основных наземных боевых единиц.
-block.crawler-factory.description = Производит быстрых саморозрушающихся боевых единиц.
-block.titan-factory.description = Производит продвинутые бронированне боевые единицы.
-block.fortress-factory.description = Производит тяжёлые артиллерийские боевые единицы.
+block.wraith-factory.description = Производит быстрые и летающие боеВые единицы.
+block.ghoul-factory.description = Производит тяжёлых ковроВых бомбардировщиков.
+block.revenant-factory.description = Производит тяжёлые летающие боеВые единицы.
+block.dagger-factory.description = Производит основных наземных боеВых единиц.
+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.tau-mech-pad.description = Обеспечивает превращение в улучшенный мех поддержки.\nИспользуйте, нажав, стоя на нём.
 block.omega-mech-pad.description = Обеспечивает превращение в тяжелобронированный ракетный мех.\nИспользуйте, нажав, стоя на нём.

core/assets/bundles/bundle_se.properties

@@ -16,7 +16,6 @@ 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!
-
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
 stat.built = Buildings Built:[accent] {0}
@@ -24,10 +23,8 @@ 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}
@@ -40,11 +37,13 @@ database = Core Database
 savegame = Spara Spel
 loadgame = Importera Spel
 joingame = Join Game
+addplayers = Add/Remove Players
 customgame = Anpassat Spel
 newgame = Nytt Spel
 none = <ingen>
 minimap = Minikarta
 close = Stäng
+website = Website
 quit = Avsulta
 maps = Kartor
 continue = Fortsätt
@@ -73,6 +72,7 @@ server.kicked.nameEmpty = Ditt namn är ogiltigt.
 server.kicked.idInUse = You are already on this server! Connecting with two accounts is not permitted.
 server.kicked.customClient = This server does not support custom builds. Ladda ned en officiell verision.
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [lightgray]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[lightgray]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. Note that public networks sometimes do not allow server discovery.
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
 hostserver = Host Multiplayer Game
@@ -250,7 +250,6 @@ editor.mapname = Kartnamn:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
 editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
 editor.selectmap = Select a map to load:
-
 toolmode.replace = Byt ut
 toolmode.replace.description = Draws only on solid blocks.
 toolmode.replaceall = Byt ut alla
@@ -265,7 +264,6 @@ toolmode.fillteams = Fyll Lag
 toolmode.fillteams.description = Fill teams instead of blocks.
 toolmode.drawteams = Rita Lag
 toolmode.drawteams.description = Draw teams instead of blocks.
-
 filters.empty = [lightgray]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Brus
@@ -297,7 +295,6 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radie
 filter.option.percentile = Percentile
-
 width = Bredd:
 height = Höjd:
 menu = Meny
@@ -315,7 +312,6 @@ tutorial.retake = Ta Om Tutorial
 editor = Editor
 mapeditor = Map Editor
 donate = Donera
-
 abandon = Ge upp
 abandon.text = Zonen och alla dess resurser förloras till fienden.
 locked = Låst
@@ -341,7 +337,6 @@ zone.objective.survival = Survive
 zone.objective.attack = Destroy Enemy Core
 add = Lägg till...
 boss.health = Boss Health
-
 connectfail = [crimson]Connection error:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
 error.invalidaddress = Ogiltig adress.
@@ -352,7 +347,6 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Okänt nätverksfel.
 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 = Kratrar
@@ -367,7 +361,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 fridgid 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.
@@ -382,7 +375,6 @@ 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 = Språk
 settings.reset = Återställ till Standardvärden
 settings.rebind = Byt
@@ -435,7 +427,6 @@ blocks.inaccuracy = Inaccuracy
 blocks.shots = Skott
 blocks.reload = Shots/Second
 blocks.ammo = Ammunition
-
 bar.drilltierreq = Bättre Borr Krävs
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Effektivitet: {0}%
@@ -448,7 +439,6 @@ bar.heat = Hetta
 bar.power = Power
 bar.progress = Build Progress
 bar.spawned = Units: {0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] skada
 bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary
@@ -460,7 +450,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 = block
 unit.powersecond = power units/second
 unit.liquidsecond = liquid units/second
@@ -513,6 +502,7 @@ setting.lasers.name = Show Power Lasers
 setting.pixelate.name = Pixellera[lightgray] (disables animations)
 setting.minimap.name = Visa Minikarta
 setting.musicvol.name = Musikvolym
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Stäng Av Musik
 setting.sfxvol.name = Ljudeffektvolym
 setting.mutesound.name = Stäng Av Ljudeffekter
@@ -918,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets. Equipped with two miniature Scorch-class flamethrowers.
 unit.fortress.description = A heavy artillery mech. Equipped with two modified Hail-type cannons for long-range assault on enemy structures and units.
 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.chaos-array.description =
-unit.eradicator.description =
 unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
 unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critital infrastructure.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description =
-unit.reaper.description =
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with pure coal. Produces silicon.
@@ -1043,4 +1029,4 @@ block.tau-mech-pad.description = Provides transformation into an advanced suppor
 block.omega-mech-pad.description = Provides transformation into a heavily-armored missile mech.\nUse by tapping while standing on it.
 block.javelin-ship-pad.description = Provides transformation into a quick, lightly-armored interceptor.\nUse by tapping while standing on it.
 block.trident-ship-pad.description = Provides transformation into a heavy support bomber.\nUse by tapping while standing on it.
-block.glaive-ship-pad.description = Provides transformation into a large, well-armored gunship.\nUse by tapping while standing on it.
+block.glaive-ship-pad.description = Provides transformation into a large, well-armored gunship.\nUse by tapping while standing on it.

core/assets/bundles/bundle_tk.properties

@@ -43,6 +43,7 @@ newgame = New Game
 none = <none>
 minimap = Minimap
 close = Kapat
+website = Website
 quit = Cik
 maps = Haritalar
 continue = Devam et
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = ismin gecerli degil.
 server.kicked.idInUse = Zaten oyundasin! iki ayri hesapla oyuna katilamazsin!
 server.kicked.customClient = Bu oyun ayarlanmis vesiyonlara izin vermiyor. Orijinal bir versiyon dene!
 server.kicked.gameover = Game over!
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = [accent]host[] su linkte bir oyun acti! [scarlet]6567[]. \nSeninle [LIGHT_GRAY]ayni internete[] sahip olan kisiler oyunu gorebilir.\n\neger baska yerlerden kisilerind de gelmesini istiyorsan, [accent]oyun acmak[]zorunludur.\n\n[LIGHT_GRAY]Not: eger baglanmakta gucluk cekiliyorsa, antivirusunun internetine baglanmasini izin vermesini sagla.
 join.info = Buradan,[accent]Oyunun linkini[] kullanarak katilabilir, yada, [accent]internetinle[] baglanacak oyun bulabilirsin\ninternetli ve Linkli oyunlar desteklenir.\n\n[LIGHT_GRAY]Not: Otomatik bir oyun listesi goruntulenemez. Yapimcidan linkini iste.
 hostserver = Oyun ac
@@ -154,7 +156,10 @@ cancel = iptal
 openlink = Linki ac
 copylink = Linki kopyala
 back = Geri don
+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?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Yukleniyor...
 saving = [accent]Kaydediliyor...
 wave = [accent]Dalga {0}
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Ore
@@ -302,6 +308,7 @@ ping = Ping: {0}ms
 language.restart = Lutfen dil degisiminin etkin olmasi icin oyunu yeniden baslatin
 settings = ayarlar
 tutorial = Tutorial
+tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Harita yaraticisi
 donate = Bagis yap
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]Best: {0}
 launch = Launch
 launch.title = Launch Successful
 launch.next = [LIGHT_GRAY]next opportunity at wave {0}
-launch.unable = [scarlet]Unable to LAUNCH.[] Enemies.
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [LIGHT_GRAY]Reach wave {0}\nto configure loadout.
@@ -352,6 +360,7 @@ zone.tarFields.name = Tar Fields
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = Dil
@@ -417,6 +427,7 @@ blocks.inaccuracy = sekme
 blocks.shots = vuruslar
 blocks.reload = Yeniden doldurma
 blocks.ammo = Ammo
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}
@@ -491,6 +502,7 @@ setting.lasers.name = Guc lazerlerini goster
 setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
 setting.minimap.name = Haritayi goster
 setting.musicvol.name = Ses yuksekligi
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Sesi kapat
 setting.sfxvol.name = Ses seviyesi
 setting.mutesound.name = Sesi kapat
@@ -819,9 +831,10 @@ block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 team.blue.name = blue
-team.red.name = red
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = orange
-team.none.name = gray
+team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
 unit.spirit.name = Spirit Drone
@@ -839,27 +852,26 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
-tutorial.morecopper = More copper is required.\n\nEither mine it manually, or place more drills.
+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.turret = Defensive structures must be built to repel the[LIGHT_GRAY] enemy[].\nBuild a duo turret near your base.
 tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = The[LIGHT_GRAY] enemy[] approaches.\n\nDefend your core for 2 waves. Build more turrets.
-tutorial.lead = More ores are available. Explore and mine[accent] lead[].\n\nDrag from your unit to the core to transfer resources.
-tutorial.smelter = Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one.
-tutorial.densealloy = The smelter will now produce alloy.\nGet some.\nImprove the production if necessary.
-tutorial.siliconsmelter = The core will now create a[accent] spirit drone[] for mining and repairing blocks.\n\nFactories for other units can be created with [accent] silicon.\nMake a silicon smelter.
-tutorial.silicondrill = Silicon requires[accent] coal[] and[accent] sand[].\nStart by making drills.
-tutorial.generator = This technology requires power.\nCreate a[accent] combustion generator[] for it.
-tutorial.generatordrill = Combustion generators need fuel.\nFuel it with coal from a drill.
-tutorial.node = Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.
-tutorial.nodelink = Power can be transferred through contacting power blocks and generators, or by linked power nodes.\n\nLink power by tapping the node and selecting the generator and silicon smelter.
-tutorial.silicon = Silicon is being produced. Get some.\n\nImproving the production system is advised.
-tutorial.daggerfactory = Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs.
-tutorial.router = Factories need resources to function.\nCreate a router to split conveyor resources.
-tutorial.dagger = Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
-tutorial.battle = The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.
+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 = ise yayar bir materyal. Kazma makineleriyle yada tasimayla alinabilir.
 item.lead.description = Basit bir baslangic materyali. sivi tasimada kullanilabilir.
 item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = havaya sikabilen, gelismis bir unit
 unit.fortress.description = A heavy artillery ground unit.
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.ghoul.description = A heavy carpet bomber. Uses blast compound or pyratite as ammo.
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with highly pure coke in order to produce silicon.

core/assets/bundles/bundle_uk_UA.properties

@@ -33,7 +33,6 @@ level.mode = Режим гри:
 showagain = Не показувати знову до наступного сеансу
 coreattack = < Ядро знаходиться під атакою! >
 nearpoint = [[ [scarlet]ЗАЛИШТЕ ЦЮ ЗОНУ НЕГАЙНО[] ]\nАннігіляція неминуча.
-outofbounds = [ ПОЗА МЕЖАМИ ]\nСаморуйнування через{0}
 database = База даних ядра
 savegame = Зберегти гру
 loadgame = Завантажити гру
@@ -44,8 +43,8 @@ newgame = Нова гра
 none = <нічого>
 minimap = Міні-мапа
 close = Закрити
-quit = Вихід
 website = Веб-сайт
+quit = Вихід
 maps = Мапи
 continue = Продовжити
 maps.none = [LIGHT_GRAY]Мап не знайдено!
@@ -73,6 +72,7 @@ server.kicked.nameEmpty = Ваше ім’я має містити принай
 server.kicked.idInUse = Ви вже на цьому сервері! Підключення двох облікових записів не допускається.
 server.kicked.customClient = Цей сервер не підтримує користувальницькі збірки. Завантажте офіційну версію.
 server.kicked.gameover = Гра завершена!
+server.versions = Your version:[accent] {0}[]\nServer version:[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Підтримується локальна мережа(LAN) і широкосмугова мережа(WAN).\n\n[LIGHT_GRAY] Примітка. Тут немає автоматичного глобального списку серверів; якщо ви хочете підключитися до когось через IP, вам доведеться попросити створювача серверу дати свій ip.
 hostserver = Запустити багатокористувальницький сервер
@@ -360,13 +360,14 @@ zone.tarFields.name = Дьогтьові поля
 zone.saltFlats.name = Соляні рівнини
 zone.impact0078.name = Імпульс 0078
 zone.crags.name = Скелі
+zone.fungalPass.name = Грибний перевал
 zone.groundZero.description = Оптимальне місце для повторних ігор. Низька ворожа загроза. Мало ресурсів. \nЗбирайте якомога більше свинцю та міді. \nЙдіть далі.
-zone.frozenForest.description = Навіть тут, ближче до гір, спори поширилися. Холодна температура не може їх утримувати тут завжди.\n\Зважтесь створити енергію. Побудуйте генератори внутрішнього згорання. Навчіться користуватися регенераторами.
+zone.frozenForest.description = Навіть тут, ближче до гір, спори поширилися. Холодна температура не може їх утримувати тут завжди.\nЗважтесь створити енергію. Побудуйте генератори внутрішнього згорання. Навчіться користуватися регенераторами.
 zone.desertWastes.description = Ці відходи є величезними, непередбачуваними і перетинаються з занедбаними секторальними структурами.\nВугілля присутнє в регіоні. Спаліть його для енергії або синтезуйте у графіт.\n\n[lightgray]Це місце посадки не можна гарантувати.
 zone.saltFlats.description = На околиці пустелі лежать соляні рівнини. У цьому місці можна знайти небагато ресурсів.\n\nТут вороги спорудили комплекс сховищ ресурсів. Викорініть їх ядро. Не залишайте нічого цінного.
 zone.craters.description = У цьому кратері накопичилася вода, пережиток старих воєн. Відновіть місцевість. Зберіть пісок. Виплавіть метакскло. Накачайте воду, щоб охолодити турелі і бури.
 zone.ruinousShores.description = Минулі відходи - це берегова лінія. Колись у цьому місці розташувався береговий оборонний масив. Залишилося не так багато чого. Тільки найосновніші оборонні споруди залишилися непошкодженими, все інше зводиться до брухту.\nПродовжуйте експансію назовні. Повторно розкрийте технологію.
-zone.stainedMountains.description =Далі у вглиб материка лежать гори, ще не заражені спорами.\nВидобудьте надлишковий титан у цій місцевості. Дізнайтеся, як використовувати його.\n\nТут ворожа присутність більша. Не дайте їм часу відправити свої найсильніші одиниці.
+zone.stainedMountains.description = Далі у вглиб материка лежать гори, ще не заражені спорами.\nВидобудьте надлишковий титан у цій місцевості. Дізнайтеся, як використовувати його.\n\nТут ворожа присутність більша. Не дайте їм часу відправити свої найсильніші одиниці.
 zone.overgrowth.description = Ця територія заросла, ближче до джерела спор.\nВорог тут встановив форпост. Побудуйте бойові одиниці Кинджал. Знищте його. Поверніть те, що було втрачено.
 zone.tarFields.description = Окраїна зони видобутку нафти, між горами та пустелею. Один з небагатьох районів із корисними запасами смоли.\nНезважаючи на те, що покинута, ця територія має поблизу небезпечні сили противника. Не варто їх недооцінювати.\n\n[lightgray]Якщо можливо, дослідіть технологію переробки нафти.
 zone.desolateRift.description = Надзвичайно небезпечна зона. Багато ресурсів, але мало місця. Евакуюватися потрібно якомога швидше. Не розслабляйтеся між ворожими атаками.
@@ -418,7 +419,6 @@ blocks.speedincrease = Збільшення швидкості
 blocks.range = Радіус дії
 blocks.drilltier = Видобуває
 blocks.drillspeed = Базова швидкість буріння
-blocks.drilltierreq = Потребується кращий бур
 blocks.boosteffect = Прискорювальний ефект
 blocks.maxunits = Максимальна кількість активних одиниць
 blocks.health = Здоров’я
@@ -646,9 +646,8 @@ mech.buildspeed = [LIGHT_GRAY]Швидкість будування: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Теплоємність: {0}
 liquid.viscosity = [LIGHT_GRAY]В’язкість: {0}
 liquid.temperature = [LIGHT_GRAY]Температура: {0}
-block.sand-boulder.name = Sand Boulder
-block.grass.name = Трава
 block.sand-boulder.name = Пісочний валун
+block.grass.name = Трава
 block.salt.name = Сіль
 block.saltrocks.name = Сіляні камні
 block.pebbles.name = Галька
@@ -839,6 +838,7 @@ team.derelict.name = Залишена
 team.green.name = Зелена
 team.purple.name = Фіолетова
 unit.spirit.name = Ремонтувальний дрон «Привид»
+unit.draug.name = Draug Miner Drone
 unit.phantom.name = Будівельний дрон «Фантом»
 unit.dagger.name = Кинджал
 unit.crawler.name = Камікадзе
@@ -961,7 +961,7 @@ block.overflow-gate.description = Комбінований розгалужув
 block.mass-driver.description = Кінцевий елемент транспортного блоку. Збирає кілька предметів, а потім вистрілює їх до іншої електромагнитної катапульти на великій відстані. Для роботи потрібна енергія.
 block.mechanical-pump.description = Недорогий насос з повільним виходом, але без енергоспоживання.
 block.rotary-pump.description = Удосконалений насос. Насоси більше викачують, але потребують енергію.
-block.thermal-pump.description = Кінцевий насос.
+block.thermal-pump.description = Найкращий насос.
 block.conduit.description = Основний блок транспортування рідини. Пересуває рідини вперед. Застосовується спільно з насосами та іншими трубопроводами.
 block.pulse-conduit.description = Вдосконалений блок транспортування рідини. Транспортує рідини швидше і зберігає більше, ніж стандартні трубопроводи.
 block.liquid-router.description = Приймає рідини з одного напрямку та виводить їх до трьох інших напрямків порівну. Також можна зберігати певну кількість рідини. Корисно для розщеплення рідин від одного джерела до кількох мішеней.
@@ -971,7 +971,7 @@ block.bridge-conduit.description = Розширений блок транспо
 block.phase-conduit.description = Розширений блок транспортування рідини. Використовує енергію для транспортування рідин до підключеного фазового каналу через декілька плиток.
 block.power-node.description = Передає живлення на підключені вузли. Вузол буде отримувати живлення від будь-яких сусідніх блоків або подавати живлення до них.
 block.power-node-large.description = Удосконалений вузол живлення з більшим діапазоном і більшою кількістю підключень.
-block.surge-tower.description =Надзвичайно дальний вузол живлення з меншою кількістю доступних з’єднань.
+block.surge-tower.description = Надзвичайно дальний вузол живлення з меншою кількістю доступних з’єднань.
 block.battery.description = Зберігає енергію як буфер в часи надлишкової енергії. Виводить енергію у періоди дефіциту.
 block.battery-large.description = Зберігає набагато більше енергії, ніж звичайний акумулятор.
 block.combustion-generator.description = Виробляє енергію, спалюючи легкозаймисті матеріали, такі як вугілля.
@@ -995,7 +995,7 @@ block.core-foundation.description = Друга версія ядра. Краще
 block.core-nucleus.description = Третя і остання ітерація капсули ядра. Надзвичайно добре броньований. Зберігає величезні обсяги ресурсів.
 block.vault.description = Зберігає велику кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів із сховища.
 block.container.description = Зберігає велику кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів із сховища.
-block.unloader.description =Вивантажує предмети з контейнера, склепіння або серцевини на конвеєр або безпосередньо в сусідній блок. Тип предмета для завантаження можна змінити, натиснувши на блок.
+block.unloader.description = Вивантажує предмети з контейнера, склепіння або серцевини на конвеєр або безпосередньо в сусідній блок. Тип предмета для завантаження можна змінити, натиснувши на блок.
 block.launch-pad.description = Запускає партії предметів без необхідності запуску ядра.
 block.launch-pad-large.description = Покращена версія стартового майданчика. Зберігає більше предметів. Запускається частіше.
 block.duo.description = Невелика дешева башта. Корисна проти наземних одиниць.

core/assets/bundles/bundle_zh_CN.properties

@@ -16,7 +16,6 @@ screenshot.invalid = 地图太大，可能没有足够的内存用于截图。
 gameover = 你的核心被摧毁了！
 gameover.pvp = [accent] {0}[] 队获胜!
 highscore = [accent]新纪录！
-
 stat.wave = 战胜的波数：[accent]{0}
 stat.enemiesDestroyed = 消灭的敌人：[accent]{0}
 stat.built = 建造的建筑：[accent]{0}
@@ -24,10 +23,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}[]" 地图吗？
 level.highscore = 最高分：[accent]{0}
@@ -46,6 +43,7 @@ newgame = 新游戏
 none = <无>
 minimap = 小地图
 close = 关闭
+website = Website
 quit = 退出
 maps = 地图
 continue = 继续
@@ -74,6 +72,7 @@ server.kicked.nameEmpty = 无效的名字！
 server.kicked.idInUse = 你已在这个服务器上！不允许用两个账号连接。
 server.kicked.customClient = 这个服务器不支持定制版本。下载官方版本。
 server.kicked.gameover = 游戏结束！
+server.versions = Your version:[accent] {0}[]\nServer version:[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 = 创建服务器
@@ -157,7 +156,10 @@ cancel = 取消
 openlink = 打开链接
 copylink = 复制链接
 back = 返回
+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 = 确定退出？
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]加载中……
 saving = [accent]保存中……
 wave = [accent]波次 {0}
@@ -172,7 +174,7 @@ saveimage = 保存图片
 unknown = 未知
 custom = 自定义
 builtin = 内建的
-map.delete.confirm = 你确定你想要删除这张地图吗？这个操作无法取消！
+map.delete.confirm = 你确定你想要删除这张地图吗？这个操作无法撤销！
 map.random = [accent]随机地图
 map.nospawn = 这个地图没有核心！请在编辑器中添加一个[ROYAL]蓝色[]的核心。
 map.nospawn.pvp = 这个地图没有敌人的核心！请在编辑器中添加一个[ROYAL]红色[]的核心。
@@ -248,7 +250,6 @@ editor.mapname = 地图名称：
 editor.overwrite = [accent]警告！\n这将会覆盖一个已经存在的地图。
 editor.overwrite.confirm = [scarlet]警告！[]存在同名地图。你确定你想要覆盖？
 editor.selectmap = 选择一个地图加载：
-
 toolmode.replace = 替换
 toolmode.replace.description = 仅在实心块上绘制。
 toolmode.replaceall = 全部替换
@@ -263,11 +264,11 @@ toolmode.fillteams = 填充团队
 toolmode.fillteams.description = 填充团队而不是方块。
 toolmode.drawteams = 绘制团队
 toolmode.drawteams.description = 绘制团队而不是方块。
-
 filters.empty = [LIGHT_GRAY]没有筛选器！用下方的按钮添加一个。
 filter.distort = Distort
 filter.noise = Noise
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = Ore
@@ -294,13 +295,12 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
-
 width = 宽度：
 height = 高度：
 menu = 菜单
 play = 开始游戏
-load = 载入游戏
 campaign = 战役模式
+load = 载入游戏
 save = 保存
 fps = FPS：{0}
 tps = TPS：{0}
@@ -308,10 +308,10 @@ ping = 延迟：{0}毫秒
 language.restart = 为了使语言设置生效请重启游戏。
 settings = 设置
 tutorial = 教程
+tutorial.retake = Re-Take Tutorial
 editor = 编辑器
 mapeditor = 地图编辑器
 donate = 打赏
-
 abandon = 放弃
 abandon.text = 这个区域和它的所有资源会被敌人重置。
 locked = 已被锁定
@@ -322,8 +322,9 @@ bestwave = [LIGHT_GRAY]最高波次：{0}
 launch = < 发射 >
 launch.title = 发射成功
 launch.next = [LIGHT_GRAY]下一个发射机会在第 {0} 波
-launch.unable = [scarlet]发射失败。[]敌人未被全部消灭。
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = 您将发射核心中所有资源。\n此地图将被重置。
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = 解锁
 configure = 设定发射资源数量
 configure.locked = [LIGHT_GRAY]到达第 {0} 波\n才设定发射资源。
@@ -336,7 +337,6 @@ zone.objective.survival = 生存
 zone.objective.attack = 摧毁敌方核心
 add = 添加……
 boss.health = BOSS 生命值
-
 connectfail = [crimson]服务器连接失败：[accent]{0}
 error.unreachable = 服务器无法访问。
 error.invalidaddress = 地址无效。
@@ -347,21 +347,20 @@ error.mapnotfound = 找不到地图文件!
 error.io = 网络 I/O 错误。
 error.any = 未知网络错误。
 error.bloom = 未能初始化特效。\n您的设备可能不支持它。
-
 zone.groundZero.name = 零号地区
-zone.desertWastes.name = 沙漠废物
+zone.desertWastes.name = 荒芜沙漠
 zone.craters.name = 陨石带
 zone.frozenForest.name = 冰冻森林
-zone.ruinousShores.name = 毁灭海岸
+zone.ruinousShores.name = 遗迹海岸
 zone.stainedMountains.name = 绵延群山
 zone.desolateRift.name = 荒芜裂谷
-zone.nuclearComplex.name = 核裂变
+zone.nuclearComplex.name = 核裂阵
 zone.overgrowth.name = 增生区
 zone.tarFields.name = 石油田
 zone.saltFlats.name = 盐碱荒滩
 zone.impact0078.name = 0078号冲击
 zone.crags.name = 悬崖
-
+zone.fungalPass.name = Fungal Pass
 zone.groundZero.description = 重新开始的最佳位置。敌人威胁很小，资源少。\n尽可能收集多的铅和铜。\n行动。
 zone.frozenForest.description = 即使在这里，靠近山脉的地方，孢子也已经扩散。寒冷的温度不可能永远容纳它们。\n\n此行动须投入电力。建造燃烧发电机并学会使用修理者。
 zone.desertWastes.description = 这些废物是巨大的，不可预测的，并且与废弃的结构交错在一起。燃烧它以获取动力或合成石墨。\n\n[lightgray]无法保证此着陆位置。
@@ -373,9 +372,9 @@ zone.overgrowth.description = 这个地区生长过度，靠近孢子的来源
 zone.tarFields.description = 位于山脉和沙漠之间的产油区的郊区是少数几个有可用焦油储量的地区之一。\n尽管被废弃，但附近仍有一些危险的敌军。不要低估它们。\n\n[lightgray]如果可能，研究石油加工技术。
 zone.desolateRift.description = 非常危险的区域。资源丰富但空间小。破坏风险高。尽快离开，不要被敌人的攻击间隔太长所愚弄。
 zone.nuclearComplex.description = 以前生产和加工钍的设施已变成废墟。\n[浅灰色]研究钍及其多种用途。\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.impact0078.description = <在此处插入说明>
 zone.crags.description = <在此处插入说明>
-
 settings.language = 语言
 settings.reset = 恢复默认
 settings.rebind = 重新绑定
@@ -428,7 +427,7 @@ blocks.inaccuracy = 误差
 blocks.shots = 发射数
 blocks.reload = 重新装弹
 blocks.ammo = 子弹
-
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = 挖掘速度：{0}/s
 bar.efficiency = 效率：{0}%
 bar.powerbalance = 能量：{0}
@@ -440,7 +439,6 @@ bar.heat = 热量
 bar.power = 电力
 bar.progress = 制造进度
 bar.spawned = 单位数量：{0}/{1}
-
 bullet.damage = [stat]{0}[lightgray] 伤害
 bullet.splashdamage = [stat]{0}[lightgray] 范围伤害 ~[stat] {1}[lightgray] 格
 bullet.incendiary = [stat] 燃烧
@@ -452,7 +450,6 @@ bullet.freezing = [stat] 冰冻
 bullet.tarred = [stat] 减速
 bullet.multiplier = [stat]{0}[lightgray]x 子弹数量
 bullet.reload = [stat]{0}[lightgray]x 装弹
-
 unit.blocks = 方块
 unit.powersecond = 能量单位/秒
 unit.liquidsecond = 液体单位/秒
@@ -498,13 +495,14 @@ setting.sensitivity.name = 控制器灵敏度
 setting.saveinterval.name = 自动保存间隔
 setting.seconds = {0} 秒
 setting.fullscreen.name = 全屏
-setting.borderlesswindow.name = 全屏化[LIGHT_GRAY] (可能需要重启)
+setting.borderlesswindow.name = 无边框窗口[LIGHT_GRAY] (可能需要重启)
 setting.fps.name = 显示 FPS
-setting.vsync.name = 帧同步
+setting.vsync.name = 垂直同步
 setting.lasers.name = 显示能量射线
 setting.pixelate.name = 像素画面 [LIGHT_GRAY](可能会降低性能)
 setting.minimap.name = 显示小地图
 setting.musicvol.name = 音乐音量
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = 静音
 setting.sfxvol.name = 音效音量
 setting.mutesound.name = 静音
@@ -561,7 +559,6 @@ mode.pvp.description = 和本地玩家对战。
 mode.attack.name = 攻击
 mode.attack.description = 没有波数，但是有摧毁敌人基地的任务。
 mode.custom = 自定义模式
-
 rules.infiniteresources = 无限资源
 rules.wavetimer = 波次计时器
 rules.waves = 波次
@@ -588,7 +585,6 @@ rules.title.resourcesbuilding = 资源和建造
 rules.title.player = 玩家
 rules.title.enemy = 敌人
 rules.title.unit = 单位
-
 content.item.name = 物品
 content.liquid.name = 液体
 content.unit.name = 部队
@@ -650,7 +646,6 @@ mech.buildspeed = [LIGHT_GRAY]建造速度：{0}%
 liquid.heatcapacity = [LIGHT_GRAY]热容量：{0}
 liquid.viscosity = [LIGHT_GRAY]粘度：{0}
 liquid.temperature = [LIGHT_GRAY]温度：{0}
-
 block.sand-boulder.name = 沙砂巨石
 block.grass.name = 草地
 block.salt.name = 盐碱地
@@ -736,7 +731,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 = 连接点
@@ -825,7 +820,7 @@ block.surge-wall.name = 波动墙
 block.surge-wall-large.name = 大型波动墙
 block.cyclone.name = 气旋炮
 block.fuse.name = 融合炮
-block.shock-mine.name = 休克地雷
+block.shock-mine.name = 脉冲地雷
 block.overdrive-projector.name = 超速投影器
 block.force-projector.name = 力墙投影器
 block.arc.name = 电弧
@@ -836,13 +831,14 @@ block.container.name = 容器
 block.launch-pad.name = 发射台
 block.launch-pad-large.name = 大型发射台
 team.blue.name = 蓝
-team.red.name = 红
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = 橙
-team.none.name = 灰
+team.derelict.name = derelict
 team.green.name = 绿
 team.purple.name = 紫
-unit.draug.name = 德鲁格采矿机
 unit.spirit.name = 幽灵修理机
+unit.draug.name = 德鲁格采矿机
 unit.phantom.name = 鬼怪建造机
 unit.dagger.name = 尖刀
 unit.crawler.name = 爬行者
@@ -856,28 +852,26 @@ unit.chaos-array.name = 混沌者
 unit.eradicator.name = 根除者
 unit.lich.name = 尸鬼
 unit.reaper.name = 死神
-tutorial.begin = 你的任务是消灭[LIGHT_GRAY] 敌人 [].\n\n首先开始[accent] 采集铜矿 []。点击核心附近的铜矿开始。
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = 手动采矿效率低.\n[accent] 钻头 []可以自动采矿.\n放一个在铜矿上吧.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]传送带[] 可以把物资传送到核心.\n请造一个传送线，从钻头到核心.
-tutorial.morecopper = 需要更多的铜.\n\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.turret = 必须建造防御建筑来击退[LIGHT_GRAY] 敌人[].\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.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = [LIGHT_GRAY]敌人[] 来了.\n\n保护基地，防御2波攻击. 造更多的炮塔.
-tutorial.lead = 有更多的矿可用. 探索和采集[accent] 铅[].\n\n按住你的采矿单位拖放到核心来传送资源.
-tutorial.smelter = 铜和铅是弱金属.\n超级[accent] 致密合金[] 可以从冶炼厂生产.\n\n造一个吧.
-tutorial.densealloy = 冶炼厂将生产合金.\n生产一些.\n有必要可以改进一下生产.
-tutorial.siliconsmelter = 基地现在将制作一个[accent] 无人机[] 来采矿和维修方块.\n\n其他单位的工程可以用[accent] 硅 []来建造.\n造一个硅冶炼厂.
-tutorial.silicondrill = 硅需要[accent] 煤[] 和[accent] 沙[].\n开始制作钻头吧.
-tutorial.generator = 这项技术需要能源.\n造一个[accent] 燃烧发电机[] 来发电.
-tutorial.generatordrill = 燃烧发电机需要燃料.\n用钻头采集煤来供给燃料.
-tutorial.node = 能源需要传输.\n造一个[accent] 能量节点[] 靠近火力发电机来传输它的能源.
-tutorial.nodelink = 使耗能方块紧靠发电机或者用能源节点连接来传输电力.\n\n点击能源节点并选择发电机和硅冶炼厂来链接能源.
-tutorial.silicon = 正在生产硅. 多生产点.\n\n建议优化一下生产系统.
-tutorial.daggerfactory = 建造一个[accent] 尖刀机甲工厂.[]\n\n它可以用来生产机甲
-tutorial.router = 工厂需要资源来运作.\n造一个路由器来分发传送资源.
-tutorial.dagger = 链接能源节点到工厂.\n一旦需求满足, 将会制作一个机甲.\n\n根据需要制作更多的钻头，发电机，传送带.
-tutorial.battle = [LIGHT_GRAY] 敌人[] 的核心已经暴露。\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.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 = 一种有用的结构材料。在各种类型的方块中广泛使用。
 item.lead.description = 一种基本的起始材料。被广泛用于电子设备和液体运输方块。 
 item.metaglass.description = 一种超级强硬的复合玻璃。通常用来传送和收藏液体。
@@ -914,13 +908,9 @@ unit.crawler.description = 一种地面装置，由一个框架和绑在上面
 unit.titan.description = 一种先进的装甲地面部队。攻击地面和空中目标。配备两个微型灼烧级火焰喷射器。
 unit.fortress.description = 一种重型炮兵机甲。装备两门改进型冰雹炮，用于对敌军建筑物和部队进行远程攻击。
 unit.eruptor.description = 一种用来拆除建筑物的重型机甲。在敌人的防御工事上发射一股熔渣，将它们熔化并点燃挥发物。
-unit.chaos-array.description =
-unit.eradicator.description =
 unit.wraith.description = 一种快速、一击即退的拦截器机甲。目标是发电机。
 unit.ghoul.description = 一种地毯式轰炸机。通过敌人的结构进行攻击，并瞄准关键的基础设施。
 unit.revenant.description = 一种发射导弹的重型飞行机甲
-unit.lich.description =
-unit.reaper.description =
 block.graphite-press.description = 把大块的煤压缩成纯石墨片。
 block.multi-press.description = 石墨压缩机的升级版。利用水和电力快速高效地处理煤炭。
 block.silicon-smelter.description = 用高纯度的焦炭来加工沙子以生产硅。
@@ -928,20 +918,20 @@ block.kiln.description = 将铅和沙子熔炼成钢化玻璃，需要少量电
 block.plastanium-compressor.description = 用石油和钛生产塑钢。
 block.phase-weaver.description = 用放射性钍和大量沙子生产相织物。
 block.alloy-smelter.description = 用钛，铅，硅和铜生产浪涌合金。
-block.pulverizer.description = 将废料压碎成沙子。当缺少天然沙子时很有用。
-block.pyratite-mixer.description = 用煤，铅和沙子混合成高度易燃的硫。
-block.blast-mixer.description = 用油将硫转化为不易燃但更具爆炸性的爆炸化合物。
 block.cryofluidmixer.description = 水和钛结合到低温流体中，冷却效率更高。
+block.blast-mixer.description = 用油将硫转化为不易燃但更具爆炸性的爆炸化合物。
+block.pyratite-mixer.description = 用煤，铅和沙子混合成高度易燃的硫。
 block.melter.description = 将废料熔化成矿渣，以便进一步加工或用于炮塔子弹。
-block.incinerator.description = 用于除掉任何多余的物品或液体。
-block.spore-press.description = 压缩孢子荚得到石油。
 block.separator.description = 从矿渣中提取有用的矿物。
+block.spore-press.description = 压缩孢子荚得到石油。
+block.pulverizer.description = 将废料压碎成沙子。当缺少天然沙子时很有用。
 block.coal-centrifuge.description = 使石油凝固成煤块。
-block.item-source.description = 无限输出物品。仅限沙盒。
-block.liquid-source.description = 无限输出液体。仅限沙盒。
-block.item-void.description = 在不使用电源的情况下销毁任何进入它的物品。仅限沙盒。
-block.power-source.description = 无限输出功率。仅限沙盒。
+block.incinerator.description = 用于除掉任何多余的物品或液体。
 block.power-void.description = 消耗输入的所有功率。仅限沙盒。
+block.power-source.description = 无限输出功率。仅限沙盒。
+block.item-source.description = 无限输出物品。仅限沙盒。
+block.item-void.description = 在不使用电源的情况下销毁任何进入它的物品。仅限沙盒。
+block.liquid-source.description = 无限输出液体。仅限沙盒。
 block.copper-wall.description = 廉价的防守区块。\n用于保护前几波中的核心和炮塔。
 block.copper-wall-large.description = 廉价的防御块。\n用于保护前几个波浪中的核心和炮塔。\n跨越多个区块。
 block.titanium-wall.description = 中等强度的防御挡块。\n提供中等强度的防御以抵御敌人。
@@ -955,30 +945,30 @@ block.surge-wall-large.description = 强大的防御区块。\n有很小的机
 block.door.description = 一扇小门，可以通过点击打开和关闭。\n如果打开，敌人可以射击并穿过。
 block.door-large.description = 一扇大门，可以通过点击打开和关闭。\n如果打开，敌人可以射击并穿过。\n跨越多个区块。
 block.mender.description = 定期修理附近的方块，使防御系统在波与波之间得到修复。\n通常使用硅来提高范围和效率。
-block.mend-projector.description = 定期修复附近的建筑物。
+block.mend-projector.description = 修理者的升级。定期修复附近的建筑物。
 block.overdrive-projector.description = 提高附近建筑物的速度，如钻头和传送带。
 block.force-projector.description = 自身周围创建一个六边形力场，使建筑物和内部单位免受子弹的伤害。
 block.shock-mine.description = 伤害踩到它的敌人。敌人几乎看不到它。
 block.conveyor.description = 初级传送带。将物品向前移动并自动将它们放入炮塔或工厂中。可旋转方向。
 block.titanium-conveyor.description = 高级传送带。能比初级传送带更快地移动物品。
-block.router.description = 从一个方向接受物品，并将它们平均输出到最多3个其他方向。用于将材料从一个源分割为多个目标。
-block.distributor.description = 一个高级路由器，可以将物品分成最多7个方向。
+block.junction.description = 两条交叉传送带的桥梁。适用于两条不同传送带将不同材料运送到不同位置的情况。
 block.bridge-conveyor.description = 高级项目传输块。允许在跨越任何地形或建筑物上运输物品，最多跨越3个块。
 block.phase-conveyor.description = 高级传送带。使用电力将物品传送到距离几个块的相位传送带上。
 block.sorter.description = 对物品进行分类。如果物品与所选种类，则允许其通过。否则，物品将从左边和右边输出。
+block.router.description = 从一个方向接受物品，并将它们平均输出到最多3个其他方向。用于将材料从一个源分割为多个目标。
+block.distributor.description = 一个高级路由器，可以将物品分成最多7个方向。
 block.overflow-gate.description = 分离器和路由器的组合，如果前面被挡住，则向从左和右输出。
-block.junction.description = 两条交叉传送带的桥梁。适用于两条不同传送带将不同材料运送到不同位置的情况。
 block.mass-driver.description = 终极传送带。收集几件物品，然后将它们射向长距离外的另一个批量传送带。
+block.mechanical-pump.description = 一种输出速度慢但没有功耗的廉价泵。
+block.rotary-pump.description = 一种先进的泵，通过使用动力使速度加倍。
+block.thermal-pump.description = 终级水泵。
 block.conduit.description = 基本液体传输块。像输送机一样工作，但用于液体。最适用于提取器，泵或其他导管。
 block.pulse-conduit.description = 高级液体传输块。比标准导管更快地输送液体并储存更多液体。
-block.phase-conduit.description = 高级液体传输块。使用电力将液体传送到多个块上的连接相管道。
 block.liquid-router.description = 接受来自一个方向的液体并将它们平均输出到最多3个其他方向。也可以储存一定量的液体。用于将液体从一个源分成多个目标。
 block.liquid-tank.description = 存储大量液体。当存在对材料的非恒定需求或作为冷却重要块的安全措施时，将其用于创建缓冲区。
 block.liquid-junction.description = 作为两个交叉管道的桥梁。适用于两种不同导管将不同液体输送到不同位置的情况。
 block.bridge-conduit.description = 高级液体传输块。允许在任何地形或建筑物的最多3个块上运输液体。
-block.mechanical-pump.description = 一种输出速度慢但没有功耗的廉价泵。
-block.rotary-pump.description = 一种先进的泵，通过使用动力使速度加倍。
-block.thermal-pump.description = 终级水泵。
+block.phase-conduit.description = 高级液体传输块。使用电力将液体传送到多个块上的连接相管道。
 block.power-node.description = 连接节点传输电源。最多可连接四个电源，用电器或节点。节点将从任何相邻块接收电力或向其供电。
 block.power-node-large.description = 传输径大于电源节点，最多可连接六个电源，接收器或节点。
 block.surge-tower.description = 具有较少可用连接的远程电源节点。
@@ -987,11 +977,11 @@ block.battery-large.description = 比普通电池容量更大。
 block.combustion-generator.description = 通过燃烧油或易燃材料产生电力。
 block.thermal-generator.description = 当放置在热的地方时发电。
 block.turbine-generator.description = 比燃烧发电机更有效，但需要额外的水。
+block.differential-generator.description = 产生大量的能量。利用低温流体和燃烧的硫之间的温差。
 block.rtg-generator.description = 一种放射性同位素热电发电机，它不需要冷却，但功率低于钍反应堆。
 block.solar-panel.description = 标准太阳能面板，提供少量电力。
 block.solar-panel-large.description = 比标准太阳能电池板提供更好的电源，但构建起来要贵得多。
 block.thorium-reactor.description = 高放射性钍产生大量电力。需要持续冷却。如果供应的冷却剂量不足，会剧烈爆炸。
-block.differential-generator.description = 产生大量的能量。利用低温流体和燃烧的硫之间的温差。
 block.impact-reactor.description = 一种先进的发电机，能够以最高效率产生大量的电力。需要大量的电源输入才能启动进程。
 block.mechanical-drill.description = 便宜的钻头。放置在适当的块上时，无限期地以缓慢的速度输出物品。
 block.pneumatic-drill.description = 一种改进的钻头，它更快，能够利用气压处理更硬的材料。
@@ -1003,40 +993,40 @@ block.oil-extractor.description = 使用大量的电力从沙子中提取石油
 block.core-shard.description = 核心第一代。一旦被摧毁，与该地区的所有联系都将失去。不要让这种情况发生。
 block.core-foundation.description = 核心第二代。有更好的装甲。可以存储更多资源。
 block.core-nucleus.description = 核心第三代，也是最后一代。装甲非常好。存储大量资源。
-block.unloader.description = 物品从容器，仓库或核心卸载到传送带上或直接卸载到相邻的块中。可以通过点击卸载器来更改要卸载的项目类型。
-block.container.description = 存储少量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。 [LIGHT_GRAY]卸载器[]可用于从容器中获取物品。
 block.vault.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.duo.description = 小而便宜的炮塔。对地高效。
+block.scatter.description = 不可或缺的防空炮塔，向空中单位发射铅或废料。
+block.scorch.description = 小型炮塔，燃烧任何靠近它的地面敌人。近距离非常有效。
+block.hail.description = 小型，远程炮台。
+block.wave.description = 中型快速炮塔，射出液体泡泡。有液体输入时自动灭火。
+block.lancer.description = 中型对地炮塔。遇敌时会充能并发射强有力的的能量束。
 block.arc.description = 小型炮塔，发射电弧。
-block.hail.description = 小型炮兵炮台。
-block.lancer.description = 中型炮塔，发射带电的电子束。
-block.wave.description = 中型快速炮塔，射出液体泡泡。
-block.salvo.description = 中型炮塔，齐射射击。
-block.swarmer.description = 中型炮塔，发射爆炸导弹。
-block.ripple.description = 大型炮兵炮塔，可同时向多个目标开火。
-block.cyclone.description = 大型快速炮塔。
-block.fuse.description = 大型炮塔，发射强大的短程光束。
-block.spectre.description = 大型炮塔，一次射出两颗强大的子弹。
-block.meltdown.description = 发射强大的远程光束的大型炮塔。
-block.crawler-factory.description = 生产快速自毁单元。
+block.swarmer.description = 中型炮塔，对空对地，发射跟踪爆炸导弹。
+block.salvo.description = 双管炮的升级。中型，齐射射击。
+block.fuse.description = 大型炮塔，发射三道刺穿敌人的短程光束。
+block.ripple.description = 大型远程炮台，非常强力，向远处的敌人投射一簇弹药。
+block.cyclone.description = 大型快速炮塔，对空对地，向周围敌人发射爆炸弹。
+block.spectre.description = 超大型炮塔，对空对地，一次射出两颗强大的穿甲子弹。
+block.meltdown.description = 超大型激光炮塔，充能之后持续发射光束，需要冷却剂。
 block.draug-factory.description = 生产德鲁格釆矿机。
 block.spirit-factory.description = 生产幽灵修理机。
 block.phantom-factory.description = 生产鬼怪建造机。
 block.wraith-factory.description = 生产快速截击机。
 block.ghoul-factory.description = 生产重型地毯轰炸机。
+block.revenant-factory.description = 生产重型导弹部队。
 block.dagger-factory.description = 生产基本地面单位。
+block.crawler-factory.description = 生产快速自毁单元。
 block.titan-factory.description = 生产先进的装甲地面单位。
 block.fortress-factory.description = 生产重型地面火炮部队。
-block.revenant-factory.description = 生产重型导弹部队。
 block.repair-point.description = 连续治疗附近最近的受损单位。
 block.dart-mech-pad.description = 离开你当前的装置，换成一个基本攻击机甲。\n站在上面时双击切换。
-block.trident-ship-pad.description = 离开你当前的装置，换成一个装甲合理的重型轰炸机。\n站在上面时双击切换。
-block.javelin-ship-pad.description = 离开你当前的装置，换成一个强大而快速的截击机，用闪电武器。\n站在上面时双击切换。
-block.glaive-ship-pad.description = 离开现有的装置，换成装甲良好的大型武装直升机。\n站在上面时双击切换。
-block.tau-mech-pad.description = 离开你当前的装置并换成一个可以治愈友方建筑物和单位的支撑机械。\n站在上面时双击切换。
 block.delta-mech-pad.description = 离开你当前的装置并换成一个快速，轻装甲的机械装置，用于快速攻击。\n站在上面时双击切换。
-block.omega-mech-pad.description = 离开你当前的装置并换成一个笨重且装甲良好的机甲，用于前线攻击。\n站在上面时双击切换。
+block.tau-mech-pad.description = 离开你当前的装置并换成一个可以治愈友方建筑物和单位的支撑机械。\n站在上面时双击切换。
+block.omega-mech-pad.description = 离开你当前的装置并换成一个笨重且装甲良好的机甲，用于前线攻击。\n站在上面时双击切换。
+block.javelin-ship-pad.description = 离开你当前的装置，换成一个强大而快速的截击机，用闪电武器。\n站在上面时双击切换。
+block.trident-ship-pad.description = 离开你当前的装置，换成一个装甲合理的重型轰炸机。\n站在上面时双击切换。
+block.glaive-ship-pad.description = 离开现有的装置，换成装甲良好的大型武装直升机。\n站在上面时双击切换。

core/assets/bundles/bundle_zh_TW.properties

@@ -43,6 +43,7 @@ newgame = 新遊戲
 none = 〈沒有〉
 minimap = 小地圖
 close = 關閉
+website = Website
 quit = 退出
 maps = 地圖
 continue = 繼續
@@ -71,6 +72,7 @@ server.kicked.nameEmpty = 你的名稱必須至少包含一個字母或數字。
 server.kicked.idInUse = 你已經在伺服器中！不允許用兩個賬號。
 server.kicked.customClient = 這個伺服器不支持自訂客戶端，請下載官方版本。
 server.kicked.gameover = 遊戲結束！
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = 目前伺服器監聽於連接埠[scarlet]6567[]。\n所有跟您在同一個[LIGHT_GRAY]網路或區域網路[]環境的玩家應該能在他們的伺服器清單中找到您的伺服器。\n\n如果您希望網際網路上的玩家透過IP 位址連線到您的伺服器，您必須設定[accent]連接埠轉發[]。\n\n[LIGHT_GRAY]注意：如果區域網路內有玩家無法連線至您的伺服器，請務必確認您已於防火牆設定中開放Mindustry存取您的區域網路。
 join.info = 您可以在此輸入欲連線的[accent]伺服器的IP位址[]，或尋找[accent]區域網路[]內的伺服器。目前支援區域網路與網際網路連線。\n\n[LIGHT_GRAY]注意：這裡沒有網際網路伺服器清單，如果您想透過IP位址連線到某人的伺服器，您必須向他們詢問IP位址。
 hostserver = 建立伺服器
@@ -154,7 +156,10 @@ cancel = 取消
 openlink = 開啟連結
 copylink = 複製連結
 back = 返回
+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 = 您確定要退出嗎？
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]載入中……
 saving = [accent]儲存中……
 wave = [accent]第{0}波
@@ -263,6 +268,7 @@ filters.empty = [LIGHT_GRAY]沒有過濾器！使用下面的按鈕添加一個
 filter.distort = 歪曲
 filter.noise = 噪聲
 filter.median = Median
+filter.oremedian = Ore Median
 filter.blend = Blend
 filter.defaultores = Default Ores
 filter.ore = 礦石
@@ -302,6 +308,7 @@ ping = 延遲：{0}ms
 language.restart = 請重新啟動遊戲以使選取的語言生效。
 settings = 設定
 tutorial = 教學
+tutorial.retake = Re-Take Tutorial
 editor = 地圖編輯器
 mapeditor = 地圖編輯器
 donate = 贊助
@@ -315,8 +322,9 @@ bestwave = [LIGHT_GRAY]高分：{0}
 launch = 發射
 launch.title = 發射成功
 launch.next = [LIGHT_GRAY]下次的機會於波次{0}
-launch.unable = [scarlet]無法發射。[]有敵人。
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
 launch.confirm = 這將發射核心中的所有資源。\n你將無法返回這個基地。
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = 揭露
 configure = 配置裝載
 configure.locked = [LIGHT_GRAY]到達波次{0}\n以配置裝載。
@@ -352,6 +360,7 @@ zone.tarFields.name = 焦油田
 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 fridgid 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.
@@ -363,6 +372,7 @@ zone.overgrowth.description = This area is overgrown, closer to the source of th
 zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
 zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+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 = 語言
@@ -417,6 +427,7 @@ blocks.inaccuracy = 誤差
 blocks.shots = 射擊數
 blocks.reload = 重裝彈藥
 blocks.ammo = 彈藥
+bar.drilltierreq = Better Drill Required
 bar.drillspeed = 鑽頭速度：{0}/秒
 bar.efficiency = 效率：{0}%
 bar.powerbalance = 能量變化：{0}
@@ -491,6 +502,7 @@ setting.lasers.name = 顯示雷射光束
 setting.pixelate.name = 像素化[LIGHT_GRAY]（可能降低性能）
 setting.minimap.name = 顯示小地圖
 setting.musicvol.name = 音樂音量
+setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = 靜音
 setting.sfxvol.name = 音效音量
 setting.mutesound.name = 靜音
@@ -819,9 +831,10 @@ block.container.name = 容器
 block.launch-pad.name = 發射台
 block.launch-pad-large.name = 大型發射台
 team.blue.name = 藍
-team.red.name = 紅
+team.crux.name = red
+team.sharded.name = orange
 team.orange.name = 橙
-team.none.name = 灰
+team.derelict.name = derelict
 team.green.name = 綠
 team.purple.name = 紫
 unit.spirit.name = 輕型無人機
@@ -839,27 +852,26 @@ unit.chaos-array.name = 混沌陣
 unit.eradicator.name = 消除者
 unit.lich.name = 巫妖
 unit.reaper.name = 收割者
-tutorial.begin = 你的任務是毀滅[LIGHT_GRAY]敵人[]。\n\n首先[accent]挖掘銅礦[]。點擊核心附近的銅脈以開始。
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = 手動挖掘礦石是低效率的。\n[accent]鑽頭[]能夠自動挖掘礦石。\n在銅脈上放置一個鑽頭。
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
 tutorial.conveyor = [accent]輸送帶[]能夠將物品運輸到核心。\n製作一條從鑽頭開始到核心的輸送帶。
-tutorial.morecopper = 需要更多銅。\n\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.turret = 防禦建築是必須的以擊退[LIGHT_GRAY]敵人[]。\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.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
 tutorial.waves = [LIGHT_GRAY]敵人[]來臨。\n\n防衛核心2波。建造更多的砲塔以防衛。
-tutorial.lead = 有更多的礦石可用。探索和挖掘[accent]鉛[]。\n\n點擊您的單位拖動到核心以傳輸資源。
-tutorial.smelter = 銅和鉛是柔軟的金屬。\n優良的[accent]稠密合金[]可以在冶煉廠中生產。\n\n建造一個冶煉廠。
-tutorial.densealloy = 冶煉廠現在將生產稠密合金。\n請獲取更多的稠密合金。\n必要時改善生產系統。
-tutorial.siliconsmelter = 核心現在將製作一個[accent]輕型無人機[]以挖掘礦石和修理方塊。\n\n製作其他單位的工廠可以使用[accent]矽[]以建造。\n建造一個冶矽廠。
-tutorial.silicondrill = 矽需要[accent]煤[]和[accent]沙[]以製作。\n放置鑽頭以開始。
-tutorial.generator = 這項技術需要能量。\n建造一個[accent]燃燒發電機[]。
-tutorial.generatordrill = 燃燒發電機需要燃料。\n用鑽頭挖的煤為它加燃料。
-tutorial.node = 電源需要運輸。\n在燃燒發電機旁邊建造一個[accent]能量節點[]以傳遞其能量。
-tutorial.nodelink = 能量可透過接觸的能量方塊和發電機，或者通過連接的能量節點傳遞。\n\n點擊能量節點並選擇發電機和冶矽廠以連接能量。
-tutorial.silicon = 正在製作矽。請獲取更多的矽。\n\n建議改善生產系統。
-tutorial.daggerfactory = 建造一個[accent]匕首機甲工廠[]。\n\n這將製作攻擊機甲。
-tutorial.router = 工廠需要資源以運作。\n建造一個分配器以均分輸送帶的資源。
-tutorial.dagger = 連接能量節點至工廠。\n一旦要求滿足，將製作一個機甲。\n\n根據需要建造更多鑽頭、發電機和輸送帶。發電機和輸送帶。
-tutorial.battle = [LIGHT_GRAY]敵人[]透露了他們的核心。\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.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 = 一種有用的結構材料。在各種類型的方塊中廣泛使用。
 item.lead.description = 一種基本的起始材料。被廣泛用於電子設備和運輸液體方塊。
 item.metaglass.description = 一種超級強硬玻璃混合物。廣泛用於液體分配和存儲。
@@ -896,13 +908,9 @@ unit.crawler.description = A ground unit consisting of a stripped-down frame wit
 unit.titan.description = 一種高級的具有裝甲的地面單位。使用碳化物作為彈藥。攻擊地面單位和空中單位。
 unit.fortress.description = 一種具有重型大砲的地面單位。
 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.chaos-array.description = 
-unit.eradicator.description = 
 unit.wraith.description = 一種快速、打了就跑的攔截機。
 unit.ghoul.description = 一種重型的鋪蓋性的轟炸機。使用爆炸化合物或黃鐵礦作為彈藥。
 unit.revenant.description = A heavy, hovering missile array.
-unit.lich.description = 
-unit.reaper.description = 
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = 使用高純度焦炭還原沙子以生產矽。

core/assets/contributors

@@ -26,7 +26,7 @@ beito
 BeefEX
 Lorex
 laohuaji233
-CrazyBearTR
+Spico The Spirit Guy
 Zachary
 Fenr1r
 Jaiun Lee
@@ -71,3 +71,4 @@ Paul T
 Dominik
 Arkanic
 Potion
+Markus G

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

@@ -0,0 +1,177 @@
+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 class ClientLauncher extends ApplicationCore{
+    private static final int loadingFPS = 20;
+
+    private float smoothProgress;
+    private long lastTime;
+    private long beginTime;
+    private boolean finished = false;
+
+    @Override
+    public void setup(){
+        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.loadDefaultFont();
+        UI.loadSystemCursors();
+
+        //1. bundles
+        //2. rest of vars
+        assets.load(new Vars());
+        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();
+        }
+    }
+
+    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 GameLoadEvent());
-    }
-}

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

@@ -1,35 +1,36 @@
 package io.anuke.mindustry;
 
-import io.anuke.arc.Application.ApplicationType;
-import io.anuke.arc.Core;
-import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.util.Structs;
+import io.anuke.arc.Application.*;
+import io.anuke.arc.*;
+import io.anuke.arc.assets.*;
+import io.anuke.arc.files.*;
+import io.anuke.arc.graphics.*;
+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.effect.Fire;
-import io.anuke.mindustry.entities.effect.Puddle;
-import io.anuke.mindustry.entities.impl.EffectEntity;
-import io.anuke.mindustry.entities.traits.DrawTrait;
-import io.anuke.mindustry.entities.traits.SyncTrait;
+import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.effect.*;
+import io.anuke.mindustry.entities.impl.*;
+import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.Serialization;
+import io.anuke.mindustry.gen.*;
+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.util.Arrays;
-import java.util.Locale;
+import java.nio.charset.*;
+import java.util.*;
 
 @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";
@@ -116,10 +117,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 */
@@ -137,14 +142,20 @@ public class Vars{
     public static DefaultWaves defaultWaves;
     public static LoopControl loops;
 
+    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;
@@ -158,6 +169,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();
 
@@ -180,29 +197,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();
-        tileGroup = Entities.addGroup(TileEntity.class, false);
-        bulletGroup = Entities.addGroup(Bullet.class).enableMapping();
-        effectGroup = Entities.addGroup(EffectEntity.class, false);
-        groundEffectGroup = Entities.addGroup(DrawTrait.class, false);
-        puddleGroup = Entities.addGroup(Puddle.class).enableMapping();
-        shieldGroup = Entities.addGroup(ShieldEntity.class, false);
-        fireGroup = Entities.addGroup(Fire.class).enableMapping();
+        maps = new Maps();
+        spawner = new WaveSpawner();
+        indexer = new BlockIndexer();
+        pathfinder = new Pathfinder();
+
+        entities = new Entities();
+        playerGroup = entities.add(Player.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());
@@ -217,16 +237,64 @@ public class Vars{
         ios = Core.app.getType() == ApplicationType.iOS;
         android = Core.app.getType() == ApplicationType.Android;
 
+        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/");
+
+        maps.load();
+    }
+
+    public static void loadSettings(){
         Core.settings.setAppName(appName);
 
         if(steam){
             Core.settings.setDataDirectory(Core.files.local("saves/"));
         }
 
-        dataDirectory = Core.settings.getDataDirectory();
-        screenshotDirectory = dataDirectory.child("screenshots/");
-        customMapDirectory = dataDirectory.child("maps/");
-        saveDirectory = dataDirectory.child("saves/");
-        tmpDirectory = dataDirectory.child("tmp/");
+        Core.settings.defaults("locale", "default");
+        Core.keybinds.setDefaults(Binding.values());
+        Core.settings.load();
+
+        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

@@ -15,8 +15,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.world;
+import static io.anuke.mindustry.Vars.*;
 
 public class Pathfinder{
     private static final long maxUpdate = Time.millisToNanos(4);
@@ -116,7 +115,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

@@ -1,16 +1,14 @@
 package io.anuke.mindustry.content;
 
-import io.anuke.arc.Core;
-import io.anuke.arc.function.BooleanProvider;
-import io.anuke.arc.graphics.Color;
+import io.anuke.arc.*;
+import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Tmp;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.entities.Damage;
-import io.anuke.mindustry.entities.bullet.Bullet;
-import io.anuke.mindustry.entities.bullet.BulletType;
-import io.anuke.mindustry.game.ContentList;
+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.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
@@ -24,16 +22,13 @@ import io.anuke.mindustry.world.blocks.production.*;
 import io.anuke.mindustry.world.blocks.sandbox.*;
 import io.anuke.mindustry.world.blocks.storage.*;
 import io.anuke.mindustry.world.blocks.units.*;
-import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
-import io.anuke.mindustry.world.meta.Attribute;
-import io.anuke.mindustry.world.modules.LiquidModule;
+import io.anuke.mindustry.world.consumers.*;
+import io.anuke.mindustry.world.meta.*;
+import io.anuke.mindustry.world.modules.*;
 
-import static io.anuke.mindustry.Vars.state;
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 public class Blocks implements ContentList{
-    public static final BooleanProvider padVisible = () -> state.rules.attackMode || state.rules.pvp || state.isEditor();
-
     public static Block
 
     //environment
@@ -79,7 +74,7 @@ public class Blocks implements ContentList{
     duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown,
 
     //units
-    draugFactory, spiritFactory, phantomFactory, wraithFactory, ghoulFactory, revenantFactory, daggerFactory, crawlerFactory, titanFactory,
+    commandCenter, draugFactory, spiritFactory, phantomFactory, wraithFactory, ghoulFactory, revenantFactory, daggerFactory, crawlerFactory, titanFactory,
     fortressFactory, repairPoint,
 
     //upgrades
@@ -1648,17 +1643,23 @@ public class Blocks implements ContentList{
             consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 10));
         }};
 
-        wraithFactory = new UnitFactory("wraith-factory"){{
-            requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 30, Items.lead, 40, Items.silicon, 45));
-            type = UnitTypes.wraith;
-            produceTime = 750;
+        commandCenter = new CommandCenter("command-center"){{
+            requirements(Category.units, ItemStack.with(Items.copper, 200, Items.lead, 250, Items.silicon, 250, Items.graphite, 100));
             size = 2;
-            consumes.power(0.6f);
+            health = size * size * 55;
+        }};
+
+        wraithFactory = new UnitFactory("wraith-factory"){{
+            requirements(Category.units, ItemStack.with(Items.titanium, 30, Items.lead, 40, Items.silicon, 45));
+            type = UnitTypes.wraith;
+            produceTime = 700;
+            size = 2;
+            consumes.power(0.5f);
             consumes.items(new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 5));
         }};
 
         ghoulFactory = new UnitFactory("ghoul-factory"){{
-            requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 75, Items.lead, 65, Items.silicon, 110));
+            requirements(Category.units, ItemStack.with(Items.titanium, 75, Items.lead, 65, Items.silicon, 110));
             type = UnitTypes.ghoul;
             produceTime = 1150;
             size = 3;
@@ -1667,7 +1668,7 @@ public class Blocks implements ContentList{
         }};
 
         revenantFactory = new UnitFactory("revenant-factory"){{
-            requirements(Category.units, padVisible, ItemStack.with(Items.plastanium, 50, Items.titanium, 150, Items.lead, 150, Items.silicon, 200));
+            requirements(Category.units, ItemStack.with(Items.plastanium, 50, Items.titanium, 150, Items.lead, 150, Items.silicon, 200));
             type = UnitTypes.revenant;
             produceTime = 2000;
             size = 4;
@@ -1676,7 +1677,7 @@ public class Blocks implements ContentList{
         }};
 
         daggerFactory = new UnitFactory("dagger-factory"){{
-            requirements(Category.units, padVisible, ItemStack.with(Items.lead, 55, Items.silicon, 35));
+            requirements(Category.units, ItemStack.with(Items.lead, 55, Items.silicon, 35));
             type = UnitTypes.dagger;
             produceTime = 850;
             size = 2;
@@ -1685,17 +1686,17 @@ public class Blocks implements ContentList{
         }};
 
         crawlerFactory = new UnitFactory("crawler-factory"){{
-            requirements(Category.units, padVisible, ItemStack.with(Items.lead, 25, Items.silicon, 30));
+            requirements(Category.units, ItemStack.with(Items.lead, 45, Items.silicon, 30));
             type = UnitTypes.crawler;
-            produceTime = 250;
+            produceTime = 300;
             size = 2;
-            maxSpawn = 8;
-            consumes.power(0.4f);
-            consumes.items(new ItemStack(Items.coal, 5));
+            maxSpawn = 6;
+            consumes.power(0.5f);
+            consumes.items(new ItemStack(Items.coal, 10));
         }};
 
         titanFactory = new UnitFactory("titan-factory"){{
-            requirements(Category.units, padVisible, ItemStack.with(Items.graphite, 50, Items.lead, 50, Items.silicon, 45));
+            requirements(Category.units, ItemStack.with(Items.graphite, 50, Items.lead, 50, Items.silicon, 45));
             type = UnitTypes.titan;
             produceTime = 1050;
             size = 3;
@@ -1704,7 +1705,7 @@ public class Blocks implements ContentList{
         }};
 
         fortressFactory = new UnitFactory("fortress-factory"){{
-            requirements(Category.units, padVisible, ItemStack.with(Items.thorium, 40, Items.lead, 110, Items.silicon, 75));
+            requirements(Category.units, ItemStack.with(Items.thorium, 40, Items.lead, 110, Items.silicon, 75));
             type = UnitTypes.fortress;
             produceTime = 2000;
             size = 3;

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

@@ -32,7 +32,7 @@ public class Fx implements ContentList{
     bigShockwave, nuclearShockwave, explosion, blockExplosion, blockExplosionSmoke, shootSmall, shootHeal, shootSmallSmoke, shootBig, shootBig2, shootBigSmoke,
     shootBigSmoke2, shootSmallFlame, shootPyraFlame, shootLiquid, shellEjectSmall, shellEjectMedium,
     shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot,
-    unitSpawn, spawnShockwave, magmasmoke, impactShockwave, impactcloud, impactsmoke, dynamicExplosion, padlaunch;
+    unitSpawn, spawnShockwave, magmasmoke, impactShockwave, impactcloud, impactsmoke, dynamicExplosion, padlaunch, commandSend;
 
     @Override
     public void load(){
@@ -53,6 +53,13 @@ public class Fx implements ContentList{
             Draw.reset();
         });
 
+        commandSend = new Effect(28, e -> {
+            Draw.color(Pal.command);
+            Lines.stroke(e.fout() * 2f);
+            Lines.circle(e.x, e.y, 4f + e.finpow() * 120f);
+            Draw.color();
+        });
+
         placeBlock = new Effect(16, e -> {
             Draw.color(Pal.accent);
             Lines.stroke(3f - e.fin() * 2f);

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/content/TechTree.java

@@ -254,6 +254,7 @@ public class TechTree implements ContentList{
                         });
 
                         node(daggerFactory, () -> {
+                            node(commandCenter, () -> {});
                             node(crawlerFactory, () -> {
                                 node(titanFactory, () -> {
                                     node(fortressFactory, () -> {
@@ -296,7 +297,7 @@ public class TechTree implements ContentList{
     private TechNode node(Block block, Runnable children){
         ItemStack[] requirements = new ItemStack[block.buildRequirements.length];
         for(int i = 0; i < requirements.length; i++){
-            requirements[i] = new ItemStack(block.buildRequirements[i].item, 30 + block.buildRequirements[i].amount * 5);
+            requirements[i] = new ItemStack(block.buildRequirements[i].item, 30 + block.buildRequirements[i].amount * 6);
         }
 
         return new TechNode(block, requirements, children);

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.graphics.Color;
-import io.anuke.arc.graphics.Pixmap;
-import io.anuke.arc.util.Log;
+import io.anuke.arc.function.*;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.util.*;
 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.LegacyColorMapper;
+import io.anuke.mindustry.world.*;
 
 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){
-            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("-------------------");
-        }
-
         loaded = true;
     }
 
-    public void initialize(Consumer<Content> callable){
-        initialize(callable, false);
+    /** 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}", Array.with(ContentType.values()).mapInt(c -> contentMap[c.ordinal()].size).sum());
+        Log.info("-------------------");
+    }
+
+    /** Calls Content#init() on everything. Use only after all modules have been created.*/
+    public void init(){
+        initialize(Content::init);
+    }
+
+    /** Calls Content#load() on everything. Use only after all modules have been created on the client.*/
+    public void load(){
+        initialize(Content::load);
     }
 
     /** Initializes all content with the specified function. */
-    public void initialize(Consumer<Content> callable, boolean override){
-        if(initialization.contains(callable) && !override) return;
+    private void initialize(Consumer<Content> callable){
+        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,6 +1,7 @@
 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.*;
@@ -13,8 +14,8 @@ 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.*;
@@ -25,6 +26,8 @@ import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.storage.*;
 
 import java.io.*;
+import java.time.*;
+import java.time.format.*;
 
 import static io.anuke.arc.Core.*;
 import static io.anuke.mindustry.Vars.*;
@@ -35,10 +38,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 final Saves saves;
-    public final MusicControl music;
-    public final Tutorial tutorial;
+public class Control implements ApplicationListener, Loadable{
+    public Saves saves;
+    public MusicControl music;
+    public Tutorial tutorial;
     public InputHandler input;
 
     private Interval timer = new Interval(2);
@@ -46,37 +49,6 @@ 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);
@@ -177,12 +149,32 @@ 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);
+    @Override
+    public void loadAsync(){
+        saves = new Saves();
+        tutorial = new Tutorial();
+        music = new MusicControl();
 
-            checkClassicData();
-        }
+        Draw.scl = 1f / Core.atlas.find("scale_marker").getWidth();
+
+        UnitScl.dp.setProduct(settings.getInt("uiscale", 100) / 100f);
+
+        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
@@ -240,6 +232,9 @@ public class Control implements ApplicationListener{
             world.loadMap(map, rules);
             state.rules = rules;
             logic.play();
+            if(settings.getBool("savecreate")){
+                control.saves.addSave(map.name() + "-" + DateTimeFormatter.ofPattern("MMM dd h:mm").format(LocalDateTime.now()));
+            }
         });
     }
 
@@ -382,6 +377,11 @@ public class Control implements ApplicationListener{
                 dialog.show();
             }));
         }
+
+        if(android){
+            Sounds.empty.loop(0f, 1f, 0f);
+            checkClassicData();
+        }
     }
 
     @Override
@@ -396,6 +396,17 @@ public class Control implements ApplicationListener{
         music.update();
         loops.update();
 
+        if(Core.input.keyTap(Binding.fullscreen)){
+            boolean full = settings.getBool("fullscreen");
+            if(full){
+                graphics.setWindowedMode(graphics.getWidth(), graphics.getHeight());
+            }else{
+                graphics.setFullscreenMode(graphics.getDisplayMode());
+            }
+            settings.put("fullscreen", !full);
+            settings.save();
+        }
+
         if(!state.is(State.menu)){
             input.update();
 

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);
-                    Entities.update(groundEffectGroup);
+                    effectGroup.update();
+                    groundEffectGroup.update();
                 }
 
                 if(!state.isEditor()){
                     for(EntityGroup group : unitGroups){
-                        Entities.update(group);
+                        group.update();
                     }
 
-                    Entities.update(puddleGroup);
-                    Entities.update(shieldGroup);
-                    Entities.update(bulletGroup);
-                    Entities.update(tileGroup);
-                    Entities.update(fireGroup);
+                    puddleGroup.update();
+                    shieldGroup.update();
+                    bulletGroup.update();
+                    tileGroup.update();
+                    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;
@@ -151,15 +151,38 @@ public class NetClient implements ApplicationListener{
             throw new ValidateException(player, "Player has sent a message above the text limit.");
         }
 
-        //server console logging
-        Log.info("&y{0}: &lb{1}", player.name, message);
+        //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);
+            //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].";
+                }
+
+                player.sendMessage(text);
+            }
+        }
     }
 
-    private static String colorizeName(int id, String name){
+    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++){
@@ -347,7 +370,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.ObjectSet;
+import io.anuke.arc.collection.*;
 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<>();
@@ -112,7 +112,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;
             }
 
@@ -191,6 +191,138 @@ 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.");
+                }
+            }
+        });
+    }
+
+    public int votesRequired(){
+        return playerGroup.size() * 2 / 3;
     }
 
     public Team assignTeam(Player current, Iterable<Player> players){
@@ -422,10 +554,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);
@@ -455,7 +587,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/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);
-        draw(puddleGroup);
-        draw(groundEffectGroup, e -> !(e instanceof BelowLiquidTrait));
+        groundEffectGroup.draw(e -> e instanceof BelowLiquidTrait);
+        puddleGroup.draw();
+        groundEffectGroup.draw(e -> !(e instanceof BelowLiquidTrait));
 
         blocks.processBlocks();
 
@@ -244,8 +248,8 @@ public class Renderer implements ApplicationListener{
             bloom.capture();
         }
 
-        draw(bulletGroup);
-        draw(effectGroup);
+        bulletGroup.draw();
+        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(settings.getBool("animatedshields")){
+        if(shieldGroup.countInBounds() > 0){
+            if(settings.getBool("animatedshields") && Shaders.shield != null){
                 Draw.flush();
                 shieldBuffer.begin();
                 graphics.clear(Color.CLEAR);
-                Entities.draw(shieldGroup);
-                Entities.draw(shieldGroup, shield -> true, shield -> ((ShieldEntity)shield).drawOver());
+                shieldGroup.draw();
+                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);
-            draw(playerGroup, p -> p.isFlying() == flying && p.getTeam() == team && !p.isDead(), Unit::drawUnder);
+            unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.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);
-            draw(playerGroup, p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawAll);
+            unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.isDead(), 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);
-            draw(playerGroup, p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawOver);
+            unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.isDead(), 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,13 @@ 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.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 +36,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{
-    private FreeTypeFontGenerator generator;
+public class UI implements ApplicationListener, Loadable{
+    private Skin skin;
 
     public MenuFragment menufrag;
     public HudFragment hudfrag;
@@ -67,9 +72,23 @@ public class UI implements ApplicationListener{
     public Cursor drillCursor, unloadCursor;
 
     public UI(){
-        Skin skin = new Skin(Core.atlas);
-        generateFonts(skin);
+        skin = new 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("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 +116,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 +130,23 @@ 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));
+
+        FreeTypeFontParameter param = new FreeTypeFontParameter(){{
+            size = fontParameter().size;
+            borderColor = Color.DARK_GRAY;
+            borderWidth = UnitScl.dp.scl(2f);
+            spaceX -= borderWidth;
+            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 +171,22 @@ public class UI implements ApplicationListener{
         unloadCursor = Core.graphics.newCursor("unload");
     }
 
-    void generateFonts(Skin skin){
-        generator = new FreeTypeFontGenerator(Core.files.internal("fonts/font.ttf"));
+    public void setupFonts(){
+        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
@@ -225,13 +259,14 @@ public class UI implements ApplicationListener{
 
     @Override
     public void resize(int width, int height){
+        if(Core.scene == null) return;
         Core.scene.resize(width, height);
         Events.fire(new ResizeEvent());
     }
 
     @Override
     public void dispose(){
-        generator.dispose();
+        //generator.dispose();
     }
 
     public void loadAnd(Runnable call){

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 final Maps maps = new Maps();
-    public final BlockIndexer indexer = new BlockIndexer();
-    public final WaveSpawner spawner = new WaveSpawner();
-    public final Pathfinder pathfinder = new Pathfinder();
+public class World{
     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(){
@@ -190,9 +174,11 @@ public class World implements ApplicationListener{
             }
         }
 
-        addDarkness(tiles);
+        if(!headless){
+            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());
@@ -354,7 +340,7 @@ public class World implements ApplicationListener{
         for(int x = 0; x < tiles.length; x++){
             for(int y = 0; y < tiles[0].length; y++){
                 Tile tile = tiles[x][y];
-                if(tile.block().solid && !tile.block().synthetic() && tile.block().fillsTile){
+                if(tile.isDarkened()){
                     dark[x][y] = darkIterations;
                 }
             }
@@ -383,9 +369,21 @@ public class World implements ApplicationListener{
         for(int x = 0; x < tiles.length; x++){
             for(int y = 0; y < tiles[0].length; y++){
                 Tile tile = tiles[x][y];
-                if(tile.block().solid && !tile.block().synthetic()){
+                if(tile.isDarkened()){
                     tiles[x][y].rotation(dark[x][y]);
                 }
+                if(dark[x][y] == 4){
+                    boolean full = true;
+                    for(Point2 p : Geometry.d4){
+                        int px = p.x + x, py = p.y + y;
+                        if(Structs.inBounds(px, py, tiles) && !(tiles[px][py].isDarkened() && dark[px][py] == 4)){
+                            full = false;
+                            break;
+                        }
+                    }
+
+                    if(full) tiles[x][y].rotation(5);
+                }
             }
         }
     }

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

@@ -93,11 +93,11 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 "$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(() -> {
-                    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));
                         }
@@ -286,11 +286,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

@@ -9,8 +9,6 @@ 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 +68,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);
 

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.util.Scaling;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.ui.BorderImage;
-import io.anuke.mindustry.ui.dialogs.FloatingDialog;
+import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.ui.*;
+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){
-            selected = world.maps.all().first();
+        if(maps.all().size > 0){
+            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,13 @@
 package io.anuke.mindustry.editor;
 
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.scene.ui.TextButton;
-import io.anuke.arc.scene.ui.TextField;
-import io.anuke.mindustry.core.Platform;
-import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.ui.dialogs.FloatingDialog;
+import io.anuke.arc.function.*;
+import io.anuke.arc.scene.ui.*;
+import io.anuke.mindustry.*;
+import io.anuke.mindustry.core.*;
+import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.ui.dialogs.*;
 
 import static io.anuke.mindustry.Vars.ui;
-import static io.anuke.mindustry.Vars.world;
 
 public class MapSaveDialog extends FloatingDialog{
     private TextField field;
@@ -24,7 +23,7 @@ public class MapSaveDialog extends FloatingDialog{
         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 +68,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.Array;
-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;
+import io.anuke.arc.collection.*;
+import io.anuke.mindustry.entities.traits.*;
 
+/** Simple container for managing entity groups.*/
 public class Entities{
-    private static 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;
+    private final Array<EntityGroup<?>> groupArray = new Array<>();
 
-    public static void clear(){
+    public void clear(){
         for(EntityGroup group : groupArray){
             group.clear();
         }
     }
 
-    public static EntityGroup<?> getGroup(int id){
-        return groups.get(id);
+    public EntityGroup<?> get(int 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){
-        return addGroup(type, true);
+    public <T extends Entity> EntityGroup<T> add(Class<T> type){
+        return add(type, true);
     }
 
-    public static <T extends Entity> EntityGroup<T> addGroup(Class<T> type, boolean useTree){
-        EntityGroup<T> group = new EntityGroup<>(type, useTree);
-        groups.put(group.getID(), group);
+    public <T extends Entity> EntityGroup<T> add(Class<T> type, boolean useTree){
+        EntityGroup<T> group = new EntityGroup<>(groupArray.size, type, useTree);
         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.collection.IntMap;
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.function.Predicate;
-import io.anuke.arc.math.geom.QuadTree;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.entities.traits.Entity;
+import io.anuke.arc.*;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.function.*;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.math.geom.*;
+import io.anuke.mindustry.entities.traits.*;
 
+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> entitiesToRemove = new Array<>(false, 16);
-    private final Array<T> entitiesToAdd = new Array<>(false, 16);
+    private final Array<T> entityArray = new Array<>(false, 32);
+    private final Array<T> entitiesToRemove = new Array<>(false, 32);
+    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/HealthTrait.java

@@ -20,6 +20,10 @@ public interface HealthTrait{
     default void onDeath(){
     }
 
+    default boolean damaged(){
+        return health() < maxHealth() - 0.0001f;
+    }
+
     default void damage(float amount){
         health(health() - amount);
         if(health() <= 0 && !isDead()){

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

@@ -16,6 +16,7 @@ import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.units.CommandCenter.*;
 import io.anuke.mindustry.world.blocks.units.UnitFactory.*;
 import io.anuke.mindustry.world.meta.*;
 
@@ -25,7 +26,6 @@ import static io.anuke.mindustry.Vars.*;
 
 /** Base class for AI units. */
 public abstract class BaseUnit extends Unit implements ShooterTrait{
-
     protected static int timerIndex = 0;
 
     protected static final int timerTarget = timerIndex++;
@@ -83,6 +83,22 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
         return world.tile(spawner);
     }
 
+    public boolean isCommanded(){
+        return indexer.getAllied(team, BlockFlag.comandCenter).size != 0 && indexer.getAllied(team, BlockFlag.comandCenter).first().entity instanceof CommandCenterEntity;
+    }
+
+    public UnitCommand getCommand(){
+        if(isCommanded()){
+            return indexer.getAllied(team, BlockFlag.comandCenter).first().<CommandCenterEntity>entity().command;
+        }
+        return null;
+    }
+
+    /**Called when a command is recieved from the command center.*/
+    public void onCommand(UnitCommand command){
+
+    }
+
     /** Initialize the type and team of this unit. Only call once! */
     public void init(UnitType type, Team team){
         if(this.type != null) throw new RuntimeException("This unit is already initialized!");
@@ -129,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;
     }
 
@@ -303,6 +319,10 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
         state.set(getStartState());
 
         health(maxHealth());
+
+        if(isCommanded()){
+            onCommand(getCommand());
+        }
     }
 
     @Override

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

@@ -1,20 +1,19 @@
 package io.anuke.mindustry.entities.type;
 
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.g2d.Fill;
-import io.anuke.arc.math.Angles;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Tmp;
-import io.anuke.mindustry.entities.Predict;
-import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.bullet.BulletType;
-import io.anuke.mindustry.entities.units.UnitState;
-import io.anuke.mindustry.graphics.Pal;
-import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.world.meta.BlockFlag;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.math.*;
+import io.anuke.arc.math.geom.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.entities.*;
+import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.units.*;
+import io.anuke.mindustry.graphics.*;
+import io.anuke.mindustry.net.*;
+import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.meta.*;
+
+import static io.anuke.mindustry.Vars.*;
 
 public abstract class FlyingUnit extends BaseUnit{
     protected float[] weaponAngles = {0, 0};
@@ -80,14 +79,40 @@ public abstract class FlyingUnit extends BaseUnit{
                     return;
                 }
 
-                target = getClosestCore();
-            };
+                target = getSpawner();
+                if(target == null) target = getClosestCore();
+            }
 
             if(target != null){
-                circle(60f + Mathf.absin(Time.time() + Mathf.randomSeed(id) * 1200f, 70f, 1200f));
+                circle(80f + Mathf.randomSeed(id) * 120);
             }
         }
-    };
+    },
+    retreat = new UnitState(){
+        public void entered(){
+            target = null;
+        }
+
+        public void update(){
+            if(retarget()){
+                target = getSpawner();
+
+                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();
+            }
+
+            circle(targetHasFlag(BlockFlag.repair) ? 20f : 60f + Mathf.randomSeed(id) * 50, 0.65f * type.speed);
+        }
+    };;
+
+    @Override
+    public void onCommand(UnitCommand command){
+        state.set(command == UnitCommand.retreat ? retreat :
+        command == UnitCommand.attack ? attack :
+        command == UnitCommand.patrol ? patrol :
+        null);
+    }
 
     @Override
     public void move(float x, float y){

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

@@ -1,22 +1,20 @@
 package io.anuke.mindustry.entities.type;
 
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.math.Angles;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.util.Time;
-import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.entities.Predict;
-import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.bullet.BulletType;
-import io.anuke.mindustry.entities.units.UnitState;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.type.Weapon;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.blocks.Floor;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.graphics.g2d.*;
+import io.anuke.arc.math.*;
+import io.anuke.arc.math.geom.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.*;
+import io.anuke.mindustry.entities.*;
+import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.units.*;
+import io.anuke.mindustry.game.*;
+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();
@@ -63,8 +61,25 @@ public abstract class GroundUnit extends BaseUnit{
                 }
             }
         }
+    },
+    retreat = new UnitState(){
+        public void entered(){
+            target = null;
+        }
+
+        public void update(){
+            moveAwayFromCore();
+        }
     };
 
+    @Override
+    public void onCommand(UnitCommand command){
+        state.set(command == UnitCommand.retreat ? retreat :
+        command == UnitCommand.attack ? attack :
+        command == UnitCommand.patrol ? patrol :
+        null);
+    }
+
     @Override
     public void interpolate(){
         super.interpolate();
@@ -182,9 +197,9 @@ public abstract class GroundUnit extends BaseUnit{
     protected void patrol(){
         vec.trns(baseRotation, type.speed * Time.delta());
         velocity.add(vec.x, vec.y);
-        vec.trns(baseRotation, type.hitsizeTile * 3);
+        vec.trns(baseRotation, type.hitsizeTile * 5);
         Tile tile = world.tileWorld(x + vec.x, y + vec.y);
-        if((tile == null || tile.solid() || tile.floor().drownTime > 0) || stuckTime > 10f){
+        if((tile == null || tile.solid() || tile.floor().drownTime > 0 || tile.floor().isLiquid) || stuckTime > 10f){
             baseRotation += Mathf.sign(id % 2 - 0.5f) * Time.delta() * 3f;
         }
 
@@ -208,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;
 
@@ -231,10 +246,10 @@ 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) < 90f) return;
+        if(tile == targetTile || core == null || dst(core) < 120f) return;
 
         velocity.add(vec.trns(angleTo(targetTile), type.speed * Time.delta()));
         rotation = Mathf.slerpDelta(rotation, baseRotation, type.rotatespeed);

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,14 +171,10 @@ 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);
         }
     }
 
-    public boolean damaged(){
-        return health < maxHealth() - 0.00001f;
-    }
-
     public Tile getTile(){
         return tile;
     }

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

@@ -3,11 +3,11 @@ package io.anuke.mindustry.entities.type.base;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.mindustry.entities.type.FlyingUnit;
-import io.anuke.mindustry.entities.units.UnitState;
+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{
@@ -33,6 +33,11 @@ public abstract class BaseDrone extends FlyingUnit{
         }
     };
 
+    @Override
+    public void onCommand(UnitCommand command){
+        //do nothing, normal commands are not applicable here
+    }
+
     @Override
     protected void updateRotation(){
         if(target != null && shouldRotate() && target.dst(this) < type.range){
@@ -44,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/entities/units/UnitCommand.java

@@ -0,0 +1,18 @@
+package io.anuke.mindustry.entities.units;
+
+import io.anuke.arc.*;
+
+public enum UnitCommand{
+    attack, retreat, patrol;
+
+    private final String localized;
+    public static final UnitCommand[] all = values();
+
+    UnitCommand(){
+        localized = Core.bundle.get("command." + name());
+    }
+
+    public String localized(){
+        return localized;
+    }
+}