why

* Create Polish steam translation file

* Delete polish

* Added Polish translation steam folder

Allready has translated achievments to Polish.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,12 @@
+---
+name: Bug report
+about: Create a report to help fix an issue.
+---
+
+**Platform**: (Android/iOS/Mac/Windows/Linux)
+
+**Build**: (The build number under the title in the main menu. Required.)
+
+**Issue**: (Explain your issue in detail.)
+
+**Steps to reproduce**: (How you happened across the issue, and what you were doing at the time.)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,7 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+Do not make a new issue for feature requests. Instead, post it in #545.

.gitignore

@@ -4,6 +4,7 @@ logs/
 /core/assets/bundles/output/
 /core/assets/.gifimages/
 /deploy/
+/out/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/
@@ -20,6 +21,10 @@ logs/
 /tests/build/
 /server/build/
 changelog
+saves/
+core/assets/saves/
+/core/assets/saves/
+steam_appid.txt
 /test_files/
 /annotations/build/
 /android/assets/mindustry-maps/

.travis.yml

@@ -9,14 +9,14 @@ android:
 script:
 - git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
 - cd ../MindustryBuilds
-- echo ${TRAVIS_BUILD_NUMBER} > version.txt
+- echo ${TRAVIS_TAG}
-- git add .
+- if [ -n "$TRAVIS_TAG" ]; then echo versionName=4-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi
-- 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
+- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; fi
 - cd ../Mindustry
 - git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
+- if [ -n "$TRAVIS_TAG" ]; then cd ../Arc; git tag ${TRAVIS_TAG}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/Arc ${TRAVIS_TAG}; cd ../Mindustry; fi
 - "./gradlew test"
 - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
 - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"

README.md

@@ -29,6 +29,13 @@ _Building:_ `./gradlew desktop:dist`
 
 Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server', e.g. `gradlew server:dist`.
 
+#### Android
+
+1. Install the Android SDK [here.](https://developer.android.com/studio#downloads) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
+2. Create a file named `local.properties` inside the Mindustry directory, with its contents looking like this: `sdk.dir=<Path to Android SDK you just downloaded, without these bracket>`. For example, if you're on Windows and installed the tools to C:\\tools, your local.properties would contain `sdk.dir=C:\\tools` (*note the double backslashes are required instead of single ones!*).
+3. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
+4. (Optional) To debug the application on a connected phone, do `gradlew android:installDebug android:run`. It is **highly recommended** to use IntelliJ for this instead, however.
+
 ##### Troubleshooting
 
 If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, run `chmod +x ./gradlew` before running `./gradlew`. *This is a one-time procedure.*

TRANSLATING.md

@@ -31,6 +31,10 @@ There are two ways to test the translation bundle:
 1) Assuming you have the PC version downloaded, download your bundle file, name it `bundle.properties`, then place it in the same folder as the Mindustry desktop executable and run it. *You should get a popup message in-game confirming that you have loaded an external translation.*
 2) For advanced users: simply download your fork of mindustry and compile/run the game.
 
+#### Translating for stores (Steam, Google Play)
+
+If you would like to translate the descriptions for Google Play or Steam, see the [Fastlane Metadata folder](https://github.com/Anuken/Mindustry/tree/master/fastlane/metadata) and submit a pull request for files there. On Google Play, you would create or edit the folder with the correct local code; for Steam, I have to update the translations manually, so just name the folder with the language name, and include the same files as the English folder does.
+
 **And that's it.**  
 
 *(...of course, that's never really it. Bother me on Discord when something inevitably goes wrong.)*

android/AndroidManifest.xml

@@ -28,14 +28,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:mimeType="application/octet-stream"/>
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.mmap"/>
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -43,21 +35,6 @@
                 <data android:mimeType="application/octet-stream" />
                 <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msav"/>
             </intent-filter>
-
-
-            <intent-filter android:icon="@mipmap/ic_launcher"
-                           android:label="Mindustry Map"
-                           android:priority="1">
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.mmap" android:mimeType="*/*"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msav" android:mimeType="*/*"/>
-            </intent-filter>
         </activity>
 
     </application>

android/build.gradle

@@ -26,7 +26,6 @@ repositories{
 
 dependencies{
     implementation project(":core")
-    implementation project(":net")
 
     implementation arcModule("backends:backend-android")
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
@@ -70,7 +69,8 @@ android{
     }
 
     defaultConfig{
-        Integer vcode = new Properties().with{p -> p.load(new FileInputStream(file('../core/assets/version.properties'))); return p }['androidBuildCode']?.toInteger() ?: 1
+        Properties props = new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
+        Integer vcode = props['androidBuildCode']?.toInteger() ?: 1
         def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
 
         applicationId "io.anuke.mindustry"
@@ -79,6 +79,11 @@ android{
         
         versionName versionNameResult
         versionCode vcode
+
+        if(project.hasProperty("release")){
+            props['androidBuildCode'] = (vcode + 1).toString()
+        }
+        props.store(file('../core/assets/version.properties').newWriter(), null)
     }
 
     compileOptions{

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

@@ -1,9 +1,11 @@
 package io.anuke.mindustry;
 
 import android.*;
+import android.app.*;
 import android.content.*;
 import android.content.pm.*;
 import android.net.*;
+import android.os.Build.*;
 import android.os.*;
 import android.provider.Settings.*;
 import android.telephony.*;
@@ -16,8 +18,6 @@ import io.anuke.arc.util.*;
 import io.anuke.arc.util.serialization.*;
 import io.anuke.mindustry.game.Saves.*;
 import io.anuke.mindustry.io.*;
-import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.ui.dialogs.*;
 
 import java.io.*;
@@ -35,16 +35,10 @@ public class AndroidLauncher extends AndroidApplication{
     @Override
     protected void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
-        AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
-        config.useImmersiveMode = true;
-        config.depth = 0;
         if(doubleScaleTablets && isTablet(this.getContext())){
-            UnitScl.dp.addition = 0.5f;
+            Scl.setAddition(0.5f);
         }
 
-        config.hideStatusBar = true;
-        Net.setClientProvider(new ArcNetClient());
-        Net.setServerProvider(new ArcNetServer());
         initialize(new ClientLauncher(){
 
             @Override
@@ -70,36 +64,53 @@ public class AndroidLauncher extends AndroidApplication{
                 }
             }
 
-            @Override
-            public void requestExternalPerms(Runnable callback){
-                if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
-                checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    callback.run();
-                }else{
-                    permCallback = callback;
-                    ArrayList<String> perms = new ArrayList<>();
-                    if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-                    }
-                    if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
-                    }
-                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
-                }
-            }
-
             @Override
             public void shareFile(FileHandle file){
             }
 
             @Override
-            public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, Predicate<String> filetype){
+            public void showFileChooser(boolean open, String extension, Consumer<FileHandle> cons){
-                chooser = new FileChooser(text, file -> filetype.test(file.extension().toLowerCase()), open, cons);
+                if(VERSION.SDK_INT >= VERSION_CODES.Q){
-                if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
+                    Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
+                    intent.addCategory(Intent.CATEGORY_OPENABLE);
+                    intent.setType(extension.equals("zip") ? "application/zip" : "*/*");
+                    addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
+                        if(code == Activity.RESULT_OK && in != null && in.getData() != null){
+                            Uri uri = in.getData();
+
+                            if(uri.getPath().contains("(invalid)")) return;
+
+                            Core.app.post(() -> Core.app.post(() -> cons.accept(new FileHandle(uri.getPath()){
+                                @Override
+                                public InputStream read(){
+                                    try{
+                                        return getContentResolver().openInputStream(uri);
+                                    }catch(IOException e){
+                                        throw new ArcRuntimeException(e);
+                                    }
+                                }
+
+                                @Override
+                                public OutputStream write(boolean append){
+                                    try{
+                                        return getContentResolver().openOutputStream(uri);
+                                    }catch(IOException e){
+                                        throw new ArcRuntimeException(e);
+                                    }
+                                }
+                            })));
+                        }
+                    });
+                }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                     checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    chooser.show();
+                    chooser = new FileChooser(open ? "$open" : "$save", file -> file.extension().equalsIgnoreCase(extension), open, file -> {
-                    chooser = null;
+                        if(!open){
+                            cons.accept(file.parent().child(file.nameWithoutExtension() + "." + extension));
                         }else{
+                            cons.accept(file);
+                        }
+                    });
+
                     ArrayList<String> perms = new ArrayList<>();
                     if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
                         perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@@ -108,6 +119,8 @@ public class AndroidLauncher extends AndroidApplication{
                         perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
                     }
                     requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
+                }else{
+                    super.showFileChooser(open, extension, cons);
                 }
             }
 
@@ -125,7 +138,11 @@ public class AndroidLauncher extends AndroidApplication{
             public boolean canDonate(){
                 return true;
             }
-        }, config);
+        }, new AndroidApplicationConfiguration(){{
+            useImmersiveMode = true;
+            depth = 0;
+            hideStatusBar = true;
+        }});
         checkFiles(getIntent());
     }
 
@@ -173,10 +190,10 @@ public class AndroidLauncher extends AndroidApplication{
                                 SaveSlot slot = control.saves.importSave(file);
                                 ui.load.runLoadSave(slot);
                             }catch(IOException e){
-                                ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, true)));
+                                ui.showException("$save.import.fail", e);
                             }
                         }else{
-                            ui.showError("$save.import.invalid");
+                            ui.showErrorMessage("$save.import.invalid");
                         }
                     }else if(map){ //open map
                         FileHandle file = Core.files.local("temp-map." + mapExtension);

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

@@ -4,6 +4,11 @@ import java.lang.annotation.*;
 
 public class Annotations{
 
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface StyleDefaults {
+    }
+
     /** Indicates that a method should always call its super version. */
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.SOURCE)

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

@@ -1,26 +1,22 @@
 package io.anuke.annotations;
 
 import com.squareup.javapoet.*;
+import io.anuke.annotations.Annotations.*;
 
-import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.*;
-import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.*;
-import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.*;
-import javax.annotation.processing.SupportedSourceVersion;
+import javax.tools.Diagnostic.*;
-import javax.lang.model.SourceVersion;
+import javax.tools.*;
-import javax.lang.model.element.Modifier;
+import java.nio.file.*;
-import javax.lang.model.element.TypeElement;
+import java.util.*;
-import javax.tools.Diagnostic.Kind;
-import javax.tools.StandardLocation;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes("io.anuke.annotations.Annotations.StyleDefaults")
 public class AssetsAnnotationProcessor extends AbstractProcessor{
     /** Name of the base package to put all the generated classes. */
     private static final String packageName = "io.anuke.mindustry.gen";
+    private String path;
     private int round;
 
     @Override
@@ -38,13 +34,13 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
         if(round++ != 0) return false; //only process 1 round
 
         try{
-
+            path = Paths.get(Utils.filer.createResource(StandardLocation.CLASS_OUTPUT, "no", "no")
-            String path = Paths.get(Utils.filer.createResource(StandardLocation.CLASS_OUTPUT, "no", "no")
                         .toUri().toURL().toString().substring(System.getProperty("os.name").contains("Windows") ? 6 : "file:".length()))
                         .getParent().getParent().getParent().getParent().getParent().getParent().toString();
 
-            process("Sounds", path + "/assets/sounds", "io.anuke.arc.audio.Sound", "newSound");
+            processSounds("Sounds", path + "/assets/sounds", "io.anuke.arc.audio.Sound");
-            process("Musics", path + "/assets/music", "io.anuke.arc.audio.Music", "newMusic");
+            processSounds("Musics", path + "/assets/music", "io.anuke.arc.audio.Music");
+            processUI(roundEnv.getElementsAnnotatedWith(StyleDefaults.class));
 
             return true;
         }catch(Exception e){
@@ -53,19 +49,74 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
         }
     }
 
-    @Override
+    void processUI(Set<? extends Element> elements) throws Exception{
-    public Set<String> getSupportedAnnotationTypes() {
+        String[] iconSizes = {"small", "smaller", "tiny"};
-        return Collections.singleton("*");
+
+        TypeSpec.Builder type = TypeSpec.classBuilder("Tex").addModifiers(Modifier.PUBLIC);
+        TypeSpec.Builder ictype = TypeSpec.classBuilder("Icon").addModifiers(Modifier.PUBLIC);
+        MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        MethodSpec.Builder loadStyles = MethodSpec.methodBuilder("loadStyles").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        MethodSpec.Builder icload = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        String resources = path + "/assets-raw/sprites/ui";
+        Files.walk(Paths.get(resources)).forEach(p -> {
+            if(Files.isDirectory(p) || p.getFileName().toString().equals(".DS_Store")) return;
+
+            String filename = p.getFileName().toString();
+            filename = filename.substring(0, filename.indexOf("."));
+
+            ArrayList<String> names = new ArrayList<>();
+            names.add("");
+            if(filename.contains("icon")){
+                names.addAll(Arrays.asList(iconSizes));
             }
 
-    void process(String classname, String path, String rtype, String loadMethod) throws Exception{
+            for(String suffix : names){
+                suffix = suffix.isEmpty() ? "" : "-" + suffix;
+
+                String sfilen = filename + suffix;
+                String dtype = p.getFileName().toString().endsWith(".9.png") ? "io.anuke.arc.scene.style.NinePatchDrawable" : "io.anuke.arc.scene.style.TextureRegionDrawable";
+
+                String varname = capitalize(sfilen);
+                TypeSpec.Builder ttype = type;
+                MethodSpec.Builder tload = load;
+                if(varname.startsWith("icon")){
+                    varname = varname.substring("icon".length());
+                    varname = Character.toLowerCase(varname.charAt(0)) + varname.substring(1);
+                    ttype = ictype;
+                    tload = icload;
+                    if(SourceVersion.isKeyword(varname)) varname += "i";
+                }
+
+                if(SourceVersion.isKeyword(varname)) varname += "s";
+
+                ttype.addField(ClassName.bestGuess(dtype), varname, Modifier.STATIC, Modifier.PUBLIC);
+                tload.addStatement(varname + " = ("+dtype+")io.anuke.arc.Core.atlas.drawable($S)", sfilen);
+            }
+        });
+
+        for(Element elem : elements){
+            TypeElement t = (TypeElement)elem;
+            t.getEnclosedElements().stream().filter(e -> e.getKind() == ElementKind.FIELD).forEach(field -> {
+                String fname = field.getSimpleName().toString();
+                if(fname.startsWith("default")){
+                    loadStyles.addStatement("io.anuke.arc.Core.scene.addStyle(" + field.asType().toString() + ".class, io.anuke.mindustry.ui.Styles." + fname + ")");
+                }
+            });
+        }
+
+        ictype.addMethod(icload.build());
+        JavaFile.builder(packageName, ictype.build()).build().writeTo(Utils.filer);
+
+        type.addMethod(load.build());
+        type.addMethod(loadStyles.build());
+        JavaFile.builder(packageName, type.build()).build().writeTo(Utils.filer);
+    }
+
+    void processSounds(String classname, String path, String rtype) throws Exception{
         TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
-        //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();
@@ -84,27 +135,38 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
 
             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))",
+            String filename = "io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3")+"\"";
-            //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"));
 
+            loadBegin.addStatement("io.anuke.arc.Core.assets.load("+filename +", "+rtype+".class).loaded = a -> " + name + " = ("+rtype+")a", 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());
-            //cons.consume(type, fname, name);
         });
 
         if(classname.equals("Sounds")){
             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(loadBegin.build());
         type.addMethod(dispose.build());
         JavaFile.builder(packageName, type.build()).build().writeTo(Utils.filer);
     }
+
+    static String capitalize(String s){
+        StringBuilder result = new StringBuilder(s.length());
+
+        for(int i = 0; i < s.length(); i++){
+            char c = s.charAt(i);
+            if(c != '_' && c != '-'){
+                if(i > 0 && (s.charAt(i - 1) == '_' || s.charAt(i - 1) == '-')){
+                    result.append(Character.toUpperCase(c));
+                }else{
+                    result.append(c);
+                }
+            }
+        }
+
+        return result.toString();
+    }
 }

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

@@ -54,8 +54,20 @@ class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees> {
 		return false;
 	}
 
+	@SuppressWarnings("unchecked")
 	public boolean checkScope (Scope members) {
-		for (Symbol s : members.getElements()) {
+		Iterable<Symbol> it;
+		try{
+			it = (Iterable<Symbol>)members.getClass().getMethod("getElements").invoke(members);
+		}catch(Throwable t){
+			try{
+				it = (Iterable<Symbol>)members.getClass().getMethod("getSymbols").invoke(members);
+			}catch(Exception e){
+				throw new RuntimeException(e);
+			}
+		}
+
+		for (Symbol s : it) {
 			if (s instanceof MethodSymbol) {
 				MethodSymbol ms = (MethodSymbol) s;
 

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

@@ -118,7 +118,7 @@ public class RemoteReadGenerator{
             if(entry.forward && entry.where.isServer && needsPlayer){
                 //call forwarded method
                 readBlock.addStatement(packageName + "." + entry.className + "." + entry.element.getSimpleName() +
-                "__forward(player.con.id" + (varResult.length() == 0 ? "" : ", ") + varResult.toString() + ")");
+                "__forward(player.con" + (varResult.length() == 0 ? "" : ", ") + varResult.toString() + ")");
             }
 
             readBlock.nextControlFlow("catch (java.lang.Exception e)");

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

@@ -85,19 +85,19 @@ public class RemoteWriteGenerator{
 
         //if toAll is false, it's a 'send to one player' variant, so add the player as a parameter
         if(!toAll){
-            method.addParameter(int.class, "playerClientID");
+            method.addParameter(ClassName.bestGuess("io.anuke.mindustry.net.NetConnection"), "playerConnection");
         }
 
         //add sender to ignore
         if(forwarded){
-            method.addParameter(int.class, "exceptSenderID");
+            method.addParameter(ClassName.bestGuess("io.anuke.mindustry.net.NetConnection"), "exceptConnection");
         }
 
         //call local method if applicable, shouldn't happen when forwarding method as that already happens by default
         if(!forwarded && methodEntry.local != Loc.none){
             //add in local checks
             if(methodEntry.local != Loc.both){
-                method.beginControlFlow("if(" + getCheckString(methodEntry.local) + " || !io.anuke.mindustry.net.Net.active())");
+                method.beginControlFlow("if(" + getCheckString(methodEntry.local) + " || !io.anuke.mindustry.Vars.net.active())");
             }
 
             //concatenate parameters
@@ -159,7 +159,7 @@ public class RemoteWriteGenerator{
             boolean writePlayerSkipCheck = methodEntry.where == Loc.both && i == 0;
 
             if(writePlayerSkipCheck){ //write begin check
-                method.beginControlFlow("if(io.anuke.mindustry.net.Net.server())");
+                method.beginControlFlow("if(io.anuke.mindustry.Vars.net.server())");
             }
 
             if(Utils.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
@@ -194,18 +194,18 @@ public class RemoteWriteGenerator{
 
         if(forwarded){ //forward packet
             if(!methodEntry.local.isClient){ //if the client doesn't get it called locally, forward it back after validation
-                sendString = "send(";
+                sendString = "io.anuke.mindustry.Vars.net.send(";
             }else{
-                sendString = "sendExcept(exceptSenderID, ";
+                sendString = "io.anuke.mindustry.Vars.net.sendExcept(exceptConnection, ";
             }
         }else if(toAll){ //send to all players / to server
-            sendString = "send(";
+            sendString = "io.anuke.mindustry.Vars.net.send(";
         }else{ //send to specific client from server
-            sendString = "sendTo(playerClientID, ";
+            sendString = "playerConnection.send(";
         }
 
         //send the actual packet
-        method.addStatement("io.anuke.mindustry.net.Net." + sendString + "packet, " +
+        method.addStatement(sendString + "packet, " +
         (methodEntry.unreliable ? "io.anuke.mindustry.net.Net.SendMode.udp" : "io.anuke.mindustry.net.Net.SendMode.tcp") + ")");
 
 
@@ -217,8 +217,8 @@ public class RemoteWriteGenerator{
     }
 
     private String getCheckString(Loc loc){
-        return loc.isClient && loc.isServer ? "io.anuke.mindustry.net.Net.server() || io.anuke.mindustry.net.Net.client()" :
+        return loc.isClient && loc.isServer ? "io.anuke.mindustry.Vars.net.server() || io.anuke.mindustry.Vars.net.client()" :
-        loc.isClient ? "io.anuke.mindustry.net.Net.client()" :
+        loc.isClient ? "io.anuke.mindustry.Vars.net.client()" :
-        loc.isServer ? "io.anuke.mindustry.net.Net.server()" : "false";
+        loc.isServer ? "io.anuke.mindustry.Vars.net.server()" : "false";
     }
 }

build.gradle

@@ -21,32 +21,24 @@ allprojects{
 
     ext{
         versionNumber = '4'
-        versionModifier = 'release'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         gdxVersion = '1.9.10'
         roboVMVersion = '2.3.7'
+        steamworksVersion = '1.8.0'
         arcHash = null
 
         debugged = {
-            return new File(projectDir.parent, '../debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
+            return new File(projectDir.parent, '../Mindustry-Debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
         }
 
         localArc = {
-            return (!project.hasProperty("release")) && new File(projectDir.parent, '../Arc').exists()
+            return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists()
         }
 
         getArcHash = {
-            //get latest commit hash from github since JITPack's '-snapshot' version doesn't work correctly
+            return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"]
-            if(arcHash == null){
-                try{
-                    arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0]
-                }catch(e){
-                    e.printStackTrace()
-                    arcHash = "-SNAPSHOT"
-                }
-            }
-            return arcHash
         }
 
         arcModule = { String name ->
@@ -150,13 +142,15 @@ project(":desktop"){
 
     dependencies{
         compile project(":core")
-        compile project(":net")
 
         if(debugged()) compile project(":debug")
 
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
 
+        compile "com.code-disaster.steamworks4j:steamworks4j:$steamworksVersion"
+        compile "com.code-disaster.steamworks4j:steamworks4j-server:$steamworksVersion"
+
         compile arcModule("backends:backend-sdl")
         compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.2'
     }
@@ -175,7 +169,7 @@ project(":ios"){
         }
 
         props['app.id'] = 'io.anuke.mindustry'
-        props['app.version'] = '4.0'
+        props['app.version'] = '4.2.1'
         props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
         props['app.executable'] = 'IOSLauncher'
         props['app.name'] = 'Mindustry'
@@ -185,7 +179,6 @@ project(":ios"){
 
     dependencies{
         compile project(":core")
-        compile project(":net")
         compileOnly project(":annotations")
 
         compile arcModule("backends:backend-robovm")
@@ -201,6 +194,7 @@ project(":core"){
     apply plugin: "java"
 
     task preGen{
+        outputs.upToDateWhen{ false } 
         generateLocales()
         writeVersion()
     }
@@ -249,7 +243,6 @@ project(":server"){
 
     dependencies{
         compile project(":core")
-        compile project(":net")
         compile arcModule("backends:backend-headless")
     }
 }
@@ -277,7 +270,6 @@ project(":tools"){
     dependencies{
         compile project(":core")
 
-        //for render tests
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
 
@@ -294,14 +286,6 @@ project(":annotations"){
     }
 }
 
-project(":net"){
-    apply plugin: "java"
-
-    dependencies{
-        compile project(":core")
-    }
-}
-
 task deployAll{
     task cleanDeployOutput{
         doFirst{

core/assets/bundles/bundle.properties

@@ -51,9 +51,19 @@ minimap = Minimap
 close = Close
 website = Website
 quit = Quit
+save.quit = Save & Quit
 maps = Maps
+maps.browse = Browse Maps
 continue = Continue
 maps.none = [lightgray]No maps found!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
+
 about.button = About
 name = Name:
 noname = Pick a[accent] player name[] first.
@@ -64,16 +74,18 @@ techtree = Tech Tree
 research.list = [lightgray]Research:
 research = Research
 researched = [lightgray]{0} researched.
-players = {0} players online
+players = {0} players
-players.single = {0} player online
+players.single = {0} player
 server.closing = [accent]Closing server...
 server.kicked.kick = You have been kicked from the server!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Server closed.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Outdated client! Update your game!
 server.kicked.serverOutdated = Outdated server! Ask the host to update!
 server.kicked.banned = You are banned on this server.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = You have been kicked recently.\nWait before connecting again.
 server.kicked.nameInUse = There is someone with that name\nalready on this server.
 server.kicked.nameEmpty = Your chosen name is invalid.
@@ -84,11 +96,13 @@ server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
 host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [lightgray]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[lightgray]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. Note that public networks sometimes do not allow server discovery.
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
 hostserver = Host Multiplayer Game
+invitefriends = Invite Friends
 hostserver.mobile = Host\nGame
 host = Host
 hosting = [accent]Opening server...
 hosts.refresh = Refresh
 hosts.discovering = Discovering LAN games
+hosts.discovering.any = Discovering games
 server.refreshing = Refreshing server
 hosts.none = [lightgray]No local games found!
 host.invalid = [scarlet]Can't connect to host.
@@ -109,22 +123,27 @@ server.edit = Edit Server
 server.outdated = [crimson]Outdated Server![]
 server.outdated.client = [crimson]Outdated Client![]
 server.version = [gray]v{0} {1}
-server.custombuild = [yellow]Custom Build
+server.custombuild = [accent]Custom Build
 confirmban = Are you sure you want to ban this player?
 confirmkick = Are you sure you want to kick this player?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Are you sure you want to make this player an admin?
 confirmunadmin = Are you sure you want to remove admin status from this player?
 joingame.title = Join Game
 joingame.ip = Address:
 disconnect = Disconnected.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Failed to load world data!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connecting...
 connecting.data = [accent]Loading world data...
 server.port = Port:
 server.addressinuse = Address already in use!
 server.invalidport = Invalid port number!
-server.error = [crimson]Error hosting server: [accent]{0}
+server.error = [crimson]Error hosting server.
 save.old = This save is for an older version of the game, and can no longer be used.\n\n[lightgray]Save backwards compatibility will be implemented in the full 4.0 release.
 save.new = New Save
 save.overwrite = Are you sure you want to overwrite\nthis save slot?
@@ -144,6 +163,7 @@ save.rename = Rename
 save.rename.text = New name:
 selectslot = Select a save.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 save.corrupted = [accent]Save file corrupted or invalid!\nIf you have just updated your game, this is probably a change in the save format and [scarlet]not[] a bug.
 empty = <empty>
 on = On
@@ -151,12 +171,13 @@ off = Off
 save.autosave = Autosave: {0}
 save.map = Map: {0}
 save.wave = Wave {0}
-save.difficulty = Difficulty: {0}
+save.mode = Gamemode: {0}
 save.date = Last Saved: {0}
 save.playtime = Playtime: {0}
 warning = Warning.
 confirm = Confirm
 delete = Delete
+view.workshop = View In Workshop
 ok = OK
 open = Open
 customize = Customize Rules
@@ -193,6 +214,11 @@ map.nospawn = This map does not have any cores for the player to spawn in! Add a
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-orange[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Brush
 editor.openin = Open In Editor
 editor.oregen = Ore Generation
@@ -200,11 +226,14 @@ editor.oregen.info = Ore Generation:
 editor.mapinfo = Map Info
 editor.author = Author:
 editor.description = Description:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.ingame = Edit In-Game
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
 waves.never = <never>
@@ -221,15 +250,17 @@ waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [lightgray]<Default>
+details = Details...
 edit = Edit...
 editor.name = Name:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
 editor.teams = Teams
-editor.errorload = Error loading file:\n[accent]{0}
+editor.errorload = Error loading file.
-editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorsave = Error saving file.
-editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
+editor.errorimage = That's an image, not a map.\n\nIf you want to import a 3.5/build 40 map, use the 'Import Legacy Map' button in the editor.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined. Are you trying to load a save file?
 editor.update = Update
@@ -248,7 +279,7 @@ editor.importmap = Import Map
 editor.importmap.description = Import an already existing map
 editor.importfile = Import File
 editor.importfile.description = Import an external map file
-editor.importimage = Import Legacy Image
+editor.importimage = Import Legacy Map
 editor.importimage.description = Import an external map image file
 editor.export = Export...
 editor.exportfile = Export File
@@ -262,6 +293,7 @@ editor.resizemap = Resize Map
 editor.mapname = Map Name:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
 editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
+editor.exists = A map with this name already exists.
 editor.selectmap = Select a map to load:
 
 toolmode.replace = Replace
@@ -345,6 +377,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [lightgray]Unlock configuring loadout: Wave {0}.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
@@ -445,6 +478,7 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
@@ -454,9 +488,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}/s
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
@@ -503,6 +539,7 @@ setting.antialias.name = Antialias[lightgray] (requires restart)[]
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
@@ -533,8 +570,9 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
-setting.playerchat.name = Display In-Game Chat
+setting.playerchat.name = Display Player Bubble 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
@@ -544,8 +582,8 @@ category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
 command.attack = Attack
+command.rally = Rally
 command.retreat = Retreat
-command.patrol = Patrol
 keybind.gridMode.name = Block Select
 keybind.gridModeShift.name = Category Select
 keybind.press = Press a key...
@@ -764,10 +802,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Junction
 block.router.name = Router
 block.distributor.name = Distributor
 block.sorter.name = Sorter
+block.message.name = Message
 block.overflow-gate.name = Overflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
@@ -885,11 +926,11 @@ unit.lich.name = Lich
 unit.reaper.name = Reaper
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
-tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building.
+tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building, and[accent] Hold Ctrl while scrolling[] to zoom in and out.
 tutorial.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 = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\n\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core.
-tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
+tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core.
 tutorial.turret = Once an item enters your core, it can be used for building.\nKeep in mind that not all items can be used for building.\nItems that are not used for building, such as[accent] coal[] or[accent] scrap[], cannot be put into the core.\nDefensive structures must be built to repel the[lightgray] enemy[].\nBuild a[accent] duo turret[] near your base.
 tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill near the turret.\nLead conveyors into the turret to supply it with copper.\n\n[accent]Ammo delivered: 0/1
 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.
@@ -904,7 +945,6 @@ tutorial.waves = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 wav
 tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
 tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese resources can then be used to research new technology.\n\n[accent]Press the launch button.
 
-
 item.copper.description = The most basic structural material. Used extensively in all types of blocks.
 item.lead.description = A basic starter material. Used extensively in electronics and liquid transportation blocks.
 item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
@@ -944,6 +984,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
 unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critical infrastructure.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with pure coal. Produces silicon.
@@ -1045,7 +1086,7 @@ block.ripple.description = An extremely powerful artillery turret. Shoots cluste
 block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to patrol, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
+block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
 block.draug-factory.description = Produces Draug mining drones.
 block.spirit-factory.description = Produces Spirit structural repair drones.
 block.phantom-factory.description = Produces advanced construction drones.

core/assets/bundles/bundle_cs.properties

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

core/assets/bundles/bundle_de.properties

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

core/assets/bundles/bundle_es.properties

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

core/assets/bundles/bundle_et.properties

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

core/assets/bundles/bundle_fr.properties

@@ -15,8 +15,8 @@ screenshot = Capture d'écran sauvegardée à {0}
 screenshot.invalid = La carte est trop large, il n'y a potentiellement pas assez de mémoire pour la capture d'écran.
 gameover = Game over
 gameover.pvp = L'équipe [accent] {0}[] a gagnée !
-highscore = [YELLOW]Nouveau meilleur score!
+highscore = [accent]Nouveau meilleur score!
-load.sound = Sonds
+load.sound = Sons
 load.map = Cartes
 load.image = Images
 load.content = Contenus
@@ -29,12 +29,12 @@ stat.deconstructed = Bâtiments déconstruits:[accent] {0}
 stat.delivered = Ressources transférées:
 stat.rank = Rang Final: [accent]{0}
 launcheditems = [accent]Ressources transférées
-map.delete = Êtes-vous sûr de supprimer cette carte "[accent]{0}[]"?
+map.delete = Êtes-vous sûr de vouloir supprimer cette carte "[accent]{0}[]"?
 level.highscore = Meilleur score: [accent]{0}
 level.select = Sélection de niveau
 level.mode = Mode de jeu:
 showagain = Ne pas montrer la prochaine fois
-coreattack = [scarlet]<La base est en train d'être attaquée>
+coreattack = [scarlet]<La base est attaquée>
 nearpoint = [ [scarlet]QUITTEZ LE POINT D'APPARITION ENNEMI IMMÉDIATEMENT[] ]\nannihilation imminente
 database = Base de données
 savegame = Sauvegarder la partie
@@ -48,9 +48,18 @@ minimap = Minimap
 close = Fermer
 website = Site Web
 quit = Quitter
+save.quit = Save & Quit
 maps = Cartes
+maps.browse = Parcourir les Cartes
 continue = Continuer
-maps.none = [LIGHT_GRAY]Aucune carte trouvée!
+maps.none = [lightgray]Aucune carte trouvée!
+invalid = Invalide
+preparingconfig = Préparation de la Configuration
+preparingcontent = Préparation du Contenu
+uploadingcontent = Publication du Contenu
+uploadingpreviewfile = Publication du Fichier d'Aperçu
+committingchanges = Validation des Modifications
+done = Fait
 about.button = À propos
 name = Nom:
 noname = Commencer par choisir un[accent] nom de joueur[].
@@ -58,34 +67,38 @@ filename = Nom du fichier:
 unlocked = Nouveau bloc débloqué!
 completed = [accent]Complété
 techtree = Arbre technologique
-research.list = [LIGHT_GRAY]Recherche:
+research.list = [lightgray]Recherche:
 research = Rechercher
-researched = [LIGHT_GRAY]{0} recherché(e).
+researched = [lightgray]{0} recherché(e).
 players = {0} joueurs en ligne
-players.single = {0} joueurs en ligne
+players.single = {0} joueur en ligne
 server.closing = [accent]Fermeture du serveur...
 server.kicked.kick = Vous avez été expulsé du serveur!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Serveur fermé.
-server.kicked.vote = Vous avez été expulsé à cause d'un vote. Au revoir!
+server.kicked.vote = Vous avez été expulsé suite à un vote. Au revoir.
-server.kicked.clientOutdated = Client dépassé! Mettez à votre jeu à jour!
+server.kicked.clientOutdated = Client obsolète! Mettez à votre jeu à jour!
-server.kicked.serverOutdated = Serveur dépassé! Demandez à l'hôte de le mettre à jour!
+server.kicked.serverOutdated = Serveur obsolète! Demandez à l'hôte de le mettre à jour!
 server.kicked.banned = Vous avez été banni sur ce serveur.
-server.kicked.typeMismatch = Ce serveur n'est pas compatible avec votre type de version.
+server.kicked.typeMismatch = Ce serveur n'est pas compatible avec votre version du jeu.
+server.kicked.playerLimit = Ce serveur est plein. Veuillez attendre qu'une place se libére.
 server.kicked.recentKick = Vous avez été expulsé récemment.\nAttendez avant de vous connecter à nouveau.
 server.kicked.nameInUse = Il y a déjà quelqu'un avec\nce nom sur ce serveur.
 server.kicked.nameEmpty = Votre nom est invalide.
-server.kicked.idInUse = Vous êtes déjà sur ce serveur! Se connecter avec deux comptes n'est pas permis!
+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 = Votre version:[accent] {0}[]\nLa version du serveur:[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 requis.\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.
+host.info = Le bouton [accent]Héberger[] héberge un serveur sur le port [scarlet]6567[]. \nN'importe qui sur le même [lightgray]wifi ou réseau local []devrait voir votre serveur sur leur liste des serveurs.\n\nSi vous voulez que les gens puissent s'y connecter de partout à l'aide de votre IP, [accent]le transfert de port (port forwarding)[] est requis.\n\n[lightgray]Note: Si quelqu'un a des problèmes de connexion à votre partie LAN, vérifiez que vous avez autorisé l'accès à Mindustry sur votre réseau local dans les paramètres de votre pare-feu.
-join.info = Ici vous pouvez entrez [accent]l'adresse IP d'un serveur []pour s'y connecter, ou découvrir un serveur en [accent]réseau local[].\nLe multijoueur en LAN ainsi qu'en WAN est supporté.\n\n[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.
+join.info = Ici vous pouvez entrez [accent]l'adresse IP d'un serveur []pour s'y connecter, ou découvrir un serveur en [accent]réseau local[].\nLe multijoueur en LAN ainsi qu'en WAN est supporté.\n\n[lightgray]Note: Il n'y a pas de liste de serveurs globaux automatiques; Si vous voulez vous connectez à quelqu'un par IP, il faudra d'abord demander à l'hébergeur leur IP.
 hostserver = Héberger une partie
+invitefriends = Inviter des Amis
 hostserver.mobile = Héberger\nune partie
 host = Héberger
 hosting = [accent]Préparation du serveur...
 hosts.refresh = Actualiser
-hosts.discovering = Découverte de jeux en LAN
+hosts.discovering = Recherche des jeux en LAN
+hosts.discovering.any = Recherche de parties
 server.refreshing = Actualisation du serveur
 hosts.none = [lightgray]Aucun jeu en LAN trouvé!
 host.invalid = [scarlet]Impossible de se connecter à l'hôte.
@@ -101,28 +114,33 @@ server.bans.none = Aucun joueur banni trouvé!
 server.admins = Administrateurs
 server.admins.none = Pas d'administrateurs trouvés!
 server.add = Ajouter un serveur
-server.delete = Êtes-vous sûr de supprimer ce serveur ?
+server.delete = Êtes-vous sûr de vouloir supprimer ce serveur ?
 server.edit = Modifier le serveur
 server.outdated = [crimson]Serveur obsolète![]
 server.outdated.client = [crimson]Client obsolète![]
 server.version = [lightgray]Version: {0} {1}
 server.custombuild = [yellow]Version personnalisée
-confirmban = Êtes-vous sûr de bannir ce joueur?
+confirmban = Souhaitez vous vraiment bannir ce joueur?
-confirmkick = Êtes-vous sûr d'expulser ce joueur?
+confirmkick = Souhaitez vous vraiment expulser ce joueur?
-confirmunban = Êtes-vous sûr de réintégrer ce joueur ?
+confirmvotekick = Voulez vous vraiment voter l'expulsion de ce joueur?
-confirmadmin = Êtes-vous sûr de faire de ce joueur un administrateur?
+confirmunban = Souhaitez vous vraiment réintégrer ce joueur ?
-confirmunadmin = Êtes-vous sûr d'enlever le statut d'administrateur à ce joueur?
+confirmadmin = Souhaitez vous vraiment rendre ce joueur administrateur?
+confirmunadmin = Souhaitez vous vraiment enlever le statut d'administrateur à ce joueur?
 joingame.title = Rejoindre une partie
 joingame.ip = IP:
 disconnect = Déconnecté.
+disconnect.error = Erreur de connexion.
+disconnect.closed = Connexion fermée.
+disconnect.timeout = Délai de connexion expiré.
 disconnect.data = Les données du monde n'ont pas pu être chargées!
+cantconnect = Impossible de rejoindre ([accent]{0}[]).
 connecting = [accent]Connexion...
-connecting.data = [accent]Chargement des données du monde...
+connecting.data = [accent]Chargement de la partie...
 server.port = Port:
 server.addressinuse = Adresse déjà utilisée!
 server.invalidport = numéro de port invalide!
 server.error = [crimson]Erreur d'hébergement: [accent]{0}
-save.old = Cette sauvegarde provient d'une ancienne version du jeu, et ne peut plus être utilisée.\n\n[LIGHT_GRAY]la compatibilité des anciennes sauvegardes sera bientôt ajoutée dans la version 4.0 stable.
+save.old = Cette sauvegarde provient d'une ancienne version du jeu, et ne peut plus être utilisée.\n\n[lightgray]la compatibilité des anciennes sauvegardes sera bientôt ajoutée dans la version 4.0 stable.
 save.new = Nouvelle sauvegarde
 save.overwrite = Êtes-vous sûr de vouloir\n écraser cette sauvegarde ?
 overwrite = Écraser
@@ -133,27 +151,29 @@ save.delete.confirm = Êtes-vous sûr de vouloir supprimer cette sauvegarde?
 save.delete = Supprimer
 save.export = Exporter une\nsauvegarde
 save.import.invalid = [accent]Cette sauvegarde est invalide!
-save.import.fail = [crimson]L'importation de la sauvegarde\na échoué: [accent]{0}
+save.import.fail = [crimson]Échec d'importation: [accent]{0}
-save.export.fail = [crimson]L'exportation de la sauvegarde\na échoué [accent]{0}
+save.export.fail = [crimson]Échec d'exportation: [accent]{0}
 save.import = Importer une sauvegarde
 save.newslot = Nom de la sauvegarde:
 save.rename = Renommer
 save.rename.text = Nouveau nom:
-selectslot = Sélectionner une sauvegarde.
+selectslot = Choisissez une sauvegarde.
 slot = [accent]Emplacement {0}
-save.corrupted = [accent]Fichier de sauvegarde corrompu ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]pas[] à un bug.
+editmessage = Modifier le Message
+save.corrupted = [accent]Sauvegarde corrompue ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]pas[] à un bug.
 empty = <vide>
 on = Activé
 off = Désactivé
 save.autosave = Sauvegarde automatique: {0}
 save.map = Carte: {0}
 save.wave = Vague {0}
-save.difficulty = Difficulté: {0}
+save.mode = Mode de jeu: {0}
 save.date = Dernière sauvegarde: {0}
 save.playtime = Temps de jeu: {0}
-warning = Avertissement
+warning = Avertissement.
 confirm = Confirmer
 delete = Supprimer
+view.workshop = Voir dans le Workshop
 ok = OK
 open = Ouverture
 customize = Personaliser
@@ -167,41 +187,49 @@ data.exported = Données Exportées.
 data.invalid = Ce ne sont pas des données de jeu valides.
 data.import.confirm = L'importation des données externes va effacer[scarlet] toutes[] vos actuelles données de jeu.\n[accent]Ceci ne pourra pas être annulé![]\n\nUne fois les données importées, le jeu quittera immédiatement.
 classic.export = Exporter les données Classic
-classic.export.text = [accent]Mindustry[] vient juste d'avoir eu une mise à jour majeur.\nDes données de sauvegarde et/ou de cartes provenant de la version Classic (v3.5 build 40) ont été détectées. Souhaitez-vous exporter ces sauvegardes dans le dossier accueil de votre télephone, pour les utiliser dans Mindustry Classic ?
+classic.export.text = [accent]Mindustry[] vient d'avoir une mise à jour majeure.\nDes sauvegardes et/ou des cartes de la version Classic (v3.5 build 40) ont été détectées. Souhaitez-vous exporter ces sauvegardes dans le dossier accueil de votre télephone, pour les utiliser dans Mindustry Classic ?
-quit.confirm = Êtes-vous sûr de quitter?
+quit.confirm = Êtes-vous sûr de vouloir quitter?
-quit.confirm.tutorial = Êtes-vous sur de ce que vous faites ?\n Le tutoriel peut être repris dans [accent]Paramètres->Jeu->Reprendre le turoriel.[]
+quit.confirm.tutorial = Êtes-vous sur de ce que vous faites?\nLe tutoriel peut être repris dans [accent]Paramètres->Jeu->Reprendre le tutoriel.[]
 loading = [accent]Chargement...
 saving = [accent]Sauvegarde...
 wave = [accent]Vague {0}
-wave.waiting = [LIGHT_GRAY]Vague dans {0}
+wave.waiting = [lightgray]Vague dans {0}
-wave.waveInProgress = [LIGHT_GRAY]Wave en cours
+wave.waveInProgress = [lightgray]Wave en cours
-waiting = [LIGHT_GRAY]En attente...
+waiting = [lightgray]En attente...
 waiting.players = En attente de joueurs...
-wave.enemies = [LIGHT_GRAY]{0} Ennemis restants
+wave.enemies = [lightgray]{0} Ennemis restants
-wave.enemy = [LIGHT_GRAY]{0} Ennemi restant
+wave.enemy = [lightgray]{0} Ennemi restant
 loadimage = Charger l'image
 saveimage = Sauvegarder l'image
 unknown = Inconnu
 custom = Personnalisé
 builtin = Intégré
-map.delete.confirm = Êtes-vous sûr de supprimer cette carte? Cette action ne peut pas être défaite!
+map.delete.confirm = Voulez vous vraiment supprimer cette carte? Cette action ne peut pas être annulée!
 map.random = [accent]Carte aléatoire
-map.nospawn = Cette carte n'a pas de base pour qu'un joueur puisse y apparaisse! Veiller ajouter une [ROYAL]base bleue[] sur cette carte dans l'éditeur.
+map.nospawn = Cette carte n'a pas de base pour qu'un joueur puisse y apparaisse! Ajoutez une base[accent] orange[] sur cette carte dans l'éditeur.
-map.nospawn.pvp = Cette carte n'a pas de base ennemies pour qu'un joueur ennemi y apparaisse! Ajouter au moins une [SCARLET]base rouge[] sur cette carte dans l'éditeur.
+map.nospawn.pvp = Cette carte n'a pas de base ennemies pour qu'un joueur ennemi y apparaisse! Ajouter au moins une base [SCARLET] non-orange[] dans l'éditeur.
-map.nospawn.attack = Cette carte n'a aucune base ennemie à attaquer! Veuillez ajouter une [SCARLET]base rouge[] sur cette carte dans l'éditeur.
+map.nospawn.attack = Cette carte n'a aucune base ennemie à attaquer! Veuillez ajouter une base[SCARLET] rouge[] sur cette carte dans l'éditeur.
 map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
+map.publish.error = Erreur de Publication de la Carte: {0}
+map.publish.confirm = Êtes-vous sûr de vouloir publier cette carte?\n\n[lightgray]Assurez-vous d’accepter d’abord les CGU du Workshop, sinon vos cartes ne seront pas affichées!
+eula = CGU de Steam
+map.publish = Carte publiée.
+map.publishing = [accent]Publication de la carte...
 editor.brush = Pinceau
 editor.openin = Ouvrir dans l'éditeur
 editor.oregen = Génération de minerais
 editor.oregen.info = Génération de minerais:
-editor.mapinfo = Infos sur la carte
+editor.mapinfo = Infos Carte
 editor.author = Auteur:
 editor.description = Description:
+editor.nodescription = Une carte doit avoir une description d'au moins 4 caractères pour pouvoir être publiée.
 editor.waves = Vagues:
 editor.rules = Règles:
 editor.generation = Génération:
 editor.ingame = Éditer dans le jeu
+editor.publish.workshop = Publier sur le Workshop
 editor.newmap = Nouvelle carte
+workshop = Workshop
 waves.title = Vagues
 waves.remove = Supprimer
 waves.never = <jamais>
@@ -216,37 +244,39 @@ 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 = Aucun enemies définis.\nNotez que les dispositions de vagues vides seront automatiquement remplacées par les dispositions par défauts.
+waves.none = Aucun enemies définis.\nNotez que les vagues vides seront automatiquement remplacées par une vague générée par défaut.
-editor.default = [LIGHT_GRAY]<par défaut>
+editor.default = [lightgray]<par défaut>
+details = Détails...
 edit = Modifier...
 editor.name = Nom:
-editor.spawn = Faire apparaitre l'unité
+editor.spawn = Créer l'unité
 editor.removeunit = Enlever l'unité
 editor.teams = Équipe
 editor.errorload = Erreur lors du chargement du fichier:\n[accent]{0}
 editor.errorsave = Erreur lors de la sauvegarde du fichier:\n[accent]{0}
-editor.errorimage = Ceci est une image, et non une carte. Changer l'extension du fichier ne marchera pas.\n\nSi vous voulez importer une carte d'une ancienne version, utilisez le bouton 'importer une ancienne carte' dans l'éditeur.
+editor.errorimage = Ceci est une image, et non une carte. \n\nSi vous voulez importer une carte provenant de la version 3.5 (build 40), utilisez le bouton 'importer une carte obsolète (image)' dans l'éditeur.
 editor.errorlegacy = Cette carte est trop ancienne, et utilise un format de carte qui n'est plus supporté.
-editor.errorheader = Le fichier de carte est soit invalide ou corrompu.
+editor.errornot = Ceci n'est pas un fichier de carte.
-editor.errorname = La carte n'a pas de nom!
+editor.errorheader = Le fichier de carte est invalide ou corrompu.
+editor.errorname = La carte n'a pas de nom, essayez vous de charger une sauvegarde? 
 editor.update = Mettre à jour
-editor.randomize = Aléatoiriser
+editor.randomize = Rendre aléatoire
 editor.apply = Appliquer
 editor.generate = Générer
 editor.resize = Redimensionner
-editor.loadmap = Charger une carte
+editor.loadmap = Charger la carte
-editor.savemap = Sauvegarder une carte
+editor.savemap = Sauvegarder la carte
 editor.saved = Sauvegardé!
-editor.save.noname = Votre carte n'a pas de nom ! Définissez-en un sur le menu 'info de la carte'.
+editor.save.noname = Votre carte n'a pas de nom! Ajoutez un nom dans le menu 'info de la carte'.
-editor.save.overwrite = Votre carte réécrit une carte intégrée! Choisissez un nom différent dans le menu 'info de la carte' .
+editor.save.overwrite = Votre carte écrase une carte du jeu de base! Choisissez un nom différent dans le menu 'info de la carte' .
-editor.import.exists = [scarlet]Importation impossible :[] Une carte intégrée nommé '{0}' existe déjà!
+editor.import.exists = [scarlet]Importation impossible :[] '{0}' est le nom d'une carte du jeu de base!
 editor.import = Importation...
 editor.importmap = Importer une carte
 editor.importmap.description = Importer une carte existante
 editor.importfile = Importer un fichier
-editor.importfile.description = Importer un fichier de carte extérieur
+editor.importfile.description = Importer une carte externe
-editor.importimage = Importer l'image du terrain
+editor.importimage = Importer une carte obsolète
-editor.importimage.description = Importer une image de la carte extérieure
+editor.importimage.description = Importer une carte externe (image)
 editor.export = Exporter...
 editor.exportfile = Exporter un fichier
 editor.exportfile.description = Exporter un fichier de carte
@@ -254,11 +284,12 @@ editor.exportimage = Exporter l'image du terrain
 editor.exportimage.description = Exporter une image de la carte
 editor.loadimage = Importer le terrain
 editor.saveimage = Exporter le terrain
-editor.unsaved = [scarlet]Vous avez des modifications non sauvegardés ![]Voulez-vous vraiment quitter ?
+editor.unsaved = [scarlet]Vous n'avez pas sauvegardé vos modifications![]Voulez-vous vraiment quitter ?
 editor.resizemap = Redimensionner\nla carte
 editor.mapname = Nom de la carte:
-editor.overwrite = [accent]Attention !\nCeci réécrit une carte existante.
+editor.overwrite = [accent]Attention!\nCeci écrase une carte existante.
-editor.overwrite.confirm = [scarlet]Attention ![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir la réécrire?
+editor.overwrite.confirm = [scarlet]Attention![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir l'écraser?
+editor.exists = Une carte avec ce nom existe déjà.
 editor.selectmap = Sélectionnez une carte:
 toolmode.replace = Remplacer
 toolmode.replace.description = Dessiner seulement sur les blocs solides.
@@ -271,10 +302,10 @@ toolmode.square.description = Pinceau carré.
 toolmode.eraseores = Effacer les minéraux
 toolmode.eraseores.description = Efface seulement les minéraux.
 toolmode.fillteams = Remplire les équipes
-toolmode.fillteams.description = Rempli les équipes au lieu de blocs.
+toolmode.fillteams.description = Rempli les équipes au lieu des blocs.
 toolmode.drawteams = Dessiner les équipes
 toolmode.drawteams.description = Dessine les équipes au lieu de blocs.
-filters.empty = [LIGHT_GRAY]Aucun filtre! Ajoutez-en un avec les boutons ci-dessous.
+filters.empty = [lightgray]Aucun filtre! Ajoutez-en un avec les boutons ci-dessous.
 filter.distort = Déformation
 filter.noise = Bruit
 filter.median = Median
@@ -322,83 +353,84 @@ tutorial.retake = Re-Take Tutorial
 editor = Éditeur
 mapeditor = Éditeur de carte
 donate = Faire un\ndon
-abandon = Abandon
+abandon = Abandonner
 abandon.text = Cette zone et toutes ses ressources vont être perdues.
 locked = Verrouillé
-complete = [LIGHT_GRAY]Compléter:
+complete = [lightgray]Compléter:
 zone.requirement = Vague {0} dans la zone {1}
-resume = Reprendre la partie en cours:\n[LIGHT_GRAY]{0}
+resume = Reprendre la partie:\n[lightgray]{0}
-bestwave = [LIGHT_GRAY]Meilleur: {0}
+bestwave = [lightgray]Meilleur: {0}
-launch = Lancement
+launch = < Lancement >
 launch.title = Lancement réussi
-launch.next = [LIGHT_GRAY] Prochaine opportunité à la vague {0}
+launch.next = [lightgray]Prochaine opportunité à la vague {0}
 launch.unable2 = [scarlet]Lancement impossible.[]
-launch.confirm = Cela va transférer toutes les ressources dans votre noyau.\nVous ne pourrez plus retourner à cette base.
+launch.confirm = Cela va transférer toutes les ressources de votre noyau.\nVous ne pourrez plus retourner à cette base.
-launch.skip.confirm = Si vous sautez maintenant, vous ne pourriez pas effectuer le lancement avant les prochaines vagues.
+launch.skip.confirm = Si vous passez à la vague suivante, vous ne pourrez pas effectuer le lancement avant les prochaines vagues.
 uncover = Découvrir
-configure = Configurer le transfert des ressources.
+configure = Modifier les ressources emportées.
-configure.locked = [LIGHT_GRAY]Atteignez la vague {0}\npour configurer le transfert des ressources
+configure.locked = [lightgray]Atteignez la vague {0}\npour configurer les ressources emportées.
-zone.unlocked = [LIGHT_GRAY]{0} Débloquée.
+configure.invalid = Le montant doit être un nombre compris entre 0 et {0}.
+zone.unlocked = [lightgray]{0} Débloquée.
 zone.requirement.complete = Vague {0} atteinte:\n{1} Exigences de la zone complétées
-zone.config.complete = Vague {0} atteinte:\nConfiguration du transfert débloquée.
+zone.config.complete = Vague {0} atteinte:\nConfiguration des ressources emportées possible.
-zone.resources = Ressources détectées:
+zone.resources = [lightgray]Ressources détectées:
 zone.objective = [lightgray]Objective: [accent]{0}
-zone.objective.survival = Survive
+zone.objective.survival = Survivre
 zone.objective.attack = Détruire le noyau ennemi
 add = Ajouter...
-boss.health = Vie du Boss
+boss.health = Santé du Boss
-connectfail = [crimson]Échec de la connexion au serveur : [accent]{0}
+connectfail = [crimson]Échec de la connexion au serveur :\n\n[accent]{0}
-error.unreachable = Serveur injoignable.
+error.unreachable = Serveur injoignable.\nL'adresse IP est correcte?
 error.invalidaddress = Adresse invalide.
-error.timedout = Délai de connexion dépassé!\nAssurez-vous que l'hôte a autorisé l'accès au port, et que l'adresse soit correcte!
+error.timedout = Délai de connexion dépassé!\nAssurez-vous que l'hôte a autorisé l'accès au port (port forwarding), et que l'adresse soit correcte!
 error.mismatch = Erreur de paquet:\nPossible différence de verison entre le client et le serveur .\nVérifiez que vous et l'hôte avez la version de Mindustry la plus recente!
 error.alreadyconnected = Déjà connecté.
-error.mapnotfound = Fichier de la carte introuvable!
+error.mapnotfound = Carte introuvable!
 error.io = Erreur de Réseau (I/O)
 error.any = Erreur réseau inconnue
 error.bloom = Echec de l'initialisation du flou lumineux.\nVotre appareil peux ne pas le supporter.
 zone.groundZero.name = Première Bataille
-zone.desertWastes.name = Décharge Désertique
+zone.desertWastes.name = Désert Sauvage
 zone.craters.name = Les Cratères
 zone.frozenForest.name = Forêt Glaciale
 zone.ruinousShores.name = Rives en Ruine
 zone.stainedMountains.name = Montagnes Tâchetées
-zone.desolateRift.name = Fissure abandonnée
+zone.desolateRift.name = Ravin Abandonné
-zone.nuclearComplex.name = Complexe nucléaire
+zone.nuclearComplex.name = Complexe Nucléaire
-zone.overgrowth.name = Surcroissance
+zone.overgrowth.name = Surcroissance Végétale
 zone.tarFields.name = Champs de Pétrole
 zone.saltFlats.name = Marais Salants
 zone.impact0078.name = Impact 0078
 zone.crags.name = Rochers
-zone.fungalPass.name = Fungal Pass
+zone.fungalPass.name = Passe Fongique
-zone.groundZero.description = L'emplacement optimal pour commencer. Faible menace ennemie. Peu de ressources. \nRecueillez autant de plomb et de cuivre que possible.\nBougez-vous.
+zone.groundZero.description = L'emplacement optimal pour débuter. Faible menace ennemie. Peu de ressources. \nRecueillez autant de plomb et de cuivre que possible.\nRien d'autre à signaler.
-zone.frozenForest.description = Même ici, plus près des montagnes, les spores se sont propagées. Les températures glaciales ne pourront pas les contenir pour toujours.\n\nFamiliarisez vous avec l'Énergie. Construisez des generateurs a combustion. Aprenez a utiliser les réparateurs.
+zone.frozenForest.description = Même ici, plus près des montagnes, les spores se sont propagées. Les températures glaciales ne pourront pas les contenir pour toujours.\n\nFamiliarisez vous avec l'Énergie. Construisez des générateurs a combustion. Aprenez a utiliser les réparateurs.
-zone.desertWastes.description = Ces déchets sont vastes, imprévisibles et se croisent avec des structures sectorielles abandonnées.\nLe charbon est présent dans la région. Brulew-le pour génerer de l'Énergie ou synthétisez-le en graphite.\n\n[lightgray]Ce lieu d'atterisage est imprévisible.
+zone.desertWastes.description = Cette étendue désertique est immense, imprévisibles. On y croise des structures abandonnées.\nLe charbon est présent dans la région. Brulez-le pour générer de l'Énergie ou synthétisez-le en graphite.\n\n[lightgray]Ce lieu d'atterisage est imprévisible.
-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 y a érigé un complexe de stockage de ressources. Éradiquez leur présence.
+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 y a érigé un stockage de ressources. Éradiquez leur présence.
-zone.craters.description = L'eau s'est accumulée dans ce cratère, vestige des guerres anciennes. Récupérez la zone. Recueilliez du sable pour le transformer en méta-verre. Pompez de l'eau pour refroidir les tourelles et les perceuses.
+zone.craters.description = L'eau s'est accumulée dans ce cratère, vestige des guerres anciennes. Récupérez la zone. Recueilliez du sable pour le transformer en verre trempé. Pompez de l'eau pour refroidir les tourelles et les perceuses.
-zone.ruinousShores.description = Passé les déchets, c'est le rivage. Auparavent, 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 sont restées indemnes, tout le reste étant réduit à néant. Continuez l'expansion en avant. Redécouvrez la technologie.
+zone.ruinousShores.description = Passé les contrées désertiques, c'est le rivage. Auparavent, 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 sont restées indemnes, tout le reste étant réduit à néant.\nÉtendez vous. Redécouvrez la technologie.
-zone.stainedMountains.description = Plus à l'intérieur des terres se trouvent les montagnes, non polluées encore par les spores. Extrayez le titane qui abonde dans cette région. Apprenez à vous en servir. L'ennemi est plus présent ici. Ne leur donnez pas le temps d'envoyer leurs unités les plus fortes.
+zone.stainedMountains.description = A l'intérieur des terres se trouvent des montagnes, épargnées par les spores. Extrayez le titane qui abonde dans cette région. Apprenez à vous en servir. La menace ennemi se fait plus présente ici. Ne leur donnez pas le temps de rallier leurs puissantes unités.
-zone.overgrowth.description = Cette zone est envahie par la végétation, étant plus proche de la source des spores.\nL’ennemi a établi une base ici. Construisez des unitées Poignards pour le détruire. Reprends ce qui a été perdu.
+zone.overgrowth.description = Cette zone est étouffée par la végétation, et proche de la source des spores.\nL’ennemi a établi une base ici. Construisez des unitées Titan pour le détruire. Reprennez 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 disposant de réserves de Pétrole utilisables. Bien qu'abandonnée, cette zone compte des forces ennemies dangereuses à proximité. Ne les sous-estimez pas.\n\n[lightgray]Si possible, recherchez les technologie de traitement d'huile.
+zone.tarFields.description = La périphérie d'une zone de puits pétroliers, entre montagnes et désert. Une des rares zones disposant de réserves de Pétrole utilisables. Bien qu'abandonnée, cette zone compte des forces ennemies dangereuses à proximité. Ne les sous-estimez pas.\n\n[lightgray]Si possible, recherchez les technologie de traitement d'huile.
-zone.desolateRift.description = Une zone extrêmement dangereuse. Ressources abondantes, mais peu d'espace. Risque élevé de destruction. Partez le plus vite possible. Ne vous laissez pas berner par le long espacement entre les attaques ennemies.
+zone.desolateRift.description = Une zone extrêmement dangereuse. Ressources abondantes, mais peu d'espace. Fort risque de destruction. Repartez le plus vite possible. Ne vous laissez pas berner par une longue attente entre deux vagues ennemies.
-zone.nuclearComplex.description = Une ancienne installation de production et de traitement de thorium, réduite en ruines.\n[lightgray]Faites des recherches sur le thorium et ses nombreuses utilisations.\n\nL'ennemi est présent ici en grand nombre, guettant constamment les assaillants.
+zone.nuclearComplex.description = Une ancienne installation de production et traitement de thorium réduite en ruines.\n[lightgray]Faites des recherches sur le thorium et ses nombreuses utilisations.\n\nL'ennemi est présent ici en grand nombre, à l'affut constant.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
+zone.fungalPass.description = Une zone de transition entre les hautes montagnes et les basses régions infestées de spores. Une petite base de reconnaissance ennemie s'y trouve.\nDétruisez la.\nUtilisez les unités Poignard et Rampeurs. Détruisez les deux noyaux.
 zone.impact0078.description = <insérer une description ici>
 zone.crags.description = <insérer une description ici>
 settings.language = Langue
 settings.data = Données du Jeu
-settings.reset = Valeurs par défaut.
+settings.reset = Valeurs par Défaut.
 settings.rebind = Réattribuer
 settings.controls = Contrôles
 settings.game = Jeu
 settings.sound = Son
 settings.graphics = Graphismes
 settings.cleardata = Effacer les données du jeu...
-settings.clear.confirm = Êtes-vous sûr d'effacer ces données ?\nCe qui est fait ne peut pas être défait!
+settings.clear.confirm = Êtes-vous sûr d'effacer ces données ?\nAucun retour en arrière n'est possible!
-settings.clearall.confirm = [scarlet]ATTENTION![]\nCet action effacera toutes les données, y conpris les sauvegarges, les cartes, les déblocages et la configuration des touches.\nUne fois que vous aurez pressé 'ok' le jeu effacera TOUTES les données et se fermera.
+settings.clearall.confirm = [scarlet]ATTENTION![]\nCet action effacera toutes les données, y conpris les sauvegarges, les cartes, la progression et la configuration des touches.\nUne fois que vous aurez pressé 'ok' le jeu effacera TOUTES les données et se fermera.
-settings.clearunlocks = Effacer les déblocages
+settings.clearunlocks = Effacer la progression
 settings.clearall = Tout effacer
-paused = En pause
+paused = [accent]< Pause >
 yes = Oui
 no = Non
 info.title = Info
@@ -408,71 +440,74 @@ attackpvponly = [scarlet]Seulement disponible dans les modes Attaque et PvP
 blocks.input = Input
 blocks.output = Output
 blocks.booster = Booster
-block.unknown = [LIGHT_GRAY]???
+block.unknown = [lightgray]???
 blocks.powercapacity = Capacité d'énergie
 blocks.powershot = Énergie/Tir
 blocks.damage = Dégâts
-blocks.targetsair = Cible les unités aériennes
+blocks.targetsair = Cibles Aériennes
-blocks.targetsground = Cible les unités terrestres
+blocks.targetsground = Cibles Terrestres
 blocks.itemsmoved = Vitesse de Déplacement
 blocks.launchtime = Temps entre chaque lancement
 blocks.shootrange = Portée
 blocks.size = Taille
-blocks.liquidcapacity = Capacité en liquide
+blocks.liquidcapacity = Capacité liquide
-blocks.powerrange = Distance de transmission
+blocks.powerrange = Portée électrique
 blocks.poweruse = Énergie utilisée
 blocks.powerdamage = Énergie/Dégâts
 blocks.itemcapacity = Stockage
-blocks.basepowergeneration = Génération d'énergie minimale
+blocks.basepowergeneration = Taux d'énergie normale
-blocks.productiontime = Temps de production
+blocks.productiontime = Durée de production
-blocks.repairtime = Temps pour la Réparation Totale du Bloc
+blocks.repairtime = Durée de Réparation Complète du Bloc
 blocks.speedincrease = Accéleration
 blocks.range = Portée
 blocks.drilltier = Forable
 blocks.drillspeed = Vitesse de forage de base
 blocks.boosteffect = Boost Effect
-blocks.maxunits = Nombre d'unités actives maximal
+blocks.maxunits = Unités actives max
 blocks.health = Santé
-blocks.buildtime = Temps de construction
+blocks.buildtime = Durée de construction
-blocks.inaccuracy = Précision
+blocks.buildcost = Coût de Construction
-blocks.shots = Tir
+blocks.inaccuracy = Imprécision
+blocks.shots = Tirs
 blocks.reload = Tirs/Seconde
 blocks.ammo = Munitions
-bar.drilltierreq = Meilleure Foreuse Requise
+bar.drilltierreq = Foreuse Ameliorée Requise
 bar.drillspeed = Vitesse de forage: {0}/s
 bar.efficiency = Efficacité: {0}%
 bar.powerbalance = Énergie: {0}/s
+bar.powerstored = Stocké: {0}/{1}
 bar.poweramount = Énergie: {0}
-bar.poweroutput = Énergie en sortie: {0}
+bar.poweroutput = Énergie Produite: {0}
 bar.items = Objets: {0}
+bar.capacity = Capacité: {0}
 bar.liquid = Liquide
 bar.heat = Chaleur
 bar.power = Énergie
 bar.progress = Progression de la construction
 bar.spawned = Unités: {0}/{1}
-bullet.damage = [stat]{0}[lightgray] dgt
+bullet.damage = [stat]{0}[lightgray] dégâts
-bullet.splashdamage = [stat]{0}[lightgray] dgt de zone ~[stat] {1}[lightgray] tuiles
+bullet.splashdamage = [stat]{0}[lightgray] dégâts de zone ~[stat] {1}[lightgray] blocs
 bullet.incendiary = [stat]incendiaire
-bullet.homing = [stat]autoguidage
+bullet.homing = [stat]autoguidé
 bullet.shock = [stat]choc
-bullet.frag = [stat]fragmentation
+bullet.frag = [stat]explose
 bullet.knockback = [stat]{0}[lightgray] recul
 bullet.freezing = [stat]gel
-bullet.tarred = [stat]Pétrolené
+bullet.tarred = [stat]goudronné
 bullet.multiplier = [stat]{0}[lightgray]x multiplicateur de munitions
-bullet.reload = [stat]{0}[lightgray]x rechargement
+bullet.reload = [stat]{0}[lightgray]x vitesse de tir
 unit.blocks = blocs
-unit.powersecond = Énergie/seconde
+unit.powersecond = énergie/seconde
-unit.liquidsecond = Liquides/seconde
+unit.liquidsecond = unité de liquide/seconde
-unit.itemssecond = Objets/seconde
+unit.itemssecond = objets/seconde
-unit.liquidunits = Unité de liquide
+unit.liquidunits = unité de liquide
-unit.powerunits = Unité d'énergie
+unit.powerunits = unité d'énergie
 unit.degrees = degrés
 unit.seconds = secondes
 unit.persecond = /sec
-unit.timesspeed = x speed
+unit.timesspeed = x vitesse
 unit.percent = %
-unit.items = Objets
+unit.items = objets
 category.general = Général
 category.power = Énergie
 category.liquids = Liquides
@@ -480,20 +515,21 @@ category.items = Objets
 category.crafting = Fabrication
 category.shooting = Défense
 category.optional = Améliorations optionnelles
-setting.landscape.name = Verrouiller la rotation en mode paysage
+setting.landscape.name = Verrouiller en rotation paysage
 setting.shadows.name = Ombres
 setting.linear.name = Filtrage Linéaire
 setting.animatedwater.name = Eau animée
 setting.animatedshields.name = Boucliers Animés
-setting.antialias.name = Antialias[LIGHT_GRAY] (requiert le redémarrage du jeu)[]
+setting.antialias.name = Antialias[lightgray] (redémarrage du jeu nécéssaire)[]
-setting.indicators.name = Indicateurs pour les alliés
+setting.indicators.name = Indicateurs Alliés/Ennemis
 setting.autotarget.name = Visée automatique
-setting.keyboard.name = Controles sourie+clavier
+setting.keyboard.name = Controles Sourie+Clavier
+setting.touchscreen.name = Commandes d'Écran Tactile
 setting.fpscap.name = FPS Max
 setting.fpscap.none = Aucun
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Échelle de l'UI[lightgray] (requiert le redémarrage du jeu)[]
+setting.uiscale.name = Échelle de l'interface[lightgray] (redémarrage du jeu nécéssaire)[]
-setting.swapdiagonal.name = Autoriser le placement des blocs en diagonal
+setting.swapdiagonal.name = Autoriser le placement en diagonale
 setting.difficulty.training = Entraînement
 setting.difficulty.easy = Facile
 setting.difficulty.normal = Normal
@@ -501,37 +537,38 @@ setting.difficulty.hard = Difficile
 setting.difficulty.insane = Extrême
 setting.difficulty.name = Difficulté:
 setting.screenshake.name = Tremblement de l'écran
-setting.effects.name = Montrer les effets
+setting.effects.name = Afficher les effets
 setting.sensitivity.name = Sensibilité de la manette
 setting.saveinterval.name = Intervalle des sauvegardes auto
 setting.seconds = {0} secondes
-setting.fullscreen.name = Plein écran
+setting.fullscreen.name = Plein Écran
-setting.borderlesswindow.name = Ecran sans bords[LIGHT_GRAY] (peut requérir le redémarrage du jeu)
+setting.borderlesswindow.name = Fenêtre sans bords (Borderless)[lightgray] (peut requérir le redémarrage du jeu)
 setting.fps.name = Afficher FPS
 setting.vsync.name = VSync
-setting.lasers.name = Afficher les rayons des lasers
+setting.lasers.name = Afficher les connections Électriques
-setting.pixelate.name = Pixeliser[LIGHT_GRAY] (désactive les animations)
+setting.pixelate.name = Pixeliser[lightgray] (désactive les animations)
-setting.minimap.name = Montrer la minimap
+setting.minimap.name = Montrer la Minimap
-setting.musicvol.name = Volume de la musique
+setting.musicvol.name = Volume Musique
-setting.ambientvol.name = Ambient Volume
+setting.ambientvol.name = Volume Ambiant
-setting.mutemusic.name = Couper la musique
+setting.mutemusic.name = Couper la Musique
-setting.sfxvol.name = Volume des SFX
+setting.sfxvol.name = Volume des Effets Spéciaux
-setting.mutesound.name = Couper les SFX
+setting.mutesound.name = Couper les Effets Spéciaux Sonores
-setting.crashreport.name = Envoyer un rapport de crash anonyme
+setting.crashreport.name = Envoyer un Rapport de Crash Anonyme
-setting.savecreate.name = Créer des Sauvegardes Automatiquement
+setting.savecreate.name = Sauvegardes Auto
-setting.chatopacity.name = Opacité du chat
+setting.publichost.name = Visibilité de la Partie Publique
-setting.playerchat.name = Montrer le chat
+setting.chatopacity.name = Opacité du Chat
-uiscale.reset = L'échelle de l'UI a été modifiée.\nAppuyez sur "OK" pour confirmer.\n[scarlet]Rétablissement aux parametres d'avant et fermeture dans [accent] {0}[]...
+setting.playerchat.name = Montrer le Chat
+uiscale.reset = L'échelle de l'interface a été modifiée.\nAppuyez sur "OK" pour confirmer.\n[scarlet]Rétablissement aux parametres d'avant et fermeture dans [accent] {0}[]...
 uiscale.cancel = Annuler & Quitter
 setting.bloom.name = Flou lumineux
-keybind.title = Paramétrer les racourcis claviers
+keybind.title = Racourcis Clavier
-keybinds.mobile = [scarlet]La plupart des racourcis claviers ne sont pas fonctionnels sur mobile. Seulement les mouvements de base sont supportés.
+keybinds.mobile = [scarlet]La plupart des racourcis claviers ne sont pas fonctionnels sur mobile. Seuls les mouvements basiques sont supportés.
 category.general.name = Général
 category.view.name = Voir
 category.multiplayer.name = Multijoueur
 command.attack = Attaque
+command.rally = Rassembler
 command.retreat = Retraite
-command.patrol = Patrouille
 keybind.gridMode.name = Sélection des blocs
 keybind.gridModeShift.name = Sélection des catégories
 keybind.press = Appuyer sur une touche...
@@ -540,7 +577,7 @@ keybind.screenshot.name = Capture d'écran
 keybind.move_x.name = Mouvement x
 keybind.move_y.name = Mouvement y
 keybind.fullscreen.name = Basculer en Plein Écran
-keybind.select.name = Sélectionner
+keybind.select.name = Sélectionner/Tirer
 keybind.diagonal_placement.name = Placement en diagonale
 keybind.pick.name = Choisir un bloc
 keybind.break_block.name = Suppprimer un bloc
@@ -551,8 +588,8 @@ keybind.zoom.name = Zoom
 keybind.menu.name = Menu
 keybind.pause.name = Pause
 keybind.minimap.name = Minimap
-keybind.dash.name = Courir
+keybind.dash.name = Sprint
-keybind.chat.name = chat
+keybind.chat.name = Chat
 keybind.player_list.name = Liste des joueurs
 keybind.console.name = Console
 keybind.rotate.name = Tourner
@@ -560,11 +597,11 @@ keybind.toggle_menus.name = Cacher/afficher les menus
 keybind.chat_history_prev.name = Remonter l'historique du chat
 keybind.chat_history_next.name = Descendre l'historique du chat
 keybind.chat_scroll.name = Défilement du chat
-keybind.drop_unit.name = Larger les unitées
+keybind.drop_unit.name = Larguer l'unité
 keybind.zoom_minimap.name = Zoom minimap
 mode.help.title = Description des modes de jeu
 mode.survival.name = Survie
-mode.survival.description = Le mode normal. Ressources limitées et vagues automatiques.
+mode.survival.description = Le mode normal. Ressources limitées et vagues automatiques.\n[gray]Nécéssite un point d'apparition pour les ennemis.
 mode.sandbox.name = Bac à sable
 mode.sandbox.description = Ressources infinies et pas de minuterie pour les vagues.
 mode.pvp.name = PvP
@@ -575,26 +612,26 @@ mode.custom = Règles personnalisées
 rules.infiniteresources = Ressources infinies
 rules.wavetimer = Minuterie pour les vagues
 rules.waves = Vagues
-rules.attack = Attack Mode
+rules.attack = Mode d'Attaque
 rules.enemyCheat = Ressources infinies pour l'IA
 rules.unitdrops = Drops des unités
-rules.unitbuildspeedmultiplier = Multiplicateur de la vitesse de création d'unitées
+rules.unitbuildspeedmultiplier = Multiplicateur de Vitesse de Construction d'Unités
-rules.unithealthmultiplier = Multiplicateur de la vie des unitées
+rules.unithealthmultiplier = Multiplicateur de Santé des Unités
-rules.playerhealthmultiplier = Multiplicateur de la vie des joueurs
+rules.playerhealthmultiplier = Multiplicateur de Santé des Joueurs
-rules.playerdamagemultiplier = Multiplicateur des dégats causés par les joueurs
+rules.playerdamagemultiplier = Multiplicateur des Dégâts Joueurs
-rules.unitdamagemultiplier = Multiplicateur des dégats causés par les unité
+rules.unitdamagemultiplier = Multiplicateur des Dégats Unité
-rules.enemycorebuildradius = Rayon de non-construction autour du noyau ennemi:[LIGHT_GRAY] (tuiles)
+rules.enemycorebuildradius = Périmètre de non-construction du noyau ennemi:[lightgray] (blocs)
-rules.respawntime = Temps de réaparition:[LIGHT_GRAY] (sec)
+rules.respawntime = Durée de réaparition:[lightgray] (sec)
-rules.wavespacing = Temps entre les vagues:[LIGHT_GRAY] (sec)
+rules.wavespacing = Espacement des vagues:[lightgray] (sec)
 rules.buildcostmultiplier = Multiplicateur du prix de construction
 rules.buildspeedmultiplier = Multiplicateur du temps de construction
 rules.waitForWaveToEnd = Les vagues attendent la mort des ennemis
-rules.dropzoneradius = Rayon d'apparition des ennemis:[LIGHT_GRAY] (tuiles)
+rules.dropzoneradius = Rayon d'apparition des ennemis:[lightgray] (tuiles)
 rules.respawns = Réapparitions max par vagues
-rules.limitedRespawns = Limite de réapparition
+rules.limitedRespawns = Limiter les réapparition
 rules.title.waves = Vagues
 rules.title.respawns = Réapparitions
-rules.title.resourcesbuilding = Ressources & Constructions
+rules.title.resourcesbuilding = Ressources & Construction
 rules.title.player = Joueurs
 rules.title.enemy = Ennemis
 rules.title.unit = Unités
@@ -609,83 +646,83 @@ item.coal.name = Charbon
 item.graphite.name = Graphite
 item.titanium.name = Titane
 item.thorium.name = Thorium
-item.silicon.name = Silicone
+item.silicon.name = Silice
 item.plastanium.name = Plastanium
-item.phase-fabric.name = Tissu phasé
+item.phase-fabric.name = Tissu Phasé
-item.surge-alloy.name = Alliage superchargé
+item.surge-alloy.name = Alliage Superchargé
-item.spore-pod.name = Spore Pod
+item.spore-pod.name = Glande de Spore
 item.sand.name = Sable
-item.blast-compound.name = Mélange explosif
+item.blast-compound.name = Mélange Explosif
 item.pyratite.name = Pyratite
-item.metaglass.name = Méta-Verre
+item.metaglass.name = Verre Trempé
 item.scrap.name = Ferraille
 liquid.water.name = Eau
 liquid.slag.name = Scories
 liquid.oil.name = Pétrole
-liquid.cryofluid.name = Liquide cryogénique
+liquid.cryofluid.name = Liquide Cryogénique
 mech.alpha-mech.name = Alpha
-mech.alpha-mech.weapon = Fusil automatique
+mech.alpha-mech.weapon = Mitraille Lourde
-mech.alpha-mech.ability = Essaim de drone
+mech.alpha-mech.ability = Régénération
 mech.delta-mech.name = Delta
-mech.delta-mech.weapon = Arc électrique
+mech.delta-mech.weapon = Arc Électrique
 mech.delta-mech.ability = Décharge
 mech.tau-mech.name = Tau
-mech.tau-mech.weapon = Laser restructurant
+mech.tau-mech.weapon = Laser Restructurant
-mech.tau-mech.ability = Explosion réparante
+mech.tau-mech.ability = Éclat Réparateur
 mech.omega-mech.name = Omega
-mech.omega-mech.weapon = Essaim de missiles auto-guidés
+mech.omega-mech.weapon = Missiles Essaim
 mech.omega-mech.ability = Armure
 mech.dart-ship.name = Dard
-mech.dart-ship.weapon = Pistolet automatique
+mech.dart-ship.weapon = Mitraillette
 mech.javelin-ship.name = Javelin
-mech.javelin-ship.weapon = Missiles explosifs autoguidés
+mech.javelin-ship.weapon = Missiles Rafale
-mech.javelin-ship.ability = Décharge de propulseur
+mech.javelin-ship.ability = Décharge de Propulseur
 mech.trident-ship.name = Trident
-mech.trident-ship.weapon = Largage de bombes
+mech.trident-ship.weapon = Bombes
 mech.glaive-ship.name = Glaive
-mech.glaive-ship.weapon = Fusil automatique incendiaire
+mech.glaive-ship.weapon = Mitraille incendiaire
 item.explosiveness = [LIGHT_GRAY]Explosivité: {0}
 item.flammability = [LIGHT_GRAY]Inflammabilité: {0}
 item.radioactivity = [LIGHT_GRAY]Radioactivité: {0}
 unit.health = [LIGHT_GRAY]Santé: {0}
 unit.speed = [LIGHT_GRAY]Rapidité: {0}
 mech.weapon = [LIGHT_GRAY]Arme: {0}
-mech.health = [LIGHT_GRAY]Health: {0}
+mech.health = [LIGHT_GRAY]Santé: {0}
-mech.itemcapacity = [LIGHT_GRAY]Capacité de stockage: {0}
+mech.itemcapacity = [LIGHT_GRAY]Capacité: {0}
-mech.minespeed = [LIGHT_GRAY]Vitesse de minage: {0}
+mech.minespeed = [LIGHT_GRAY]Vitesse d'extraction: {0}
-mech.minepower = [LIGHT_GRAY]Puissance du minage: {0}
+mech.minepower = [LIGHT_GRAY]Puissance d'extraction: {0}
 mech.ability = [LIGHT_GRAY]Compétence: {0}
-mech.buildspeed = [LIGHT_GRAY]Vitesse de construction: {0}%
+mech.buildspeed = [LIGHT_GRAY]Vitesse de Construction: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Capacité Thermique: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
 liquid.temperature = [LIGHT_GRAY]Température: {0}
-block.sand-boulder.name = Bloc de sable
+block.sand-boulder.name = Bloc de Sable
 block.grass.name = Herbe
 block.salt.name = Sel
 block.saltrocks.name = Roches de sel
 block.pebbles.name = Cailloux
 block.tendrils.name = Vrilles
 block.sandrocks.name = Roches de sable
-block.spore-pine.name = Spore Piquants
+block.spore-pine.name = Pin Sporifié
-block.sporerocks.name = Spore Rocheux
+block.sporerocks.name = Roche Sporeuse
 block.rock.name = Roche
 block.snowrock.name = Roches enneigés
 block.snow-pine.name = Pin enneigé
-block.shale.name = Schiste Argileux
+block.shale.name = Schiste
-block.shale-boulder.name = Blocs de Schiste Argileux
+block.shale-boulder.name = Blocs de Schiste
 block.moss.name = Mousse
 block.shrubs.name = Arbustes
 block.spore-moss.name = Mousse Sporeuse
 block.shalerocks.name = Rochets de de Schiste Argileux
-block.scrap-wall.name = Murs de Ferraille
+block.scrap-wall.name = Mur de Ferraille
-block.scrap-wall-large.name = Grand Murs de Ferraille
+block.scrap-wall-large.name = Mur de Ferraille Large
-block.scrap-wall-huge.name = Murs de Ferraille Énorme
+block.scrap-wall-huge.name = Mur de Ferraille Énorme
-block.scrap-wall-gigantic.name = Murs de Ferraille Gigantesque
+block.scrap-wall-gigantic.name = Mur de Ferraille Gigantesque
 block.thruster.name = Propulseur
 block.kiln.name = Four
 block.graphite-press.name = Presse à Graphite
 block.multi-press.name = Multi-Presse
-block.constructing = {0}\n[LIGHT_GRAY](En Construction)
+block.constructing = {0}\n[lightgray](En Construction)
 block.spawn.name = Point d'Apparition Ennemi
 block.core-shard.name = Noyau: Tesson
 block.core-foundation.name = Noyau: Fondation
@@ -704,21 +741,21 @@ block.craters.name = Cratères
 block.sand-water.name = Sable Mouillé
 block.darksand-water.name = Sable Mouillé Sombre
 block.char.name = Cendre
-block.holostone.name = Pierre Claire
+block.holostone.name = Pierre Holographique
 block.ice-snow.name = Neige Gelée
 block.rocks.name = Roches
 block.icerocks.name = Roches de Glace
-block.snowrocks.name = Roches de Neige
+block.snowrocks.name = Roches des Neiges
-block.dunerocks.name = Roches de Dunes
+block.dunerocks.name = Roches des Dunes
 block.pine.name = Pin
 block.white-tree-dead.name = Arbre Blanc Mort
 block.white-tree.name = Arbre Blanc
-block.spore-cluster.name = Spores Groupés
+block.spore-cluster.name = Grappe de Spores
-block.metal-floor.name = Plancher de Métal
+block.metal-floor.name = Plancher Métallique 1
-block.metal-floor-2.name = Plancher de Métal 2
+block.metal-floor-2.name = Plancher Métallique 2
-block.metal-floor-3.name = Plancher de Métal 3
+block.metal-floor-3.name = Plancher Métallique 3
-block.metal-floor-5.name = Plancher de Métal 5
+block.metal-floor-5.name = Plancher Métallique 5
-block.metal-floor-damaged.name = Plancher de Métal Endommagé
+block.metal-floor-damaged.name = Plancher Métallique Endommagé
 block.dark-panel-1.name = Panneau Sombre 1
 block.dark-panel-2.name = Panneau Sombre 2
 block.dark-panel-3.name = Panneau Sombre 3
@@ -747,10 +784,13 @@ block.hail.name = Grêle
 block.lancer.name = Lancier
 block.conveyor.name = Convoyeur
 block.titanium-conveyor.name = Convoyeur en Titane
+block.armored-conveyor.name = Convoyeur Cuirassé
+block.armored-conveyor.description = Déplace les objets à la même vitesse que les convoyeurs en titane, mais est plus résistant. Seulement d'autres convoyeurs peuvent faire rentrer des ressources par ses cotés.
 block.junction.name = Jonction
 block.router.name = Routeur
 block.distributor.name = Distributeur
 block.sorter.name = Trieur
+block.message.name = Message
 block.overflow-gate.name = Barrière de Débordement
 block.silicon-smelter.name = Fonderie de Silicone
 block.phase-weaver.name = Tisseur à Phase
@@ -785,25 +825,25 @@ block.tau-mech-pad.name = Reconstructeur de Mécha Tau
 block.conduit.name = Conduit
 block.mechanical-pump.name = Pompe Mécanique
 block.item-source.name = Source de Ressources
-block.item-void.name = Destructeur de Ressource
+block.item-void.name = Destructeur de Ressources
 block.liquid-source.name = Source de Liquide
 block.power-void.name = Absorbeur Énergétique
 block.power-source.name = Énergie Infinie
 block.unloader.name = Déchargeur
 block.vault.name = Coffre-Fort
 block.wave.name = Vague
-block.swarmer.name = Essaimeur
+block.swarmer.name = Subjugueur
 block.salvo.name = Salve
-block.ripple.name = Onduleur
+block.ripple.name = Percussion
 block.phase-conveyor.name = Convoyeur Phasé
 block.bridge-conveyor.name = Pont
 block.plastanium-compressor.name = Compresseur de Plastanium
-block.pyratite-mixer.name = Mixeur à Pyratite
+block.pyratite-mixer.name = Mixeur de Pyratite
 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 d'Huile
+block.oil-extractor.name = Extracteur de Pétrole
-block.command-center.name = Command Center
+block.command-center.name = Centre de Commandement
 block.draug-factory.name = Usine de Drones Draug Mineurs
 block.spirit-factory.name = Usine de Drones Spirituels Réparateurs
 block.phantom-factory.name = Usine de Drones Fantômes Constructeurs
@@ -820,7 +860,7 @@ block.phase-conduit.name = Conduit Phasé
 block.liquid-router.name = Routeur de Liquide
 block.liquid-tank.name = Réservoir à Liquide
 block.liquid-junction.name = Jonction à Liquide
-block.bridge-conduit.name = Pont à Liquide
+block.bridge-conduit.name = Conduit Surélevé
 block.rotary-pump.name = Pompe Rotative
 block.thorium-reactor.name = Réacteur à Thorium
 block.mass-driver.name = Transporteur de Masses
@@ -830,13 +870,13 @@ block.thermal-generator.name = Générateur Thermique
 block.alloy-smelter.name = Fonderie d'Alliage Superchargé
 block.mender.name = Réparateur
 block.mend-projector.name = Projecteur Soignant
-block.surge-wall.name = Mur superchargé
+block.surge-wall.name = Mur Superchargé
-block.surge-wall-large.name = Grand mur superchargé
+block.surge-wall-large.name = Grand mur Superchargé
 block.cyclone.name = Cyclone
 block.fuse.name = Fusible
-block.shock-mine.name = Mines à Chocs
+block.shock-mine.name = Mine à Chocs
 block.overdrive-projector.name = Projecteur Surmultiplicateur
-block.force-projector.name = Projecteur de Champ de Force
+block.force-projector.name = Champ de Force
 block.arc.name = Arc
 block.rtg-generator.name = Générateur G.T.R.
 block.spectre.name = Spectre
@@ -844,13 +884,13 @@ block.meltdown.name = Fusion
 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.blue.name = bleu
-team.crux.name = red
+team.crux.name = rouge
-team.sharded.name = orange
+team.sharded.name = éclaté
-team.orange.name = Orange
+team.orange.name = orange
-team.derelict.name = derelict
+team.derelict.name = abandonné
-team.green.name = Vert
+team.green.name = vert
-team.purple.name = Violet
+team.purple.name = violet
 unit.spirit.name = Drone Spirituel Réparateur
 unit.draug.name = Drone Draug Mineur
 unit.phantom.name = Drone Fantôme Constructeur
@@ -858,7 +898,7 @@ unit.dagger.name = Poignard
 unit.crawler.name = Rampeur
 unit.titan.name = Titan
 unit.ghoul.name = Goule
-unit.wraith.name = Spectral
+unit.wraith.name = Spectre
 unit.fortress.name = Forteresse
 unit.revenant.name = Revenant
 unit.eruptor.name = Érupteur
@@ -925,10 +965,11 @@ unit.eruptor.description = Une unité lourde conçue pour détruire les structur
 unit.wraith.description = Une unité d'interception rapide et de frappe. Cible les générateurs d'énergie.
 unit.ghoul.description = Un bombardier lourd de saturation. Déchire a travert les structures ennemies, ciblant les infrastructures critiques.
 unit.revenant.description = Un arsenal de missiles lourd et planant.
+block.message.description = Enregistre un message. Utilisé pour la communication entre alliés.
 block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite pur.
 block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
 block.silicon-smelter.description = Réduit le sable avec du charbon pur. Produit du silicone.
-block.kiln.description = Fait fondre le sable et le plomb en méta-verre. Nécessite de petites quantités d'énergie.
+block.kiln.description = Fait fondre le sable et le plomb en verre trempé. Nécessite de petites quantités d'énergie.
 block.plastanium-compressor.description = Produit du plastanium à partir d'huile et de titane.
 block.phase-weaver.description = Produit du tissu phasé à partir de thorium et de grandes quantités de sable. Nécessite des quantités massives d'énergie pour fonctionner.
 block.alloy-smelter.description = Produit un alliage superchargé à l'aide de titane, de plomb, de silicone et de cuivre.
@@ -1007,8 +1048,8 @@ block.oil-extractor.description = Utilise une grande quantité d'énergie afin d
 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 = La deuxième version du noyau. Meilleur blindage. Stocke plus de ressources.
 block.core-nucleus.description = La troisième et dernière iteraction de la capsule centrale. Extrêmement bien blindée. Stocke des quantités massive de ressources.
-block.vault.description = Stocke un grand nombre d'objets. Utile pour réguler le flux d'objet quand la demande de matériaux est inconstante.un [LIGHT_GRAY] déchargeur[] peut être utilisé pour récupérer des objets depuis le coffre-fort.
+block.vault.description = Stocke un grand nombre d'objets. Utile pour réguler le flux d'objet quand la demande de matériaux est inconstante.un [lightgray] déchargeur[] peut être utilisé pour récupérer des objets depuis le coffre-fort.
-block.container.description = Stocke un petit nombre d'objet . Utile pour réguler le flux d'objet quand la demande de matériaux est inconstante.un [LIGHT_GRAY] déchargeur[] peut être utilisé pour récupérer des objets depuis le conteneur.
+block.container.description = Stocke un petit nombre d'objet . Utile pour réguler le flux d'objet quand la demande de matériaux est inconstante.un [lightgray] déchargeur[] peut être utilisé pour récupérer des objets depuis le conteneur.
 block.unloader.description = Décharge des objets depuis des conteneurs, coffres-forts ou de la base sur un convoyeur ou directement dans un bloc adjacent . Le type d'objet peut être changé en appuyant sur le déchargeur.
 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.

core/assets/bundles/bundle_fr_BE.properties

@@ -4,10 +4,10 @@ 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 = Liste des modifications de mise à jour
+link.changelog.description = Liste des mises à jour
 link.dev-builds.description = Versions instables de développement
-link.trello.description = Planning Trello officiel pour les fonctionnalités planifiées.
+link.trello.description = 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
+link.itch.io.description = Site itch.io avec les versions téléchargeables pour ordinateur.
 link.google-play.description = Page Google Play du jeu
 link.wiki.description = Wiki officiel de Mindustry
 linkfail = L'ouverture du lien a échoué!\nL'URL a été copiée dans votre presse-papier.
@@ -16,18 +16,18 @@ screenshot.invalid = Carte trop grande, potentiellement pas assez de mémoire po
 gameover = Le base a été détruite.
 gameover.pvp = L'équipe[accent] {0}[] a gagnée !
 highscore = [accent]Nouveau meilleur score !
-load.sound = Sounds
+load.sound = Son
 load.map = Maps
 load.image = Images
-load.content = Content
+load.content = Contenu
-load.system = System
+load.system = Système
 stat.wave = Vagues vaincues:[accent] {0}
 stat.enemiesDestroyed = Ennemies détruits:[accent] {0}
 stat.built = Bâtiments construits:[accent] {0}
 stat.destroyed = Bâtiments détruits:[accent] {0}
 stat.deconstructed = Bâtiments déconstruits:[accent] {0}
 stat.delivered = Ressources transférées:
-stat.rank = FRang Final: [accent]{0}
+stat.rank = Rang Final: [accent]{0}
 launcheditems = [accent]Ressources transférées
 map.delete = Êtes-vous sûr de vouloir supprimer cette carte ?"[accent]{0}[]"?
 level.highscore = Meilleur score: [accent]{0}
@@ -48,9 +48,18 @@ minimap = Minimap
 close = Fermer
 website = Website
 quit = Quitter
+save.quit = Save & Quit
 maps = Cartes
+maps.browse = Browse Maps
 continue = Continue
 maps.none = [LIGHT_GRAY]Aucune carte trouvée!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = À propos
 name = Nom:
 noname = Choisissez d'abord [accent]un pseudo[].
@@ -61,16 +70,18 @@ techtree = Arbre technologique
 research.list = [LIGHT_GRAY]Recherche:
 research = Recherche
 researched = [LIGHT_GRAY]{0} recherchée.
-players = {0} joueurs en ligne
+players = {0} joueurs
-players.single = {0} joueur en ligne
+players.single = {0} joueur
 server.closing = [accent]Fermeture du serveur ...
 server.kicked.kick = Vous avez été expulsé du serveur !
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Serveur fermé.
 server.kicked.vote = You have been vote-kicked. Goodbye.
 server.kicked.clientOutdated = Client dépassé! Mettez à jour votre jeu !
 server.kicked.serverOutdated = Serveur dépassé! Demandez à l'hôte de le mettre à jour !
 server.kicked.banned = Vous êtes banni de ce serveur.
 server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = Ce serveur est complet. Attendez qu'une place ce libére.
 server.kicked.recentKick = Vous avez été expulsé récemment.\nAttendez avant de vous connecter à nouveau.
 server.kicked.nameInUse = Il y a déjà quelqu'un avec ce nom\nsur ce serveur.
 server.kicked.nameEmpty = Votre nom doit contenir au moins une lettre ou un chiffre.
@@ -81,11 +92,13 @@ server.versions = Votre version:[accent] {0}[]\nVersion du serveur:[accent] {1}[
 host.info = Le bouton [accent]héberger[] héberge un serveur sur les ports [scarlet]6567[] et [scarlet]6568.[]\nN'importe qui sur le même [LIGHT_GRAY]réseau wifi ou local[] devrait pouvoir voir votre serveur dans sa liste de serveurs.\n\nSi vous voulez que les gens puissent se connecter de n'importe où grâce à l'IP, [accent]rediriger les ports[] est requis.\n\n[LIGHT_GRAY]Note:Si quelqu'un éprouve des difficultés à se connecter à votre partie LAN, assurez-vous que vous avez autorisé Mindustry à accéder à votre réseau local dans les paramètres de votre pare-feu.
 join.info = Ici, vous pouvez entrer l' [accent]IP d'un serveur[] pour s'y connecter, ou découvrir les serveurs[accent]sur votre réseau local[] pour s'y connecter.\nLes parties multijoueur LAN et WAN sont toutes deux supportées.\n\n[LIGHT_GRAY]Note: Aucune liste globale des serveurs n'est génerée automatiquement: si vous voulez vous connecter à un serveur par IP, vous devrez demander l'IP à l'hébergeur.
 hostserver = Héberger un serveur
+invitefriends = Invite Friends
 hostserver.mobile = Héberger\nUne partie
 host = Héberger
 hosting = [accent]Ouverture du serveur ...
 hosts.refresh = Actualiser
 hosts.discovering = Recherche de parties en LAN
+hosts.discovering.any = Discovering games
 server.refreshing = Actualisation du serveur
 hosts.none = [lightgray]Aucun jeu en LAN trouvé !
 host.invalid = [scarlet]Impossible de se\nconnecter à l'hôte.
@@ -106,16 +119,21 @@ server.edit = Modifier le serveur
 server.outdated = [crimson]Serveur obsolète ![]
 server.outdated.client = [crimson]Client obsolète ![]
 server.version = [lightgray]Version: {0} {1}
-server.custombuild = [yellow]Version personnalisée
+server.custombuild = [accent]Version personnalisée
 confirmban = Êtes-vous sûr de vouloir bannir ce joueur ?
 confirmkick = Êtes-vous sûr de vouloir expulser ce joueur?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Êtes-vous sûr de vouloir annuler le ban de ce joueur ?
 confirmadmin = Êtes-vous sûr de vouloir faire de ce joueur un administrateur ?
 confirmunadmin = Êtes-vous sûr de vouloir supprimer le statut d'administrateur de ce joueur ?
 joingame.title = Rejoindre une partie
 joingame.ip = IP:
 disconnect = Déconnecté.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Les données du monde n'ont pas pu être chargées !
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connexion...
 connecting.data = [accent]Chargement des données du monde...
 server.port = Port:
@@ -141,6 +159,7 @@ save.rename = Renommer
 save.rename.text = Nouveau nom:
 selectslot = Sélectionnez une sauvegarde.
 slot = [accent]Emplacement {0}
+editmessage = Edit Message
 save.corrupted = [accent]Fichier de sauvegarde corrompu ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]non[] un bug.
 empty = <vide>
 on = Allumer
@@ -148,12 +167,13 @@ off = Éteint
 save.autosave = Sauvegarde automatique {0}
 save.map = Carte: {0}
 save.wave = Vague {0}
-save.difficulty = Difficulté: {0}
+save.mode = Mode de jeu {0}
 save.date = Dernière sauvegarde: {0}
 save.playtime = Temps de jeu: {0}
 warning = Avertissement.
 confirm = Confirmer
 delete = Supprimer
+view.workshop = View In Workshop
 ok = OK
 open = Ouvrir
 customize = Personnaliser
@@ -190,6 +210,11 @@ map.nospawn = Cette carte ne possède pas de base pour que le joueur puisse appa
 map.nospawn.pvp = Cette carte ne contient aucune base ennemi dans lequel le joueur apparaît!\nAjoutez des bases [SCARLET]rouge[] à cette carte dans l'éditeur.
 map.nospawn.attack = Cette carte ne contient aucune base ennemi à attaquer! Ajoutez des bases [SCARLET]rouge[] à cette carte dans l'éditeur.
 map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Pinceau
 editor.openin = Ouvrir dans l'éditeur
 editor.oregen = Génération des minerais
@@ -197,11 +222,14 @@ editor.oregen.info = Génération de minerais:
 editor.mapinfo = Infos sur la carte
 editor.author = Auteur:
 editor.description = Description:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Vagues:
 editor.rules = Règles:
 editor.generation = Generation:
 editor.ingame = Modifier en jeu
+editor.publish.workshop = Publish On Workshop
 editor.newmap = Nouvelle carte
+workshop = Workshop
 waves.title = Vagues
 waves.remove = Retirer
 waves.never = <jamais>
@@ -218,6 +246,7 @@ waves.invalid = Vagues invalides dans le Presse-papiers.
 waves.copied = Vagues copiées.
 waves.none = Aucun ennemi défini.\nNotez que les dispositions vides seront automatiquement remplacées par la dispositions par défaut.
 editor.default = [LIGHT_GRAY]<Par défaut>
+details = Details...
 edit = Modifier...
 editor.name = Nom:
 editor.spawn = Ajouter une unité
@@ -225,8 +254,9 @@ editor.removeunit = Retirer l'unité
 editor.teams = Équipes
 editor.errorload = Erreur lors du chargement du fichier:\n[accent]{0}
 editor.errorsave = Erreur lors de la sauvegarde du fichier:\n[accent]{0}
-editor.errorimage = C'est une image, pas une carte. Ne changez pas les extensions en espérant que cela fonctionne.\n\nSi vous souhaitez importer une carte, utilisez le bouton "importer une carte" dans l'éditeur.
+editor.errorimage = C’est une image, pas une carte.\n\nSi vous souhaitez importer une carte 3.5/build 40, utilisez le bouton "Importer une carte héritée" dans l’éditeur.
 editor.errorlegacy = Cette carte est trop ancienne et utilise un format de carte qui n'est plus pris en charge.
+editor.errornot = Ce n'est pas un fichier de carte.
 editor.errorheader = Ce fichier de carte n'est pas valide ou corrompu.
 editor.errorname = La carte n'a pas de nom !
 editor.update = Mettre à jour
@@ -245,7 +275,7 @@ editor.importmap = Importer une carte
 editor.importmap.description = Importer une carte déjà existante
 editor.importfile = Importer un fichier
 editor.importfile.description = Importer une carte à partir d'un fichier externe
-editor.importimage = Importer l'image du terrain
+editor.importimage = Importer la carte existante
 editor.importimage.description = Importer une image de terrain à partir d'un fichier externe
 editor.export = Exportation en cours...
 editor.exportfile = Exporter un fichier
@@ -259,6 +289,7 @@ editor.resizemap = Redimensionner\nla carte
 editor.mapname = Nom de la carte:
 editor.overwrite = [accent]Attention!\nCela écrasera une carte existante.
 editor.overwrite.confirm = [scarlet]Attention ![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir la réécrire?
+editor.exists = A map with this name already exists.
 editor.selectmap = Sélectionnez une carte à charger:
 toolmode.replace = Remplacer
 toolmode.replace.description = Dessine uniquement sur des blocs pleins.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Découvrir
 configure = Configurer le transfert des ressources.
 configure.locked = [LIGHT_GRAY]Atteigner la vague {0}\npour configurer le transfert des ressources.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} Débloquée.
 zone.requirement.complete = Vague {0} atteinte:\n{1} Exigences de la zone complétées
 zone.config.complete = Vague {0} atteinte:\nConfiguration du transfert débloquée.
@@ -434,6 +466,7 @@ blocks.boosteffect = Effet boostant
 blocks.maxunits = Maximum d'unitée active
 blocks.health = Santé
 blocks.buildtime = Temps de construction
+blocks.buildcost = Coût de construction
 blocks.inaccuracy = Précision
 blocks.shots = Tirs
 blocks.reload = Tirs/Seconde
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Vitesse de forage: {0}/s
 bar.efficiency = Efficacité: {0}%
 bar.powerbalance = Énergie: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Énergie: {0}
 bar.poweroutput = Énergie en sortie: {0}
 bar.items = Objets: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquide
 bar.heat = Chaleur
 bar.power = Énergie
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (demande le redémarrage de l'app
 setting.indicators.name = Indicateurs d'alliés
 setting.autotarget.name = Visée automatique
 setting.keyboard.name = Contrôles Souris + Clavier
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = Vide
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = Volume des SFX
 setting.mutesound.name = Couper les SFX
 setting.crashreport.name = Envoyer des rapports d'incident anonymement.
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Opacité du tchat
 setting.playerchat.name = Afficher le tchat en jeu
 uiscale.reset = L'échelle de l'interface a été modifiée.\nAppuyez sur "OK" pour confirmer cette échelle.\n[scarlet]Revenir et sortir en[accent] {0}[] réglages...
@@ -530,8 +567,8 @@ category.general.name = Général
 category.view.name = Voir
 category.multiplayer.name = Multijoueur
 command.attack = Attaquer
+command.rally = Rally
 command.retreat = Retraite
-command.patrol = Patrouiller
 keybind.gridMode.name = Sélectionnez le bloc
 keybind.gridModeShift.name = Sélection de la catégorie
 keybind.press = Appuyez sur une touche ...
@@ -747,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Transporteur
 block.titanium-conveyor.name = Transporteur en titane
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Junction
 block.router.name = Routeur
 block.distributor.name = [accent]Distributeur[]
 block.sorter.name = Trieur
+block.message.name = Message
 block.overflow-gate.name = Barrière de Débordement
 block.silicon-smelter.name = Fonderie de silicone
 block.phase-weaver.name = Tisseur à phase
@@ -871,8 +911,8 @@ tutorial.intro = Vous êtes entré dans le[scarlet] Tutoriel de Mindustry.[]\nCo
 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 = Le minage manuel est inefficace.\n[accent]Des foreuses[]peuvent miner automatiquement.\nAppuyez sur l'onglet de forage en bas à droite.\nSélectionnez la[accent] perceuse mécanique[].\nPlacez-la sur une veine de cuivre, puis appuyez sur la[accent] coche(V)[] ci-dessous pour confirmer votre sélection.\nAppuyez sur le [accent] bouton X[]pour annuler le placement.
 tutorial.blockinfo = Chaque bloc a des statistiques différentes. Chaque foreuse ne peut extraire que certains minerais.\nPour vérifier les informations et les statistiques d'un bloc,[accent] tapez sur le "?" tout en le sélectionnant dans le menu de compilation.[]\n\n[accent]Accédez aux statistiques de la foreuse mécanique maintenant.[]
-tutorial.conveyor = [accent]Les tapis roulants[] sont utilisés pour transporter des objets jusqu'à la base.\nFaites une ligne de tapis roulants de la foreuse à la base.
+tutorial.conveyor = [accent]Convoyeurs[] sont utilisés pour transporter des articles à la base.\nFaire une ligne de convoyeurs de la foreusse à la base.\n[accent]Maintenez le clique droit de la souris pour placer dans une ligne.[]\nMaintenir[accent] CTRL[] en sélectionnant une ligne à placer en diagonale.\n\n[accent]Placez 2 convoyeurs avec l'outil ligne, puis livrez un article dans la base.
-tutorial.conveyor.mobile = [accent]Les tapis roulants[] sont utilisés pour transporter des objets jusqu'à la base.\nFaites une ligne de tapis roulants de la foreuse à la base.\n[accent]Placez en ligne en maintenant votre doigt enfoncé pendant quelques secondes[] et glisser dans une direction.\n\n[accent]{0}/{1} convoyeurs placés en ligne\n[accent]0/1 articles livrés
+tutorial.conveyor.mobile = [accent]Convoyeurs[] sont utilisés pour transporter des articles à la base.\nFaire une ligne de convoyeurs de la foreusse à la base.\n[accent] Placez dans une ligne en maintenant votre doigt appuyé pendant quelques secondes[] et en le faisant glisser dans une direction.\n\n[accent]Placez 2 convoyeurs avec l'outil ligne, puis livrez un article dans la base.
 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 = Pendant le combat, vous pouvez[accent] mettre le jeu en pause.[]\nVous pouvez construire des bâtiments pendant que le jeu est en pause.\n\n[accent]Appuyez sur espace pour mettre le jeu en pause.
@@ -925,6 +965,7 @@ unit.eruptor.description = Un mech lourd conçu pour abattre des structures. Tir
 unit.wraith.description = Une unité volante rapide harcelant les ennemis. Utilise du plomb comme munitions.
 unit.ghoul.description = Un bombardier lourd. Utilise de la pyratite ou des explosifs comme munitions.
 unit.revenant.description = Un arsenal de missiles lourd et planant.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite.
 block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
 block.silicon-smelter.description = Réduit le sable avec du coke* très pur afin de produire du silicium. (*Coke produit à partir de charbon:REF)

core/assets/bundles/bundle_in_ID.properties

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

core/assets/bundles/bundle_ko.properties

@@ -1,4 +1,4 @@
-credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]
+credits.text = 제작자 [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[] / [scarlet]한국어 번역자[] - [royal]Potion[]
 credits = 제작자
 contributors = 번역 및 기여자들
 discord = Mindustry Discord 에 참여 해 보세요!
@@ -19,15 +19,15 @@ highscore = [accent]최고점수 달성!
 load.sound = 소리
 load.map = 맵
 load.image = 사진
-load.content = Content
+load.content = 컨텐츠
 load.system = 시스템
-stat.wave = 웨이브 성공:[accent]{0}
+stat.wave = 버틴 단계 수 : [accent]{0}
 stat.enemiesDestroyed = 파괴한 적 수 : [accent]{0}
 stat.built = 건설한 건물 수 : [accent]{0}
 stat.destroyed = 파괴된 건물 수 : [accent]{0}
 stat.deconstructed = 파괴한 건물 수 : [accent]{0}
 stat.delivered = 획득한 자원 :
-stat.rank = 최종 기록: [accent]{0}
+stat.rank = 최종 점수: [accent]{0}
 launcheditems = [accent]창고
 map.delete = 정말로 "[accent]{0}[]" 맵을 삭제하시겠습니까?
 level.highscore = 최고 점수 : [accent]{0}
@@ -48,9 +48,18 @@ minimap = 미니맵
 close = 닫기
 website = 웹사이트
 quit = 나가기
+save.quit = 저장  나가기
 maps = 맵
+maps.browse = 맵 검색
 continue = 계속하기
 maps.none = [LIGHT_GRAY]맵을 찾을 수 없습니다!
+invalid = 오류
+preparingconfig = 설정 사전준비
+preparingcontent = 컨텐츠 사전준비
+uploadingcontent = 컨텐츠 업로드
+uploadingpreviewfile = 미리보기 파일 업로드
+committingchanges = 바뀐 점 적용
+done = 완료
 about.button = 정보
 name = 이름 :
 noname = 먼저 [accent] 유저 이름[] 을 설정하세요.
@@ -65,12 +74,14 @@ players = 현재 {0}명 접속중
 players.single = 현재 {0}명만 있음.
 server.closing = [accent]서버 닫는중...
 server.kicked.kick = 서버에서 추방되었습니다!
+server.kicked.whitelist = 당신은 이 서버의 화이트리스트가 아닙니다.
 server.kicked.serverClose = 서버 종료됨.
 server.kicked.vote = 당신은 투표로 추방되었습니다. 그러니 좀 적당히 하지 그랬어요?
 server.kicked.clientOutdated = 오래된 버전의 게임입니다! 게임을 업데이트 하세요!
 server.kicked.serverOutdated = 오래된 버전의 서버입니다! 서버 호스트 관리자에게 문의하세요!
 server.kicked.banned = 서버 규칙 위반으로 인해, 이제 당신은 영원히 이 서버를 플레이 하실 수 없습니다.
-server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.typeMismatch = 클라이언트와 호환되지 않는 서버입니다. 디스코드에서 #mods에 들러보는 건 어떨까요?
+server.kicked.playerLimit = 서버가 꽉 찼습니다. 빈 공간이 생길 때까지 기다려주세요.
 server.kicked.recentKick = 방금 추방처리 되었습니다.\n잠시 기다린 후에 접속 해 주세요.
 server.kicked.nameInUse = 이 닉네임이 이미 서버에서 사용중입니다.
 server.kicked.nameEmpty = 당신의 닉네임이 비어있습니다.
@@ -81,11 +92,13 @@ server.versions = 클라이언트 버전 : [accent] {0}[]\n서버 버전 : [acce
 host.info = [accent]호스트[] 버튼은 현재 네트워크의 [scarlet]6567[] 포트를 사용합니다.\n[LIGHT_GRAY]같은 Wi-Fi 또는 로컬 네트워크[] 에서 서버 목록을 볼 수 있습니다.\n\n만약 플레이어들이 이 IP를 통해 어디에서나 연결할 수 있게 하고 싶다면, 공유기 설정에서 [accent]포트 포워딩[]을 하시거나 Vpn을 사용하셔야 합니다.\n\n[LIGHT_GRAY]참고: LAN 게임 연결에 문제가 있는 사람이 있다면, 방화벽 설정에서 Mindustry 가 로컬 네트워크에 액세스하도록 허용했는지 확인 해 주세요.
 join.info = 여기서 [accent]서버 IP[]를 입력하여 다른 서버에 접속할 수 있습니다.\n또는 [accent]로컬 네트워크(LAN)[] 서버를 검색하여 접속할 수 있습니다.\nLAN 및 WAN 멀티 플레이어 모두 지원됩니다.\n\n[LIGHT_GRAY]참고:여기에서는 자동으로 글로벌 서버를 추가하지 않습니다. IP로 다른 사람의 서버에 접속할려면 직접 서버 주소를 찾아서 적으셔야합니다.[]\n\n[ROYAL]한국의 서버로는 mindustry.kr[accent](포트없음)[],6568과 server1.mindustry.r-e.kr의 8000,8001,8002,8004포트가 있습니다.\n서버 주소 입력방법은 < 주소:포트 >의 형식입니다.
 hostserver = 서버 열기
+invitefriends = 친구 초대
 hostserver.mobile = 서버\n열기
 host = 서버 열기
 hosting = [accent]서버 여는중...
 hosts.refresh = 새로고침
 hosts.discovering = LAN 게임 찾기
+hosts.discovering.any = 서버 찾기
 server.refreshing = 서버 목록 새로고치는중...
 hosts.none = [lightgray]LAN 게임을 찾을 수 없습니다!
 host.invalid = [scarlet]서버에 연결할 수 없습니다!
@@ -109,18 +122,23 @@ server.version = [lightgray]서버 버전: {0} {1}
 server.custombuild = [yellow]사용자 정의 서버
 confirmban = 이 플레이어를 차단하시겠습니까?
 confirmkick = 정말로 이 플레이어를 추방시키겠습니까?
+confirmvotekick = 정말로 이 플레이어 추방에 투표하시겠습니까?
 confirmunban = 이 플레이어를 차단해제 하시겠습니까?
 confirmadmin = 이 플레이어를 관리자로 만들겠습니까?
 confirmunadmin = 이 플레이어를 일반 유저로 만들겠습니까?
 joingame.title = 게임 참가
 joingame.ip = 주소:
 disconnect = 서버와 연결이 해제되었습니다.
-disconnect.data = 맵 데이터를 받아오는데 실패했습니다!
+disconnect.error = Connection error.
+disconnect.closed = 연결이 끊어졌습니다..
+disconnect.timeout = 연결 시간 한계 도달..
+disconnect.data = 월드 데이터 로딩 실패..
+cantconnect = 게임 [accent]{0}[]에 접속하지 못했습니다.
 connecting = [accent]연결중...
-connecting.data = [accent]맵 데이터 다운로드중...
+connecting.data = [accent]월드 데이터 로딩중...
 server.port = 포트:
-server.addressinuse = 이 주소는 이미 사용중입니다!
+server.addressinuse = 주소가 이미 사용중입니다!
-server.invalidport = 포트 번호가 잘못되었습니다.
+server.invalidport = 포트가 올바르지 않습니다!
 server.error = [accent]{0}[crimson]서버를 여는데 오류가 발생했습니다.
 save.old = 이 저장파일은 이전 버전의 게임용이며, 지금은 사용할 수 없습니다. \n\n[LIGHT_GRAY]4.0 정식때 이전 게임버전에서 만든 저장파일과 호환됩니다.
 save.new = 새로 저장
@@ -141,6 +159,7 @@ save.rename = 이름 변경
 save.rename.text = 새 이름:
 selectslot = 저장슬롯을 선택하십시오.
 slot = [accent]{0}번째 슬롯
+editmessage = 글 수정하기
 save.corrupted = [accent]세이브 파일이 손상되었거나 잘못된 파일입니다! 만약 게임을 업데이트 했다면 이것은 아마 저장 형식 변경일 것이고, 이것은 버그가 [scarlet]아닙니다[].
 empty = <비어있음>
 on = 켜기
@@ -148,12 +167,13 @@ off = 끄기
 save.autosave = 자동저장: {0}
 save.map = 맵: {0}
 save.wave = 웨이브 {0}
-save.difficulty = 난이도: {0}
+save.mode = 게임모드 : {0}
 save.date = 마지막 저장날짜: {0}
 save.playtime = 플레이시간: {0}
 warning = 경고.
 confirm = 확인
 delete = 삭제
+view.workshop = 워크샵에서 보기
 ok = OK
 open = 열기
 customize = 맞춤설정
@@ -190,6 +210,11 @@ map.nospawn = 이 맵에 플레이어가 생성될 코어가 없습니다! 맵
 map.nospawn.pvp = 이 맵에는 적팀 코어가 없습니다! 에디터에서 [ROYAL]노랑색 팀이 아닌[] 코어를 추가하세요.
 map.nospawn.attack = 이 맵에는 플레이어가 공격할 수 있는 적의 코어가 없습니다! 에디터에서 [ROYAL] 빨강색 팀[] 코어를 맵에 추가하세요.
 map.invalid = 파일이 잘못되었거나 손상되어 맵을 열 수 없습니다.
+map.publish.error = 맵 업로드 오류 : {0}
+map.publish.confirm = 맵을 업로드 하시겠습니까?\n\n[lightgray]먼저 워크샵 EULA에 동의하시지 않으면 맵이 표시되지 않습니다!
+eula = 스팀 EULA
+map.publish = 맵 업로드 완료!
+map.publishing = [accent]맵 업로드 중...
 editor.brush = 브러쉬
 editor.openin = 편집기 열기
 editor.oregen = 광물 무작위 생성
@@ -197,16 +222,19 @@ editor.oregen.info = 광물 무작위 생성:
 editor.mapinfo = 맵 정보
 editor.author = 만든이:
 editor.description = 설명:
-editor.waves = 웨이브:
+editor.nodescription = 맵을 업로드하려면 최소 4자 이상의 설명이 있어야합니다.
+editor.waves = 단계 :
 editor.rules = 규칙:
 editor.generation = 맵 생성 설정:
 editor.ingame = 인게임 편집
+editor.publish.workshop = 워크샵 업로드
 editor.newmap = 신규 맵
-waves.title = 웨이브
+workshop = 워크샵
+waves.title = 단계
 waves.remove = 삭제
 waves.never = 여기까지 유닛생성
 waves.every = 매
-waves.waves = 웨이브마다
+waves.waves = 단계마다
 waves.perspawn = 생성
 waves.to = 부터
 waves.boss = 이 유닛을 보스로 설정
@@ -214,10 +242,11 @@ waves.preview = 미리보기
 waves.edit = 편집
 waves.copy = 클립보드로 복사
 waves.load = 클립보드에서 불러오기
-waves.invalid = 클립보드의 잘못된 웨이브 데이터
+waves.invalid = 클립보드의 잘못된 단계 데이터
-waves.copied = 웨이브 복사됨
+waves.copied = 단계 코드 복사됨
-waves.none = 적 웨이브가 설정되지 않았습니다.\n비어있을 시 자동으로 기본 적 웨이브로 설정됩니다.
+waves.none = 적 단계가 설정되지 않았습니다.\n비어있을 시 자동으로 기본 적 단계로 설정됩니다.
 editor.default = [LIGHT_GRAY]<기본값>
+details = 설명
 edit = 편집
 editor.name = 이름:
 editor.spawn = 유닛 생성
@@ -227,6 +256,7 @@ editor.errorload = [accent]{0} 파일을 불러오는데 실패했습니다.
 editor.errorsave = [accent]{0} 파일을 저장하는데 실패했습니다.
 editor.errorimage = 이것은 맵이 아니라 사진입니다.\n\n예전 맵을 가져올려면 편집기의 '예전 맵 가져오기' 버튼을 사용하세요.
 editor.errorlegacy = 이 맵은 너무 오래되어, 더이상 지원하지 않는 맵 형식을 사용합니다.
+editor.errornot = 선택한 대상이 맵 파일이 아닙니다.
 editor.errorheader = 이 맵 파일은 유효하지 않거나 손상되었습니다.
 editor.errorname = 맵에 이름이 지정되어 있지 않습니다.
 editor.update = 업데이트
@@ -259,6 +289,7 @@ editor.resizemap = 맵 크기 조정
 editor.mapname = 맵 이름:
 editor.overwrite = [accept]경고!이 명령은 기존 맵을 덮어씌우게 됩니다.
 editor.overwrite.confirm = [scarlet]경고![] 이 이름을 가진 맵이 이미 있습니다. 덮어 쓰시겠습니까?
+editor.exists = 같은 이름의 맵이 이미 존재합니다.
 editor.selectmap = 불러올 맵 선택:
 toolmode.replace = 재배치
 toolmode.replace.description = 블록을 배치합니다.
@@ -277,8 +308,8 @@ toolmode.drawteams.description = 블록 대신 팀 건물을 배치합니다.
 filters.empty = [LIGHT_GRAY]필터가 없습니다!! 아래 버튼을 눌러 추가하세요.
 filter.distort = 왜곡
 filter.noise = 맵 전체에 타일 혹은 블럭 뿌리기
-filter.median = 중앙값
+filter.median = 타일 비율 조정
-filter.oremedian = 자원 중앙값
+filter.oremedian = 자원 크기 조정
 filter.blend = 벽 주위에 타일 설치
 filter.defaultores = 기본 자원값 추가
 filter.ore = 자원
@@ -326,7 +357,7 @@ abandon = 포기
 abandon.text = 이 구역의 모든 자원이 적에게 빼앗길 것입니다.
 locked = 잠김
 complete = [LIGHT_GRAY]완료:
-zone.requirement = 지역 {1} 에서 웨이브 {0} 달성
+zone.requirement = 지역 {1} 에서 단계 {0} 달성
 resume = 지역 계속 플레이:\n[LIGHT_GRAY]{0}
 bestwave = [LIGHT_GRAY]최고 점수: {0}
 launch = < 출격 >
@@ -334,13 +365,14 @@ launch.title = 출격 성공
 launch.next = [LIGHT_GRAY]다음 출격기회는 {0} 단계에서 나타납니다.
 launch.unable2 = [scarlet]출격할 수 없습니다.[]
 launch.confirm = 출격하게 되면 모든 자원이 코어로 들어갑니다.\n또한 성공하기 전까지 기지로 돌아갈 수 없습니다.
-launch.skip.confirm = 만약 지금 출격하시지 않고 스킵하신다면, 다음 출격 웨이브까지 기다려야 합니다.
+launch.skip.confirm = 만약 지금 출격하시지 않고 스킵하신다면, 다음 출격 단계까지 기다려야 합니다.
 uncover = 구역 개방
 configure = 코어 시작자원 설정
 configure.locked = {0} 단계에서 시작자원 설정 잠금이 해제됩니다.
+configure.invalid = 해당  0 과 {0} 사이여야 합니다.
 zone.unlocked = [LIGHT_GRAY] 잠금 해제되었습니다!
-zone.requirement.complete = 웨이브 {0} 달성:\n{1} 지역 요구사항이 충족되었습니다!
+zone.requirement.complete = 단계 {0} 달성:\n{1} 지역 요구사항이 충족되었습니다!
-zone.config.complete = 웨이브 {0} 달성:\n시작자원 설정 기능이 해금되었습니다!
+zone.config.complete = 단계 {0} 달성:\n시작자원 설정 기능이 해금되었습니다!
 zone.resources = 자원이 감지되었습니다 :
 zone.objective = [lightgray]게임 모드: [accent]{0}
 zone.objective.survival = 생존
@@ -405,13 +437,13 @@ info.title = [accent]정보
 error.title = [crimson]오류가 발생했습니다.
 error.crashtitle = 오류가 발생했습니다.
 attackpvponly = [scarlet]오직 Pvp/공격 모드에서만 사용가능합니다.
-blocks.input = 입력
+blocks.input = 소모 자원
-blocks.output = 출력
+blocks.output = 출력 자원
 blocks.booster = 가속
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = 전력 용량
 blocks.powershot = 1발당 전력 소모량
-blocks.damage = Damage
+blocks.damage = 공격력
 blocks.targetsair = 공중공격 가능
 blocks.targetsground = 지상공격 가능
 blocks.itemsmoved = 이동 속도
@@ -434,22 +466,25 @@ blocks.boosteffect = 가속 효과
 blocks.maxunits = 최대 활성유닛
 blocks.health = 체력
 blocks.buildtime = 건설 시간
+blocks.buildcost = 건설 재료
 blocks.inaccuracy = 오차각
 blocks.shots = 발포 횟수
 blocks.reload = 재장전
 blocks.ammo = 탄약
-bar.drilltierreq = 드릴이 요구됨
+bar.drilltierreq = 더 좋은 드릴이 요구됨
 bar.drillspeed = 채광 속도 : {0}/s
 bar.efficiency = 효율성 : {0}%
 bar.powerbalance = 전력 : {0}/s
-bar.poweramount = 전력 : {0}
+bar.powerstored = 에너지 저장량 : {0}/{1}
-bar.poweroutput = 전력 출력 : {0}
+bar.poweramount = 전력 저장량 : {0}
-bar.items = 아이템: {0}
+bar.poweroutput = 전력 생산량 : {0}/s
+bar.items = 최대 120개중 {0}개 중
+bar.capacity = 저장공간 : {0}
 bar.liquid = 액체
 bar.heat = 발열
 bar.power = 전력
-bar.progress = 건설 진행
+bar.progress = 생산 진행도
-bar.spawned = 유닛: {0}/{1}
+bar.spawned = 최대 {1}기 중 {0}기 생산됨
 bullet.damage = [stat]{0}[lightgray] 데미지
 bullet.splashdamage = [stat]{0}[lightgray] 범위 데미지 ~[stat] {1}[lightgray] 타일
 bullet.incendiary = [stat]방화
@@ -486,9 +521,10 @@ setting.linear.name = 선형 필터링
 setting.animatedwater.name = 움직이는 물
 setting.animatedshields.name = 움직이는 보호막
 setting.antialias.name = 안티 에일리어싱[LIGHT_GRAY] (재시작 필요)[]
-setting.indicators.name = 아군/적 인디게이터 표시
+setting.indicators.name = 아군/적 인디케이터 표시
 setting.autotarget.name = 자동 조준
 setting.keyboard.name = 마우스+키보드 조작
+setting.touchscreen.name = 터치스크린 
 setting.fpscap.name = 최대 FPS
 setting.fpscap.none = 없음
 setting.fpscap.text = {0}FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = 효과음 크기
 setting.mutesound.name = 소리 끄기
 setting.crashreport.name = 오류 보고서 보내기
 setting.savecreate.name = 자동 저장 활성화
+setting.publichost.name = 공용 서버 보이기
 setting.chatopacity.name = 채팅 투명도
 setting.playerchat.name = 인게임 채팅 표시
 uiscale.reset = UI 스케일이 변경되었습니다.\n"확인"버튼을 눌러 스케일을 확인하세요.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
@@ -530,8 +567,8 @@ category.general.name = 일반
 category.view.name = 보기
 category.multiplayer.name = 멀티플레이
 command.attack = 공격
+command.rally = Rally
 command.retreat = 후퇴
-command.patrol = 순찰
 keybind.gridMode.name = 블록 선택
 keybind.gridModeShift.name = 카테고리 선택
 keybind.press = 키를 누르세요.
@@ -747,10 +784,13 @@ block.hail.name = 헤일
 block.lancer.name = 랜서
 block.conveyor.name = 컨베이어
 block.titanium-conveyor.name = 티타늄 컨베이어
+block.armored-conveyor.name = 장갑 컨베이어
+block.armored-conveyor.description = 운송 속도는 티타늄 컨베이어와 비슷하나, 훨씬 단단합니다. 그러나 컨베이어외에는 자원을 받지 못합니다. \n\n[royal]체력이 늘어났지만, 벽만큼 단단하지는 않습니다. 단단하다고 해서 안심하지 마세요.
 block.junction.name = 교차기
 block.router.name = 분배기
 block.distributor.name = 대형 분배기
 block.sorter.name = 필터
+block.message.name = 메모 블럭
 block.overflow-gate.name = 오버플로 게이트
 block.silicon-smelter.name = 실리콘 제련소
 block.phase-weaver.name = 메타 합성기
@@ -803,7 +843,7 @@ block.blast-mixer.name = 폭발물 혼합기
 block.solar-panel.name = 태양 전지판
 block.solar-panel-large.name = 대형 태양 전지판
 block.oil-extractor.name = 석유 추출기
-block.command-center.name = 유닛 명령 
+block.command-center.name = 지휘소
 block.draug-factory.name = 광부 드론 공장
 block.spirit-factory.name = 수리 드론 공장
 block.phantom-factory.name = 건설 드론 공장
@@ -854,8 +894,8 @@ team.purple.name = 보라색 팀
 unit.spirit.name = 스피릿 수리 드론
 unit.draug.name = 드라우그 채광 드론
 unit.phantom.name = 팬텀 건설 드론
-unit.dagger.name = 디거
+unit.dagger.name = 대거
-unit.crawler.name = 자폭자
+unit.crawler.name = 크롤러
 unit.titan.name = 타이탄
 unit.ghoul.name = 구울 폭격기
 unit.wraith.name = 유령 전투기
@@ -871,16 +911,16 @@ tutorial.intro = Mindustry 튜토리얼을 시작하겠습니다. 튜토리얼
 tutorial.drill = 수동으로 채광하는 것은 효율이 낮습니다.\n[accent]드릴[]은 자동으로 드릴 바로아래에 있는 광물들을 채광합니다.\n드릴 카테고리의 기계식 드릴을 선택하여 구리 광맥위에 설치하세요.\n마우스 오른쪽 버튼으로 취소가 가능합니다.
 tutorial.drill.mobile = 수동으로 채광하는 것은 효율이 낮습니다.\n[accent]드릴[]은 자동으로 드릴 바로아래에 있는 광물들을 채광합니다.\n드릴 카테고리의 기계식 드릴을 선택하여 구리 광맥위에 설치하세요.\n취소 버튼을 눌러 건축하기 전의 설계를 취소할 수 있습니다.
 tutorial.blockinfo = 블록들은 각각 능력이 다르며, 하위 티어의 드릴은 채광할 수 있는 광물의 종류가 적습니다.\n블럭의 정보를 확인하기 위해서는,[accent] 카테고리의 블럭을 누른 후, "?"버튼을 클릭하여 블럭의 정보를 확인하세요.[]\n[royal]궁금한 블럭의 정보를 아무거나 한 번 확인해보세요.
-tutorial.conveyor = [accent]컨베이어[]는 붙어 있는 곳에서 받는 아이템을 코어로 운반합니다.\n드릴에서 코어까지 컨베이어 라인을 만드세요.\n[accent]컨베이어를 클릭 후 건설을 시작하려는 지점을 마우스 왼쪽 버튼으로 꾸욱 누른 뒤[] 드래그하여 설계하세요.\n\n컨베이어 건설 수[accent]{0}/{1}\n[accent]광물을 코어로 운반하세요.
+tutorial.conveyor = [accent]컨베이어[]는 붙어 있는 곳에서 받는 아이템을 코어로 운반합니다.\n드릴에서 코어까지 컨베이어 라인을 만드세요.\n[accent]컨베이어를 클릭 후 건설을 시작하려는 지점을 마우스 왼쪽 버튼으로 꾸욱 누른 뒤[] 드래그하여 설계하세요.\n\n[accent]컨베이어를 2개 이상 건설 후 광물을 코어로 운반하세요.
-tutorial.conveyor.mobile = [accent]컨베이어[]는 붙어 있는 곳에서 받는 아이템을 코어로 운반합니다.\n드릴에서 코어까지 컨베이어 라인을 만드세요.\n[accent]컨베이어를 화면에 1초정도 클릭하여 작은 노란색 원이 잠깐 나타났다 사라질 때까지 기다리신 후[] 드래그하여 설계하세요.\n\n컨베이어 건설 수[accent]{0}/{1}\n[accent]광물을 코어로 운반하세요.
+tutorial.conveyor.mobile = [accent]컨베이어[]는 붙어 있는 곳에서 받는 아이템을 코어로 운반합니다.\n드릴에서 코어까지 컨베이어 라인을 만드세요.\n[accent]컨베이어를 화면에 1초정도 클릭하여 작은 노란색 원이 잠깐 나타났다 사라질 때까지 기다리신 후[] 드래그하여 설계하세요.\n\n[accent]컨베이어를 2개 이상 건설 후 광물을 코어로 운반하세요.
 tutorial.turret = 방어 구조물은 [LIGHT_GRAY]적[]을 물리치기 위해 반드시 필요합니다.\n포탑 카테고리의 듀오 포탑을 선택하신 후, 기지 근처에 듀오 포탑을 설치하세요.
 tutorial.drillturret = 듀오 포탑이 공격하기 위해서는[accent] 구리 탄약[]을 필요로 합니다.\n포탑 근처의 구리 광맥에 드릴을 설치하고 컨베이어로 포탑과 이어서 포탑에 구리를 공급하세요.\n또는 직접 코어에서 광물을 꺼내 포탑에 넣을 수도 있습니다.
-tutorial.pause = 싱글 플래이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]스페이스 버튼[]을 눌러 일시정지하세요.
+tutorial.pause = 싱글 플레이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]스페이스 버튼[]을 눌러 일시정지하세요.
-tutorial.pause.mobile = 싱글 플래이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]일시정지 버튼[]을 눌러 일시정지하세요.
+tutorial.pause.mobile = 싱글 플레이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]일시정지 버튼[]을 눌러 일시정지하세요.
 tutorial.unpause = 게임을 진행하기 위해 [accent]스페이스 버튼[]을 다시 누르세요.
 tutorial.unpause.mobile = 게임을 진행하기 위해 같은 위치의 버튼을 다시 누르세요.
 tutorial.breaking = 설계를 방해하는 블록을 제거하기 위해서 [accent]첫 번째 지점을 마우스 오른쪽 버튼[]으로 누른 뒤 드래그하여 범위를 지정해서 제거하세요.[]\n\n[accent]코어 근처의 조각 블럭 3개[]를 제거하세요.
-tutorial.breaking.mobile = 설계를 방해하는 블록을 제거하기 위해서 [accent]망치 버튼을 눌러 제거모드[]로 변경하신 후, 첫번째 지점을 누른 후 드래그하여 범위를 지정한뒤 V버튼을 클릭해 블럭을 제거하세요.\n\n[accent]코어 근처의 조각 블럭 3개[]를 제거하세요.
+tutorial.breaking.mobile = 설계를 방해하는 블록을 제거하기 위해서 [accent]망치 버튼을 눌러 제거모드[]로 변경하신 후, 첫번째 지점을 누른 후 드래그하여 범위를 지정한뒤 V버튼을 클릭해 블럭을 제거하세요.\n\n[accent]코어 근처의 조각벽 3개[]를 제거하세요.
 tutorial.withdraw = [accent]코어나 창고, 공장[]같은 자원을 넣을 수 있는 일부 블럭에서는 직접 자원을 빼낼 수도 있습니다.\n[accent]코어를 클릭 후 자원을 눌러서 자원을 빼내세요.
 tutorial.deposit = 자원을 다시 블록에 넣을수도 있습니다.\n\n[accent]당신의 기체에서 코어로 드래그[]하여 자원을 되돌려 넣으세요.
 tutorial.waves = [LIGHT_GRAY]적[]이 접근합니다.\n당신의 기체는 적을 향해 클릭하여 공격할 수 있습니다. 또한, 구리를 더 캐내고 포탑을 더 지어서 방어를 강화하세요.\n\n[accent]2단계 동안 코어를 보호하세요.[]
@@ -888,16 +928,16 @@ tutorial.waves.mobile = [LIGHT_GRAY]적[]이 접근합니다.\n당신의 기체
 tutorial.launch = 특정 단계에 도달하면 [accent]출격[]이 가능합니다.\n[accent]출격[]을 하게되면 해당 지역의 코어에 들어있는 자원들을 캠페인의 자원 창고로 보내지만, 해당 지역의 [accent]모든 것들[]은 날라가게 되니 주의하세요.
 item.copper.description = 모든 종류의 블록에서 광범위하게 사용되는 자원입니다.
 item.lead.description = 쉽게 구할 수 있으며, 전자 및 액체 수송 블록에서 광범위하게 사용되는 자원입니다.
-item.metaglass.description = 초강력 유리 화합물. 액체 분배 및 저장에 광범위하게 사용됩니다.\n\n[royal]빨리 생산할수록 게임이 편해집니다.
+item.metaglass.description = 초강력 유리 화합물. 액체 분배 및 저장에 광범위하게 사용됩니다.\n\n[royal]액체를 활용하기 위한 필수품입니다.
 item.graphite.description = 탄약 및 전기 절연에 사용되는 광물질화 탄소.
 item.sand.description = 고티어 합금을 제작할 때 사용되는 일반적인 재료입니다.
 item.coal.description = 흔하고 쉽게 구할 수 있는 연료.
 item.titanium.description = 파이프 재료나 고급 드릴, 비행기/기체 등에서 재료로 사용되는 자원입니다.
 item.thorium.description = 건물의 재료, 터렛의 탄약 또는 핵연료로 사용되는 방사성 금속입니다.
 item.scrap.description = 오래된 건물과 유닛의 남은 잔해. 미량의 다양한 금속들이 포함되어 있습니다.
-item.silicon.description = 매우 유용한 물질로, 기체를 만들거나 태양 전지판 등 전자 건물에 사용할 수 있습니다.\n\n[royal]이 것이 생산되면 발전속도가 급속도로 빨라집니다.
+item.silicon.description = 매우 유용한 물질로, 기체를 만들거나 태양 전지판 등 전자 건물에 사용할 수 있습니다.\n\n[royal]전력을 효과적으로 생산/관리하기 위한 필수품입니다.
 item.plastanium.description = 고급 항공기 및 분열 탄약에 사용되는 가벼운 연성 재료.
-item.phase-fabric.description = 최첨단 전자 제품과 자기수리 기술에 사용되는 거의 무중력에 가까운 물질입니다.\n\n[royal]발전기 근처에 있는 오버드라이브에 함부로 이 것을 넣지마세요.
+item.phase-fabric.description = 최첨단 전자 제품과 자기수리 기술에 사용되는 거의 무중력에 가까운 물질입니다.\n\n[royal]메타 가속하면 범위가 늘어나는 건물들이 있습니다.
 item.surge-alloy.description = 순간적으로 전압이 증가하는 전기 특성을 가진 고급 합금입니다.
 item.spore-pod.description = 석유를 만들거나 탄약과 합성해 연료로 전환하는데 사용됩니다.
 item.blast-compound.description = 터렛 및 건설의 재료로 사용되는 휘발성 폭발물.\n연료로도 사용할 수 있지만, 별로 추천하지는 않습니다.
@@ -911,13 +951,13 @@ mech.delta-mech.description = 빠르게 이동하는 적을 처치하기 위한
 mech.tau-mech.description = 지원형 기체.\n총을 발사하여 건물을 치료하고 회복 능력 사용으로 화재를 진압하거나, 반경 내 아군을 치유시킵니다.
 mech.omega-mech.description = 지상 기체 최종판이자 건물 파괴용으로 적합한 부피가 크고 튼튼한 기체.\n방어 모드는 최대 90% 의 피해를 줄일 수 있습니다.
 mech.dart-ship.description = 표준 비행선.\n빠르고 가볍지만 공격력이 거의 없고 채광 속도가 느립니다.
-mech.javelin-ship.description = 치고 빠지는 공격을 위한 비행선.\n처음에는 느리지만, 가속도가 붙어 엄청난 속도로 미사일 피해를 입힐 수 있으며, 전격 능력을 사용할 수 있습니다.\n\n[royal]보호막을 제거하기에 가장 좋습니다.
+mech.javelin-ship.description = 치고 빠지는 공격을 위한 비행선.\n처음에는 느리지만, 가속도가 붙어 엄청난 속도로 미사일 피해를 입힐 수 있으며, 전격 능력을 사용할 수 있습니다.\n\n[royal]지나가기만 해도 보호막을 전부 파괴합니다.
-mech.trident-ship.description = 대형 공중 폭격능력과 빠른 건설능력을 가진 폭격기.\n당연하게도 엄청 단단합니다.
+mech.trident-ship.description = 대형 공중 폭격능력과 빠른 건설능력을 가진 폭격기입니다.
 mech.glaive-ship.description = 크고 잘 무장된 총을 가진 비행선.\n방화용 리피터가 장착되어 있으며, 가속도와 최대속도가 높습니다.
 unit.draug.description = 가장 기본적인 채굴 드론입니다 저렴하게 생산 가능하며 자동으로 구리와 납을 캐내 가까운 코어에 저장합니다.
 unit.spirit.description = 블록을 자동으로 수리합니다.
 unit.phantom.description = 첨단 드론 유닛. 플레이어의 건설을 도와줍니다.
-unit.dagger.description = 기본 지상 유닛입니다.\n플레이어 기체처럼 드론을 소환하지는 않습니다.
+unit.dagger.description = 기본 지상 유닛입니다.
 unit.crawler.description = 지상 유닛. 적이 가까이에 있으면 폭발합니다.
 unit.titan.description = 고급 지상 유닛입니다.\n원거리 총 대신에 근접 화염 방사기를 가지고 있으며, 지상과 공중 둘다 공격할 수 있습니다.
 unit.fortress.description = 중포 지상 유닛.\n높은 공격력을 가진 총과 높은 체력을 가지고 있습니다.
@@ -925,6 +965,7 @@ unit.eruptor.description = 지상 유닛. 광재를 넣은 파도와 같은 무
 unit.wraith.description = 적 핵심 건물 및 유닛을 집중적으로 공격하는 방식을 사용하는 전투기 입니다.
 unit.ghoul.description = 무겁고 튼튼한 지상 폭격기 입니다.\n주로 적 건물로 이동하여 엄청난 폭격을 가합니다.
 unit.revenant.description = 플래이어가 생산가능한 최종 공중 전투기. 폭발물을 쓰는 스웜 포탑과 같은 무기를 사용합니다.
+block.message.description = 글을 작성할 수 있습니다. 이 것을 이용하여 같은 팀과 소통을 해보세요.
 block.graphite-press.description = 석탄 덩어리를 흑연으로 압축합니다.
 block.multi-press.description = 흑연 압축기의 상향 버전입니다. 물과 전력을 이용해 석탄을 빠르고 효율적으로 압축합니다.
 block.silicon-smelter.description = 석탄과 모래를 사용해 실리콘을 생산합니다.
@@ -987,7 +1028,7 @@ block.power-node.description = 전기을 연결된 대상과 연동시킵니다.
 block.power-node-large.description = 전기를 연결된 대상과 연동시킵니다.\n최대 30개의 대상을 연결시킬 수 있고, 범위도 더 넓습니다.
 block.surge-tower.description = 전기를 연결된 대상과 연동시킵니다.\n2개의 대상만 연결시킬 수 있지만 대신에 범위가 매우 넓습니다.
 block.battery.description = 전력 생산량에 여유가 있을경우, 생산된 잉여 전력을 여기에 저장합니다.\n\n[ROYAL]이것을 이용해 한순간에 많은 전력을 사용하는 포탑들을 보조가능합니다.
-block.battery-large.description = 일반 배터리보다 훨씬 많은 량의 전력을 저장합니다.\n\n[ROYAL]임시 전력을 만들어서 냉각기에 전기가 부족해 원자로 폭발이 일어나는 것을 막아보는 것은 어떨까요? 
+block.battery-large.description = 일반 배터리보다 훨씬 많은 량의 전력을 저장합니다.\n\n[ROYAL]배터리 9개를 설치하는 것보다 효율이 좋습니다.
 block.combustion-generator.description = 인화성 물질을 태워 소량의 전력을 생산합니다.
 block.thermal-generator.description = 건설가능한 열이 있는 타일 위에 건설하면 전력을 생산합니다.\n\n[ROYAL]용암 웅덩이 혹은 열기지대에서 무한정 열을 발산합니다.
 block.turbine-generator.description = 화력 발전기보다 효율적이지만, 액체가 추가적으로 필요합니다.\n\n[ROYAL]일반 타일에서 물추출기 1개로 2개가 가동가능합니다.
@@ -996,8 +1037,8 @@ block.rtg-generator.description = 방사성동위원소 열전기 발전기\n토
 block.solar-panel.description = 태양광으로 극소량의 전기을 생산합니다.
 block.solar-panel-large.description = 일반 태양 전지판보다 훨씬 발전량이 많지만, 건축비도 훨씬 비쌉니다.
 block.thorium-reactor.description = 토륨을 이용해 막대한 양의 전기를 생산합니다. 지속적인 냉각이 필요하며 냉각제의 양이 부족하면 크게 폭발합니다.\n\n[royal]폭발로 인한 피해를 버틸 수 있는 건물은 없습니다.
-block.impact-reactor.description = 최첨단 발전기\n폭발물과 냉각수를 이용해 최고의 효율로 매우 많은 양의 전기를 생산할 수 있습니다. 발전을 시작하는데 전기가 필요하며 발전기를 가동하는데 시간이 많이 걸립니다.\n[royal]오버드라이브 프로젝터로 10000이상의 전기를 생산할 수 있으며, 가동중에 전기가 끊기면 가동을 다시 해야되기 때문에 창고,물탱크,배터리 등을 주위에 설치하고 나서 가동하는 것을 추천합니다.
+block.impact-reactor.description = 최첨단 발전기\n폭발물과 냉각수를 이용해 최고의 효율로 매우 많은 양의 전기를 생산할 수 있습니다. 발전을 시작하는데 전기가 필요하며 발전기를 가동하는데 시간이 많이 걸립니다.\n[royal]오버드라이브 프로젝터로 10000이상의 전기를 생산할 수 있으며, 가동중에 전기가 끊기면 가동을 다시 해야되기 때문에 창고,물탱크,배터리 등을 주위에 설치하고 나서 가동하는 것을 추천드립니다.
-block.mechanical-drill.description = 싸구려 드릴. 적절한 타일 위에 놓였을때 매우 느린 속도로 채광합니다.\n\n[ROYAL]구리와 납은 광부 드론으로 대체가 가능합니다.
+block.mechanical-drill.description = 싸구려 드릴. 적절한 타일 위에 놓였을때 매우 느린 속도로 채광합니다.\n\n[ROYAL]구리와 납은 채광 드론으로 대체가 가능합니다.
 block.pneumatic-drill.description = 기압을 이용하여 보다 빠르게 단단한 물질을 채광할 수 있는 향상된 드릴.\n\n[ROYAL]전기를 사용하지 않는 드릴이라도 물과 오버드라이브를 이용하여 가속할 수 있습니다.
 block.laser-drill.description = 토륨을 채광할 수 있는 고급 드릴입니다. 전력과 물을 공급하여 빠른 속도로 채광할 수 있습니다.\n\n[ROYAL]드릴아래에 배치된 광물타일의 비율에 따라 채광량이 달라집니다.
 block.blast-drill.description = 최상위 드릴입니다. 많은량의 전력이 필요합니다.\n\n[ROYAL]물추출기 하나면 충분합니다.
@@ -1007,14 +1048,14 @@ block.oil-extractor.description = 대량의 전력과 물을 사용하여 모래
 block.core-shard.description = 코어의 1단계 형태입니다.\n이것이 파괴되면 플레이하고 있는 지역과의 연결이 끊어지니 적의 공격에 파괴되지 않도록 주의하세요.\n[ROYAL]연결이 끊긴다는 말은 게임오버와 일맥상통합니다.
 block.core-foundation.description = 코어의 2단계 형태입니다.\n첫 번째 코어보다 더 튼튼하고 더 많은 자원을 저장할 수 있습니다.\n\n[ROYAL]크기도 좀 더 큽니다.
 block.core-nucleus.description = 코어의 3단계이자 마지막 형태입니다.\n최고로 튼튼하며 막대한 양의 자원들을 저장할 수 있습니다.
-block.vault.description = 각종 대량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 창고에서 물건을 회수할 수 있습니다.\n\n[royal]포탑의 탄약, ☆핵융합로의 폭발물☆, 원자로 냉각수의 티타늄등 여러 자원들의 여분을 미리 저장하여 혹시모를 사태를 예방하세요.
+block.vault.description = 각종 대량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 창고에서 물건을 회수할 수 있습니다.\n\n[royal]포탑의 탄약, 핵융합로의 폭발물, 원자로 냉각수의 티타늄등 여러 자원들의 여분을 미리 저장하여 혹시모를 사태를 예방하세요.
 block.container.description = 각종 소량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 컨테이너에서 자원을 회수할 수 있습니다.\n\n[royal]또는 컨테이너를 클릭하고 자원을 눌러 자원을 강탈해갈수도 있습니다.
 block.unloader.description = 컨테이너, 창고 또는 코어에서 인접한 블록으로 자원을 출하합니다. 출하시킬 자원의 종류는 언로더를 눌러 지정할 수 있습니다.
-block.launch-pad.description = 출격할 필요 없이 자원을 수송시킵시다.\n\n[royal]제발 멀티에서 이거 설치하고 잠수좀 타지마세요. 하는 것도 없이 자원만 빼가는 건 너무 민폐입니다.
+block.launch-pad.description = 출격할 필요 없이 자원을 수송시킵시다.\n\n[royal]캠페인에서 이 것을 이용해 게임 중에 테크 트리를 올릴 수 있습니다.
-block.launch-pad-large.description = 출격 패드의 강화버전\n더 많은 자원을 더 자주 출격시킵니다.\n\n[ROYAL]크기도 더 크다죠
+block.launch-pad-large.description = 출격 패드의 강화버전\n더 많은 자원을 더 자주 출격시킵니다.\n\n[ROYAL]크기도 더 큽니다.
 block.duo.description = 소형 포탑입니다.\n가장 기본적인 포탑으로 약한 탄환을 발사합니다.
 block.scatter.description = 중형 대공 포탑입니다.\n납이나 고철 덩어리를 적에게 쏩니다.
-block.scorch.description = 소형 포탑입니다.\n지상의 적을 매우 강력한 화염으로 지져버립니다. 사거리가 짧고 지상만 공격 가능한 것 때문인지 지상유닛 상대로는 최고의 공격력을 보여줍니다.\n\n[royal]너무 빨리 모든 것을 태우다보니 건물에는 불이 안 붙더군요.
+block.scorch.description = 소형 포탑입니다.\n지상의 적을 매우 강력한 화염으로 지져버립니다. 근거리에서 효과적입니다.\n\n[royal]유닛 상대로 무지막지한 공격력을 보여줍니다.
 block.hail.description = 소형 포탑입니다.\n장거리로 포탄을 발사합니다.
 block.wave.description = 중형 포탑입니다. 대상에게 포탑에 공급된 액체를 발사합니다. 물또는 냉각수가 공급되면 자동으로 불을 끕니다.
 block.lancer.description = 중형 포탑입니다.\n적을 레이저로 관통합니다.
@@ -1026,22 +1067,22 @@ block.ripple.description = 대형 포탑입니다.\n여러 발의 사격을 동
 block.cyclone.description = 대형 포탑입니다.\n초고속으로 사격합니다.
 block.spectre.description = 초대형 포탑입니다.\n한 번에 두 발의 강력한 총알을 쏩니다.
 block.meltdown.description = 초대형 포탑.\n장거리의 강력한 열광선을 발사합니다.
-block.command-center.description = 아군 유닛에게 이동 명령을 내릴 수 있는 건물입니다.\n명령의 종류는 순찰/공격/후퇴가 있으며, 순찰은 유닛이 맵 주위를 돌아다니게, 공격은 유닛들을 적 코어를 향해 공격하도록, 후퇴는 유닛들을 아군 코어 또는 공장으로 돌아오게 합니다.\n\n[royal]이제 공중유닛도 모아서 보낼 수 있습니다!
+block.command-center.description = 아군 유닛에게 이동 명령을 내릴 수 있는 건물입니다.\n명령의 종류는 순찰/공격/후퇴가 있으며, 순찰은 유닛이 순찰 지점을 돌아다니게, 공격은 유닛들을 적 코어를 향해 공격하도록, 후퇴는 유닛들을 아군 코어 또는 공장으로 돌아오게 합니다.\n\n[royal]생존 모드일 경우 공격 명령이 유닛을 적 생성 지점으로 보내니 조심하세요.
 block.draug-factory.description = 구리와 납을 캐는 채광 드론을 생산합니다.\n\n[ROYAL]이 드론은 영혼을 가지고 있습니다.
 block.spirit-factory.description = 블록을 수리하는 수리 드론을 생산합니다.\n\n[ROYAL]드론에도 정령이 있다죠.
 block.phantom-factory.description = 건설을 도와주는 빌더 드론을 생산합니다.\n\n[ROYAL]당신의 환영입니다.
-block.wraith-factory.description = 빠른 뺑소니 요격기 유닛을 생산합니다.\n\n[ROYAL]?:저거 안죽어요??\n??:님 인터넷을 확인해보셈\n?:아 왠지 기체가 이상한 곳을 조준하더라..
+block.wraith-factory.description = 빠른 뺑소니 요격기 유닛을 생산합니다.\n\n[ROYAL]체력 자체는 무척 적습니다.
 block.ghoul-factory.description = 중탄두 폭격기를 생산합니다.\n\n[ROYAL]적 위를 유령처럼 맴돕니다.
-block.revenant-factory.description = 중량의 폭발물 스웜 포대를 가진 전함을 생산합니다.\n\n[ROYAL]캠페인과 사용자 정의 게임에서 ai가 다른 대표적인 유닛이라죠.
+block.revenant-factory.description = 중량의 폭발물 스웜 포대를 가진 전함을 생산합니다.\n\n[ROYAL]
-block.dagger-factory.description = 기본 지상 유닛을 생산합니다.\n\n[ROYAL]원래대로라면 대거라 읽어야 되지만 총을 쏜다는 것이 이상하기도 해서 한국 커뮤니티에서는 그냥 디거라 부른다죠. 그게 좀 더 입에 붙잖아요?
+block.dagger-factory.description = 기본 지상 유닛을 생산합니다.\n\n[ROYAL]대거지만 단검으로 공격하진 않습니다.
-block.crawler-factory.description = 자폭하는 지상 유닛을 생산합니다.\n\n[ROYAL]가까이 가기만 해도 죽는 섬세한 친구랍니다.
+block.crawler-factory.description = 자폭하는 지상 유닛을 생산합니다.\n\n[ROYAL]레일만으로도 막을 수 있습니다.
-block.titan-factory.description = 화염방사기를 장착한 지상유닛를 생산합니다.\n\n[ROYAL]최강이 될 수도, 최약이 될 수도 있습니다.
+block.titan-factory.description = 화염방사기를 장착한 지상유닛를 생산합니다.\n\n[ROYAL]유닛 상대로 강력한 공격력을 보여줍니다.
 block.fortress-factory.description = 중대포 지상유닛를 생산합니다.
-block.repair-point.description = 주변에서 가장 가까운 손상된 유닛을 지속적으로 치료합니다.\n\n[ROYAL]이 것으로 플래이어는 지속적인 교전이 가능해집니다.
+block.repair-point.description = 주변에서 가장 가까운 손상된 유닛을 지속적으로 치료합니다.
 block.dart-mech-pad.description = 기본적인 공격용 지상 기체로 전환할 수 있습니다.\n눌러서 변신하세요.\n\n[ROYAL]한 번 더 눌러서 기본 공중 기체로 전환가능합니다.
 block.delta-mech-pad.description = 전격 무기와 천둥의 특수능력을 가진 기체로 전환할 수 있습니다.\n눌러서 전환하세요.\n\n[ROYAL]공중으로 날았다가 착지하는 것으로 특수능력의 발현이 가능합니다.
 block.tau-mech-pad.description = 수리의 능력을 가진 지원형 기체로 전환할 수 있습니다.\n눌러서 전환하세요.\n\n[ROYAL]주변에 피해를 입은 유닛이 있다면 수리의 파동을 발산합니다.
 block.omega-mech-pad.description = 포탑과의 전투가 용이하고 기체중에서 가장 단단한 기체로 전환할 수 있습니다.\n눌러서 전환하세요.\n\n[ROYAL]교전시에 지상에 착지한 상태라면 방어모드에 진입해 90퍼센트의 피해를 흡수합니다.
 block.javelin-ship-pad.description = 전격 무기와 강력하고 번개의 특수능력을 가진 빠른 요격체로 전환할 수 있습니다.\n눌러서 전환하세요.\n\n[ROYAL]최고 속도에 도달하면 주변을 번개로 지져버립니다.
 block.trident-ship-pad.description = 잘 무장된 중폭격기로 전환이 가능합니다.\n눌러서 전환하세요.\n\n[ROYAL]적들의 위에서 폭격하기 때문에 비전투 건물이나 실드를 파괴할 때 용이합니다. 더해서 건물 건설 속도가 가장 빠릅니다.
-block.glaive-ship-pad.description = 방화기를 장착한 전투기로 전환이 가능합니다.\n누르거나 클릭하여 이 기체로 바꿉니다.\n\n[ROYAL]컨트롤하기 가장 적합한 기체입니다.
+block.glaive-ship-pad.description = 방화기를 장착한 전투기로 전환이 가능합니다.\n누르거나 클릭하여 이 기체로 바꿉니다.\n\n[ROYAL]속도가 가장 빠릅니다.

core/assets/bundles/bundle_nl.properties

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

core/assets/bundles/bundle_nl_BE.properties

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

core/assets/bundles/bundle_pl.properties

@@ -4,7 +4,7 @@ contributors = Tłumacze i pomocnicy
 discord = Odwiedź nasz serwer Discord!
 link.discord.description = Oficjalny serwer Discord Mindustry
 link.github.description = Kod Gry
-link.changelog.description = List of update changes
+link.changelog.description = Informacje o aktualizacjach
 link.dev-builds.description = Niestabilne wersje gry
 link.trello.description = Oficjalna tablica Trello z planowanym funkcjami
 link.itch.io.description = Strona itch.io z oficjanymi wersjami do pobrania
@@ -16,10 +16,10 @@ screenshot.invalid = Zrzut ekranu jest zbyt duży. Najprawdopodobniej brakuje mi
 gameover = Rdzeń został zniszczony.
 gameover.pvp = Zwyciężyła drużyna [accent]{0}[]!
 highscore = [YELLOW] Nowy rekord!
-load.sound = Sounds
+load.sound = Dźwięki
-load.map = Maps
+load.map = Mapy
-load.image = Images
+load.image = Obrazy
-load.content = Content
+load.content = Treść
 load.system = System
 stat.wave = Fale powstrzymane:[accent] {0}
 stat.enemiesDestroyed = Przeciwnicy zniszczeni:[accent] {0}
@@ -46,11 +46,20 @@ newgame = Nowa Gra
 none = <none>
 minimap = Minimapa
 close = Zamknij
-website = Website
+website = Strona Gry
 quit = Wyjdź
+save.quit = Save & Quit
 maps = Mapy
+maps.browse = Browse Maps
 continue = Kontynuuj
 maps.none = [LIGHT_GRAY]Nie znaleziono żadnych map!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = O grze
 name = Nazwa:
 noname = Najpierw wybierz [accent]nazwę gracza[]
@@ -65,27 +74,31 @@ players = {0} graczy online
 players.single = {0} gracz online
 server.closing = [accent] Zamykanie serwera...
 server.kicked.kick = Zostałeś wyrzucony z serwera!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Serwer został zamknięty.
-server.kicked.vote = You have been vote-kicked. Goodbye.
+server.kicked.vote = Zostałeś wyrzucony z gry. Żegnaj.
 server.kicked.clientOutdated = Nieaktualna gra! Zaktualizują ją!
 server.kicked.serverOutdated = Nieaktualny serwer! Poproś hosta o jego aktualizację.
 server.kicked.banned = Zostałeś zbanowany na tym serwerze.
-server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.typeMismatch = Ten serwer jest niekompatybilny z twoją wersją gry.
+server.kicked.playerLimit = Serwer pełny. Poczekaj na wolny slot.
 server.kicked.recentKick = Zostałeś niedawno wyrzucony.\nPoczekaj chwilę przed ponownym połączniem.
 server.kicked.nameInUse = Ta nazwa jest już zajęta na tym serwerze.
 server.kicked.nameEmpty = Wybrana przez Ciebie nazwa jest nieprawidłowa.
 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}[]
+server.versions = Twoja wersja gry:[accent] {0}[]\nWersja gry serwera:[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
+invitefriends = Invite Friends
 hostserver.mobile = Hostuj\ngrę
 host = Hostuj
 hosting = [accent] Otwieranie serwera...
 hosts.refresh = Odśwież
 hosts.discovering = Wyszukiwanie gier w sieci LAN
+hosts.discovering.any = Discovering games
 server.refreshing = Odświeżanie serwera
 hosts.none = [lightgray] Brak serwerów w sieci LAN!
 host.invalid = [scarlet] Nie można połączyć się z hostem.
@@ -93,7 +106,7 @@ trace = Zlokalizuj gracza
 trace.playername = Nazwa gracza: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Wyjątkowe ID: [accent]{0}
-trace.mobile = Mobile Client: [accent]{0}
+trace.mobile = Klient Mobilny: [accent]{0}
 trace.modclient = Zmodowany klient: [accent]{0}
 invalidid = Złe ID klienta! Udostępnij raport błędu.
 server.bans = Bany
@@ -109,13 +122,18 @@ server.version = [lightgray]Wersja: {0}
 server.custombuild = [yellow]Zmodowany klient
 confirmban = Jesteś pewny, że chcesz zbanować tego gracza?
 confirmkick = Jesteś pewny, że chcesz wyrzucić tego gracza?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Jesteś pewny, że chcesz odbanować tego gracza?
 confirmadmin = Jesteś pewny, że chcesz dać rangę admina temu graczowi?
 confirmunadmin = Jesteś pewny, że chcesz zabrać rangę admina temu graczowi?
 joingame.title = Dołącz do gry
 joingame.ip = IP:
 disconnect = Rozłączono.
+disconnect.error = Błąd połączenia.
+disconnect.closed = Połączenie zostało zamknięte.
+disconnect.timeout = Przekroczono limit czasu.
 disconnect.data = Nie udało się załadować mapy!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Łączenie...
 connecting.data = [accent]Ładowanie danych świata...
 server.port = Port:
@@ -141,40 +159,42 @@ save.rename = Zmień nazwę
 save.rename.text = Nowa nazwa:
 selectslot = Wybierz zapis.
 slot = [accent]Slot {0}
-save.corrupted = [accent]Zapis gry jest uszkodzony lub nieprawidłowy! Jeżeli aktualizowałeś grę, najprawdopodobniej zmiana w formacie zapisu i [scarlet]nie jest[] to błąd.
+editmessage = Edit Message
+save.corrupted = [accent]Zapis gry jest uszkodzony lub nieprawidłowy! Jeżeli aktualizowałeś grę, najprawdopodobniej jest to zmiana w formacie zapisu i [scarlet]nie jest[] to błąd.
 empty = <pusto>
 on = Włączone
 off = Wyłączone
 save.autosave = Autozapis: {0}
 save.map = Mapa: {0}
 save.wave = Fala {0}
-save.difficulty = Poziom trudności: {0}
+save.mode = Gamemode: {0}
 save.date = Ostatnio zapisano: {0}
 save.playtime = Czas gry: {0}
 warning = Uwaga.
 confirm = Potwierdź
 delete = Usuń
+view.workshop = View In Workshop
 ok = Ok
 open = Otwórz
-customize = Customize
+customize = Dostosuj
 cancel = Anuluj
 openlink = Otwórz link
 copylink = Kopiuj link
 back = Wróć
-data.export = Export Data
+data.export = Eksportuj Dane
-data.import = Import Data
+data.import = Importuj Dane
-data.exported = Data exported.
+data.exported = Dane wyeksportowane.
-data.invalid = This isn't valid game data.
+data.invalid = Nieprawidłowe dane gry.
-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.
+data.import.confirm = Zaimportowanie zewnętrznych danych usunie[scarlet] wszystkie[] obecne dane gry.\n[accent]Nie można tego cofnąć![]\n\nGdy dane zostaną zimportowane, gra automatycznie się wyłączy.
-classic.export = Export Classic Data
+classic.export = Eksportuj dane wersji klasycznej
-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?
+classic.export.text = [accent]Mindustry[] otrzymało ostatnio ważną aktualizację.\nClassic (v3.5 build 40) zapis albo mapa zostały wykryte. Czy chciałbyś eksportować te zapisy do katalogu domowego swojego telefonu, do użycia w aplikacji Mindustry Classic?
 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.[]
+quit.confirm.tutorial = Czy jesteś pewien tego co robisz?\nSamouczek może zostać powtórzony w[accent] Opcje->Gra->Powtórz samouczek.[]
 loading = [accent]Ładowanie...
 saving = [accent]Zapisywanie...
 wave = [accent]Fala {0}
 wave.waiting = Fala za {0}
-wave.waveInProgress = [LIGHT_GRAY]Wave in progress
+wave.waveInProgress = [LIGHT_GRAY]Fala w trakcie
 waiting = [LIGHT_GRAY]Oczekiwanie...
 waiting.players = Oczekiwanie na graczy...
 wave.enemies = Pozostało [LIGHT_GRAY]{0} wrogów
@@ -190,6 +210,11 @@ map.nospawn = Ta mapa nie zawiera żadnego rdzenia! Dodaj [ROYAL]niebieski[] rdz
 map.nospawn.pvp = Ta mapa nie ma żadnego rdzenia przeciwnika, aby mogli się zrespić przeciwnicy! Dodaj[SCARLET] inny niż niebieski[] rdzeń do mapy w edytorze.
 map.nospawn.attack = Ta mapa nie ma żadnego rdzenia przeciwnika, aby można było go zaatakować! Dodaj[SCARLET] czerwony[] rdzeń do mapy w edytorze.
 map.invalid = Błąd podczas ładowania mapy: uszkodzony lub niepoprawny plik mapy.
+map.publish.error = Błąd podczas publikowania mapy: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Opublikowano mapę.
+map.publishing = [accent]Publikowanie mapy...
 editor.brush = Pędzel
 editor.openin = Otwórz w edytorze
 editor.oregen = Generacja złóż
@@ -197,20 +222,23 @@ editor.oregen.info = Generacja złóż:
 editor.mapinfo = Informacje o mapie
 editor.author = Autor:
 editor.description = Opis:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Fale:
-editor.rules = Rules:
+editor.rules = Zasady:
-editor.generation = Generation:
+editor.generation = Generacja:
 editor.ingame = Edytuj w grze
-editor.newmap = New Map
+editor.publish.workshop = Opublikuj w Workshop
+editor.newmap = Nowa Mapa
+workshop = Workshop
 waves.title = Fale
 waves.remove = Usuń
 waves.never = <nigdy>
 waves.every = co
-waves.waves = wave(s)
+waves.waves = fal(e)
-waves.perspawn = per spawn
+waves.perspawn = co pojawienie
 waves.to = do
 waves.boss = Boss
-waves.preview = Preview
+waves.preview = Podgląd
 waves.edit = Edytuj...
 waves.copy = Kopiuj do schowka
 waves.load = Załaduj ze schowka
@@ -218,15 +246,17 @@ waves.invalid = Nieprawidłowe fale w schowku.
 waves.copied = Fale zostały skopiowane.
 waves.none = Brak zdefiniowanych wrogów.\nPamiętaj, że puste układy fal zostaną automatycznie zastąpione układem domyślnym.
 editor.default = [LIGHT_GRAY]<Domyślne>
+details = Detale...
 edit = Edytuj...
 editor.name = Nazwa:
-editor.spawn = Spawn Unit
+editor.spawn = Stwórz jednostkę
-editor.removeunit = Remove Unit
+editor.removeunit = Usuń jednostkę
 editor.teams = Drużyny
 editor.errorload = Błąd podczas ładowania pliku:\n[accent]{0}
 editor.errorsave = Błąd podczas zapisywania pliku:\n[accent]{0}
 editor.errorimage = To obraz, nie mapa. Nie zmieniaj rozszeżenia spodziewając sie że to coś zmieni.\n\nJeśli chcesz zaimportować starszą mapę, użyj przycisku „importuj starszą mapę” w edytorze.
 editor.errorlegacy = Ta mapa jest zbyt stara i używa starszego formatu mapy, który nie jest już obsługiwany.
+editor.errornot = To nie jest plik mapy.
 editor.errorheader = Ten plik mapy jest nieprawidłowy lub uszkodzony.
 editor.errorname = Mapa nie zawiera nazwy.
 editor.update = Aktualizuj
@@ -259,6 +289,7 @@ editor.resizemap = Zmień rozmiar mapy
 editor.mapname = Nazwa mapy:
 editor.overwrite = [accent]Uwaga!\nSpowoduje to nadpisanie istniejącej mapy.
 editor.overwrite.confirm = [scarlet]Uwaga![] Mapa pod tą nazwą już istnieje. Jesteś pewny, że chcesz ją nadpisać?
+editor.exists = A map with this name already exists.
 editor.selectmap = Wybierz mapę do załadowania:
 toolmode.replace = Zastąp
 toolmode.replace.description = Rysuje tylko na stałych blokach.
@@ -267,7 +298,7 @@ toolmode.replaceall.description = Zastąp wszystkie bloki na mapie.
 toolmode.orthogonal = Prostokątny
 toolmode.orthogonal.description = Rysuje tylko prostopadłe linie.
 toolmode.square = Kwadrat
-toolmode.square.description = Square brush.
+toolmode.square.description = Kwadratowy pędzel.
 toolmode.eraseores = Wymaż Rudy
 toolmode.eraseores.description = Usuń tylko rudy.
 toolmode.fillteams = Wypełń Drużyny
@@ -277,20 +308,20 @@ 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.median = Mediana
-filter.oremedian = Ore Median
+filter.oremedian = Mediana rud
-filter.blend = Blend
+filter.blend = Wtopienie
 filter.defaultores = Domyślne rudy
 filter.ore = Ruda
 filter.rivernoise = Szum rzeki
 filter.mirror = Lustro
 filter.clear = Oczyść
-filter.option.ignore = Ignore
+filter.option.ignore = Ignoruj
-filter.scatter = Zozprosz
+filter.scatter = Rozprosz
 filter.terrain = Teren
 filter.option.scale = Skala
 filter.option.chance = Szansa
-filter.option.mag = Magnituda
+filter.option.mag = Wielkość
 filter.option.threshold = Próg
 filter.option.circle-scale = Skala koła
 filter.option.octaves = Oktawy
@@ -302,14 +333,14 @@ filter.option.flooronto = Podłoga Docelowa
 filter.option.wall = Ściana
 filter.option.ore = Ruda
 filter.option.floor2 = Druga podłoga
-filter.option.threshold2 = Secondary Threshold
+filter.option.threshold2 = Drugi próg
 filter.option.radius = Zasięg
 filter.option.percentile = Percentyl
 width = Szerokość:
 height = Wysokość:
 menu = Menu
 play = Graj
-campaign = Campaign
+campaign = Kampania
 load = Wczytaj
 save = Zapisz
 fps = FPS: {0}
@@ -318,7 +349,7 @@ ping = Ping: {0}ms
 language.restart = Uruchom grę ponownie, aby ustawiony język zaczął funkcjonować.
 settings = Ustawienia
 tutorial = Poradnik
-tutorial.retake = Re-Take Tutorial
+tutorial.retake = Ponów Samouczek
 editor = Edytor
 mapeditor = Edytor map
 donate = Wspomóż nas
@@ -332,21 +363,22 @@ bestwave = [LIGHT_GRAY]Najwyższa fala: {0}
 launch = < WYSTRZEL >
 launch.title = Wystrzelenie Udane
 launch.next = [LIGHT_GRAY]Następna okazja przy fali {0}
-launch.unable2 = [scarlet]Unable to LAUNCH.[]
+launch.unable2 = [scarlet]WYSTZRZELENIE niedostępne.[]
 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.
+launch.skip.confirm = Jeśli teraz przejdziesz do kolejnej fali, Nie biędziesz miał możliwości wystrzelenia do czasu pokonania dalszych fal.
 uncover = Odkryj
 configure = Skonfiguruj ładunek
 configure.locked = [LIGHT_GRAY]Dotrzyj do fali {0}\nAby skonfigurować ładunek.
+configure.invalid = Ilość musi być liczbą pomiędzy 0 a {0}.
 zone.unlocked = [LIGHT_GRAY]Strefa {0} odblokowana.
 zone.requirement.complete = Fala {0} osiągnięta:\n{1} Wymagania strefy zostały spełnione.
 zone.config.complete = Fala {0} osiągnięta:\nKonfiguracja ładunku odblokowana.
 zone.resources = Wykryte Zasoby:
-zone.objective = [lightgray]Objective: [accent]{0}
+zone.objective = [lightgray]Cel: [accent]{0}
 zone.objective.survival = Przeżyj
 zone.objective.attack = Zniszcz Rdzeń Wroga
 add = Dodaj...
-boss.health = Boss Health
+boss.health = Zdrowie Bossa
 connectfail = [crimson]Nie można połączyć się z serwerem:\n\n[accent]{0}
 error.unreachable = Serwer niedostępny.\nCzy adres jest wpisany poprawnie?
 error.invalidaddress = Niepoprawny adres.
@@ -356,37 +388,37 @@ error.alreadyconnected = Jesteś już połączony.
 error.mapnotfound = Plik mapy nie został znaleziony!
 error.io = Błąd siecowy I/O.
 error.any = Nieznany błąd sieci.
-error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.bloom = Nie udało się załadować bloom.\nTwoje urządzenie może nie wspierać tej funkcji.
 zone.groundZero.name = Wybuch Lądowy
 zone.desertWastes.name = Pustynne Pustkowia
 zone.craters.name = Kratery
 zone.frozenForest.name = Zamrożony Las
-zone.ruinousShores.name = Zniszczone Przybrzerza
+zone.ruinousShores.name = Zniszczone Przybrzeża
 zone.stainedMountains.name = Zabarwione Góry
 zone.desolateRift.name = Ponura Szczelina
 zone.nuclearComplex.name = Centrum Wyrobu Jądrowego
 zone.overgrowth.name = Przerośnięty Las
 zone.tarFields.name = Pola Smołowe
-zone.saltFlats.name = Salt Flats
+zone.saltFlats.name = Solne Równiny
 zone.impact0078.name = Uderzenie 0078
 zone.crags.name = Urwisko
-zone.fungalPass.name = Fungal Pass
+zone.fungalPass.name = Grzybowa Przełęcz
 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.
+zone.desertWastes.description = Te pustkowia są rozległe, nieprzewidywalne, i znajdują się na nich opuszczone struktury.\nWęgiel jest obecny w tym regionie. Użyj go do produkcji energii, lub do stworzenia grafitu.\n\n[lightgray]Miejsce lądowania nie jest pewne.
-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.saltFlats.description = Na obrzeżach pustyni spoczywają Solne Równiny. Można tu znaleźć niewiele surowców.\n\nWrogowie zbudowali tu bazę składującą surowce. Zniszcz ich rdżeń. Zniszcz wszystko co stanie ci na drodze.
-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.craters.description = W tym kraterze zebrała się woda. Pozostałość dawnych wojen. Odzyskaj ten teren. Wykop piasek. Wytop metaszkło. Pompuj wodę do działek obronnych i wierteł by je schłodzić
-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.ruinousShores.description = Za pustkowiami ciągnie się linia brzegowa. Kiedyś znajdowała się tu przybrzeżna linia obronna. Niewiele z niej zostało. Ostały się tylko podstawowe struktury obronne, z reszty został tylko złom.\nKontynuuj eksploracje. Odkryj pozostawioną tu technologię.
 zone.stainedMountains.description = W głębi lądu leżą góry, jeszcze nieskażone przez zarodniki.\nWydobądź obfity tytan w tym obszarze. Dowiedz się, jak z niego korzystać.\n\nObecność wroga jest tutaj większa. Nie daj im czasu na wysłanie swoich najsilniejszych jednostek.
 zone.overgrowth.description = Obszar ten jest zarośnięty, bliżej źródła zarodników.\nWróg założył tu placówkę. Zbuduj jednostki Nóż. Zniszcz to. Odzyskaj to, co nam odebrano.
 zone.tarFields.description = Obrzeża strefy produkcji ropy, między górami a pustynią. Jeden z niewielu obszarów z rezerwami użytecznej smoły.\nMimo że ta strefa jest opuszczona, w pobliżu znajdują się niebezpieczne siły wroga.  Nie lekceważ ich.\n\n[lightgray]Jeśli to możliwe, zbadaj technologię przetwarzania oleju.
-zone.desolateRift.description = Strefa wyjątkowo niebezpieczna. Opfita w zasoby ale mało miejsca. Wysokie ryzyko zniszczenia. Opuść tę strefe jak najszybciej. Nie daj się zwieść długiemu odstępowi między atakami wroga.
+zone.desolateRift.description = Strefa wyjątkowo niebezpieczna. Obfita w zasoby ale mało miejsca. Wysokie ryzyko zniszczenia. Opuść tę strefe jak najszybciej. Nie daj się zwieść długiemu odstępowi między atakami wroga.
 zone.nuclearComplex.description = Dawny zakład produkcji i przetwarzania toru, zredukowny do ruin.\n[lightgray]Zbadaj tor i jego zastosowania.\n\nWróg jest tutaj obecny w dużej ilości, nieustannie poszukuje napastników.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
+zone.fungalPass.description = Przejściowy obszar pomiędzy wysokimi górami a nisko znajdującymi się, ogarniętymi przez zarodniki równinami. Znajduje się tu mała postawiona przez wrogów baza zwiadowcza.\nZniszcz ją.\nUżyj jednostek Nóż i Pełzak. Zniszcz oba rdżenie.
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Język
-settings.data = Game Data
+settings.data = Dane Gry
 settings.reset = Przywróć domyślne
 settings.rebind = Zmień
 settings.controls = Sterowanie
@@ -404,14 +436,14 @@ no = Nie ma mowy!
 info.title = Informacje
 error.title = [crimson]Wystąpił błąd
 error.crashtitle = Wystąpił błąd
-attackpvponly = [scarlet]Only available in Attack/PvP modes
+attackpvponly = [scarlet]Dostępne tylko w trybach Atak/PvP
 blocks.input = Wejście
 blocks.output = Wyjście
 blocks.booster = Wzmacniacz
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = Pojemność mocy
 blocks.powershot = moc/strzał
-blocks.damage = Damage
+blocks.damage = Obrażenia
 blocks.targetsair = Namierzanie wrogów powietrznych
 blocks.targetsground = Namierzanie wrogów lądowych
 blocks.itemsmoved = Prędkość poruszania się
@@ -434,17 +466,20 @@ blocks.boosteffect = Efekt wzmocnienia
 blocks.maxunits = Maksymalna ilość jednostek
 blocks.health = Zdrowie
 blocks.buildtime = Czas budowy
+blocks.buildcost = Koszt budowy
 blocks.inaccuracy = Niedokładność
 blocks.shots = Strzały
 blocks.reload = Strzałów/sekundę
 blocks.ammo = Amunicja
-bar.drilltierreq = Better Drill Required
+bar.drilltierreq = Wymagane Lepsze Wiertło
 bar.drillspeed = Prędkość wiertła: {0}/s
 bar.efficiency = Efektywność: {0}%
 bar.powerbalance = Moc: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Moc: {0}
 bar.poweroutput = Wyjście mocy: {0}
 bar.items = Przedmiotów: {0}
+bar.capacity = Pojemność: {0}
 bar.liquid = Płyn
 bar.heat = Ciepło
 bar.power = Prąd
@@ -482,17 +517,18 @@ category.shooting = Strzelanie
 category.optional = Dodatkowe ulepszenia
 setting.landscape.name = Zablokuj tryb panoramiczny
 setting.shadows.name = Cienie
-setting.linear.name = Linear Filtering
+setting.linear.name = Filtrowanie Liniowe
 setting.animatedwater.name = Animowana woda
 setting.animatedshields.name = Animowana Tarcza
 setting.antialias.name = Antialias[LIGHT_GRAY] (wymaga restartu)[]
 setting.indicators.name = Wskaźniki Przyjaciół
 setting.autotarget.name = Automatyczne Celowanie
-setting.keyboard.name = Mouse+Keyboard Controls
+setting.keyboard.name = Sterowanie Myszka+Klawiatura
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Maksymalny FPS
 setting.fpscap.none = Nieograniczone
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI Scaling[lightgray] (require restart)[]
+setting.uiscale.name = Skalowanie Interfejsu[lightgray] (wymaga restartu)[]
 setting.swapdiagonal.name = Pozwala na ukośne stawianie
 setting.difficulty.training = trening
 setting.difficulty.easy = Łatwy
@@ -513,25 +549,26 @@ 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.ambientvol.name = Głośność otoczenia
 setting.mutemusic.name = Wycisz muzykę
 setting.sfxvol.name = Głośność dźwięków
 setting.mutesound.name = Wycisz dźwięki
 setting.crashreport.name = Wysyłaj anonimowo dane o crashu gry
-setting.savecreate.name = Auto-Create Saves
+setting.savecreate.name = Automatyczne tworzenie zapisu
+setting.publichost.name = Widoczność gry publicznej
 setting.chatopacity.name = Przezroczystość czatu
 setting.playerchat.name = Wyświetlaj czat w grze
-uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
+uiscale.reset = Skala interfejsu uległa zmianie.\nNaciśnij "OK" by potwierdzić zmiany.\n[scarlet]Cofanie zmian i wyjście z gry za[accent] {0}[]
-uiscale.cancel = Cancel & Exit
+uiscale.cancel = Anuluj i wyjdź
 setting.bloom.name = Bloom
 keybind.title = Zmień
-keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
+keybinds.mobile = [scarlet]Większość skrótów klawiszowych nie funkcjonuje w wersji mobilnej. Tylko podstawowe poruszanie się jest wspierane.
 category.general.name = Ogólne
 category.view.name = Wyświetl
 category.multiplayer.name = Multiplayer
 command.attack = Atakuj
+command.rally = Rally
 command.retreat = Wycofaj
-command.patrol = Patrol
 keybind.gridMode.name = Wybieranie Bloku
 keybind.gridModeShift.name = Wybieranie Kategorii
 keybind.press = Naciśnij wybrany klawisz...
@@ -541,7 +578,7 @@ keybind.move_x.name = Poruszanie w poziomie
 keybind.move_y.name = Poruszanie w pionie
 keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Zaznacz
-keybind.diagonal_placement.name = Diagonal Placement
+keybind.diagonal_placement.name = Budowa po skosie
 keybind.pick.name = Wybierz Blok
 keybind.break_block.name = Zniszcz Blok
 keybind.deselect.name = Odznacz
@@ -550,7 +587,7 @@ keybind.zoom_hold.name = Inicjator przybliżania
 keybind.zoom.name = Przybliżanie
 keybind.menu.name = Menu
 keybind.pause.name = Pauza
-keybind.minimap.name = Minimap
+keybind.minimap.name = Minimapa
 keybind.dash.name = Przyspieszenie
 keybind.chat.name = Czat
 keybind.player_list.name = Lista graczy
@@ -575,21 +612,21 @@ mode.custom = Własny tryb
 rules.infiniteresources = Nieskończone zasoby
 rules.wavetimer = Zegar fal
 rules.waves = Fale
-rules.attack = Attack Mode
+rules.attack = Tryb Ataku
 rules.enemyCheat = Nieskończone zasoby komputera-przeciwnika (czerwonego zespołu)
-rules.unitdrops = Unit Drops
+rules.unitdrops = Surowce z zniszczonych jednostek
 rules.unitbuildspeedmultiplier = Mnożnik Prędkości Tworzenia Jednostek
 rules.unithealthmultiplier = Mnożnik Życia Jednostek
 rules.playerhealthmultiplier = Mnożnik Życia Gracza
 rules.playerdamagemultiplier = Mnożnik Obrażeń Gracza
 rules.unitdamagemultiplier = Mnożnik Obrażeń Jednostek
-rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
+rules.enemycorebuildradius = Zasięg blokady budowy przy rdżeniu wroga:[LIGHT_GRAY] (kratki)
-rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
+rules.respawntime = Czas Odrodzenia:[LIGHT_GRAY] (sek)
 rules.wavespacing = Odstępy między falami:[LIGHT_GRAY] (sek)
 rules.buildcostmultiplier = Mnożnik Kosztów Budowania
 rules.buildspeedmultiplier = Mnożnik Prędkości Budowania
 rules.waitForWaveToEnd = Fale czekają na przeciwników
-rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles)
+rules.dropzoneradius = Zasięg strefy zrzutu:[LIGHT_GRAY] (kratki)
 rules.respawns = Maksymalna ilośc odrodzeń na falę
 rules.limitedRespawns = Ogranicz Odrodzenia
 rules.title.waves = Fale
@@ -602,7 +639,7 @@ content.item.name = Przedmioty
 content.liquid.name = Płyny
 content.unit.name = Jednostki
 content.block.name = Klocki
-content.mech.name = Mechs
+content.mech.name = Mechy
 item.copper.name = Miedź
 item.lead.name = Ołów
 item.coal.name = Węgiel
@@ -637,7 +674,7 @@ mech.omega-mech.weapon = Rakiety Chmarowe
 mech.omega-mech.ability = Układ Obronny
 mech.dart-ship.name = Strzałka
 mech.dart-ship.weapon = Karabin
-mech.javelin-ship.name = Javelin
+mech.javelin-ship.name = Oszczep
 mech.javelin-ship.weapon = Seria Rakiet
 mech.javelin-ship.ability = Wyładowania Dopalacza
 mech.trident-ship.name = Trójząb
@@ -655,11 +692,11 @@ mech.itemcapacity = [LIGHT_GRAY]Pojemność przedmiotów: {0}
 mech.minespeed = [LIGHT_GRAY]Prędkość kopania: {0}
 mech.minepower = [LIGHT_GRAY]Moc kopania: {0}
 mech.ability = [LIGHT_GRAY]Umiejętność: {0}
-mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
+mech.buildspeed = [LIGHT_GRAY]Szybkość Budowy: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Wytrzymałość na przegrzewanie: {0}
 liquid.viscosity = [LIGHT_GRAY]Lepkość: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
-block.sand-boulder.name = Sand Boulder
+block.sand-boulder.name = Piaskowy Głaz
 block.grass.name = Trawa
 block.salt.name = Sól
 block.saltrocks.name = Skały Solne
@@ -670,7 +707,7 @@ block.spore-pine.name = Sosna Zarodkowa
 block.sporerocks.name = Skała z Zarodkami
 block.rock.name = Skały
 block.snowrock.name = Skały śnieżne
-block.snow-pine.name = Snow Pine
+block.snow-pine.name = Sosna śniegowa
 block.shale.name = Łupek
 block.shale-boulder.name = Głaz Łupkowy
 block.moss.name = Mech
@@ -703,13 +740,13 @@ block.snow.name = Śnieg
 block.craters.name = Kratery
 block.sand-water.name = Woda z Piaskiem
 block.darksand-water.name = Woda z Ciemnym Piaskiem
-block.char.name = Char
+block.char.name = Popiół
-block.holostone.name = Holo stone
+block.holostone.name = Błyszczący kamień
 block.ice-snow.name = Lodowy Śnieg
 block.rocks.name = Skały
 block.icerocks.name = Lodowe skały
 block.snowrocks.name = Śnieżne Skały
-block.dunerocks.name = Dune Rocks
+block.dunerocks.name = Skały wydmowe
 block.pine.name = Sosna
 block.white-tree-dead.name = Białe Drzewo Martwe
 block.white-tree.name = Białe Drzewo
@@ -728,7 +765,7 @@ block.dark-panel-6.name = Ciemny Panel 6
 block.dark-metal.name = Ciemny Metal
 block.ignarock.name = Skała Wulkaniczna
 block.hotrock.name = Gorący Kamień
-block.magmarock.name = Magma Rock
+block.magmarock.name = Skała magmowa
 block.cliffs.name = Klify
 block.copper-wall.name = Miedziana Ściana
 block.copper-wall-large.name = Duża miedziana ściana
@@ -743,14 +780,17 @@ block.door-large.name = Duże drzwi
 block.duo.name = Podwójne działko
 block.scorch.name = Płomień
 block.scatter.name = Flak
-block.hail.name = Hail
+block.hail.name = Grad
 block.lancer.name = Lancer
 block.conveyor.name = Przenośnik
 block.titanium-conveyor.name = Tytanowy przenośnik
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Węzeł
 block.router.name = Rozdzielacz
 block.distributor.name = Dystrybutor
 block.sorter.name = Sortownik
+block.message.name = Message
 block.overflow-gate.name = Brama Przeciwprzepełnieniowa
 block.silicon-smelter.name = Huta Krzemu
 block.phase-weaver.name = Fazowa Fabryka
@@ -760,7 +800,7 @@ block.melter.name = Przetapiacz
 block.incinerator.name = Spalacz
 block.spore-press.name = Prasa Zarodni
 block.separator.name = Rozdzielacz
-block.coal-centrifuge.name = Coal Centrifuge
+block.coal-centrifuge.name = Wirówka węglowa
 block.power-node.name = Węzeł Prądu
 block.power-node-large.name = Duży Węzeł Prądu
 block.surge-tower.name = Wieża Energetyczna
@@ -791,7 +831,7 @@ block.power-void.name = Próżnia prądu
 block.power-source.name = Nieskończony Prąd
 block.unloader.name = Ekstraktor
 block.vault.name = Magazyn
-block.wave.name = Wave
+block.wave.name = Strumyk
 block.swarmer.name = Działo Rojowe
 block.salvo.name = Działo Salwowe
 block.ripple.name = Działo falowe
@@ -812,7 +852,7 @@ block.ghoul-factory.name = Fabryka Bombowców Upiór
 block.dagger-factory.name = Fabryka Mechów Nóż
 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.fortress-factory.name = Fabryka Mechów Forteca
 block.revenant-factory.name = Fabryka Wojowników Zjawa
 block.repair-point.name = Punkt Napraw
 block.pulse-conduit.name = Rura Pulsacyjna
@@ -846,8 +886,8 @@ block.launch-pad.name = Wyrzutnia
 block.launch-pad-large.name = Duża Wyrzutnia
 team.blue.name = niebieski
 team.crux.name = czerwony
-team.sharded.name = pomarańczowy
+team.sharded.name = żółty
-team.orange.name = orange
+team.orange.name = pomarańczowy
 team.derelict.name = szary
 team.green.name = zielony
 team.purple.name = fioletowy
@@ -868,32 +908,32 @@ unit.lich.name = Obudzony
 unit.reaper.name = Żeniec
 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 = Wydobywanie ręczne nie jest efektywne.\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.drill.mobile = Wydobywanie ręczne jest nieefektywne.\n[accent]Wiertła []mogą kopać automatycznie.\nDotknij zakładkę wiertła w prawym dolnym rogu.\nWybierz[accent] wiertło mechaniczne[].\nUmieść go na złożu miedzi poprzez Stuknięcie, potem wciśnij[accent] ptaszek[] na dole by potwierdzić wybór.\nNaciśnij przycisk[accent] X[] by anulować budowe.
-tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
+tutorial.blockinfo = Każdy blok ma inne statystyki. Każde wiertło może kopać tylko wybrane rudy.\nBy sprawdzić informacje i statystyki bloku,[accent] kliknij przycisk "?" podczas jego wyboru w menu budowy.[]\n\n[accent]Sprawdź teraz statystyki mechanicznego wiertła.[]
-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 = [accent]Przenośnik[] jest używany do transportowania przedmiotów do rdzenia.\nStwórz linie przenośników z wierteł do rdzenia.\n[accent]Przytrzymaj przycisk myszy by położyć w linii.[]\nPrzytrzymaj[accent] CTRL[] podczas wybierania linii, by budować po skosie.\n\n[accent]{0}/{1} Przenośniki położone w linii\n[accent]0/1 Przedmioty dostarczone
-tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
+tutorial.conveyor.mobile = [accent]Przenośnik[] jest używany do transportowania przedmiotów do rdzenia.\nStwórz linie przenośników z wierteł do rdzenia.\n[accent] Zbuduj w linii poprzez przytrzymanie palcem przez moment[] i przesunięcie w którymś kierunku.\n\n[accent]{0}/{1} Przenośniki położone w linii\n[accent]0/1 Przedmioty dostarczone
-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.turret = Kiedy przedmiot dociera do rdzenia, może zostać użyty do budowy.\nPamiętaj że nie każdy przedmiot może zostać użyty do budowy.\nprzedmioty które nie są używane do budowy, takie jak[accent] Węgiel[] lub[accent] złom[], nie moga zostać wprowadzone do rdzenia.\nStruktury obronne muszą zostać zbudowane by odeprzeć[lightgray] wroga[].\nZbuduj[accent] podwójne działko[] niedaleko swojej bazy.
-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.drillturret = Podwójne działka wymagają[accent] miedzianej amunicji []do strzelania.\nPołóż wiertło obok działka.\nPoprowadź przenośniki do działek by zaopatrzyć je w miedź.\n\n[accent]Amunicja dostarczona: 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 = Podczas gry, możesz[accent] zatrzymać grę.[]\nMożesz ustalić kolejkę budowy podczas pauzy.\n\n[accent]Naciśnij spacje by zapauzować.
-tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.pause.mobile = Podczas gry, możesz[accent] zatrzymać grę.[]\nMożesz ustalić kolejkę budowy podczas pauzy.\n\n[accent]Nacniśnij przycisk w lewym górnym rogu by zapauzować.
-tutorial.unpause = Now press space again to unpause.
+tutorial.unpause = Teraz znowu naciśnij spacje by odpauzować.
-tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.unpause.mobile = Naciśnij go znowu by odpauzować.
-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 = Bloki często wymagają rozbiórki.\n[accent]Przytrzymaj prawy przcisk myszy[] by niszczyć wszystkie wybrane bloki.[]\n\n[accent]Zniszcz wszystkie bloki złomu na lewo od twojego rdzenia używając selekcji obszarowej.
-tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Bloki często wymagają rozbiórki.\n[accent]Wybierz tryb dekonstrukcji[], a następnie dotknij blok by zacząć go niszczyć.\nZdekonstruuj obszarowo poprzez przytrzymanie palcem przez moment[] i przesunięcie go w jakimś kierunku.\nNaciśnij przycisk ptaszka by potwierdzić rozbiórkę.\n\n[accent]Zniszcz wszystkie bloki złomu na lewo od twojego rdzenia używając selekcji obszarowej.
-tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.withdraw = Czasami, konieczne jest wyjmowanie przedmiotów prosto z bloków.\nBy tego dokonać, [accent]kliknij blok[] z przedmiotami w nim, potem [accent]kliknij przedmiot[] w inwentarzu.\nMożesz zebrać wiele przedmiotów naraz  poprzez [accent]kliknięcie i przytrzymanie[].\n\n[accent]Zabierz trochę miedzi z rdzenia.[]
-tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
+tutorial.deposit = Włóż przedmioty do bloków poprzez przeciągnięcie z twojego statku do danego bloku.\n\n[accent]Włóż miedź z powrotem do rdzenia .[]
-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 = [lightgray] Wrogowie[] nadchodzą.\n\nBroń swój rdżeń przez 2 fale.[accent] Kliknij[] by strzelać.\nZbuduj wiecej działek i wierteł. Wydobądź więcej miedzi.
-tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
+tutorial.waves.mobile = [lightgray] Wrogowie[] nadchodzą.\n\nBroń swój rdzeń przez 2 fale. Twój statek będzie automatycznie atakował wrogów.\nZbuduj wiecej działek i wierteł. Wydobądź więcej miedzi.
-tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese resources can then be used to research new technology.\n\n[accent]Press the launch button.
+tutorial.launch = Kiedy dotrzesz do określonej fali, masz możliwość[accent] wystrzelenia rdzenia[], pozostawiając struktury obronne za sobą i[accent] otrzymując wszystkie surowce znajdujące się w rdzeniu.[]\nSurowce te mogą potem zostać użyte do odkrywania nowych technologii.\n\n[accent]Naciśnij przycisk Wystrzału.
 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.metaglass.description = Wyjątkowo wytrzymały stop szkła. Szeroko używany w transporcie i przechowywaniu płynów.
 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!
-item.thorium.description = Zwarty i radioaktywny materiał używany w struktucrach i paliwie nuklearnym. Nie trzymaj go w rękach!
+item.thorium.description = Zwarty i radioaktywny materiał używany w strukturach i paliwie nuklearnym. Nie trzymaj go w rękach!
 item.scrap.description = Pozostałości starych budynków i jednostek. Składa się z małej ilości wszystkiego.
 item.silicon.description = Niesamowicie przydatny półprzewodnk uźywany w panelach słonecznych i skomplikowanej elektronice. Nie, w Dolinie Krzemowej już nie ma krzemu.
 item.plastanium.description = Lekki i plastyczny materiał używany w amunicji odłamkowej i samolotach. Używany też w klockach LEGO (dlatego są niezniszczalne)!
@@ -903,12 +943,12 @@ item.spore-pod.description = Używany do wyrobu oleju, materiałów wybuchowych
 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.slag.description = Wiele różnych metali stopionych i zmieszanych razem. Może zostać rozdzielony na jego metale składowe, albo wystrzelony w wrogie jednostki i użyty jako broń.
-liquid.oil.description = Może się palić, eksplodować lub być używana do schładzania.
+liquid.oil.description = Używany w do produkcji złożonych materiałów. Może zostać przetworzony na węgiel, lub wystrzelony w wrogów przez wieżyczke.
 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, lec jest wstanie szybko rozwalić grupę wrogich jednostek piorunami.
+mech.delta-mech.description = Szybki i wrażliwy mech stworzony do szybkich ataków i ucieczki. Zadaje niewielkie obrażenia strukturom, lecz może bardzo szybko niszczyć spore grupy jednostek wroga przy pomocy jego działek tesli.
-mech.tau-mech.description = Mech pomocny. Naprawia budynki drużyny, strzelając w nie. Potrafi wygasić niedalekie pożary i uleczyć bliskich przyjaciół.
+mech.tau-mech.description = Mech wsparcia. 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.
 mech.javelin-ship.description = Statek do ataku i szybkiej ucieczki. Zaczyna powoli, ale przyspiesza do wielkiej prędkości. Przy tej prędkości, może przelecieć koło wrogiej bazy i atakować piorunami czy rakietami. 
@@ -921,12 +961,13 @@ unit.dagger.description = Podstawowy mech lądowy. Sam jest słaby, lecz przydat
 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 = Zaawansowana, opancerzona jednostka naziemna. Atakuje zarówno cele naziemne, jak i powietrzne. Wyposażony w dwa miniaturowe miotacze ognia typu Płomień.
 unit.fortress.description = Ciężki mech artyleryjski. Wyposażony w dwa zmodyfikowane działa typu gradowego do ataku na dalekie odległości na konstrukcje i jednostki wroga.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
+unit.eruptor.description = Ciężki mech stworzony do niszczenia struktur. Strzela wiązką żużlu w kierunku fortyfikacji wroga, Topiąc je oraz podpalając łatwopalne przedmioty.
 unit.wraith.description = Szybka jednostka, stosuje taktyke uderz-uciekaj Namierza jakiekolwiek źródło prądu.
 unit.ghoul.description = Ciężki bombowiec dywanowy. Rozdziera struktury wroga, atakując krytyczną infrastrukturę.
 unit.revenant.description = Ciężka, unosząca sie platforma z rakietami.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Kompresuje kawałki węgla w czyste blaszki grafitu.
-block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
+block.multi-press.description = Ulepszona wersja prasy grafitowej. Używa wody i prądu do kompresowania węgla szybko i efektywnie.
 block.silicon-smelter.description = Redukuje piasek za pomocą wysoce czystego węgla w celu wytworzenia krzemu.
 block.kiln.description = Stapia ołów i piasek na metaszkło. Wymaga małej ilości energii.
 block.plastanium-compressor.description = Wytwarza plastan z oleju i tytanu.
@@ -934,9 +975,9 @@ block.phase-weaver.description = Produkuje Włókna Fazowe z radioaktywnego toru
 block.alloy-smelter.description = Produkuje stop Elektrum z tytanu, ołowiu, krzemu i miedzi.
 block.cryofluidmixer.description = Łączy wodę i tytan w lodociecz, który jest znacznie bardziej wydajny w chłodzeniu niż woda.
 block.blast-mixer.description = Kruszy i miesza skupiska zarodników z piratytem, tworząc związek wybuchowy.
-block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
+block.pyratite-mixer.description = Miesza węgiel, ołów i piasek tworząc bardzo łatwopalny piratian.
 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.separator.description = Oddziela użyteczne materiały z mieszaniny jaką jest żużel.
 block.spore-press.description = Kompresuje kapsułki zarodników w olej.
 block.pulverizer.description = Mieli złom w drobny piasek. Przydatne, gdy brakuje naturalnego piasku.
 block.coal-centrifuge.description = Zestala olej w kawałki węgla.
@@ -958,21 +999,21 @@ block.surge-wall.description = Najsilniejszy blok obronny.\nMa niewielką szans
 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.mender.description = Co jakiś czas naprawia bloki w zasięgu. Utrzymuje struktury obronne w dobrym stanie.\nOpcjonalnie używa silikonu do zwiększenia zasięgu i szybkości naprawy.
-block.mend-projector.description = Periodically heals blocks in its vicinity.
+block.mend-projector.description = Co jakiś czas naprawia bloki w zasięgu. Lepsza wersja naprawiacza.
-block.overdrive-projector.description = Increases the speed of nearby buildings like drills and conveyors.
+block.overdrive-projector.description = Zwiększa szybkość budynków w zasięgu takich jak wiertła czy przenośniki.
-block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage through bullets.
+block.force-projector.description = Wytwarza pole siłowe w kształcie sześciokąta wokół siebie, chroniąc budynki i jednostki wewnątrz od obrażeń zadanych przez pociski.
-block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
+block.shock-mine.description = Zadaje obrażenia jednostkom wroga którzy na nią wejdą. Ledwo widoczne dla wrogów.
-block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into turrets or crafters. Rotatable.
+block.conveyor.description = Podstawowy blok transportowy dla przedmiotów. Automatycznie przesyła przedmioty naprzód do działek oraz maszyn. Można obrócić.
-block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
+block.titanium-conveyor.description = Zaawansowany blok transportowy dla przedmiotów. Przesyła przedmioty szybciej od zwykłego przenośnika.
-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.junction.description = Używany jako most dla dwóch krzyżujących się przenośników. Przydatne w sytuacjach kiedy dwa różne przenośniki transportują różne surowce do różnych miejsc.
 block.bridge-conveyor.description = Zaawansowany blok transportujący. Pozwala na przenoszenie przedmiotów nawet do 3 bloków na każdym terenie, przez każdy budynek.
-block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
+block.phase-conveyor.description = Zaawansowany blok transportowy dla przedmiotów. Używa energii przy teleportacji przedmiotów do podłączonego transportera fazowego na spore odległości.
 block.sorter.description = Sortuje przedmioty. Jeśli przedmiot pasuje to przechodzi dalej, jeśli nie - to przechodzi na boki.
 block.router.description = Akceptuje przedmioty z jednego miejsca i rozdziela je do trzech innych kierunków. Przydatne w rozdzielaniu materiałów z jednego źródła do wielu celów.
 block.distributor.description = Zaawansowany rozdzielacz, rozdzielający przedmioty do 7 innych kierunków.
 block.overflow-gate.description = Rozdzielacz, który przerzuca przedmioty, kiedy główna droga jest przepełniona
-block.mass-driver.description = Ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range.
+block.mass-driver.description = Najlepszy blok do transportu przedmiotów. Zbiera wiele przedmiotów naraz a potem wystrzeliwuje je do kolejnej katapulty masy na bardzo duże odległości.
 block.mechanical-pump.description = Tania pompa o niskiej przepustowości. Nie wymaga prądu.
 block.rotary-pump.description = Zaawansowana pompa, dwukrotnie większa przepustowość od mechanicznej pompy. Wymaga prądu.
 block.thermal-pump.description = Najlepsza pompa. Trzy razy szybsza od mechanicznej pompy i jedyna, która może wypompować lawę.
@@ -984,41 +1025,41 @@ block.liquid-junction.description = Działa jak most dla dwóch krzyżujących s
 block.bridge-conduit.description = Zaawansowany blok przenoszący ciecze. Pozwala na przenoszenie cieczy nawet do 3 bloków na każdym terenie, przez każdy budynek.
 block.phase-conduit.description = Zaawansowany blok do przenoszenia cieczy. Używa prądu, aby przenieść ciecz do połączonego transportera fazowego przez kilka bloków.
 block.power-node.description = Przesyła moc do połączonych węzłów. Można podłączyć do czterech źródeł zasilania, zlewów lub węzłów. Zasila też bloki które go dotykają.
-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.power-node-large.description = Posiada większy zasięg niż zwykły węzeł prądu. Można podłączyć do sześciu źródeł zasilania, zlewów lub węzłów.
-block.surge-tower.description = An extremely long-range power node with fewer available connections.
+block.surge-tower.description = Węzęł prądu z bardzo dużym zasięgiem, posiadający mniej możliwych podłączeń.
-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.description = Przechowuje energię przy nadwyżce produkcji oraz dostarcza energię kiedy jest jej brak, dopóki jest w niej miejsce.
-block.battery-large.description = Stores much more power than a regular battery.
+block.battery-large.description = Przechowuje o wiele wiecej prądu niż standardowa bateria.
 block.combustion-generator.description = Wytwarza energię poprzez spalanie łatwopalnych materiałów.
-block.thermal-generator.description = Generates power when placed in hot locations.
+block.thermal-generator.description = Generuje prąd kiedy jest postawiony na źródłach ciepła.
 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.differential-generator.description = Generuje duże ilości prądu. Wykorzystuje różnice temperatur pomiędzy Lodocieczą a spalanym Piratianem.
-block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
+block.rtg-generator.description = Termoelektryczny generator wykorzystujący izotopy promieniotwórcze. Nie wymaga chłodzenia, ale produkuje mniej energii od reaktora torowego.
-block.solar-panel.description = Provides a small amount of power from the sun.
+block.solar-panel.description = Wytwarza małe ilości prądu wykorzystując energię słoneczną.
-block.solar-panel-large.description = Provides much better power supply than a standard solar panel, but is also much more expensive to build.
+block.solar-panel-large.description = Wytwarza o wiele więcej prądu niż zwykły panel słoneczny, ale jest o wiele droższy w budowie.
-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.thorium-reactor.description = Produkuje bardzo duże ilości prądu z wysoce radioaktywnego toru. Wymaga ciągłego chłodzenia. Silnie eksploduje jeśli nie zostanie dostarczona wystarczająca ilość chłodziwa. Produkcja energii zależy od zapełnienia, produkując bazową ilość energii przy całkowitym zapełnieniu.
-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 = Zaawansowany generator, zdolny do produkcji ogromnych ilości prądu u szczytu swoich możliwości. Wymaga znacznych ilości energii do rozpoczęcia procesu.
 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.pneumatic-drill.description = Ulepszone wiertło, które jest szybsze i może wykopywać twardsze surowce przy użyciu ciśnienia.
-block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Additionally, radioactive thorium can be retrieved with this drill.
+block.laser-drill.description = Pozwala kopać jeszcze szybciej poprzez technologię laserową, ale wymaga energii. Dodatkowo, radioaktywny tor może zostać wydobyty przez to wiertło.
-block.blast-drill.description = The ultimate drill. Requires large amounts of power.
+block.blast-drill.description = Najlepsze wiertło. Wymaga dużych ilości energii.
 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.oil-extractor.description = Używa bardzo dużych ilości energii do ekstrakcji ropy z piasku. Używaj go w sytuacji kiedy nie ma bezpośredniego źródła ropy w okolicy.
-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-shard.description = Pierwsza wersja rdzenia. Gdy zostaje zniszczony, wszelki kontakt do regionu zostaje utracony. Nie pozwól na to.
-block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
+block.core-foundation.description = Druga wersja rdzenia. Lepiej opancerzony. Przechowuje więcej surowców.
-block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.core-nucleus.description = Trzecia i ostatnia wersja rdzenia. Bardzo dobrze opanczerzony. Przechowuje ogromne ilości surowców.
-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.vault.description = Przechowuje duże ilości przedmiotów każdego rodzaju. [LIGHT_GRAY] Ekstraktor[] może zostać użyty do rozładowania magazynu.
-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.container.description = Przechowuje małe ilości przedmiotów każdego rodzaju. [LIGHT_GRAY] ekstraktor[] może zostać użyty do rozładowania kontenera.
-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.unloader.description = Wyciąga przedmioty z kontenera, magazynu oraz rdżenia na przenośniki lub bezpośrednio na przyległe bloki. Typ przedmiotu jaki zostanie wyciągniety może zostać zmieniony poprzez kliknięcie.
-block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished.
+block.launch-pad.description = Wysyła pakiety przedmiotów bez potrzeby wystrzeliwania rdżenia. Niedokończona.
-block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
+block.launch-pad-large.description = Ulepszona wersja wyrzutni. Magazynuje więcej przedmiotów. Wysyła częściej.
-block.duo.description = Mała, tania wieża. Przydatny przeciwko jednostkom naziemnym.
+block.duo.description = Mała, tania wieża. Przydatna 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.arc.description = Mała wieża bliskiego zasięgu, która wystrzeliwuje wiązki tesli 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.
@@ -1029,19 +1070,19 @@ block.meltdown.description = Duża wieża, która strzela potężnymi wiązkami
 block.command-center.description = Wydaje polecenia ruchu sojuszniczym jednostkom na całej mapie.\nPowoduje patrolowanie jednostek, atakowanie wrogiego rdzenia lub wycofanie się do rdzenia / fabryki. Gdy nie ma rdzenia wroga, jednostki będą domyślnie patrolować pod dowództwem ataku.
 block.draug-factory.description = Produkuje drony wydobywcze Draug.
 block.spirit-factory.description = Produkuje lekkie drony, które naprawiają bloki.
-block.phantom-factory.description = Produkuje zaawansowane drony które pomgają przy budowie.
+block.phantom-factory.description = Produkuje zaawansowane drony które pomagają przy budowie.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
+block.wraith-factory.description = Produkuje szybkie jednostki powietrzne typu "uderz-uciekaj".
-block.ghoul-factory.description = Produces heavy carpet bombers.
+block.ghoul-factory.description = Produkuje ciężkie bombowce dywanowe.
-block.revenant-factory.description = Produces heavy laser air units.
+block.revenant-factory.description = Produkuje ciężkie jednostki powietrzne z wyrzutniami rakiet.
-block.dagger-factory.description = Produces basic ground units.
+block.dagger-factory.description = Produkuje podstawowe jednostki lądowe.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
+block.crawler-factory.description = Produkuje szybkie jednostki lądowe typu "kamikaze".
-block.titan-factory.description = Produces advanced, armored ground units.
+block.titan-factory.description = Produkuje zaawansowane, opancerzone jednostki lądowe.
-block.fortress-factory.description = Produces heavy artillery ground units.
+block.fortress-factory.description = Produkuje naziemne jednostki ciężkiej artylerii.
 block.repair-point.description = Bez przerw ulecza najbliższą zniszczoną jednostkę w jego zasięgu.
-block.dart-mech-pad.description = Provides transformation into a basic attack mech.\nUse by tapping while standing on it.
+block.dart-mech-pad.description = Umożliwia transformacje w podstawowego mecha bojowego.\nUżyj klikając podczas stania na nim.
-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.delta-mech-pad.description = Opuść swój obecny statek i zamień go na szybki, lekko opancerzony mech stworzony do ataków typu uderz-uciekaj.\nUżyj, klikając dwukrotnie podczas stania na lądowisku.
-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.tau-mech-pad.description = Opuść swój obecny statek i zamień go na mech wsparcia który może leczyć sojusznicze struktury i jednostki.\nUżyj, klikając dwukrotnie podczas stania na lądowisku.
-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.omega-mech-pad.description = Opuść swój obecny statek i zamień go na masywny, dobrze opancerzony mech, przeznaczony do ataków na froncie.\nUżyj, klikając dwukrotnie podczas stania na lądowisku.
-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.javelin-ship-pad.description = Opuść swój obecny statek i zamień go na silny i szybki statek przechwytujący z bronią błyskawicową.\nUżyj, klikając dwukrotnie podczas stania na lądowisku.
-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.trident-ship-pad.description = Opuść swój obecny statek i zamień go na dość dobrze opancerzony ciężki bombowiec.\nUżyj, klikając dwukrotnie podczas stania na lądowisku.
-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.glaive-ship-pad.description = Opuść swój obecny statek i zamień go na duży, mocno opancerzony statek bojowy.\nUżyj, klikając dwukrotnie podczas stania na lądowisku.

core/assets/bundles/bundle_pt_BR.properties

@@ -1,28 +1,28 @@
-credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\n\n[GRAY](In case you can't tell, this text is currently unfinished.\nTranslators, don't edit it yet!)
+credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]
-credits = Creditos
+credits = Créditos
 contributors = Tradutores e contribuidores
 discord = Junte-se ao Discord do Mindustry! (Lá nós falamos em inglês)
 link.discord.description = O discord oficial do Mindustry
-link.github.description = Codigo fonte do jogo.
+link.github.description = Código fonte do jogo.
 link.changelog.description = List of update changes
-link.dev-builds.description = Desenvolvimentos Instaveis
+link.dev-builds.description = Desenvolvimentos Instáveis
 link.trello.description = Trello Oficial para Updates Planejados
 link.itch.io.description = Pagina da Itch.io com os Downloads
 link.google-play.description = Listamento do google play store
 link.wiki.description = Wiki oficial do Mindustry
 linkfail = Falha ao abrir o link\nO Url foi copiado
 screenshot = Screenshot salvo para {0}
-screenshot.invalid = Mapa grande demais, Potencialmente sem memoria suficiente para captura.
+screenshot.invalid = Mapa grande demais, Potencialmente sem memória suficiente para captura.
 gameover = O núcleo foi destruído.
 gameover.pvp = O time[accent] {0}[] É vitorioso!
 highscore = [YELLOW]Novo recorde!
-load.sound = Sounds
+load.sound = Sons
-load.map = Maps
+load.map = Mapas
-load.image = Images
+load.image = Imagens
-load.content = Content
+load.content = Conteúdo
-load.system = System
+load.system = Sistema
 stat.wave = Hordas derrotadas:[accent] {0}
-stat.enemiesDestroyed = Enimigos Destruídos:[accent] {0}
+stat.enemiesDestroyed = Inimigos Destruídos:[accent] {0}
 stat.built = Construções construídas:[accent] {0}
 stat.destroyed = Construções destruídas:[accent] {0}
 stat.deconstructed = Construções desconstruídas:[accent] {0}
@@ -48,9 +48,18 @@ minimap = Mini-Mapa
 close = Fechar
 website = Website
 quit = Sair
+save.quit = Save & Quit
 maps = Mapas
+maps.browse = Browse Maps
 continue = Continuar
 maps.none = [LIGHT_GRAY]Nenhum Mapa Encontrado!
+invalid = Invalid
+preparingconfig = Preparing Config
+preparingcontent = Preparing Content
+uploadingcontent = Uploading Content
+uploadingpreviewfile = Uploading Preview File
+committingchanges = Comitting Changes
+done = Done
 about.button = Sobre
 name = Nome:
 noname = Pegue[accent] um nome[] primeiro.
@@ -65,27 +74,31 @@ players = {0} Jogadores Ativos
 players.single = {0} Jogador Ativo
 server.closing = [accent]Fechando servidor...
 server.kicked.kick = Voce foi expulso do servidor!
+server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Servidor Fechado.
-server.kicked.vote = You have been vote-kicked. Goodbye.
+server.kicked.vote = Você foi expulso desse servidor. Tchau.
 server.kicked.clientOutdated = Cliente desatualizado! Atualize seu jogo!
-server.kicked.serverOutdated = Servidor desatualiado! Peca ao dono para atualizar!
+server.kicked.serverOutdated = Servidor desatualiado! Peça ao dono para atualizar!
-server.kicked.banned = Voce foi banido do servidor.
+server.kicked.banned = Você foi banido do servidor.
-server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.typeMismatch = Este servidor não é compatível com a sua versão.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
 server.kicked.recentKick = Voce foi banido recentemente.\nEspere para conectar de novo.
-server.kicked.nameInUse = Este nome ja esta sendo usado\nneste servidor.
+server.kicked.nameInUse = Este nome já esta sendo usado\nneste servidor.
-server.kicked.nameEmpty = Voce deve ter pelo menos uma letra ou numero.
+server.kicked.nameEmpty = Voce deve ter pelo menos uma letra ou número.
-server.kicked.idInUse = Voce ja esta neste servidor! Conectar com duas contas não é permitido.
+server.kicked.idInUse = Voce ja está 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}[]
+server.versions = Sua versão:[accent] {0}[]\nVersão do servidor:[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
+invitefriends = Invite Friends
 hostserver.mobile = Hospedar\nJogo
 host = Hospedar
 hosting = [accent]Abrindo server...
 hosts.refresh = Atualizar
 hosts.discovering = Descobrindo jogos em lan
+hosts.discovering.any = Discovering games
 server.refreshing = Atualizando servidor
 hosts.none = [lightgray]Nenhum jogo lan encontrado!
 host.invalid = [scarlet]Não foi possivel Hospedar.
@@ -109,18 +122,23 @@ server.version = [lightgray]Versão: {0}
 server.custombuild = [yellow]Construção customizada
 confirmban = Certeza que quer banir este jogador?
 confirmkick = Certeza que quer expulsar o jogador?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Certeza que quer desbanir este jogador?
 confirmadmin = Certeza que quer fazer este jogador um administrador?
 confirmunadmin = Certeza que quer remover o estatus de adminstrador deste jogador?
 joingame.title = Entrar no jogo
 joingame.ip = IP:
 disconnect = Desconectado.
-disconnect.data = Falha ao abrir a data do mundo!
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
+disconnect.data = Falha ao abrir os dados do mundo!
+cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Conectando...
-connecting.data = [accent]Carregando data do mundo...
+connecting.data = [accent]Carregando dados do mundo...
 server.port = Porte:
 server.addressinuse = Senha em uso!
-server.invalidport = Numero de port invalido!
+server.invalidport = Numero de porta invalido!
 server.error = [crimson]Erro ao hospedar o servidor: [accent]{0}
 save.old = Este save é para uma versão antiga do jogo, E não pode ser usado.\n\n[LIGHT_GRAY]Salvar Versões antigas vai ser Implementado Na versão 4.0 completa
 save.new = Novo Save
@@ -141,6 +159,7 @@ save.rename = Renomear
 save.rename.text = Novo jogo:
 selectslot = Selecione um slot para salvar.
 slot = [accent]Slot {0}
+editmessage = Edit Message
 save.corrupted = [accent]Arquivo corrompido ou inválido!
 empty = <vazio>
 on = Ligado
@@ -148,12 +167,13 @@ off = Desligado
 save.autosave = Autosalvar: {0}
 save.map = Mapa: {0}
 save.wave = Horda {0}
-save.difficulty = Dificuldade: {0}
+save.mode = Gamemode: {0}
 save.date = Último salvamento: {0}
 save.playtime = Tempo De Jogo: {0}
 warning = Aviso.
 confirm = Confirmar
 delete = Excluir
+view.workshop = View In Workshop
 ok = OK
 open = Abrir
 customize = Customize
@@ -161,15 +181,15 @@ cancel = Cancelar
 openlink = Abrir Link
 copylink = Copiar link
 back = Voltar
-data.export = Export Data
+data.export = Exportar Data
-data.import = Import Data
+data.import = Importar Data
-data.exported = Data exported.
+data.exported = Data exportada.
-data.invalid = This isn't valid game data.
+data.invalid = Isso não é daa de jogo válida.
-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.
+data.import.confirm = Importal data externa irá deletar[scarlet] toda[] sua data atual.\n[accent]Isso não pode ser desfeito![]\n\nQuando sua data é importada, seu jogo ira sair imediatamente.
-classic.export = Export Classic Data
+classic.export = Exportar data classica
 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.[]
+quit.confirm.tutorial = Você tem certeza você sabe oque Você esta fazendo?\nO tutorial pode ser refeito nas [accent] Configurações->Jogo->Refazer Tutorial.[]
 loading = [accent]Carregando...
 saving = [accent]Salvando...
 wave = [accent]Horda {0}
@@ -188,8 +208,13 @@ map.delete.confirm = Certeza que quer deletar este mapa? Isto não pode ser desf
 map.random = [accent]Mapa aleatório
 map.nospawn = Esse mapa não contém um [yellow]núcleo[] para o jogador Nascer! [ROYAL]blue[] Coloque um [yellow]núcleo[] no editor de mapa.
 map.nospawn.pvp = Esse mapa não tem núcleos inimigos para os jogadores nascerem! Adicione[SCARLET] Núcleos vermelhos[] no mapa no editor.
-map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn.attack = Esse mapa não tem nenhum núcleos enimigos para o jogador atacar! coloque[SCARLET] Núcleos[] vermelhos no editor.
 map.invalid = Erro ao carregar o mapa: Arquivo de mapa invalido ou corrupto.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Pincel
 editor.openin = Abrir no Editor
 editor.oregen = Geração de minério
@@ -197,11 +222,14 @@ editor.oregen.info = Geração de minério:
 editor.mapinfo = Informação do mapa
 editor.author = Autor:
 editor.description = Descrição:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Ondas:
 editor.rules = Regras:
 editor.generation = Generation:
-editor.ingame = Editar em-jogo
+editor.ingame = Editar em jogo
-editor.newmap = New Map
+editor.publish.workshop = Publish On Workshop
+editor.newmap = Novo mapa
+workshop = Workshop
 waves.title = Hordas
 waves.remove = Remover
 waves.never = <nunca>
@@ -214,10 +242,11 @@ waves.preview = Prever
 waves.edit = Editar...
 waves.copy = Copiar para área de transferência
 waves.load = carregar da área de transferência
-waves.invalid = Ondas inválidas na área de transferência.
+waves.invalid = Hordas inválidas na área de transferência.
-waves.copied = Ondas copiadas.
+waves.copied = Hordas copiadas.
-waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+waves.none = Sem hordas definidas.\nNote que layouts vazios de ondas serão automaticamente substituídos pelo layout padrão.
 editor.default = [LIGHT_GRAY]<padrão>
+details = Details...
 edit = Editar...
 editor.name = Nome:
 editor.spawn = Criar unidade
@@ -227,9 +256,10 @@ editor.errorload = Erro carregando arquivo:\n[accent]{0}
 editor.errorsave = Erro salvando arquivo:\n[accent]{0}
 editor.errorimage = Isso é uma imagem, Não um mapa. Não vá por aí mudando extensões esperando que funcione.\n\nSe você quer importar um mapa legacy, Use o botão 'Importar mapa legacy'no editor.
 editor.errorlegacy = Esse mapa é velho demais, E usa um formato de mapa legacy que não é mais suportado.
-editor.errorheader = Este arquivo de mapa não é mais valido, Ou esta corrompido.
+editor.errornot = This is not a map file.
+editor.errorheader = Este arquivo de mapa não é mais válido ou está corrompido.
 editor.errorname = Mapa não tem nome definido.
-editor.update = atualizar
+editor.update = Atualizar
 editor.randomize = Randomizar
 editor.apply = Aplicar
 editor.generate = Gerar
@@ -240,14 +270,14 @@ editor.saved = Salvo!
 editor.save.noname = Seu mapa não tem um nome! Coloque um no menu de "Informação do mapa"
 editor.save.overwrite = O seu mapa Substitui um mapa já construído! Coloque um nome diferente no menu "Informação do mapa"
 editor.import.exists = [scarlet]Não foi possivel importar:[] Um mapa Construído chamado '{0}' Já existe!
-editor.import = Importando...
+editor.import = Importar...
 editor.importmap = Importar Mapa
 editor.importmap.description = Importar um mapa existente
 editor.importfile = Importar arquivo
 editor.importfile.description = Importar um arquivo externo
 editor.importimage = Importar imagem do terreno
 editor.importimage.description = Importar uma imagem de terreno externa
-editor.export = Exportando...
+editor.export = Exportar...
 editor.exportfile = Exportar arquivo
 editor.exportfile.description = Exportar um arquivo de mapa
 editor.exportimage = Exportar imagem de terreno
@@ -259,17 +289,18 @@ editor.resizemap = Redimensionar Mapa
 editor.mapname = Nome do Mapa:
 editor.overwrite = [accent]Aviso!\nIsso Subistitui um mapa existente.
 editor.overwrite.confirm = [scarlet]Aviso![] Um mapa com esse nome já existe. Tem certeza que deseja substituir?
+editor.exists = A map with this name already exists.
 editor.selectmap = Selecione uma mapa para carregar:
-toolmode.replace = Replace
+toolmode.replace = Substituir
 toolmode.replace.description = Draws only on solid blocks.
-toolmode.replaceall = Replace All
+toolmode.replaceall = Substituir tudo
-toolmode.replaceall.description = Replace all blocks in map.
+toolmode.replaceall.description = Substitui todos os blocos no mapa
 toolmode.orthogonal = Orthogonal
 toolmode.orthogonal.description = Draws only orthogonal lines.
 toolmode.square = Square
 toolmode.square.description = Square brush.
-toolmode.eraseores = Erase Ores
+toolmode.eraseores = Apagar minérios
-toolmode.eraseores.description = Erase only ores.
+toolmode.eraseores.description = Apaga apenas minérios.
 toolmode.fillteams = Fill Teams
 toolmode.fillteams.description = Fill teams instead of blocks.
 toolmode.drawteams = Draw Teams
@@ -309,7 +340,7 @@ width = Largura:
 height = Altura:
 menu = Menu
 play = Jogar
-campaign = Campaign
+campaign = Campanha
 load = Carregar
 save = Salvar
 fps = FPS: {0}
@@ -318,14 +349,14 @@ 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
+tutorial.retake = Refazer Tutorial
 editor = Editor
 mapeditor = Editor de mapa
 donate = Doar
 abandon = Abandonar
-abandon.text = Esta zona e todos os seus recursos serão perdidos para o enimigo.
+abandon.text = Esta zona e todos os seus recursos serão perdidos para o inimigo.
 locked = Trancado
-complete = [LIGHT_GRAY]Complete:
+complete = [LIGHT_GRAY]Completo:
 zone.requirement = Onda {0} Na zona {1}
 resume = Resumir Zona:\n[LIGHT_GRAY]{0}
 bestwave = [LIGHT_GRAY]Melhor: {0}
@@ -334,17 +365,18 @@ launch.title = Lançamento feito com sucesso
 launch.next = [LIGHT_GRAY]próxima oportunidade na onda {0}
 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.
+launch.skip.confirm = Se você pular a onda agora, você não será capaz de lançar até ondas mais avançadas.
 uncover = Descobrir
 configure = Configurar carregamento
 configure.locked = [LIGHT_GRAY]Alcançe a onda {0}\npara Configurar o Loadout.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [LIGHT_GRAY]{0} Desbloqueado.
 zone.requirement.complete = Onda {0} alcançada:\n{1} Requerimentos da zona alcançada.
 zone.config.complete = Onda {0} Alcançada:\nLoadout config desbloqueado.
 zone.resources = Recursos detectados:
-zone.objective = [lightgray]Objective: [accent]{0}
+zone.objective = [lightgray]Objetivo: [accent]{0}
-zone.objective.survival = Survive
+zone.objective.survival = Sobreviver
-zone.objective.attack = Destroy Enemy Core
+zone.objective.attack = Destruir o núcleo inimigo
 add = Adicionar...
 boss.health = Saúde do chefe
 connectfail = [crimson]Falha ao entrar no servidor: [accent]{0}
@@ -367,13 +399,13 @@ zone.desolateRift.name = Fenda desolada
 zone.nuclearComplex.name = Complexo de construção nuclear
 zone.overgrowth.name = SobreCrescido
 zone.tarFields.name = Campos de Tar
-zone.saltFlats.name = Salt Flats
+zone.saltFlats.name = Planícies de sal
-zone.impact0078.name = Impact 0078
+zone.impact0078.name = Impacto 0078
-zone.crags.name = Crags
+zone.crags.name = Penhascos
-zone.fungalPass.name = Fungal Pass
+zone.fungalPass.name = Passagem de fungos
-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.groundZero.description = Uma ótima localização para começar de novo. Baixa ameaça inimiga. Poucos recursos.\nColete o máximo de chumbo e cobre possível.\nContinue!
-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.frozenForest.description = Até aqui, perto das montanhas, os esporos se espalharam. As baixas temperaturas não podem contê-los para sempre.\n\nComeçe a busca por energia. Construa geradores à combustão. Aprenda a usar os reparadores (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.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCarvão está presente na região. O queime por energia, ou sintetize grafite.\n\n[lightgray]Esse local de pouso não pode ser garantido.
 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.
@@ -386,15 +418,15 @@ zone.fungalPass.description = A transition area between high mountains and lower
 zone.impact0078.description = <insert description here>
 zone.crags.description = <insert description here>
 settings.language = Linguagem
-settings.data = Game Data
+settings.data = Dados do jogo
 settings.reset = Restaurar Padrões
 settings.rebind = Religar
 settings.controls = Controles
 settings.game = Jogo
 settings.sound = Som
 settings.graphics = Gráficos
-settings.cleardata = Data do jogo limpa...
+settings.cleardata = Apagar dados...
-settings.clear.confirm = Certeza que quer limpar a data?\nOque é feito não pode ser desfeito!
+settings.clear.confirm = Certeza que quer limpar a os dados?\nOque é feito não pode ser desfeito!
 settings.clearall.confirm = [scarlet]Aviso![]\nIsso vai limpar toda a data, Incluindo saves, mapas, Keybinds e desbloqueados.\nQuando apertar 'ok' Vai apagar toda a data e sair automaticamente.
 settings.clearunlocks = Limpar liberados
 settings.clearall = Limpar tudo
@@ -411,7 +443,7 @@ blocks.booster = Booster
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = Capacidade de Energia
 blocks.powershot = Energia/tiro
-blocks.damage = Damage
+blocks.damage = Dano
 blocks.targetsair = Mirar no ar
 blocks.targetsground = Mirar no chão
 blocks.itemsmoved = Velocidade de movimento
@@ -429,22 +461,25 @@ blocks.repairtime = Tempo de reparo total do bloco
 blocks.speedincrease = Aumento de velocidade
 blocks.range = Distancia
 blocks.drilltier = Furaveis
-blocks.drillspeed = Velocidade da furadeira base
+blocks.drillspeed = Velocidade da broca base
 blocks.boosteffect = Efeito do Boost
 blocks.maxunits = Maximo de unidades ativas
 blocks.health = Saúde
 blocks.buildtime = Tempo de construção
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Imprecisão
 blocks.shots = Tiros
 blocks.reload = Recarregar
 blocks.ammo = Munição
-bar.drilltierreq = Better Drill Required
+bar.drilltierreq = Broca melhor necessária.
-bar.drillspeed = Velocidade da furadeira: {0}/s
+bar.drillspeed = Velocidade da broca: {0}/s
-bar.efficiency = Eficiencia: {0}%
+bar.efficiency = Eficiência: {0}%
 bar.powerbalance = Energia: {0}
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Energia: {0}
 bar.poweroutput = Saída de energia: {0}
 bar.items = Itens: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquido
 bar.heat = Aquecimento
 bar.power = Poder
@@ -475,7 +510,7 @@ unit.percent = %
 unit.items = itens
 category.general = Geral
 category.power = Poder
-category.liquids = Liquidos
+category.liquids = Líquidos
 category.items = Itens
 category.crafting = Construindo
 category.shooting = Atirando
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (Requer recomeço)[]
 setting.indicators.name = Indicador de aliados
 setting.autotarget.name = Alvo automatico
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = FPS Maximo
 setting.fpscap.none = Nenhum
 setting.fpscap.text = {0} FPS
@@ -513,15 +549,16 @@ 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.ambientvol.name = Volume do ambiente
 setting.mutemusic.name = Desligar Música
 setting.sfxvol.name = Volume de Efeitos
 setting.mutesound.name = Desligar Som
 setting.crashreport.name = Enviar denuncias de crash anonimas
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Opacidade do chat
-setting.playerchat.name = Mostrar chat em-jogo
+setting.playerchat.name = Mostrar chat em jogo
-uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings...
+uiscale.reset = A escala da interface do usuário foi mudada.\nPressione "OK" para confirmar esta escala.\n[scarlet]Revertendo e saindo em[accent] {0}[] settings...
 uiscale.cancel = Cancel & Exit
 setting.bloom.name = Bloom
 keybind.title = Refazer teclas
@@ -530,8 +567,8 @@ category.general.name = Geral
 category.view.name = Ver
 category.multiplayer.name = Multijogador
 command.attack = Atacar
+command.rally = Rally
 command.retreat = Recuar
-command.patrol = Patrulha
 keybind.gridMode.name = Seleção de blocos
 keybind.gridModeShift.name = Seleção de categoria
 keybind.press = Pressione uma tecla...
@@ -602,11 +639,11 @@ content.item.name = Itens
 content.liquid.name = Liquidos
 content.unit.name = Unidades
 content.block.name = Blocos
-content.mech.name = Mecas
+content.mech.name = Armaduras
 item.copper.name = Cobre
 item.lead.name = Chumbo
 item.coal.name = Carvão
-item.graphite.name = Graphite
+item.graphite.name = Grafite
 item.titanium.name = Titânio
 item.thorium.name = Urânio
 item.silicon.name = Sílicio
@@ -616,7 +653,7 @@ item.surge-alloy.name = Liga de surto
 item.spore-pod.name = Pod de esporos
 item.sand.name = Areia
 item.blast-compound.name = Composto de explosão
-item.pyratite.name = piratita
+item.pyratite.name = Piratita
 item.metaglass.name = Metavidro
 item.scrap.name = Sucata
 liquid.water.name = Água
@@ -687,9 +724,9 @@ block.graphite-press.name = Prensa de grafite
 block.multi-press.name = Multi-Prensa
 block.constructing = {0}\n[LIGHT_GRAY](Construindo)
 block.spawn.name = Spawn dos inimigos
-block.core-shard.name = Core: Fragmento
+block.core-shard.name = Fragmento do núcleo
-block.core-foundation.name = Core: Fundação
+block.core-foundation.name = Fundação do núcleo
-block.core-nucleus.name = Core: Nucleus
+block.core-nucleus.name = Núcleo do núcleo
 block.deepwater.name = água funda
 block.water.name = Água
 block.tainted-water.name = Água contaminada
@@ -711,8 +748,8 @@ block.icerocks.name = Rochas de gelo
 block.snowrocks.name = Rochas de neve
 block.dunerocks.name = Rochas da duna
 block.pine.name = Pinheiro
-block.white-tree-dead.name = Arvore branca morta
+block.white-tree-dead.name = Árvore branca morta
-block.white-tree.name = Arvore branca
+block.white-tree.name = Árvore branca
 block.spore-cluster.name = Grupo de esporos
 block.metal-floor.name = Chão de metal
 block.metal-floor-2.name = Chão de metal 2
@@ -733,24 +770,27 @@ block.cliffs.name = Colinas
 block.copper-wall.name = Parede de Cobre
 block.copper-wall-large.name = Parede de Cobre Grande
 block.titanium-wall.name = Parede de titanio
-block.titanium-wall-large.name = Parede de titanio grande
+block.titanium-wall-large.name = Parede de titânio grande
 block.phase-wall.name = Parede de fase
 block.phase-wall-large.name = Parde de fase grande
 block.thorium-wall.name = Parede de tório
-block.thorium-wall-large.name = Parede larga de tório
+block.thorium-wall-large.name = Parede de tório grande
 block.door.name = Porta
 block.door-large.name = Porta Grande
 block.duo.name = Dupla
 block.scorch.name = Queimada
 block.scatter.name = Dispersão
 block.hail.name = Granizo
-block.lancer.name = Lancador
+block.lancer.name = Lançador
 block.conveyor.name = Esteira
-block.titanium-conveyor.name = Esteira de Titanio
+block.titanium-conveyor.name = Esteira de Titânio
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Junção
 block.router.name = Roteador
 block.distributor.name = Distribuidor
 block.sorter.name = Ordenador
+block.message.name = Message
 block.overflow-gate.name = Portão Sobrecarregado
 block.silicon-smelter.name = Fundidora de silicio
 block.phase-weaver.name = Palheta de fase
@@ -760,7 +800,7 @@ block.melter.name = Aparelho de fusão
 block.incinerator.name = Incinerador
 block.spore-press.name = Prensa de Esporo
 block.separator.name = Separador
-block.coal-centrifuge.name = Coal Centrifuge
+block.coal-centrifuge.name = Centrifuga de carvão
 block.power-node.name = Célula de energia
 block.power-node-large.name = Célula de energia Grande
 block.surge-tower.name = Torre de surto
@@ -770,23 +810,23 @@ block.combustion-generator.name = Gerador de combustão
 block.turbine-generator.name = Gerador de Turbina
 block.differential-generator.name = Gerador diferencial
 block.impact-reactor.name = Reator De Impacto
-block.mechanical-drill.name = Furadera Mecânica
+block.mechanical-drill.name = Broca Mecânica
-block.pneumatic-drill.name = Mineradora Pneumatica
+block.pneumatic-drill.name = Broca Pneumática
 block.laser-drill.name = Broca a Laser
-block.water-extractor.name = Extrator de Agua
+block.water-extractor.name = Extrator de água
 block.cultivator.name = Cultivador
-block.dart-mech-pad.name = Dart Mech Pad
+block.dart-mech-pad.name = Controle da armadura Dart
-block.delta-mech-pad.name = Controle do mech Delta
+block.delta-mech-pad.name = Controle da armadura Delta
-block.javelin-ship-pad.name = Controle do mech Javelin
+block.javelin-ship-pad.name = Controle da nave Javelin
-block.trident-ship-pad.name = Controle do mech Tridente
+block.trident-ship-pad.name = Controle da nave Tridente
-block.glaive-ship-pad.name = Controle do mech Glaive
+block.glaive-ship-pad.name = Controle da nave Glaive
-block.omega-mech-pad.name = Controle do mech Omega
+block.omega-mech-pad.name = Controle da armadura Omega
-block.tau-mech-pad.name = Controle do mech Tau
+block.tau-mech-pad.name = Controle da armadura Tau
 block.conduit.name = Cano
-block.mechanical-pump.name = Bomba Mecanica
+block.mechanical-pump.name = Bomba Mecânica
 block.item-source.name = Fonte do item
 block.item-void.name = Item Vazio
-block.liquid-source.name = Liquid Source
+block.liquid-source.name = Fonte de água
 block.power-void.name = Poder Vazio
 block.power-source.name = Poder Infinito
 block.unloader.name = Descarregador
@@ -797,23 +837,23 @@ block.salvo.name = Salvo
 block.ripple.name = Ondulação
 block.phase-conveyor.name = Esteira de Fases
 block.bridge-conveyor.name = Esteira-Ponte
-block.plastanium-compressor.name = Compressor de Plastanio
+block.plastanium-compressor.name = Compressor de Plastânio
 block.pyratite-mixer.name = Misturador de Piratita
 block.blast-mixer.name = Misturador de Explosão
 block.solar-panel.name = Painel Solar
 block.solar-panel-large.name = Painel Solar Grande
 block.oil-extractor.name = Extrator de Óleo
-block.command-center.name = Command Center
+block.command-center.name = Centro de comando
-block.draug-factory.name = Draug Miner Drone Factory
+block.draug-factory.name = Fábrica de drone de mineração Draug
-block.spirit-factory.name = Fabrica de Drone Spirit
+block.spirit-factory.name = Fábrica de drone de reparo Spirit
-block.phantom-factory.name = Fabrica de Drone Phantom
+block.phantom-factory.name = Fábrica de drone de construção Phantom
-block.wraith-factory.name = Fabrica de Drone Wraith
+block.wraith-factory.name = Fábrica de lutadores Wraith
-block.ghoul-factory.name = Fabrica de Bombardeiro Ghoul
+block.ghoul-factory.name = Fábrica de Bombardeiros Ghoul
-block.dagger-factory.name = Fabrica de mech Dagger
+block.dagger-factory.name = Fábrica de mech Dagger
-block.crawler-factory.name = Crawler Mech Factory
+block.crawler-factory.name = Fábrica de mech Crawler
-block.titan-factory.name = Fabrica de mech titan
+block.titan-factory.name = Fábrica de mech titan
-block.fortress-factory.name = Fabrica de mech Fortress
+block.fortress-factory.name = Fábrica de mech Fortress
-block.revenant-factory.name = Fabrica de lutadores Revenant
+block.revenant-factory.name = Fábrica de lutadores Revenant
 block.repair-point.name = Ponto de Reparo
 block.pulse-conduit.name = Conduto de Pulso
 block.phase-conduit.name = Conduto de Fase
@@ -822,14 +862,14 @@ block.liquid-tank.name = Tanque de Líquido
 block.liquid-junction.name = Junção de Líquido
 block.bridge-conduit.name = Conduto-Ponte
 block.rotary-pump.name = Bomba Rotatoria
-block.thorium-reactor.name = Reator Torio
+block.thorium-reactor.name = Reator de Tório
 block.mass-driver.name = Drive de Massa
-block.blast-drill.name = Mineradora de Explosão
+block.blast-drill.name = Broca de Explosão
-block.thermal-pump.name = Cano termico
+block.thermal-pump.name = Cano térmico
 block.thermal-generator.name = Gerador Térmico
 block.alloy-smelter.name = Fundidora de Liga
-block.mender.name = Mender
+block.mender.name = Reparador
-block.mend-projector.name = Projetor Mend
+block.mend-projector.name = Projetor mend
 block.surge-wall.name = Parede de Surge
 block.surge-wall-large.name = Parede de Surge grande
 block.cyclone.name = Ciclone
@@ -840,8 +880,8 @@ block.force-projector.name = Projetor Force
 block.arc.name = Arc
 block.rtg-generator.name = Gerador RTG
 block.spectre.name = Espectra
-block.meltdown.name = Derreter
+block.meltdown.name = Fusão
-block.container.name = Container
+block.container.name = Contâiner
 block.launch-pad.name = Plataforma de lançamento
 block.launch-pad-large.name = Plataforma de lançamento grande
 team.blue.name = Azul
@@ -852,7 +892,7 @@ team.derelict.name = derelict
 team.green.name = Verde
 team.purple.name = Roxo
 unit.spirit.name = Drone Spirit
-unit.draug.name = Draug Miner Drone
+unit.draug.name = Drone minerador Draug
 unit.phantom.name = Drone Phantom
 unit.dagger.name = Dagger
 unit.crawler.name = Crawler
@@ -866,16 +906,16 @@ unit.chaos-array.name = Arraia do caos
 unit.eradicator.name = Erradicador
 unit.lich.name = Lich
 unit.reaper.name = Ceifador
-tutorial.next = [lightgray]<Tap to continue>
+tutorial.next = [lightgray]<Toque para continuar>
-tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
+tutorial.intro = Você entrou no[scarlet] Tutorial do Mindustry.[]\nComeçe[accent] minerando cobre[]. Toque em um veio de minério de cobre para fazer isso.\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 = Minerar manualmente é ineficiente.\n[accent]Brocas []podem minerar automaticamente.\nColoque uma num veio 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.drill.mobile = Minerar manualmente é ineficiente.\n[accent]Brocas []podem minerar automaticamente.\nToque na aba de brocas no canto inferior direito.\nSelecione a[accent] broca mecânica[].\nToque em um veio de cobre para colocá-la, então pressione a[accent] marca de verificação[] abaixo para confirmar sua seleção.\nPressione o[accent] botão "X"[] para cancelar o posicionamento.
-tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
+tutorial.blockinfo = Cada bloco tem diferentes status. Cada broca pode extrair certos minérios.\nPara checar as informações e os status de um bloco,[accent] toque o botão "?" enquanto o seleciona no menu de construção.[]\n\n[accent]Acesse os status da broca mecânica agora.[]
-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.conveyor = [accent]Esteiras[] São usadas para transportar itens até o núcleo.\nFaça uma linha de Esteiras da mineradora até o núcleo.
-tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered
+tutorial.conveyor.mobile = [accent]Esteiras[] são usadas para transportar itens até o núcleo.\nFaça uma linha de esteiras da broca até o núcleo.\n[accent] Coloque uma linha segurando por alguns segundos[] e arrastando em uma direção.\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.drillturret = Torres duplas precisam de[accent] Cobre como munição []Para atirar.\nColoque uma broca próxima à torre para carregá-la com o 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 = Durante uma batalha, você pode[accent] pausar o jogo.[]\nVoce pode enfileirar construções enquanto o jogo está pausado.\n\n[accent]Pressione a barra de espaço para pausar.
 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.
@@ -883,7 +923,7 @@ tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down r
 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.waves = O[LIGHT_GRAY] Inimigo[] se aproxima.\n\nDefenda seu núcleo por 2 ondas. Construa mais torres.
 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.
@@ -900,44 +940,45 @@ item.plastanium.description = Leve, Material dutil Usado em aeronaves Avançadas
 item.phase-fabric.description = Uma substancia quase sem peso Usado em eletronica avançada E tecnologia de auto-reparo.
 item.surge-alloy.description = Uma liga com propriedades unicas eletricas.
 item.spore-pod.description = Usado em conversão para oleo, Combustivel e explosivos.
-item.blast-compound.description = Um composto volatil usado em bombas em bombas em explosivos. Enquanto pode ser queimado como combustivel, Isso não é recomendado.
+item.blast-compound.description = Um composto volátil usado em bombas em bombas em explosivos. Enquanto pode ser queimado como combustivel, Isso não é recomendado.
-item.pyratite.description = Substancia extremamente inflamavel usado em armas incendiarias.
+item.pyratite.description = Substância extremamente inflamavel usado em armas incendiarias.
 liquid.water.description = Comumente usado em resfriamento e no processo de perda.
-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 = Vários metais derretidos misturados juntos. POde ser separado em seus minerais constituentes, ou jogado nas unidades inimigas como uma arma.
 liquid.oil.description = Pode ser queimado, explodido ou usado como resfriador.
 liquid.cryofluid.description = A maneira mais eficiente de resfriar qualquer coisa.
-mech.alpha-mech.description = O meca padrão. Tem uma saida de dano e velocidade decente; Pode criar até 3 drones Para capacidades ofensivas aumentadas.
+mech.alpha-mech.description = A Armadura padrão. Tem uma saida de dano e velocidade decente; Pode criar até 3 drones Para capacidades ofensivas aumentadas.
-mech.delta-mech.description = Um meca rapido, De baixa armadura Feito for para ataques rapidos. Da pouco dano as estruturas, Mas pode matar grandes grupos de unidades inimigas muito rapidamente Com sua arma ARC.
+mech.delta-mech.description = Uma armadura rápida, De baixa durabilidade Feita para ataques rápidos. Da pouco dano as estruturas, Mas pode matar grandes grupos de unidades inimigas muito rapidamente Com sua arma ARC.
-mech.tau-mech.description = O meca de suporte. Conserta blocos aliados Atirando neles. Pode extinguir o fogo e consertar aliados em uma distancia Com sua habilidade de consertar.
+mech.tau-mech.description = A armadura de suporte. Conserta blocos aliados Atirando neles. Pode extinguir o fogo e consertar aliados em uma distancia Com sua habilidade de consertar.
-mech.omega-mech.description = Um meca volumoso e bem armadurado, Feito para assaltos da primeira linha. Sua habilidade de armadura Pode bloquear 90% de dano.
+mech.omega-mech.description = Uma armadura volumosa e bem armadurada, Feita para assaltos da primeira linha. Sua habilidade de armadura Pode bloquear 90% de dano.
 mech.dart-ship.description = Nave padrão. Consideravelmente leve e rapido, Tem pouca capacidade ofensiva E baixa velocidade de mineração.
 mech.javelin-ship.description = Uma nave de espinhos de atacar e correr. Quando inicialmente lento, pode acelerar a altas velocidades e voar até bases inimigas, Dando altas quantidades de dano Com seus raios e habilidades.
 mech.trident-ship.description = Um bombardeiro pesado. Consideravelmente bem armadurado.
 mech.glaive-ship.description = Uma nave armada, bem armadurada. Com um repetidor incendario equipado. Boa aceleração e maxima velocidade.
-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 = Um drone de mineração primitivo. Barato para produzir. Descartável. Minera automáticamente cobre e chumbo nas proximidades. Entrega os recursos minerados para o núcleo mais próximo.
-unit.spirit.description = A unidade de drone inicial. Ele nasce no core por padrão. Minera minérios automaticamente, Coleta itens e repara blocos.
+unit.spirit.description = A unidade de drone inicial. Ele nasce no núcleo por padrão. Minera minérios automaticamente, Coleta itens e repara blocos.
 unit.phantom.description = Uma unidade de drone avançada. Minera minérios automaticamente, Coleta itens e repara blocos automaticamente. Significantemente mais efetiva.
 unit.dagger.description = Unidade terrestre basica, Forte em grupos.
 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 = Uma unidade armadurada terreste avancada. Usa carbide como munição. Ataca ambas as unidades de Aereas e terrestres.
+unit.titan.description = Uma unidade armadurada terrestre avançada. 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.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.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
-block.silicon-smelter.description = Reduz areia a coque altamente puro Para fazer silicio.
+block.silicon-smelter.description = Reduz areia com carvão puro. Para fazer silicio.
 block.kiln.description = Derrete chumbo e areia em Metavidro. Requer pequenas quantidades de energia.
-block.plastanium-compressor.description = Produz plastanio para usando oleo e titanio.
+block.plastanium-compressor.description = Produz plastânio usando óleo e titânio.
 block.phase-weaver.description = Produz tecido de fase de torio radioativo e grandes quantidades de areia.
-block.alloy-smelter.description = Produz liga de surge de titanio, chumbo, silicio e cobre.
+block.alloy-smelter.description = Produz liga de surto com titânio, chumbo, silicio e cobre.
-block.cryofluidmixer.description = Combina agua e titanio em cryo fluido que é mais eficiente em esfriar.
+block.cryofluidmixer.description = Combina água e titânio em crio-fluido que é mais eficiente em esfriar.
-block.blast-mixer.description = Usa oleo em Transformar piratite em composto de explosão menos inflamavel mas mais explosivo
+block.blast-mixer.description = Usa óleo para Transformar piratita em composto de explosão menos inflamavel mas mais explosivo
-block.pyratite-mixer.description = Mistura carvão, Cobre e areia em piratite altamente inflamavel
+block.pyratite-mixer.description = Mistura carvão, Cobre e areia em piratita altamente inflamável
-block.melter.description = Aquece pedra em altas temperaturas para fazer lava.
+block.melter.description = Aquece pedra em altas temperaturas para fazer slag.
-block.separator.description = Expos pedra em agua em pressão para ter varios mineiras contendo na pedra.
+block.separator.description = Separa slag em seus minerais componentes, oferece o resultado refriado.
-block.spore-press.description = Compresses spore pods into oil.
+block.spore-press.description = Comprimi pods de esporos em óleo.
 block.pulverizer.description = Esmaga pedra em areia. Util quando esta em falta de areia natural.
 block.coal-centrifuge.description = Solidifes oil into chunks of coal.
 block.incinerator.description = Se livra de itens em excesso ou liquidos.
@@ -946,8 +987,8 @@ block.power-source.description = Infinitivamente da energia. Apenas caixa de are
 block.item-source.description = Infinivamente da itens. Apenas caixa de areia.
 block.item-void.description = Destroi qualquer item que entre sem requerir energia. Apenas caixa de areia.
 block.liquid-source.description = Infinitivamente da Liquidos. Apenas caixa de areia.
-block.copper-wall.description = Um bloco defensivo e barato.\nUtil para proteger o core e torres no começo.
+block.copper-wall.description = Um bloco defensivo e barato.\nUtil para proteger o núcleo e torres no começo.
-block.copper-wall-large.description = Um bloco defensivo e barato.\nUtil para proteger o core e torres no começo.\nOcupa multiplos espaços.
+block.copper-wall-large.description = Um bloco defensivo e barato.\nUtil para proteger o núcleo e torres no começo.\nOcupa multiplos espaços.
 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.\nBoa proteção contra inimigos.
@@ -964,7 +1005,7 @@ block.overdrive-projector.description = Aumenta a velocidade de unidades proxima
 block.force-projector.description = Cria um campo de forca hexagonal em volta de si mesmo, Protegendo construções e unidades dentro de dano por balas.
 block.shock-mine.description = Danifica inimigos em cima da mina. Quase invisivel ao inimigo.
 block.conveyor.description = Bloco de transporte de item basico. Move os itens a frente e os deposita automaticamente Em torres ou construtores. Rotacionavel.
-block.titanium-conveyor.description = Bloco de transporte de item avancado. Move itens mais rapidos que esteiras padrões.
+block.titanium-conveyor.description = Bloco de transporte de item avançado. Move itens mais rapidos que esteiras padrões.
 block.junction.description = Funciona como uma ponte Para duas esteiras que estejam se cruzando. Util em situações que tenha duas esteiras diferentes carregando materiais diferentes para lugares diferentes.
 block.bridge-conveyor.description = Bloco de transporte de itens avancado. Possibilita o transporte de itens acima de 3 blocos de construção ou paredes.
 block.phase-conveyor.description = Bloco de transporte de item avançado. Usa energia para teleportar itens a uma esteira de fase sobre uma severa distancia.
@@ -992,16 +1033,16 @@ block.combustion-generator.description = Gera poder usando combustivel ou oleo.
 block.thermal-generator.description = Gera uma quantidade grande de energia usando lava.
 block.turbine-generator.description = Mais eficiente que o gerador de Combustão, Mas requer agua adicional.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
-block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos Que não precisa de refriamento Mas da muito mais energia que o reator de torio.
+block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos Que não precisa de refriamento Mas da muito menos energia que o reator de torio.
 block.solar-panel.description = Gera pequenas quantidades de energia do sol.
 block.solar-panel-large.description = Da muito mais energia que o painel solar comum, Mas sua produção é mais cara.
 block.thorium-reactor.description = Gera altas quantidades de energia do torio radioativo. Requer resfriamento constante. Vai explodir violentamente Se resfriamento insuficiente for fornecido.
 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 = Uma mineradoura barata. Quando colocado em blocos apropriados, retira itens em um ritmo lento e indefinitavamente.
+block.mechanical-drill.description = Uma broca barata. Quando colocado em blocos apropriados, retira itens em um ritmo lento e indefinitavamente.
-block.pneumatic-drill.description = Uma mineradora improvisada que é mais rapida e capaz de processar mateirais mais duros usando a pressao do ar
+block.pneumatic-drill.description = Uma broca improvisada que é mais rápida e capaz de processar materiais mais duros usando a pressão do ar
 block.laser-drill.description = Possibilita a mineração ainda mais rapida usando tecnologia a laser, Mas requer poder adcionalmente torio radioativo pode ser recuperado com essa mineradora
 block.blast-drill.description = A melhor mineradora. Requer muita energia.
-block.water-extractor.description = Extrai agua do chão. Use quando não tive nenhum lago proximo
+block.water-extractor.description = Extrai água do chão. Use quando não tive nenhum lago proximo
 block.cultivator.description = Cultiva o solo com agua para pegar bio materia.
 block.oil-extractor.description = Usa altas quantidades de energia Para extrair oleo da areia. Use quando não tiver fontes de oleo por perto
 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.

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\nРедактор:\n[SLATE]Felix Corvus
+credits.text = Создатель [ROYAL]Anuken[] — [SKY]anukendev@gmail.com[]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в оф. [accent]discord-сервер Mindustry[] в канал [accent]#русский[].\n\nРедакторы и переводчики на русский язык:\n[blue]Prosta4ok_ua[green]#[yellow]6336\n[darkgray]XZ[gray]imur\n[#30FF30]Beryllium\n[tan]Felix [slate]Corvus\n[orange]Vanguard
 credits = Авторы
 contributors = Переводчики и помощники
 discord = Присоединяйтесь к нашему Discord!
@@ -17,9 +17,9 @@ gameover = Игра окончена
 gameover.pvp = [accent]{0}[] команда победила!
 highscore = [accent]Новый рекорд!
 load.sound = Звуки
-load.map = Карт
+load.map = Карты
 load.image = Изображения
-load.content = Содержание
+load.content = Содержимое
 load.system = Система
 stat.wave = Волн отражено:[accent] {0}
 stat.enemiesDestroyed = Врагов уничтожено:[accent] {0}
@@ -28,7 +28,7 @@ stat.destroyed = Строений уничтожено:[accent] {0}
 stat.deconstructed = Строений деконструировано:[accent] {0}
 stat.delivered = Ресурсов запущено:
 stat.rank = Финальный счёт: [accent]{0}
-launcheditems = [accent]Запущенные Предметы
+launcheditems = [accent]Запущенные предметы
 map.delete = Вы действительно хотите удалить карту «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
 level.select = Выбор карты
@@ -48,9 +48,18 @@ minimap = Мини-карта
 close = Закрыть
 website = Веб-сайт
 quit = Выход
+save.quit = Сохранить & Выйти
 maps = Карты
+maps.browse = Просмотр карт
 continue = Продолжить
 maps.none = [lightgray]Карты не найдены!
+invalid = Недопустимый
+preparingconfig = Подготовка конфигурации
+preparingcontent = Подготовка содержимого
+uploadingcontent = Выгрузка содержимого
+uploadingpreviewfile = Выгрузка файла предпросмотра
+committingchanges = Внесение изменений
+done = Готово
 about.button = Об игре
 name = Имя:
 noname = Для начала, придумайте[accent] себе имя[].
@@ -61,31 +70,35 @@ techtree = Дерево технологий
 research.list = [lightgray]Исследование:
 research = Исследование
 researched = [lightgray]{0} исследовано.
-players = Игроков на сервере: {0}
+players = Игроков: {0}
-players.single = {0} игрок на сервере
+players.single = {0} игрок
 server.closing = [accent]Закрытие сервера…
 server.kicked.kick = Вас выгнали с сервера!
+server.kicked.whitelist = Вы не в белом списке сервера.
 server.kicked.serverClose = Сервер закрыт.
-server.kicked.vote = You have been vote-kicked. Goodbye.
+server.kicked.vote = Вы были выгнаны с помощью голосования. Прощайте.
 server.kicked.clientOutdated = Устаревший клиент! Обновите игру!
 server.kicked.serverOutdated = Устаревший сервер! Попросите администратора сервера обновить сервер/игру!
 server.kicked.banned = Вы заблокированы на этом сервере.
-server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.typeMismatch = Этот сервер не совместим с вашим типом сборки.
-server.kicked.recentKick = Вы недавно были кикнуты.\nПодождите немного перед следующим подключением.
+server.kicked.playerLimit = Этот сервер заполнен. Дождитесь свободного слота.
+server.kicked.recentKick = Вас недавно выгнали.\nПодождите немного перед следующим подключением.
 server.kicked.nameInUse = На этом сервере есть кто-то с этим именем.
 server.kicked.nameEmpty = Ваше имя должно содержать хотя бы один символ или цифру.
 server.kicked.idInUse = Вы уже на этом сервере! Соединение с двумя учетными записями не разрешено.
 server.kicked.customClient = Этот сервер не поддерживает пользовательские сборки. Загрузите официальную версию.
 server.kicked.gameover = Игра окончена!
 server.versions = Ваша версия:[accent] {0}[]\nВерсия сервера:[accent] {1}[]
-host.info = Кнопка [accent]Сервер[] запускает сервер на порте [accent]6567[]. \nЛюбой пользователь в той же [lightgray]локальной сети или WiFi[] должен увидеть ваш сервер в своём списке серверов.\n\nЕсли Вы хотите, чтобы люди могли подключаться откуда угодно по IP, то требуется [accent]переадресация (проброс) портов[].\n\n[lightgray]Примечание: Если у кого-то возникают проблемы с подключением к вашей игре по локальной сети, убедитесь, что Вы разрешили доступ Mindustry к вашей локальной сети в настройках брандмауэра. Обратите внимание, что публичные сети иногда не позволяют обнаружение сервера.
+host.info = Кнопка [accent]Сервер[] запускает сервер на порте [accent]6567[]. \nЛюбой пользователь в той же [lightgray]локальной сети или WiFi[] должен увидеть ваш сервер в своём списке серверов.\n\nЕсли Вы хотите, чтобы люди могли подключаться откуда угодно по IP, то требуется [accent]переадресация (проброс) портов[] и наличие [red]ВНЕШНЕГО[] WAN адреса (WAN адрес [red]НЕ должен[] начинаться с [red]10[][lightgray].x.x.x[], [red]100.64[][lightgray].x.x[], [red]172.16[][lightgray].x.x[], [red]192.168[][lightgray].x.x[], [red]127[][lightgray].x.x.x[])!\nКлиентам мобильных операторов нужно уточнять информацию в личном кабинете на сайте вашего оператора!\n\n[lightgray]Примечание: Если у кого-то возникают проблемы с подключением к вашей игре по локальной сети, убедитесь, что Вы разрешили доступ Mindustry к вашей локальной сети в настройках брандмауэра. Обратите внимание, что публичные сети иногда не позволяют обнаружение сервера.
 join.info = Здесь Вы можете ввести [accent]IP-адрес сервера[] для подключения или открыть [accent]локальную сеть[] для подключения к другим серверам.\nПоддерживаются оба многопользовательских режима: LAN и WAN.\n\n[lightgray]Примечание: это НЕ автоматический глобальный список серверов; если Вы хотите подключиться к кому-то по IP, вам нужно спросить у хоста его IP-адрес.
-hostserver = Запустить многопользовательский cервер
+hostserver = Запустить многопользовательский сервер
-hostserver.mobile = Запустить\ncервер
+invitefriends = Пригласить друзей
+hostserver.mobile = Запустить\nсервер
 host = Сервер
 hosting = [accent]Открытие сервера…
 hosts.refresh = Обновить
 hosts.discovering = Поиск локальных игр
+hosts.discovering.any = Поиск игр
 server.refreshing = Обновление сервера
 hosts.none = [lightgray]Локальных игр не обнаружено!
 host.invalid = [scarlet]Не удаётся подключиться к хосту.
@@ -106,22 +119,27 @@ server.edit = Редактировать сервер
 server.outdated = [crimson]Устаревший сервер![]
 server.outdated.client = [crimson]Устаревший клиент![]
 server.version = [gray]Версия: {0} {1}
-server.custombuild = [yellow]Пользовательская сборка
+server.custombuild = [accent]Пользовательская сборка
 confirmban = Вы действительно хотите заблокировать этого игрока?
 confirmkick = Вы действительно хотите выгнать этого игрока?
+confirmvotekick = Вы действительно хотите голосованием выгнать этого игрока?
 confirmunban = Вы действительно хотите разблокировать этого игрока?
 confirmadmin = Вы действительно хотите сделать этого игрока администратором?
 confirmunadmin = Вы действительно хотите убрать этого игрока из администраторов?
 joingame.title = Присоединиться к игре
 joingame.ip = IP:
 disconnect = Отключено.
+disconnect.error = Ошибка соединения.
+disconnect.closed = Соединение закрыто.
+disconnect.timeout = Время истекло.
 disconnect.data = Ошибка при загрузке данных мира!
+cantconnect = Не удаётся присоединиться к игре ([accent]{0}[]).
 connecting = [accent]Подключение…
 connecting.data = [accent]Загрузка данных мира…
 server.port = Порт:
 server.addressinuse = Данный адрес уже используется!
 server.invalidport = Неверный номер порта!
-server.error = [crimson]Ошибка создания сервера: [accent]{0}
+server.error = [crimson]Ошибка создания сервера.
 save.old = Это сохранение для старой версии игры и больше не может использоваться.\n\n[lightgray]Совместимость сохранений будет реализована в финальной версии 4.0.
 save.new = Новое сохранение
 save.overwrite = Вы уверены, что хотите перезаписать\nэтот слот для сохранения?
@@ -141,6 +159,7 @@ save.rename = Переименовать
 save.rename.text = Новое название:
 selectslot = Выберите сохранение.
 slot = [accent]Слот {0}
+editmessage = Редактировать сообщение
 save.corrupted = [accent]Сохранённый файл повреждён или имеет недопустимый формат!\nЕсли Вы только что обновили свою игру, это, вероятно, из-за изменения формата сохранения, и [scarlet]не является[] ошибкой.
 empty = <Пусто>
 on = Вкл
@@ -148,12 +167,13 @@ off = Выкл
 save.autosave = Автосохранение: {0}
 save.map = Карта: {0}
 save.wave = Волна {0}
-save.difficulty = Сложность: {0}
+save.mode = Режим игры: {0}
 save.date = Последнее сохранение: {0}
 save.playtime = Время в игре: {0}
 warning = Предупреждение.
 confirm = Подтверждение
 delete = Удалить
+view.workshop = Просмотреть в Мастерской
 ok = ОК
 open = Открыть
 customize = Настроить правила
@@ -161,11 +181,11 @@ cancel = Отмена
 openlink = Открыть ссылку
 copylink = Скопировать ссылку
 back = Назад
-data.export = Export Data
+data.export = Экспортировать данные
-data.import = Import Data
+data.import = Импортировать данные
-data.exported = Data exported.
+data.exported = Данные экспортированы.
-data.invalid = This isn't valid game data.
+data.invalid = Эти игровые данные являются недействительными
-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.
+data.import.confirm = Импорт внешних данных сотрёт[scarlet] все[] ваши игровые данные.\n[accent]Это не может быть отменено![]\n\nКак только данные импортированы, ваша игра немедленно закроется.
 classic.export = Экспортировать данные с классической версии?
 classic.export.text = [accent]Mindustry[] получил глобальное обновление.\nБыло обнаружено Классическое (версия 3.5 сборка 40) сохранение или карта. Вы хотите экспортировать эти сохранения в домашнюю папку вашего телефона, для использования в приложении Mindustry Classic?
 quit.confirm = Вы уверены, что хотите выйти?
@@ -190,6 +210,11 @@ map.nospawn = Эта карта не имеет ни одного ядра, в
 map.nospawn.pvp = У этой карты нет вражеских ядер, в которых игрок может появиться! Добавьте[SCARLET] не оранжевое[] ядро на эту карту в редакторе.
 map.nospawn.attack = У этой карты нет вражеских ядер для атаки игроком! Добавьте[SCARLET] красное[] ядро на эту карту в редакторе.
 map.invalid = Ошибка загрузки карты: повреждённый или недопустимый файл карты.
+map.publish.error = Ошибка при публикации карты: {0}
+map.publish.confirm = Вы уверены, что хотите опубликовать эту карту?\n\n[lightgray]Убедитесь, что вы согласны с EULA Мастерской, иначе ваши карты не будут отображаться!
+eula = Лицензионное соглашение Steam с конечным пользователем
+map.publish = Карта опубликована.
+map.publishing = [accent]Отправка карты…
 editor.brush = Кисть
 editor.openin = Открыть в редакторе
 editor.oregen = Генерация руд
@@ -197,11 +222,14 @@ editor.oregen.info = Генерация руд:
 editor.mapinfo = Параметры карты
 editor.author = Автор:
 editor.description = Описание:
+editor.nodescription = Чтобы опубликовать карту, она должна содержать по крайней мере 4 символа в описании.
 editor.waves = Волны:
 editor.rules = Правила:
 editor.generation = Генерация:
 editor.ingame = Редактировать в игре
+editor.publish.workshop = Опубликовать в Мастерской Steam
 editor.newmap = Новая карта
+workshop = Workshop
 waves.title = Волны
 waves.remove = Удалить
 waves.never = <никогда>
@@ -218,15 +246,17 @@ waves.invalid = Неверные волны в буфере обмена.
 waves.copied = Волны скопированы.
 waves.none = Враги не были определены.\nОбратите внимание, что пустые волны будут автоматически заменены обычной волной.
 editor.default = [lightgray]<По умолчанию>
+details = Подробная информация…
 edit = Редактировать…
 editor.name = Название:
 editor.spawn = Создать боевую единицу
 editor.removeunit = Удалить боевую единицу
 editor.teams = Команды
-editor.errorload = Ошибка загрузки файла:\n[accent]{0}
+editor.errorload = Ошибка загрузки файла.
-editor.errorsave = Ошибка сохранения файла:\n[accent]{0}
+editor.errorsave = Ошибка сохранения файла.
-editor.errorimage = Это изображение, а не карта. Не нужно менять расширение, ожидая, что это сработает.\n\nЕсли Вы хотите импортировать устаревшую карту, то используйте кнопку «Импортировать устаревшее изображение» в редакторе.
+editor.errorimage = Это изображение, а не карта.\n\nЕсли Вы хотите импортировать карту версии 3.5/40 сборки, то используйте кнопку [accent][Импортировать устаревшую карту][] в редакторе.
 editor.errorlegacy = Эта карта слишком старая и использует устаревший формат карты, который больше не поддерживается.
+editor.errornot = Это не файл карты.
 editor.errorheader = Этот файл карты недействителен или повреждён.
 editor.errorname = Карта не имеет имени. Может быть, Вы пытаетесь загрузить сохранение?
 editor.update = Обновить
@@ -245,7 +275,7 @@ editor.importmap = Импортировать карту
 editor.importmap.description = Импортировать уже существующую карту
 editor.importfile = Импортировать файл
 editor.importfile.description = Импортировать файл карты извне
-editor.importimage = Импортировать устаревшее изображение
+editor.importimage = Импортировать устаревшую карту
 editor.importimage.description = Импортировать изображение карты извне
 editor.export = Экспорт…
 editor.exportfile = Экспортировать файл
@@ -259,6 +289,7 @@ editor.resizemap = Изменить размер карты
 editor.mapname = Название карты:
 editor.overwrite = [accent]Внимание! \nЭто перезапишет уже существующую карту.
 editor.overwrite.confirm = [scarlet]Осторожно![] Карта с таким названием уже существует. Вы действительно хотите её перезаписать?
+editor.exists = Карта с таким именем уже существует.
 editor.selectmap = Выберите карту для загрузки:
 toolmode.replace = Заменить
 toolmode.replace.description = Рисует только\nна сплошных блоках.
@@ -328,16 +359,17 @@ locked = Заблокировано
 complete = [lightgray]Достигнута:
 zone.requirement = Волна {0} в зоне {1}
 resume = Возобновить зону:\n[lightgray]{0}
-bestwave = [lightgray]Наилучшая волна: {0}
+bestwave = [lightgray]Лучшая волна: {0}
 launch = < ЗАПУСК >
 launch.title = Запуск успешен
-launch.next = [lightgray]Cледующая возможность на {0}-той волне
+launch.next = [lightgray]следующая возможность на {0}-той волне
 launch.unable2 = [scarlet]ЗАПУСК невозможен.[]
 launch.confirm = Это [accent]запустит[] все ресурсы в Вашем ядре.\nВы не сможете вернуться на эту базу.
 launch.skip.confirm = Если Вы пропустите сейчас, то Вы не сможете произвести [accent]запуск[] до более поздних волн.
 uncover = Раскрыть
-configure = Выгрузить конфигурацию
+configure = Конфигурация выгрузки
 configure.locked = [lightgray]Возможность разблокировки выгрузки ресурсов будет доступна на {0}-ой волне.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = Зона «[lightgray]{0}» теперь разблокирована.
 zone.requirement.complete = Вы достигли {0}-ой волны,\nУсловия для зоны «{1}» выполнены.
 zone.config.complete = Вы достигли {0}-ой волны,Возможность выгрузки ресурсов теперь разблокирована.
@@ -354,7 +386,7 @@ error.timedout = Время ожидания истекло!\nУбедитесь
 error.mismatch = Ошибка пакета:\nвозможное несоответствие версии клиента/сервера.\nУбедитесь, что у Вас и создателя сервера установлена последняя версия Mindustry!
 error.alreadyconnected = Вы уже подключены.
 error.mapnotfound = Файл карты не найден!
-error.io = Сетевая ошибка ввода-Вывода.
+error.io = Сетевая ошибка ввода-вывода.
 error.any = Неизвестная сетевая ошибка.
 error.bloom = Не удалось инициализировать свечение (Bloom).\nВозможно, ваше устройство не поддерживает его.
 zone.groundZero.name = Отправная точка
@@ -366,7 +398,7 @@ zone.stainedMountains.name = Окрашенные горы
 zone.desolateRift.name = Пустынный разлом
 zone.nuclearComplex.name = Ядерный производственный комплекс
 zone.overgrowth.name = Заросли
-zone.tarFields.name = Дёгтярные поля
+zone.tarFields.name = Дегтярные поля
 zone.saltFlats.name = Соляные равнины
 zone.impact0078.name = Воздействие 0078
 zone.crags.name = Скалы
@@ -386,29 +418,29 @@ zone.fungalPass.description = Переходная область между в
 zone.impact0078.description = <вставить описание здесь>
 zone.crags.description = <вставить описание здесь>
 settings.language = Язык
-settings.data = Game Data
+settings.data = Игровые данные
 settings.reset = Сбросить по умолчанию
-settings.rebind = Смена
+settings.rebind = Сменить
 settings.controls = Управление
 settings.game = Игра
 settings.sound = Звук
 settings.graphics = Графика
-settings.cleardata = Очистить данные…
+settings.cleardata = Очистить игровые данные…
 settings.clear.confirm = Вы действительно хотите очистить свои данные?\nЭто нельзя отменить!
-settings.clearall.confirm = [scarlet]ОСТОРОЖНО![]\nЭто уничтожит все данные, включая сохранения, карты, разблокированное и настройки управления.\nПосле того как Вы нажмете ОК, игра уничтожит все данные и автоматически закроется.
+settings.clearall.confirm = [scarlet]ОСТОРОЖНО![]\nЭто сотрёт все данные, включая сохранения, карты, прогресс кампании и настройки управления.\nПосле того как Вы нажмете [accent][ОК][], игра уничтожит все данные и автоматически закроется.
-settings.clearunlocks = Очистить разблокированное
+settings.clearunlocks = Очистить прогресс кампании
 settings.clearall = Очистить всё
-paused = Пауза
+paused = [accent]< Пауза >
 yes = Да
 no = Нет
 info.title = Информация
 error.title = [crimson]Произошла ошибка
 error.crashtitle = Произошла ошибка
-attackpvponly = [scarlet]Доступно только в атаке/PvP режимах
+attackpvponly = [scarlet]Доступно только в Атаке/PvP режимах
 blocks.input = Вход
 blocks.output = Выход
 blocks.booster = Ускоритель
-block.unknown = [LIGHT_GRAY]???
+block.unknown = [lightgray]???
 blocks.powercapacity = Вместимость энергии
 blocks.powershot = Энергия/Выстрел
 blocks.damage = Урон
@@ -428,12 +460,13 @@ blocks.productiontime = Время производства
 blocks.repairtime = Время полной регенерации
 blocks.speedincrease = Увеличение скорости
 blocks.range = Радиус действия
-blocks.drilltier = Добывает
+blocks.drilltier = Бурит
 blocks.drillspeed = Базовая скорость бурения
 blocks.boosteffect = Ускоряющий эффект
 blocks.maxunits = Максимальное количество активных единиц
 blocks.health = Здоровье
 blocks.buildtime = Время строительства
+blocks.buildcost = Стоимость строительства
 blocks.inaccuracy = Разброс
 blocks.shots = Выстрелы
 blocks.reload = Выстрелы/секунду
@@ -442,25 +475,27 @@ bar.drilltierreq = Требуется лучший бур
 bar.drillspeed = Скорость бурения: {0}/s
 bar.efficiency = Эффективность: {0}%
 bar.powerbalance = Энергия: {0}/с
+bar.powerstored = Накоплено: {0}/{1}
 bar.poweramount = Энергия: {0}
-bar.poweroutput = Выходная энергия: {0}
+bar.poweroutput = Выход энергии: {0}
 bar.items = Предметы: {0}
+bar.capacity = Вместимость: {0}
 bar.liquid = Жидкости
-bar.heat = Нагревание
+bar.heat = Нагрев
 bar.power = Энергия
 bar.progress = Прогресс строительства
 bar.spawned = Боев. ед.: {0}/{1}
 bullet.damage = [stat]{0}[lightgray] урона
-bullet.splashdamage = [stat]{0}[lightgray] урона в радиусе ~[stat] {1}[lightgray] БЛОКОВ
+bullet.splashdamage = [stat]{0}[lightgray] урона в радиусе ~[stat] {1}[lightgray] блоков
-bullet.incendiary = [stat]поджигающий
+bullet.incendiary = [stat]зажигательный
 bullet.homing = [stat]самонаводящийся
 bullet.shock = [stat]ЭМИ
-bullet.frag = [stat]взрывоопасный
+bullet.frag = [stat]разрывной
 bullet.knockback = [stat]{0}[lightgray] отдачи
 bullet.freezing = [stat]замораживающий
 bullet.tarred = [stat]горючий
-bullet.multiplier = [stat]{0}[lightgray]x снарядов
+bullet.multiplier = [stat]{0}[lightgray]x количество боеприпасов
-bullet.reload = [stat]{0}[lightgray]x скорость перезарядки
+bullet.reload = [stat]{0}[lightgray]x скорость стрельбы
 unit.blocks = блоки
 unit.powersecond = единиц энергии/секунду
 unit.liquidsecond = жидкостных единиц/секунду
@@ -472,7 +507,7 @@ unit.seconds = сек.
 unit.persecond = /сек
 unit.timesspeed = x скорость
 unit.percent = %
-unit.items = единиц
+unit.items = предметов
 category.general = Основные
 category.power = Энергия
 category.liquids = Жидкости
@@ -485,10 +520,11 @@ setting.shadows.name = Тени
 setting.linear.name = Линейная фильтрация
 setting.animatedwater.name = Анимированная вода
 setting.animatedshields.name = Анимированные щиты
-setting.antialias.name = Сглаживание[LIGHT_GRAY] (требует перезапуска)[]
+setting.antialias.name = Сглаживание[lightgray] (требует перезапуска)[]
 setting.indicators.name = Отображать индикаторы расположения союзников и врагов
-setting.autotarget.name = Авто-стрельба
+setting.autotarget.name = Автозахват цели
 setting.keyboard.name = Мышь+Управление с клавиатуры
+setting.touchscreen.name = Сенсорное управление
 setting.fpscap.name = Максимальный FPS
 setting.fpscap.none = Неограниченный
 setting.fpscap.text = {0} FPS
@@ -498,30 +534,31 @@ setting.difficulty.training = Обучение
 setting.difficulty.easy = Лёгкая
 setting.difficulty.normal = Нормальная
 setting.difficulty.hard = Сложная
-setting.difficulty.insane = Зачистка
+setting.difficulty.insane = Безумная
 setting.difficulty.name = Сложность:
 setting.screenshake.name = Тряска экрана
 setting.effects.name = Эффекты
 setting.sensitivity.name = Чувствительность контроллёра
 setting.saveinterval.name = Интервал сохранения
-setting.seconds = {0} сек.
+setting.seconds = {0} секунд
 setting.fullscreen.name = Полноэкранный режим
-setting.borderlesswindow.name = Окно без границ [LIGHT_GRAY] (может потребоваться перезапуск)
+setting.borderlesswindow.name = Безрамочное окно[lightgray] (может потребоваться перезапуск)
 setting.fps.name = Показывать FPS
-setting.vsync.name = Верт. синхронизация
+setting.vsync.name = Вертикальная синхронизация
-setting.lasers.name = Показывать энергию лазеров
+setting.lasers.name = Показывать лазеры энергоснабжения
-setting.pixelate.name = Пикселизация[LIGHT_GRAY] (отключает анимации)
+setting.pixelate.name = Пикселизация[lightgray] (отключает анимации)
 setting.minimap.name = Показать миникарту
 setting.musicvol.name = Громкость музыки
-setting.ambientvol.name = Звуки окружающей среды
+setting.ambientvol.name = Громкость окружения
 setting.mutemusic.name = Заглушить музыку
-setting.sfxvol.name = Громкость звукоВых эффектов
+setting.sfxvol.name = Громкость звуковых эффектов
 setting.mutesound.name = Заглушить звук
-setting.crashreport.name = Отправлять анонимные отчёты о Вылетах
+setting.crashreport.name = Отправлять анонимные отчёты о вылетах
-setting.savecreate.name = Auto-Create Saves
+setting.savecreate.name = Автоматическое создание сохранений
+setting.publichost.name = Общедоступность игры
 setting.chatopacity.name = Непрозрачность чата
-setting.playerchat.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 = Настройка управления
@@ -530,77 +567,77 @@ category.general.name = Основное
 category.view.name = Просмотр
 category.multiplayer.name = Сетевая игра
 command.attack = Атаковать
+command.rally = Точка сбора
 command.retreat = Отступить
-command.patrol = Патрулирование
 keybind.gridMode.name = Выбрать блок
 keybind.gridModeShift.name = Выбрать категорию
 keybind.press = Нажмите клавишу…
-keybind.press.axis = Нажмите клавишу…
+keybind.press.axis = Нажмите оси или клавишу…
 keybind.screenshot.name = Скриншот карты
 keybind.move_x.name = Движение по оси x
 keybind.move_y.name = Движение по оси y
-keybind.fullscreen.name = Полноэкранний режим
+keybind.fullscreen.name = Полноэкранный режим
 keybind.select.name = Выбор/Выстрел
 keybind.diagonal_placement.name = Диагональное размещение
 keybind.pick.name = Выбрать блок
 keybind.break_block.name = Разрушить блок
-keybind.deselect.name = Отмена
+keybind.deselect.name = Снять выделение
 keybind.shoot.name = Выстрел
 keybind.zoom_hold.name = Управление масштабом
 keybind.zoom.name = Приблизить/Отдалить
 keybind.menu.name = Меню
 keybind.pause.name = Пауза
 keybind.minimap.name = Мини-карта
-keybind.dash.name = Мчаться
+keybind.dash.name = Полёт/Ускорение
 keybind.chat.name = Чат
 keybind.player_list.name = Список игроков
 keybind.console.name = Консоль
 keybind.rotate.name = Вращение
-keybind.toggle_menus.name = Меню переключения
+keybind.toggle_menus.name = Переключение меню
 keybind.chat_history_prev.name = Пред. история чата
 keybind.chat_history_next.name = След. история чата
 keybind.chat_scroll.name = Прокрутка чата
-keybind.drop_unit.name = Сбросить бой. ед.
+keybind.drop_unit.name = Сбросить боев. ед.
-keybind.zoom_minimap.name = Увеличить миникарту.
+keybind.zoom_minimap.name = Масштабировать миникарту
 mode.help.title = Описание режимов
 mode.survival.name = Выживание
-mode.survival.description = Обычный режим. В этом режиме надо самим добывать ресурсы и сами волны идут автоматически. \n[gray]Требуются точки появления врагов для игры.
+mode.survival.description = Обычный режим. Необходимо добывать ресурсы, а волны наступают автоматически.\n[gray]Требуются точки появления врагов на карте для игры.
 mode.sandbox.name = Песочница
-mode.sandbox.description = Бесконечные ресурсы и нет таймера для волн, но можно самим Вызвать волну.
+mode.sandbox.description = Бесконечные ресурсы и нет таймера волн. [gray]Можно самим вызвать волну.
 mode.pvp.name = PvP
 mode.pvp.description = Боритесь против других игроков.\n[gray]Для игры требуется как минимум 2 ядра разного цвета на карте.
 mode.attack.name = Атака
-mode.attack.description = Уничтожь вражескую базу.\n[gray]Для игры требуется красное ядро на карте.
+mode.attack.description = Уничтожьте вражескую базу. Никаких волн.\n[gray]Для игры требуется красное ядро на карте.
-mode.custom = Настройки правил
+mode.custom = Пользовательские правила
-rules.infiniteresources = Бескон. ресурсы (Игрок)
+rules.infiniteresources = Бесконечные ресурсы (Игрок)
 rules.wavetimer = Интервал волн
 rules.waves = Волны
 rules.attack = Режим атаки
-rules.enemyCheat = Бескон. ресурсы (ИИ)
+rules.enemyCheat = Бесконечные ресурсы ИИ (красная команда)
-rules.unitdrops = Ресурсы боеВых единиц
+rules.unitdrops = Ресурсы за уничтожение боев. ед.
 rules.unitbuildspeedmultiplier = Множитель скорости производства боев. ед.
 rules.unithealthmultiplier = Множитель здоровья боев. ед.
 rules.playerhealthmultiplier = Множитель здоровья игрока
 rules.playerdamagemultiplier = Множитель урона игрока
 rules.unitdamagemultiplier = Множитель урона боев. ед.
-rules.enemycorebuildradius = Радиус защиты враж. ядер: [LIGHT_GRAY] (блоков)
+rules.enemycorebuildradius = Радиус защиты враж. ядер:[lightgray] (блок.)
-rules.respawntime = Интервал возрождения: [LIGHT_GRAY] (сек)
+rules.respawntime = Время возрождения:[lightgray] (сек)
-rules.wavespacing = Интервал волн: [LIGHT_GRAY] (сек)
+rules.wavespacing = Интервал волн:[lightgray] (сек)
 rules.buildcostmultiplier = Множитель затрат на строительство
 rules.buildspeedmultiplier = Множитель скорости строительства
 rules.waitForWaveToEnd = Волны ожидают врагов
-rules.dropzoneradius = Радиус зоны Высадки врагов:[LIGHT_GRAY] (блоков)
+rules.dropzoneradius = Радиус зоны высадки врагов:[lightgray] (блоков)
 rules.respawns = Макс. кол-во возрождений за волну
 rules.limitedRespawns = Ограничение возрождений
 rules.title.waves = Волны
-rules.title.respawns = Возрождения
+rules.title.respawns = Возрождение
 rules.title.resourcesbuilding = Ресурсы & строительство
 rules.title.player = Игроки
 rules.title.enemy = Враги
-rules.title.unit = Бой. ед.
+rules.title.unit = Боев. ед.
 content.item.name = Предметы
 content.liquid.name = Жидкости
-content.unit.name = БоеВые единицы
+content.unit.name = Боевые единицы
 content.block.name = Блоки
 content.mech.name = Мехи
 item.copper.name = Медь
@@ -610,12 +647,12 @@ item.graphite.name = Графит
 item.titanium.name = Титан
 item.thorium.name = Торий
 item.silicon.name = Кремний
-item.plastanium.name = Пластиний
+item.plastanium.name = Пластаний
 item.phase-fabric.name = Фазовая ткань
 item.surge-alloy.name = Кинетический сплав
 item.spore-pod.name = Споровой стручок
 item.sand.name = Песок
-item.blast-compound.name = Взрывная смесь
+item.blast-compound.name = Взрывчатая смесь
 item.pyratite.name = Пиротит
 item.metaglass.name = Метастекло
 item.scrap.name = Металлолом
@@ -624,77 +661,77 @@ liquid.slag.name = Шлак
 liquid.oil.name = Нефть
 liquid.cryofluid.name = Криогенная жидкость
 mech.alpha-mech.name = Альфа
-mech.alpha-mech.weapon = Тяжёлый пулемёт
+mech.alpha-mech.weapon = Тяжёлый бластер
 mech.alpha-mech.ability = Регенерация
 mech.delta-mech.name = Дельта
 mech.delta-mech.weapon = Дуговой генератор
 mech.delta-mech.ability = Разряд
 mech.tau-mech.name = Тау
 mech.tau-mech.weapon = Восстановительный лазер
-mech.tau-mech.ability = Регенирирующая вспышка
+mech.tau-mech.ability = Регенирирующий всплеск
 mech.omega-mech.name = Омега
-mech.omega-mech.weapon = Ракетомётный пулемёт
+mech.omega-mech.weapon = Залповые ракетницы
-mech.omega-mech.ability = Поглощение урона
+mech.omega-mech.ability = Укреплённое бронирование
 mech.dart-ship.name = Дротик
-mech.dart-ship.weapon = Ретранслятор
+mech.dart-ship.weapon = Бластер
 mech.javelin-ship.name = Джавелин
-mech.javelin-ship.weapon = Взрывные ракеты
+mech.javelin-ship.weapon = Разрывные ракеты
-mech.javelin-ship.ability = Дуговой генератор
+mech.javelin-ship.ability = Разрядный ускоритель
 mech.trident-ship.name = Трезубец
-mech.trident-ship.weapon = Бомбы
+mech.trident-ship.weapon = Бомбовый отсек
 mech.glaive-ship.name = Копьё
-mech.glaive-ship.weapon = Огненный пулемёт
+mech.glaive-ship.weapon = Огненный бластер
-item.explosiveness = [LIGHT_GRAY]Взрывоопасность: {0}%
+item.explosiveness = [lightgray]Взрывоопасность: {0}%
-item.flammability = [LIGHT_GRAY]Воспламеняемость: {0}%
+item.flammability = [lightgray]Воспламеняемость: {0}%
-item.radioactivity = [LIGHT_GRAY]Радиоактивность: {0}%
+item.radioactivity = [lightgray]Радиоактивность: {0}%
-unit.health = [LIGHT_GRAY]Здоровье: {0}
+unit.health = [lightgray]Здоровье: {0}
-unit.speed = [LIGHT_GRAY]Скорость: {0}
+unit.speed = [lightgray]Скорость: {0}
-mech.weapon = [LIGHT_GRAY]Оружие: {0}
+mech.weapon = [lightgray]Орудие: {0}
-mech.health = [LIGHT_GRAY]Здоровье: {0}
+mech.health = [lightgray]Целостность: {0}
-mech.itemcapacity = [LIGHT_GRAY]Вместимость предметов: {0}
+mech.itemcapacity = [lightgray]Вместимость предметов: {0}
-mech.minespeed = [LIGHT_GRAY]Скорость добычи: {0}%
+mech.minespeed = [lightgray]Скорость добычи: {0}%
-mech.minepower = [LIGHT_GRAY]Мощность добычи: {0}
+mech.minepower = [lightgray]Мощность добычи: {0}
-mech.ability = [LIGHT_GRAY]Способность: {0}
+mech.ability = [lightgray]Способность: {0}
-mech.buildspeed = [LIGHT_GRAY]Скорость строительства: {0}%
+mech.buildspeed = [lightgray]Скорость строительства: {0}%
-liquid.heatcapacity = [LIGHT_GRAY]Теплоёмкость: {0}
+liquid.heatcapacity = [lightgray]Теплоёмкость: {0}
-liquid.viscosity = [LIGHT_GRAY]Вязкость: {0}
+liquid.viscosity = [lightgray]Вязкость: {0}
-liquid.temperature = [LIGHT_GRAY]Температура: {0}
+liquid.temperature = [lightgray]Температура: {0}
-block.sand-boulder.name = Песочный валун
+block.sand-boulder.name = Песчаный валун
 block.grass.name = Трава
 block.salt.name = Соль
-block.saltrocks.name = Соляные Камни
+block.saltrocks.name = Соляные камни
 block.pebbles.name = Галька
-block.tendrils.name = Щупальца
+block.tendrils.name = Споровые усики
-block.sandrocks.name = Песчаные Скалы
+block.sandrocks.name = Песчаные камни
 block.spore-pine.name = Споровая сосна
-block.sporerocks.name = СпороВые камни
+block.sporerocks.name = Споровые камни
-block.rock.name = Камень
+block.rock.name = Каменный валун
-block.snowrock.name = Снежный камень
+block.snowrock.name = Заснеженный валун
-block.snow-pine.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.spore-moss.name = Споровый мох
-block.shalerocks.name = СланцеВые Породы
+block.shalerocks.name = Сланцевые камни
 block.scrap-wall.name = Стена из металлолома
-block.scrap-wall-large.name = Великая стена из металлолома
+block.scrap-wall-large.name = Большая стена из металлолома
 block.scrap-wall-huge.name = Огромная стена из металлолома
 block.scrap-wall-gigantic.name = Гигантская стена из металлолома
-block.thruster.name = Толкатель
+block.thruster.name = Маневровый двигатель
 block.kiln.name = Печь
 block.graphite-press.name = Графитный пресс
 block.multi-press.name = Мульти-пресс
-block.constructing = {0}\n[LIGHT_GRAY](Строится)
+block.constructing = {0} [lightgray](Строится)
 block.spawn.name = Точка появления врагов
-block.core-shard.name = Ядро «Осколок»
+block.core-shard.name = Ядро: «Осколок»
-block.core-foundation.name = Ядро «Штаб»
+block.core-foundation.name = Ядро: «Штаб»
-block.core-nucleus.name = Ядро «Атом»
+block.core-nucleus.name = Ядро: «Атом»
 block.deepwater.name = Глубоководье
 block.water.name = Вода
 block.tainted-water.name = Загрязнённая вода
 block.darksand-tainted-water.name = Тёмный песок с загрязнённой водой
-block.tar.name = Дёготь
+block.tar.name = Нефть
 block.stone.name = Камень
 block.sand.name = Песок
 block.darksand.name = Тёмный песок
@@ -705,20 +742,20 @@ block.sand-water.name = Песок с водой
 block.darksand-water.name = Тёмный песок с водой
 block.char.name = Выжженная земля
 block.holostone.name = Голографический камень
-block.ice-snow.name = Ледяной снег
+block.ice-snow.name = Заснеженный лёд
 block.rocks.name = Камни
 block.icerocks.name = Ледяные камни
 block.snowrocks.name = Снежные камни
-block.dunerocks.name = Песчаные Камни
+block.dunerocks.name = Тёмные песчаные камни
 block.pine.name = Сосна
 block.white-tree-dead.name = Мёртвое белое дерево
 block.white-tree.name = Белое дерево
 block.spore-cluster.name = Скопление спор
-block.metal-floor.name = Металлический пол
+block.metal-floor.name = Металлический пол 1
 block.metal-floor-2.name = Металлический пол 2
 block.metal-floor-3.name = Металлический пол 3
-block.metal-floor-5.name = Металлический пол 5
+block.metal-floor-5.name = Металлический пол 4
-block.metal-floor-damaged.name = Повреждённый Металлический Пол
+block.metal-floor-damaged.name = Повреждённый металлический пол
 block.dark-panel-1.name = Тёмная панель 1
 block.dark-panel-2.name = Тёмная панель 2
 block.dark-panel-3.name = Тёмная панель 3
@@ -726,9 +763,9 @@ block.dark-panel-4.name = Тёмная панель 4
 block.dark-panel-5.name = Тёмная панель 5
 block.dark-panel-6.name = Тёмная панель 6
 block.dark-metal.name = Тёмный металл
-block.ignarock.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 = Большая медная стена
@@ -746,24 +783,27 @@ block.scatter.name = Рассеиватель
 block.hail.name = Град
 block.lancer.name = Копейщик
 block.conveyor.name = Конвейер
-block.titanium-conveyor.name = ТитаноВый конвейер
+block.titanium-conveyor.name = Титановый конвейер
+block.armored-conveyor.name = Бронированный конвейер
+block.armored-conveyor.description = Перемещает предметы с той же скоростью, что и титановые конвейеры, но обладает большей бронёй. Не принимает на вход с боков ни от чего кроме как от других конвейеров.
 block.junction.name = Перекрёсток
 block.router.name = Маршрутизатор
-block.distributor.name = Разветвитель
+block.distributor.name = Распределитель
 block.sorter.name = Сортировщик
+block.message.name = Сообщение
 block.overflow-gate.name = Избыточный затвор
-block.silicon-smelter.name = КремниеВый плавильный завод
+block.silicon-smelter.name = Кремниевый плавильный завод
-block.phase-weaver.name = ФазоВый ткач
+block.phase-weaver.name = Фазовый ткач
 block.pulverizer.name = Измельчитель
 block.cryofluidmixer.name = Мешалка криогенной жидкости
 block.melter.name = Плавильня
 block.incinerator.name = Мусоросжигатель
-block.spore-press.name = Споровой Пресс
+block.spore-press.name = Споровой пресс
 block.separator.name = Отделитель
 block.coal-centrifuge.name = Угольная центрифуга
 block.power-node.name = Силовой узел
 block.power-node-large.name = Большой силовой узел
-block.surge-tower.name = Кинетическая башня
+block.surge-tower.name = Кинетическая вышка
 block.battery.name = Аккумулятор
 block.battery-large.name = Большой аккумулятор
 block.combustion-generator.name = Генератор внутреннего сгорания
@@ -775,13 +815,13 @@ block.pneumatic-drill.name = Пневматический бур
 block.laser-drill.name = Лазерный бур
 block.water-extractor.name = Гидроконденсатор
 block.cultivator.name = Культиватор
-block.dart-mech-pad.name = Реконструктор «Альфа»
+block.dart-mech-pad.name = Реконструктор меха «Альфа»
-block.delta-mech-pad.name = Реконструктор «Дельта»
+block.delta-mech-pad.name = Реконструктор меха «Дельта»
-block.javelin-ship-pad.name = Реконструктор «Джавелин»
+block.javelin-ship-pad.name = Реконструктор корабля «Джавелин»
-block.trident-ship-pad.name = Реконструктор «Трезубец»
+block.trident-ship-pad.name = Реконструктор корабля «Трезубец»
-block.glaive-ship-pad.name = Реконструктор «Копьё»
+block.glaive-ship-pad.name = Реконструктор корабля «Копьё»
-block.omega-mech-pad.name = Реконструктор «Омега»
+block.omega-mech-pad.name = Реконструктор меха «Омега»
-block.tau-mech-pad.name = Реконструктор «Тау»
+block.tau-mech-pad.name = Реконструктор меха «Тау»
 block.conduit.name = Трубопровод
 block.mechanical-pump.name = Механическая помпа
 block.item-source.name = Источник предметов
@@ -795,41 +835,41 @@ 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.blast-mixer.name = Мешалка взрывчатой смеси
 block.solar-panel.name = Солнечная панель
 block.solar-panel-large.name = Большая солнечная панель
 block.oil-extractor.name = Нефтяная вышка
 block.command-center.name = Командный центр
-block.draug-factory.name = Завод дронов «Драугр»
+block.draug-factory.name = Завод добывающих дронов «Драугр»
-block.spirit-factory.name = Завод ремонтных дронов «Призрак»
+block.spirit-factory.name = Завод ремонтных дронов «Дух»
 block.phantom-factory.name = Завод строительных дронов «Фантом»
-block.wraith-factory.name = Завод призрачных истребителей
+block.wraith-factory.name = Завод истребителей «Призрак»
 block.ghoul-factory.name = Завод бомбардировщиков «Гуль»
 block.dagger-factory.name = Завод мехов «Кинжал»
-block.crawler-factory.name = Завод мехов «Камикадзе»
+block.crawler-factory.name = Завод гусеничных ботов «Камикадзе»
 block.titan-factory.name = Завод мехов «Титан»
 block.fortress-factory.name = Завод мехов «Крепость»
-block.revenant-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-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 = Термальный насос
 block.thermal-generator.name = Термальный генератор
 block.alloy-smelter.name = Плавильня кинетического сплава
 block.mender.name = Регенератор
-block.mend-projector.name = Ремонтирующий гранатомёт
+block.mend-projector.name = Ремонтирующий проектор
 block.surge-wall.name = Стена из кинетического сплава
 block.surge-wall-large.name = Большая стена из кинетического сплава
 block.cyclone.name = Циклон
@@ -839,8 +879,8 @@ block.overdrive-projector.name = Сверхприводный проектор
 block.force-projector.name = Силовой проектор
 block.arc.name = Дуга
 block.rtg-generator.name = Радиоизотопный термоэлектрический генератор
-block.spectre.name = Призрак
+block.spectre.name = Спектр
-block.meltdown.name = Плазмотрон
+block.meltdown.name = Испепелитель
 block.container.name = Склад
 block.launch-pad.name = Стартовая площадка
 block.launch-pad-large.name = Большая стартовая площадка
@@ -851,16 +891,16 @@ team.orange.name = Оранжевая
 team.derelict.name = Покинутая
 team.green.name = Зелёная
 team.purple.name = Фиолетовая
-unit.spirit.name = Ремонтирующий дрон «Привидение»
+unit.spirit.name = Ремонтный дрон «Дух»
 unit.draug.name = Добывающий дрон «Драугр»
 unit.phantom.name = Строительный дрон «Фантом»
 unit.dagger.name = Кинжал
 unit.crawler.name = Камикадзе
 unit.titan.name = Титан
 unit.ghoul.name = Гуль
-unit.wraith.name = Призрачный истребитель
+unit.wraith.name = Призрак
 unit.fortress.name = Крепость
-unit.revenant.name = Потусторонний убийца
+unit.revenant.name = Мститель
 unit.eruptor.name = Извергатель
 unit.chaos-array.name = Массив хаоса
 unit.eradicator.name = Искоренитель
@@ -869,47 +909,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.drill.mobile = Ручная добыча не является эффективной.\n[accent]Буры []могут добывать автоматически.\nНажмите на вкладку с изображением сверла снизу справа.\nВыберите[accent] механический бур[]. \nРазместите его на медной жиле нажатием, затемм нажмите [accent] белую галку[] ниже, чтобы подтвердить построение выделенного.\nНажмите [accent] кнопку X[], чтобы отменить размещение.
-tutorial.blockinfo = Каждый блок имеет разные характеристики.\nЧтобы узнать информацию о блоке и о его характеристиках,[accent] нажмите на «?», когда он Выбран в меню строительства.[]\n\n[accent]Сейчас, узнайте характеристики механического бура.[]
+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 = Во время битвы Вы можете[accent] приостановить игру.[]\nВы можете планировать строительство, когда игра стоит на паузе.\n\n[accent]Нажмите ПРОБЕЛ для приостановки игры.
-tutorial.pause.mobile = Во время битВы, Вы можете[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 = Часто блоки нужно разрушать\n[accent]Зажмите ПКМ[], чтобы разрушить блоки в выбранной зоне.[]\n\n[accent]Разрушьте все стены из металлолома слева от вашего ядра.
-tutorial.breaking.mobile = Часто блоки нужно разрушить.\n[accent]Выберите режим деконструкции[], после чего нажмите на нужный блок, чтобы его разрушить.\nРазрушьте блоки в Выбранной зоне, зажав палец на несколько секунд[], и проводя его в нужном направлении.\nНажмите на галочку, чтобы подтвердить разрушение.\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.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 = Тяжёлый бомбардировщик, построенный для строительства и уничтожения вражеских укреплений. Достаточно хорошо бронированный.
@@ -917,14 +957,15 @@ mech.glaive-ship.description = Большой хорошо бронирован
 unit.draug.description = Примитивный добывающий дрон. Дёшево производить. Расходуемый. Автоматически добывает медь и свинец в непосредственной близости. Поставляет добытые ресурсы в ближайшее ядро.
 unit.spirit.description = Модифицированный «Драугр», предназначенный для ремонта вместо добычи ресурсов. Автоматически ремонтирует любые поврежденные блоки в области.
 unit.phantom.description = Продвинутый дрон. Следует за пользователями. Помогает в строительстве блоков.
-unit.dagger.description = Самый основной наземный мех. ДешёВый в производстве. Очень сильный при использовании толпами.
+unit.dagger.description = Самый основной наземный мех. Дешёвый в производстве. Очень сильный при использовании толпами.
-unit.crawler.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.message.description = Сохраняет сообщение. Используется для связи между союзниками.
 block.graphite-press.description = Сжимает куски угля в чистые листы графита.
 block.multi-press.description = Обновлённая версия графитовой печати. Использует воду и энергию для быстрой и эффективной переработки угля.
 block.silicon-smelter.description = Соединяет песок с чистым углем. Производит кремний.
@@ -942,8 +983,8 @@ block.pulverizer.description = Измельчает металлолом в ме
 block.coal-centrifuge.description = Нефть превращается в куски угля.
 block.incinerator.description = Выпаривает любой лишний предмет или жидкость, которую он получает.
 block.power-void.description = Аннулирует всю энергию, введенную в него. Только песочница.
-block.power-source.description = Бесконечно Выводит энергию. Только песочница.
+block.power-source.description = Бесконечно вводит энергию. Только песочница.
-block.item-source.description = Бесконечно Выводит элементы. Только песочница.
+block.item-source.description = Бесконечно выводит элементы. Только песочница.
 block.item-void.description = Уничтожает любые предметы. Только песочница.
 block.liquid-source.description = Бесконечно выводит жидкости. Только песочница.
 block.copper-wall.description = Дешёвый защитный блок.\nПолезно для защиты ядра и турелей в первые несколько волн.
@@ -963,7 +1004,7 @@ block.mend-projector.description = Обновлённая версия Реге
 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-conveyor.description = Улучшенный транспортный блок элемента. Позволяет транспортировать предметы по 3 плиткам любой местности или здания.
@@ -978,11 +1019,11 @@ 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 = Очень дальний узел питания с меньшим количеством доступных соединений.
@@ -997,12 +1038,12 @@ 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 = Вторая версия ядра. Лучше бронированное. Хранит больше ресурсов.
@@ -1026,7 +1067,7 @@ block.ripple.description = Очень мощная артиллерийская
 block.cyclone.description = Большая противовоздушная и наземная башня. Выстреливает взрывными глыбами зенитных орудий в ближайшие подразделения.
 block.spectre.description = Массивная двуствольная пушка. Стреляет крупными бронебойными пулями по воздушным и наземным целям.
 block.meltdown.description = Массивная лазерная пушка. Заряжает и стреляет постоянным лазерным лучом в ближайших врагов. Требуется охлаждающая жидкость для работы.
-block.command-center.description = Командует перемещениями боевых единиц по всей карте.\nУказывает подразделениям [accent]патрулировать[] территорию, [accent]атаковать[] вражеское ядро или [accent]отступать[] к ядру/фабрике. Когда вражеское ядро не представлено, единицы будут патрулировать при команде [accent]атаки[].
+block.command-center.description = Командует перемещениями боевых единиц по всей карте.\nУказывает подразделениям [accent]собираться[] вокруг командного центра, [accent]атаковать[] вражеское ядро или [accent]отступать[] к ядру/фабрике. Когда вражеское ядро не представлено, единицы будут патрулировать при команде [accent]атаки[].
 block.draug-factory.description = Производит добывающих дронов
 block.spirit-factory.description = Производит дронов, которые помогают в строительстве.
 block.phantom-factory.description = Производит улучшенных дронов, которые помогают в строительстве.
@@ -1038,7 +1079,7 @@ 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

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

core/assets/bundles/bundle_tk.properties

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

core/assets/bundles/bundle_tr.properties

@@ -16,11 +16,11 @@ screenshot.invalid = Harita çok büyük, ekran görüntüsü için potansiyel o
 gameover = Kaybettin
 gameover.pvp = [accent] {0}[] Takımı kazandı!
 highscore = [accent]Yeni rekor!
-load.sound = Sounds
+load.sound = Sesler
-load.map = Maps
+load.map = Haritalar
-load.image = Images
+load.image = Resimler
-load.content = Content
+load.content = İçerik
-load.system = System
+load.system = Sistem
 stat.wave = Yenilen Dalgalar:[accent] {0}
 stat.enemiesDestroyed = Yok Edilen Düşmanlar:[accent] {0}
 stat.built = İnşa Edilen Yapılar:[accent] {0}
@@ -35,7 +35,7 @@ level.select = Seviye Seçimi
 level.mode = Oyun Modu:
 showagain = Bir daha gösterme
 coreattack = < Çekirdek saldırı altında! >
-nearpoint = [[ [scarlet]İNİŞ PİSTİNDEN AYRIL[] ]\nimha riski yüksek
+nearpoint = [[ [scarlet]İNİŞ PİSTİNDEN AYRIL[] ]\nimha tehlikesi
 database = Çekirdek Veritabanı
 savegame = Oyunu Kaydet
 loadgame = Oyunu Yükle
@@ -48,9 +48,18 @@ minimap = Harita
 close = Kapat
 website = Website
 quit = Çık
+save.quit = Save & Quit
 maps = Haritalar
+maps.browse = Haritaları gör
 continue = Devam et
 maps.none = [lightgray]Harita Bulunamadı!
+invalid = Invalid
+preparingconfig = Yapılandırma Hazırlanıyor
+preparingcontent = İçerik Hazırlanıyor
+uploadingcontent = İçerik Yükleniyor
+uploadingpreviewfile = Önizleme Dosyası Yükleniyor
+committingchanges = Değişiklikler Uygulanıyor
+done = Bittti
 about.button = Hakkında
 name = İsim:
 noname = Bir[accent] kullanıcı adı[] seçmelisin.
@@ -58,113 +67,124 @@ filename = Dosya Adı:
 unlocked = Yeni içerik açıldı!
 completed = [accent]Tamamlandı
 techtree = Yetenek Ağacı
-research.list = [lightgray]Araştır:
+research.list = [lightgray]Araştırmalar:
 research = Araştır
 researched = [lightgray]{0} Araştırıldı.
-players = {0} oyuncu çevrimiçi
+players = {0} çevrimiçi oyuncu
-players.single = {0} oyuncu çevrimiçi
+players.single = {0} çevrimiçi oyuncu
-server.closing = [accent]Sunucu kapanıyor...
+server.closing = [accent]Sunucu kapatılıyor...
 server.kicked.kick = Sunucudan atıldın!
+server.kicked.whitelist = Beyaz listede değilsin.
 server.kicked.serverClose = Sunucu kapandı.
-server.kicked.vote = You have been vote-kicked. Goodbye.
+server.kicked.vote = Oylama ile atıldın. Görüşürüz.
-server.kicked.clientOutdated = Geçersiz sürüm! Oyununu güncelle!
+server.kicked.clientOutdated = Eski sürüm! Oyununu güncelle!
 server.kicked.serverOutdated = Geçersiz sunucu!\nKurucudan oyununu güncellemesini iste!
 server.kicked.banned = Bu sunucudan yasaklandın.
-server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.typeMismatch = Bu sunucu senin inşa türünle uyumlu değil.
-server.kicked.recentKick = Yakın bir zamanda bir sunucudan atıldın.\nBağlanmadan önce biraz bekle.
+server.kicked.playerLimit = Sunucu dolu. Yer açılmasını bekle.
+server.kicked.recentKick = Yakın bir zamanda bir sunucudan atıldın.\nBağlanmadan önce bir süre bekle.
 server.kicked.nameInUse = Sunucuda zaten o isimde biri var.
-server.kicked.nameEmpty = İsmin geçersiz.
+server.kicked.nameEmpty = Seçtiğin isim geçersiz.
 server.kicked.idInUse = Zaten bu sunucudasın! İki hesapla bir sunucuya bağlanamazsın.
 server.kicked.customClient = Bu sunucu özel sürümleri kabul etmiyor. Resmi bir sürüm indir.
-server.kicked.gameover = Game over!
+server.kicked.gameover = Oyun bitti!
-server.versions = Senin versiyon:[accent] {0}[]\nSunucunun versiyonu:[accent] {1}[]
+server.versions = Kullandığın surum:[accent] {0}[]\nSunucunun sürümü:[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.
+host.info = [accent]host[], [scarlet]6567[] portunda bir sunucuya ev sahipliği yapıyor. \nAynı [lightgray]wifi veya yerel ağdaki[] herkes sunucu listelerinde senin sunucunu görebiliyor olmalı.\n\nEğer diğerlerinin herhangi bir yerden IP ile bağlanabilmesini istiyorsan [accent]port yönlendirmesi[] gerekli.\n\n[lightgray]Not: Eğer birisi senin yerel ağ oyununa katılmakta sorun yaşıyorsa güvenlik duvarı ayarlarında Mindustry'ye yerel ağ bağlantısı izni verdiğinden emin olun. Halka açık ağların zaman zaman sunucu aramaya engel olduğunu unutmayın.
-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.
+join.info = Burada, bağlanmak istediğin sunucunun [accent]IP[] adresini girebilir veya [accent]yerel ağ[] sunucularını görebilirsin..\nHem yerel ağ hem de geniş alan ağı çoklu oyuncu için destekleniyor.\n\n[lightgray]Not: Otomatik bir global sunucu listesi yok; eğer birisine IP adresi kullanarak bağlanmak istiyorsan IP adresini istemelisin.
 hostserver = Çok Oyunculu Oyun Aç
+invitefriends = Invite Friends
 hostserver.mobile = Oyun\nKur
 host = Kur
 hosting = [accent]Sunucu açılıyor...
 hosts.refresh = Yenile
-hosts.discovering = LAN oyunu aranıyor
+hosts.discovering = Yerel ağ oyunu aranıyor
-server.refreshing = Sunucular yenileniyor
+hosts.discovering.any = Discovering games
-hosts.none = [lightgray]LAN oyunu bulunamadı!
+server.refreshing = Sunucu yenileniyor
+hosts.none = [lightgray]Yerel oyun bulunamadı!
 host.invalid = [scarlet]Kurucuya bağlanılamıyor.
-trace = Oyuncuyu takip et
+trace = Oyuncuyu Takip Et
 trace.playername = Oyuncu İsmi: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Özel ID: [accent]{0}
 trace.mobile = Mobil Sürüm: [accent]{0}
 trace.modclient = Özel Sürüm: [accent]{0}
 invalidid = Geçersiz Sürüm ID'si! Bir hata raporu gönder.
-server.bans = Yasaklar
+server.bans = Yasaklılar
 server.bans.none = Yasaklanmış oyuncu bulunamadı!
-server.admins = Yetkililer
+server.admins = Yönetici
-server.admins.none = Yetkili bulunamadı!
+server.admins.none = Yönetici bulunamadı!
-server.add = Add Server
+server.add = Sunucu Ekle
-server.delete = Are you sure you want to delete this server?
+server.delete = Bu sunucuyu silmek istediğine emin misin?
-server.edit = Edit Server
+server.edit = Sunucuyu Düzenle
-server.outdated = [crimson]Outdated Server![]
+server.outdated = [crimson]Güncel Olmayan Sunucu![]
-server.outdated.client = [crimson]Outdated Client![]
+server.outdated.client = [crimson]Güncel Olmayan Sürüm![]
 server.version = [gray]v{0} {1}
-server.custombuild = [yellow]Custom Build
+server.custombuild = [yellow]Özel Sürüm
-confirmban = Are you sure you want to ban this player?
+confirmban = Bu kullanıcıyı yasaklamak istediğine emin misin?confirmkick = Bu kullanıcıyı atmak istediğine emin misin?
 confirmkick = Are you sure you want to kick this player?
-confirmunban = Are you sure you want to unban this player?
+confirmvotekick = Are you sure you want to vote-kick this player?
-confirmadmin = Are you sure you want to make this player an admin?
+confirmunban = Bu kullanıcının yasağını kaldırmak istediğine emin misin?
-confirmunadmin = Are you sure you want to remove admin status from this player?
+confirmadmin = Bu kullanıcıyı bir yönetici yapmak istediğine emin misin?
-joingame.title = Join Game
+confirmunadmin = Bu kullanıcının yönetici yetkilerini almak istediğine istediğine emin misin?
-joingame.ip = Address:
+joingame.title = Oyuna Katıl
-disconnect = Disconnected.
+joingame.ip = Adres:
-disconnect.data = Failed to load world data!
+disconnect = Bağlantı kesildi.
-connecting = [accent]Connecting...
+disconnect.error = Bağlantı hatası.
-connecting.data = [accent]Loading world data...
+disconnect.closed = Bağlantı kapatıldı.
+disconnect.timeout = Zaman aşımı.
+disconnect.data = Dünya verisi yüklenemedi!
+cantconnect = Unable to join game ([accent]{0}[]).
+connecting = [accent]Bağlanılıyor...
+connecting.data = [accent]Dünya verisi yükleniyor...
 server.port = Port:
-server.addressinuse = Address already in use!
+server.addressinuse = Adres zaten kullanılıyor!
-server.invalidport = Invalid port number!
+server.invalidport = Geçersiz port sayısı!
-server.error = [crimson]Error hosting server: [accent]{0}
+server.error = [crimson]Sunucu kurulamadı: [accent]{0}
-save.old = This save is for an older version of the game, and can no longer be used.\n\n[lightgray]Save backwards compatibility will be implemented in the full 4.0 release.
+save.old = Bu kayıt oyunun eski bir sürümü için ve artık kullanılamaz.\n\n[lightgray]Tam 4.0 sürümü yayınlandığında geri kayıt özelliği eklenecek.
-save.new = New Save
+save.new = Yeni kayıt
-save.overwrite = Are you sure you want to overwrite\nthis save slot?
+save.overwrite = Bu kayıdın üstüne yazmak istediğine\nemin misin?
-overwrite = Overwrite
+overwrite = Üstüne yaz
-save.none = No saves found!
+save.none = Kayıt bulunamadı!
-saveload = Saving...
+saveload = Kaydediliyor...
-savefail = Failed to save game!
+savefail = Oyun kaydedilemedi!
-save.delete.confirm = Are you sure you want to delete this save?
+save.delete.confirm = Bu kaydı silmek istediğine emin misin?
-save.delete = Delete
+save.delete = Sil
-save.export = Export Save
+save.export = Kayıdı Dışa Aktar
-save.import.invalid = [accent]This save is invalid!
+save.import.invalid = [accent]Bu kayıt geçersiz!
-save.import.fail = [crimson]Failed to import save: [accent]{0}
+save.import.fail = [crimson]Kayıt içe aktarılamadı: [accent]{0}
-save.export.fail = [crimson]Failed to export save: [accent]{0}
+save.export.fail = [crimson]Kayıt dışa aktarılamadı: [accent]{0}
-save.import = Import Save
+save.import = Kayıdı İçe Aktar
-save.newslot = Save name:
+save.newslot = İsmi kaydet:
-save.rename = Rename
+save.rename = Yeniden isimlendir
-save.rename.text = New name:
+save.rename.text = Yeni isim:
-selectslot = Select a save.
+selectslot = Bir kayıt seçin.
 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.
+editmessage = Edit Message
-empty = <empty>
+save.corrupted = [accent]Kayıt dosyası bozuk veya geçersiz!\nEğer oyununuzu kısa süre öce güncellediyseniz bu, kayıt formatındaki bir değişiklik. Bir hata [scarlet]değil[].
-on = On
+empty = <boş>
-off = Off
+on = Aç
-save.autosave = Autosave: {0}
+off = Kapa
-save.map = Map: {0}
+save.autosave = Otomatk kayıt: {0}
-save.wave = Wave {0}
+save.map = Harita: {0}
-save.difficulty = Difficulty: {0}
+save.wave = Dalga {0}
-save.date = Last Saved: {0}
+save.mode = Oyun modu: {0}
-save.playtime = Playtime: {0}
+save.date = Son Kayıt: {0}
-warning = Warning.
+save.playtime = Oynama süresi: {0}
-confirm = Confirm
+warning = Uyarı.
-delete = Delete
+confirm = Doğrula
+delete = Sil
+view.workshop = View In Workshop
 ok = OK
-open = Open
+open = Aç
-customize = Customize Rules
+customize = Kuralları Özelleştir
-cancel = Cancel
+cancel = İptal
-openlink = Open Link
+openlink = Bağlantıyı Aç
-copylink = Copy Link
+copylink = Bağlantıyı Kopyala
-back = Back
+back = Geri
-data.export = Export Data
+data.export = Veriyi Dışa Aktar
-data.import = Import Data
+data.import = Veriyi İçe Aktar
-data.exported = Data exported.
+data.exported = Veri dışa aktarıldı.
-data.invalid = This isn't valid game data.
+data.invalid = Bu oyun verisi geçerli değil.
 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?
@@ -190,6 +210,11 @@ map.nospawn = This map does not have any cores for the player to spawn in! Add a
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-orange[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
+map.publish.error = Error publishing map: {0}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+eula = Steam EULA
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Brush
 editor.openin = Open In Editor
 editor.oregen = Ore Generation
@@ -197,11 +222,14 @@ editor.oregen.info = Ore Generation:
 editor.mapinfo = Map Info
 editor.author = Author:
 editor.description = Description:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.ingame = Edit In-Game
+editor.publish.workshop = Publish On Workshop
 editor.newmap = New Map
+workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
 waves.never = <never>
@@ -218,6 +246,7 @@ waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
 editor.default = [lightgray]<Default>
+details = Details...
 edit = Edit...
 editor.name = Name:
 editor.spawn = Spawn Unit
@@ -227,6 +256,7 @@ editor.errorload = Error loading file:\n[accent]{0}
 editor.errorsave = Error saving file:\n[accent]{0}
 editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor.
 editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined. Are you trying to load a save file?
 editor.update = Update
@@ -259,6 +289,7 @@ editor.resizemap = Resize Map
 editor.mapname = Map Name:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
 editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?
+editor.exists = A map with this name already exists.
 editor.selectmap = Select a map to load:
 toolmode.replace = Replace
 toolmode.replace.description = Draws only on solid blocks.
@@ -338,6 +369,7 @@ launch.skip.confirm = If you skip now, you will not be able to launch until late
 uncover = Uncover
 configure = Configure Loadout
 configure.locked = [lightgray]Unlock configuring loadout: Wave {0}.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
@@ -434,6 +466,7 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
@@ -442,9 +475,11 @@ bar.drilltierreq = Better Drill Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.powerbalance = Power: {0}/s
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
+bar.capacity = Capacity: {0}
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
@@ -489,6 +524,7 @@ setting.antialias.name = Antialias[lightgray] (requires restart)[]
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
@@ -519,6 +555,7 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display In-Game Chat
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
@@ -530,8 +567,8 @@ category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
 command.attack = Attack
+command.rally = Rally
 command.retreat = Retreat
-command.patrol = Patrol
 keybind.gridMode.name = Block Select
 keybind.gridModeShift.name = Category Select
 keybind.press = Press a key...
@@ -747,10 +784,13 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Junction
 block.router.name = Router
 block.distributor.name = Distributor
 block.sorter.name = Sorter
+block.message.name = Message
 block.overflow-gate.name = Overflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
@@ -925,6 +965,7 @@ unit.eruptor.description = A heavy mech designed to take down structures. Fires
 unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
 unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critical infrastructure.
 unit.revenant.description = A heavy, hovering missile array.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
 block.silicon-smelter.description = Reduces sand with pure coal. Produces silicon.

core/assets/bundles/bundle_uk_UA.properties

@@ -1,19 +1,19 @@
-credits.text = Створив [ROYAL]Anuken[] — [SKY]anukendev@gmail.com[]\n\nЄ питання по грі або проблеми з перекладом?\nЙдіть в офіційний сервер discord Mindustry у канал #український.\nПерекладач: [blue]Prosta4ok_ua[green]#[yellow]6336
+credits.text = Створив [ROYAL]Anuken[] — [SKY]anukendev@gmail.com[]\n\nЄ питання по грі або проблеми з перекладом?\nЙдіть в офіційний сервер discord Mindustrу\nу канал #український.\nПерекладач: [blue]Prosta4ok_ua[green]#[yellow]6336
 credits = Творці
 contributors = Перекладачі та помічники
-discord = Приєднуйтесь до нашого Discord!
+discord = Приєднуйтесь до Mindustry Discord!
 link.discord.description = Офіційний Discord-сервер Mindustry
 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.google-play.description = Завантажити для Android з Google Play
-link.wiki.description = Офіційна вікі
+link.wiki.description = Офіційна Mindustry wiki
-linkfail = Не вдалося відкрити посилання!\nURL-адреса була скопійована у буфер обміну.
+linkfail = Не вдалося відкрити посилання!\nURL-адреса скопійована в буфер обміну.
-screenshot = Зняток мапи збережено у {0}
+screenshot = Зняток мапи збережено в {0}
-screenshot.invalid = Мапа занадто велика, тому, мабуть, не вистачає пам’яті для знятку екрана.
+screenshot.invalid = Мапа занадто велика, тому, мабуть, не вистачає пам’яті для знятку мапи.
-gameover = Гру закінчено
+gameover = Гра завершена
 gameover.pvp = [accent] {0}[] команда перемогла!
 highscore = [YELLOW]Новий рекорд!
 load.sound = Звуки
@@ -22,11 +22,11 @@ load.image = Зображення
 load.content = Зміст
 load.system = Система
 stat.wave = Хвиль відбито:[accent] {0}
-stat.enemiesDestroyed = Ворогів вбито:[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}
 launcheditems = [accent]Запущені предмети
 map.delete = Ви впевнені, що хочете видалити мапу «[accent]{0}[]»?
@@ -35,27 +35,36 @@ level.select = Вибір мапи
 level.mode = Режим гри:
 showagain = Не показувати знову до наступного сеансу
 coreattack = < Ядро знаходиться під атакою! >
-nearpoint = [[ [scarlet]ЗАЛИШТЕ ЦЮ ЗОНУ НЕГАЙНО[] ]\nАннігіляція неминуча.
+nearpoint = [[ [scarlet]ЗАЛИШТЕ ЗОНУ ВИСАДКИ НЕГАЙНО[] ]\nАннігіляція неминуча.
 database = База даних ядра
 savegame = Зберегти гру
 loadgame = Завантажити гру
 joingame = Мережева гра
-addplayers = Дод./Видалити гравців
+addplayers = Додати/Видалити гравців
-customgame = Користувальницька гра
+customgame = Користувацька гра
 newgame = Нова гра
 none = <нічого>
-minimap = Міні-мапа
+minimap = Мінімапа
 close = Закрити
 website = Веб-сайт
 quit = Вихід
+save.quit = Save & Quit
 maps = Мапи
+maps.browse = Перегляд мап
 continue = Продовжити
 maps.none = [lightgray]Мап не знайдено!
+invalid = Недійсне
+preparingconfig = Підготовка конфігурації
+preparingcontent = Підготовка вмісту
+uploadingcontent = Вивантаження вмісту
+uploadingpreviewfile = Вивантаження файлу передперегляду
+committingchanges = Здійснення змін
+done = Зроблено
 about.button = Про гру
 name = Ім’я:
 noname = Спочатку придумайте[accent] собі ім’я[].
 filename = Ім’я файлу:
-unlocked = Новий контент розблоковано!
+unlocked = Доступний новий вміст!
 completed = [accent]Завершено
 techtree = Дерево технологій
 research.list = [lightgray]Дослідження:
@@ -63,32 +72,36 @@ research = Дослідження
 researched = [lightgray]{0} досліджено.
 players = Гравців на сервері: {0}
 players.single = {0} гравець на сервері
-server.closing = [accent]Закриття серверу…
+server.closing = [accent]Закриття сервера…
 server.kicked.kick = Ви були вигнані з сервера!
+server.kicked.whitelist = Ви не в білому спискі сервері.
 server.kicked.serverClose = Сервер закрито.
-server.kicked.vote = You have been vote-kicked. Goodbye.
+server.kicked.vote = Вас було вигнано із сервера за допомогою голосування. Прощавайте.
 server.kicked.clientOutdated = Застарілий клієнт! Оновіть свою гру!
-server.kicked.serverOutdated = Застарілий сервер! Попросіть адміністратора серверу оновити сервер/гру!
+server.kicked.serverOutdated = Застарілий сервер! Попросіть адміністратора сервера оновити сервер/гру!
 server.kicked.banned = Ви заблоковані на цьому сервері.
-server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.typeMismatch = Цей сервер не сумісний з вашим типом збірки.
-server.kicked.recentKick = Нещодавно Вас вигнали. \nПочекайте трохи перед наступним підключенням.
+server.kicked.playerLimit = Цей сервер — заповнений. Дочекайтесь вільного слота.
+server.kicked.recentKick = Нещодавно вас вигнали. \nПочекайте трохи перед наступним підключенням.
 server.kicked.nameInUse = На цьому сервері є хтось з таким ім’ям.
 server.kicked.nameEmpty = Ваше ім’я має містити принаймні один символ або цифру.
-server.kicked.idInUse = Ви вже на цьому сервері! Підключення двох облікових записів не допускається.
+server.kicked.idInUse = Ви вже на цьому сервері! Підключення двох облікових записів не дозволяється.
-server.kicked.customClient = Цей сервер не підтримує користувальницькі збірки. Завантажте офіційну версію.
+server.kicked.customClient = Цей сервер не підтримує користувацькі збірки. Завантажте офіційну версію.
 server.kicked.gameover = Гра завершена!
 server.versions = Ваша версія:[accent] {0}[]\nВерсія на сервері:[accent] {1}[]
 host.info = Кнопка [accent]Сервер[] розміщує сервер на порті [scarlet]6567[]. \nКористувачі, які знаходяться у тій же [lightgray]WiFi або локальній мережі[], повинні бачити ваш сервер у своєму списку серверів.\n\nЯкщо ви хочете, щоб люди могли приєднуватися з будь-якої точки через IP, то[accent] переадресація порту []обов’язкова.\n\n[lightgray]Примітка. Якщо у вас виникли проблеми з підключенням до вашої локальної гри, переконайтеся, що ви дозволили Mindustry доступ до вашої локальної мережі в налаштуваннях брандмауера. Зауважте, що публічні мережі іноді не дозволяють виявити сервер.
-join.info = Тут Ви можете ввести [accent]IP серверу[] для підключення або знайти сервери у [accent]локальній мережі[] для підключення до них.\nПідтримується локальна мережа(LAN) і широкосмугова мережа(WAN).\n\n[lightgray] Примітка. Тут немає автоматичного глобального списку серверів; якщо ви хочете підключитися до когось через IP, вам доведеться попросити створювача серверу дати свій ip.
+join.info = Тут ви можете ввести [accent]IP сервера[] для підключення або знайти сервери у [accent]локальній мережі[] для підключення до них.\nПідтримується локальна мережа(LAN) і широкосмугова мережа(WAN).\n\n[lightgray] Примітка. Тут немає автоматичного глобального списку серверів; якщо ви хочете підключитися до когось через IP, вам доведеться попросити створювача сервера дати свій ip.
-hostserver = Запустити багатокористувальницький сервер
+hostserver = Запустити багатокористувацький сервер
+invitefriends = Запросити друзів
 hostserver.mobile = Запустити\nсервер
 host = Сервер
-hosting = [accent]Відкриття серверу…
+hosting = [accent]Відкриття сервера…
 hosts.refresh = Оновити
 hosts.discovering = Пошук локальних ігор
-server.refreshing = Оновлення серверу
+hosts.discovering.any = Discovering games
+server.refreshing = Оновлення сервера
 hosts.none = [lightgray]Локальних ігр не знайдено
-host.invalid = [scarlet]Не вдалося підключитися до хосту.
+host.invalid = [scarlet]Не вдалося підключитися до сервера.
 trace = Стежити за гравцем
 trace.playername = Ім’я гравця: [accent]{0}
 trace.ip = IP: [accent]{0}
@@ -109,19 +122,24 @@ server.version = [lightgray]Версія: {0}
 server.custombuild = [yellow]Користувацька збірка
 confirmban = Ви дійсно хочете заблокувати цього гравця?
 confirmkick = Ви дійсно хочете викинути цього гравця?
+confirmvotekick = Are you sure you want to vote-kick this player?
 confirmunban = Ви дійсно хочете розблокувати цього гравця?
 confirmadmin = Ви дійсно хочете зробити цього гравця адміністратором?
 confirmunadmin = Ви дійсно хочете видалити статус адміністратора з цього гравця?
 joingame.title = Приєднатися до гри
 joingame.ip = IP:
 disconnect = Відключено.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
 disconnect.data = Не вдалося завантажити дані світу!
+cantconnect = Не вдалося під’єднатися до гри ([accent]{0}[]).
 connecting = [accent]Підключення…
 connecting.data = [accent]Завантаження даних світу…
 server.port = Порт:
 server.addressinuse = Ця адреса вже використовується!
 server.invalidport = Недійсний номер порту!
-server.error = [crimson]Помилка створення серверу: [accent]{0}
+server.error = [crimson]Помилка створення сервера: [accent]{0}
 save.old = Це збереження для старої версії гри, і його більше не можна використовувати.\n\n [lightgray]Зворотна сумісність буде реалізована у фінальній версії 4.0.
 save.new = Нове збереження
 save.overwrite = Ви впевнені, що хочете перезаписати цей слот для збереження?
@@ -129,31 +147,33 @@ overwrite = Перезаписати
 save.none = Збережень не знайдено!
 saveload = [accent]Збереження…
 savefail = Не вдалося зберегти гру!
-save.delete.confirm = Ви впевнені, що хочете видалити це збереження?
+save.delete.confirm = Ви дійсно хочете видалити це збереження?
 save.delete = Видалити
 save.export = Експортувати збереження
 save.import.invalid = [accent]Це збереження недійсне!
 save.import.fail = [crimson]Не вдалося імпортувати збереження: [accent]{0}
-save.export.fail = [crimson]Не вдалося экспортувати збереження: [accent]{0}
+save.export.fail = [crimson]Не вдалося експортувати збереження: [accent]{0}
 save.import = Імпортувати збереження
 save.newslot = Ім’я збереження:
 save.rename = Перейменувати
 save.rename.text = Нова назва:
 selectslot = Виберіть збереження.
 slot = [accent]Слот {0}
-save.corrupted = [accent]Збережений файл пошкоджено або э недійсним! \nЯкщо ви щойно оновили свою гру, це, мабуть, є зміною формату збереження та [scarlet] не є[] помилкою.
+editmessage = Edit Message
+save.corrupted = [accent]Збережений файл пошкоджено або недійсний! \nЯкщо ви щойно оновили свою гру, це, мабуть, є зміною формату збереження та [scarlet] не є[] помилкою.
 empty = <Порожньо>
 on = Увімкнено
 off = Вимкнено
 save.autosave = Автозбереження: {0}
 save.map = Мапа: {0}
 save.wave = Хвиля {0}
-save.difficulty = Складність: {0}
+save.mode = Gamemode: {0}
 save.date = Останнє збереження
 save.playtime = Час гри: {0}
 warning = Попередження
 confirm = Підтвердження
 delete = Видалити
+view.workshop = Переглянути в Майстерні
 ok = ОК
 open = Відкрити
 customize = Налаштувати правила
@@ -161,13 +181,13 @@ cancel = Скасувати
 openlink = Відкрити посилання
 copylink = Скопіювати посилання
 back = Назад
-data.export = Export Data
+data.export = Експортувати дані
-data.import = Import Data
+data.import = Импортувати дані
-data.exported = Data exported.
+data.exported = Дані імпортовано.
-data.invalid = This isn't valid game data.
+data.invalid = Це не дійсні ігрові дані.
-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.
+data.import.confirm = Імпорт зовнішніх даних видалить[scarlet] ВСІ[] ваші поточні ігрові дані.\n[accent]Це неможливо скасувати![]\n\nЩойно дані імпортуються, гра негайно закриється.
 classic.export = Експортувати класичні дані
-classic.export.text = Класичне (версія 3.5 збірка 40) збереження або мапа були знайдені. Ви хочете експортувати ці дані в домашню теку телефону, для використання у додатку Mindustry Classic?
+classic.export.text = Класичне (версія 3.5 збірка 40) збереження або мапа були знайдені. Ви хочете експортувати ці дані в домашню теку телефону, для використання у застосунку Mindustry Classic?
 quit.confirm = Ви впевнені, що хочете вийти?
 quit.confirm.tutorial = Ви впевнені, що хочете вийти з навчання?
 loading = [accent]Завантаження…
@@ -184,12 +204,17 @@ saveimage = Зберегти зображення
 unknown = Невідомо
 custom = Користувацька
 builtin = Вбудована
-map.delete.confirm = Ви впевнені, що хочете видалити цю мапу? Цю дію неможливо скасувати!
+map.delete.confirm = Ви дійсно хочете видалити цю мапу? Це неможливо буде скасувати!
 map.random = [accent]Випадкова мапа
-map.nospawn = Ця мапа не має жодного ядра для появи гравця! Додайте [ROYAL]помаранчеве[] ядро до цієї мапи у редакторі.
+map.nospawn = Ця мапа не має жодного ядра для появи гравця! Додайте [ROYAL]помаранчеве[] ядро до цієї мапи в редакторі.
 map.nospawn.pvp = У цієї мапи немає ворожих ядер, в яких гравець може з’явитися! Додайте [SCARLET]не помаранчеве[] ядро до цієї мапи в редакторі.
-map.nospawn.attack = У цієї мапи немає ворожих ядер, у яких гравець може з’явитися! Додайте [SCARLET]червоне[] ядро до цієї мапи в редакторі.
+map.nospawn.attack = У цієї мапи немає ворожих ядер, в яких гравець може з’явитися! Додайте [SCARLET]червоне[] ядро до цієї мапи в редакторі.
 map.invalid = Помилка завантаження мапи: пошкоджений або невірний файл мапи.
+map.publish.error = Помилка при опублікуванні мапи: {0}
+map.publish.confirm = Ви дійсно хочете опублікувати цю мапу?\n\n[lightgray]Переконайтеся, що спершу ви згодні з Ліцензійною угодою Steam, або ваші мапи не з’являться!
+eula = Ліцензійна угода
+map.publish = Map published.
+map.publishing = [accent]Publishing map...
 editor.brush = Пензлик
 editor.openin = Відкрити в редакторі
 editor.oregen = Генерація руд
@@ -197,11 +222,14 @@ editor.oregen.info = Генерація руд:
 editor.mapinfo = Інформація про мапу
 editor.author = Автор:
 editor.description = Опис:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
 editor.waves = Хвилі:
 editor.rules = Правила:
 editor.generation = Генерація:
 editor.ingame = Редагувати у грі
+editor.publish.workshop = Опублікувати в Майстерні Steam
 editor.newmap = Нова мапа
+workshop = Майстерня
 waves.title = Хвилі
 waves.remove = Видалити
 waves.never = <ніколи>
@@ -218,6 +246,7 @@ waves.invalid = Недійсні хвилі у буфері обміну.
 waves.copied = Хвилі скопійовані.
 waves.none = Вороги не були встановлені.\nЗазначимо, що пусті хвилі будуть автоматично замінені звичайною хвилею.
 editor.default = [lightgray]<За замовчуванням>
+details = Details...
 edit = Редагувати…
 editor.name = Назва:
 editor.spawn = Створити бойову одиницю
@@ -227,6 +256,7 @@ editor.errorload = Помилка завантаження зображення:
 editor.errorsave = Помилка збереження зображення:\n[accent]{0}
 editor.errorimage = Це зображення, а не мапа. Не змінюйте розширення, очікуючи, що це запрацює.\n\nЯкщо Ви хочете імпортувати застарілку мапу, то використовуйте кнопку «Імпортувати застаріле зображення» у редакторі.
 editor.errorlegacy = Ця мапа занадто стара і використовує попередній формат мапи, який більше не підтримується.
+editor.errornot = This is not a map file.
 editor.errorheader = Цей файл мапи недійсний або пошкоджений.
 editor.errorname = Мапа не має імені. Може Ви намагаєтеся завантажити збереження?
 editor.update = Оновити
@@ -259,6 +289,7 @@ editor.resizemap = Змінити розмір мапи
 editor.mapname = Назва мапи:
 editor.overwrite = [accent]Попередження!\nЦе перезаписує існуючу мапу.
 editor.overwrite.confirm = [scarlet]Попередження![] Мапа з такою назвою вже існує. Ви впевнені, що хочете переписати її?
+editor.exists = A map with this name already exists.
 editor.selectmap = Виберіть мапу для завантаження:
 toolmode.replace = Замінити
 toolmode.replace.description = Малює тільки\nна суцільних блоках.
@@ -338,6 +369,7 @@ launch.skip.confirm = Якщо Ви пропустите зараз, Ви не
 uncover = Розкрити
 configure = Вивантажити конфігурацію
 configure.locked = [lightgray]Можливість розблокувати вивантаження ресурсів буде доступна на {0}-тій хвилі.
+configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = Зона «[lightgray]{0}» тепер розблокована.
 zone.requirement.complete = Ви досягли {0}-тої хвилі,\nВимоги до зони «{1}» виконані.
 zone.config.complete = Ви досягли {0}-тої хвилі.\nМожливість вивантаження ресурсів тепер розблокована.
@@ -351,7 +383,7 @@ connectfail = [crimson]Помилка підключення: [accent]{0}
 error.unreachable = Сервер не доступний.
 error.invalidaddress = Некоректна адреса.
 error.timedout = Час очікування вийшов.\nПереконайтеся, що адреса коректна і що власник сервера налаштував переадресацію порту!
-error.mismatch = Помилка пакету:\nможливе невідповідність версії клієнта/сервера.\nПереконайтеся, що у Вас та у володара сервера встановлена остання версія Mindustry!
+error.mismatch = Помилка пакету:\nможливе невідповідність версії клієнта/сервера.\nПереконайтеся, що у вас та у володара сервера встановлена остання версія Mindustry!
 error.alreadyconnected = Ви вже підключилися.
 error.mapnotfound = Файл мапи не знайдено
 error.io = Мережева помилка введення-виведення
@@ -386,7 +418,7 @@ zone.fungalPass.description = Перехідна зона між високим
 zone.impact0078.description = <вставити опис тут>
 zone.crags.description = <вставити опис тут>
 settings.language = Мова
-settings.data = Game Data
+settings.data = Ігрові дані
 settings.reset = Скинути за замовчуванням
 settings.rebind = Зміна
 settings.controls = Керування
@@ -434,6 +466,7 @@ blocks.boosteffect = Прискорювальний ефект
 blocks.maxunits = Максимальна кількість активних одиниць
 blocks.health = Здоров’я
 blocks.buildtime = Час будівництва
+blocks.buildcost = Build Cost
 blocks.inaccuracy = Розкид
 blocks.shots = Постріли
 blocks.reload = Постріли/секунду
@@ -442,9 +475,11 @@ bar.drilltierreq = Потребується кращий бур
 bar.drillspeed = Швидкість буріння: {0}/с
 bar.efficiency = Ефективність: {0}%
 bar.powerbalance = Енергія: {0}/с
+bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Енергія: {0}
 bar.poweroutput = Вихідна енергія: {0}
 bar.items = Предмети: {0}
+bar.capacity = Місткість: {0}
 bar.liquid = Рідина
 bar.heat = Нагрівання
 bar.power = Енергія
@@ -489,6 +524,7 @@ setting.antialias.name = Згладжування[lightgray] (потребує
 setting.indicators.name = Показувати у сторону ворогів та союзників
 setting.autotarget.name = Авто-стрільба
 setting.keyboard.name = Миш+Керування з клавіатури
+setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Максимальний FPS
 setting.fpscap.none = Необмежений
 setting.fpscap.text = {0} FPS
@@ -518,9 +554,10 @@ setting.mutemusic.name = Заглушити музику
 setting.sfxvol.name = Гучність звукових ефектів
 setting.mutesound.name = Заглушити звук
 setting.crashreport.name = Відсилати анонімні звіти про аварійне завершення гри
-setting.savecreate.name = Auto-Create Saves
+setting.savecreate.name = Автоматичне створення збережень
+setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Непрозорість чату
-setting.playerchat.name = Відображати чат у грі
+setting.playerchat.name = Відображати хмару чата над гравцями
 uiscale.reset = Масштаб користувальницького інтерфейсу було змінено.\nНатисніть «ОК» для підтверждення цього масшатабу.\n[scarlet]Повернення налаштувань і вихід через[accent] {0}[] …
 uiscale.cancel = Скасувати & Вийти
 setting.bloom.name = Світіння
@@ -530,8 +567,8 @@ category.general.name = Основне
 category.view.name = Перегляд
 category.multiplayer.name = Мережева гра
 command.attack = Атакувати
+command.rally = Rally
 command.retreat = Відступити
-command.patrol = Патрулювати
 keybind.gridMode.name = Вибрати блок
 keybind.gridModeShift.name = Вибрати категорію
 keybind.press = Натисніть клавішу…
@@ -547,11 +584,11 @@ keybind.break_block.name = Зламати блок
 keybind.deselect.name = Скасувати
 keybind.shoot.name = Постріл
 keybind.zoom_hold.name = Керування масштабом
-keybind.zoom.name = Приблизить
+keybind.zoom.name = Приблизити
 keybind.menu.name = Меню
 keybind.pause.name = Пауза
-keybind.minimap.name = Міні-мапа
+keybind.minimap.name = Мінімапа
-keybind.dash.name = Мчатися
+keybind.dash.name = Прискоритися/Літати
 keybind.chat.name = Чат
 keybind.player_list.name = Список гравців
 keybind.console.name = Консоль
@@ -560,7 +597,7 @@ keybind.toggle_menus.name = Меню перемикання
 keybind.chat_history_prev.name = Попередня історія чату
 keybind.chat_history_next.name = Наступна історія чату
 keybind.chat_scroll.name = Прокрутка чату
-keybind.drop_unit.name = Скинути бой. од.
+keybind.drop_unit.name = Скинути бойову одиницю
 keybind.zoom_minimap.name = Збільшити міні-мапу
 mode.help.title = Опис режимів
 mode.survival.name = Хвилі
@@ -571,15 +608,15 @@ mode.pvp.name = PVP
 mode.pvp.description = боріться проти інших гравців.\n[gray]Для гри потрібно принаймні 2 ядра різного кольору на мапі.
 mode.attack.name = Атака
 mode.attack.description = Зруйнуйте ворожу базу.\n[gray]Потрібно червоне ядро на мапі для гри.
-mode.custom = Користувальницькі правила
+mode.custom = Користувацькі правила
 rules.infiniteresources = Нескінченні ресурси
 rules.wavetimer = Таймер хвиль
 rules.waves = Хвилі
 rules.attack = Режим атаки
 rules.enemyCheat = Нескінченні ресурси для ШІ
 rules.unitdrops = Ресурс бойових одиниць
-rules.unitbuildspeedmultiplier = Множник швидкості виробництва бойов. Од.
+rules.unitbuildspeedmultiplier = Множник швидкості виробництва бойових одиниць
-rules.unithealthmultiplier = Множник здоров’я бойов. од.
+rules.unithealthmultiplier = Множник здоров’я бойових одиниць
 rules.playerhealthmultiplier = Множник здоров’я гравця
 rules.playerdamagemultiplier = Множник шкоди гравця
 rules.unitdamagemultiplier = Множник шкоди бойових одиниць
@@ -709,10 +746,10 @@ block.ice-snow.name = Крижаний сніг
 block.rocks.name = Камені
 block.icerocks.name = Крижані камені
 block.snowrocks.name = Снігові камені
-block.dunerocks.name = Піщані Камені
+block.dunerocks.name = Піщані камені
 block.pine.name = Сосна
 block.white-tree-dead.name = Мертве біле дерево
-block.white-tree.name = Біле Дерево
+block.white-tree.name = Біле дерево
 block.spore-cluster.name = Скупчення спор
 block.metal-floor.name = Металевий пол 1
 block.metal-floor-2.name = Металевий пол 2
@@ -747,10 +784,13 @@ block.hail.name = Град
 block.lancer.name = Списоносець
 block.conveyor.name = Конвеєр
 block.titanium-conveyor.name = Титановий конвеєр
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.junction.name = Перехрестя
 block.router.name = Маршрутизатор
 block.distributor.name = Розподілювач
 block.sorter.name = Сортувальник
+block.message.name = Message
 block.overflow-gate.name = Надмірний затвор
 block.silicon-smelter.name = Кремнієвий плавильний завод
 block.phase-weaver.name = Фазовий ткач
@@ -925,6 +965,7 @@ unit.eruptor.description = Важкий мех, призначеней для з
 unit.wraith.description = Швидкий перехоплювач, який використовується для тактики «атакуй і біжи». Пріоритет — енергетичні генератори.
 unit.ghoul.description = Важкий килимовий бомбардувальник. Пробиває ворожі структури, орієнтуючись на віжливу інфраструктуру.
 unit.revenant.description = Важкий ракетний масив.
+block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Стискає шматки вугілля в чисті аркуші графіту.
 block.multi-press.description = Модернізована версія графітового преса. Використовує воду та енергію для швидкої та ефективної переробки вугілля.
 block.silicon-smelter.description = Змішує пісок з чистим вугіллям. Виробляє кремній.

core/assets/bundles/bundle_zh_CN.properties

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

core/assets/bundles/bundle_zh_TW.properties

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

core/assets/contributors

@@ -1,4 +1,6 @@
 Prosta4okua
+Felix Corvus
+Vanguard
 Timmeey86
 Epowerj
 Baltazár Radics
@@ -75,3 +77,5 @@ Markus G
 itskatt
 Agent-Laevain
 AzariasB
+amrsoll
+Draco

core/assets/sprites/uiskin.json

@@ -1,367 +0,0 @@
-{
-  Color: {
-    black: { a: 1, b: 0, g: 0, r: 0 },
-    white: { a: 1, b: 1, g: 1, r: 1 },
-    gray: { a: 1, b: 0.32, g: 0.32, r: 0.32 },
-    lightgray: { a: 1, b: 0.65, g: 0.65, r: 0.65 }
-    orange: { hex: "FFA500" },
-    accent: { hex: "ffd37f" }
-  },
-  TintedDrawable: {
-    dialogDim: {
-      name: whiteui,
-      color: { r: 0, g: 0, b: 0, a: 0.9 }
-    },
-    guideDim: {
-      name: whiteui,
-      color: { r: 0, g: 0, b: 0, a: 0.3 }
-    },
-    invis: {
-      name: whiteui,
-      color: { r: 0, g: 0, b: 0, a: 0 }
-    }
-    loadDim: {
-      name: white,
-      color: { r: 0, g: 0, b: 0, a: 0.8 }
-    },
-    chatfield: {
-      name: whiteui,
-      color: { r: 0, g: 0, b: 0, a: 0.2 }
-    },
-    dark: {
-      name: whiteui,
-      color: { hex: "#000000ff" }
-    },
-    none: {
-      name: whiteui,
-      color: { r: 0, g: 0, b: 0, a: 0 }
-    },
-    flat-trans: {
-      name: whiteui,
-      color: { r: 0.0, g: 0.0, b: 0.0, a: 0.6 }
-    },
-    flat: {
-      name: whiteui,
-      color: { r: 0.0, g: 0.0, b: 0.0, a: 1 }
-    },
-    flat-over: {
-      name: whiteui,
-      color: { hex: "#454545ff" }
-    }
-  },
-  ButtonStyle: {
-    default: {
-      down: button-down,
-      up: button,
-      over: button-over,
-      disabled: button-disabled
-    },
-    square: {
-      over: button-square-over,
-      disabled: button-disabled,
-      down: button-square-down,
-      up: button-square
-    },
-    toggle: {
-      checked: button-down,
-      down: button-down,
-      up: button
-    },
-    wave: {
-      up: button-edge-4,
-      over: button-edge-over-4,
-      disabled: button-edge-4
-    },
-  },
-  TextButtonStyle: {
-    default: {
-      over: button-over,
-      disabled: button-disabled,
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray,
-      down: button-down,
-      up: button
-    },
-    square: {
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray,
-      over: button-square-over,
-      disabled: button-disabled,
-      down: button-square-down,
-      up: button-square
-    },
-    node: {
-      disabled: button,
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray,
-      up: button-over,
-      over: button-down
-    },
-    right: {
-      over: button-right-over,
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray,
-      down: button-right-down,
-      up: button-right
-    },
-    wave: {
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray,
-      up: button-edge-4
-    },
-    clear: {
-      over: flat-over,
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray,
-      down: flat-over,
-      up: flat
-    },
-    discord: {
-      font: default,
-      fontColor: white,
-      up: discord-banner
-    },
-    info: {
-      font: default,
-      fontColor: white,
-      up: info-banner
-    },
-    clear-partial: {
-      down: whiteui,
-      up: pane,
-      over: flat-down,
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray
-    },
-    clear-partial-2: {
-      down: flat-over,
-      up: none,
-      over: flat-over,
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray
-    },
-    empty: {
-      font: default
-    },
-    clear-toggle: {
-      font: default,
-      fontColor: white,
-      checked: flat-down,
-      down: flat-down,
-      up: flat,
-      over: flat-over,
-      disabled: flat,
-      disabledFontColor: gray
-    },
-    clear-toggle-menu: {
-      font: default,
-      fontColor: white,
-      checked: flat-down,
-      down: flat-down,
-      up: clear,
-      over: flat-over,
-      disabled: flat,
-      disabledFontColor: gray
-    }
-    toggle: {
-      font: default,
-      fontColor: white,
-      checked: button-down,
-      down: button-down,
-      up: button,
-      over: button-over,
-      disabled: button-disabled,
-      disabledFontColor: gray
-    }
-  },
-  ImageButtonStyle: {
-    default: {
-      down: button-down,
-      up: button,
-      over: button-over,
-      imageDisabledColor: gray,
-      imageUpColor: white,
-      disabled: button-disabled
-    },
-    node: {
-      up: button-over,
-      over: button-down
-    },
-    right: {
-      over: button-right-over,
-      down: button-right-down,
-      up: button-right
-    },
-    empty: {
-      imageDownColor: accent,
-      imageUpColor: white
-    },
-    emptytoggle: {
-      imageCheckedColor: white,
-      imageDownColor: white,
-      imageUpColor: gray
-    },
-    static: {
-      up: button
-    },
-    static-down: {
-      up: button-down
-    },
-    toggle: {
-      checked: button-down,
-      down: button-down,
-      up: button,
-      imageDisabledColor: gray,
-      imageUpColor: white
-    },
-    select: {
-      checked: button-select,
-      up: none
-    },
-    clear: {
-      down: flat-over,
-      up: flat,
-      over: flat-over
-    },
-    clear-full: {
-      down: whiteui,
-      up: pane,
-      over: flat-down
-    },
-    clear-partial: {
-      down: flat-down,
-      up: none,
-      over: flat-over
-    },
-    clear-toggle: {
-      down: flat-down,
-      checked: flat-down,
-      up: flat,
-      over: flat-over
-    },
-    clear-trans: {
-      down: flat-down,
-      up: flat-trans,
-      over: flat-over
-    },
-    clear-toggle-trans: {
-      down: flat-down,
-      checked: flat-down,
-      up: flat-trans,
-      over: flat-over
-    },
-    clear-toggle-partial: {
-      down: flat-down,
-      checked: flat-down,
-      up: none,
-      over: flat-over
-    },
-  },
-  ScrollPaneStyle: {
-    default: {
-      vScroll: scroll,
-      vScrollKnob: scroll-knob-vertical-black
-    },
-    horizontal: {
-      vScroll: scroll,
-      vScrollKnob: scroll-knob-vertical-black,
-      hScroll: scroll-horizontal,
-      hScrollKnob: scroll-knob-horizontal-black
-    },
-  },
-  WindowStyle: {
-    default: {
-      titleFont: default,
-      titleFontColor: accent
-    },
-    dialog: {
-      stageBackground: dialogDim,
-      titleFont: default,
-      background: window-empty,
-      titleFontColor: accent
-    },
-    fulldialog: {
-      stageBackground: dark,
-      titleFont: default,
-      background: window-empty,
-      titleFontColor: accent
-    }
-  },
-  KeybindDialogStyle: {
-    default: {
-      keyColor: accent,
-      keyNameColor: white,
-      controllerColor: lightgray
-    },
-  },
-  SliderStyle: {
-    default-horizontal: {
-      background: slider,
-      knob: slider-knob,
-      knobOver: slider-knob-over,
-      knobDown: slider-knob-down
-    },
-    default-vertical: {
-      background: slider-vertical,
-      knob: slider-knob,
-      knobOver: slider-knob-over,
-      knobDown: slider-knob-down
-    }
-  },
-  LabelStyle: {
-    default: {
-      font: default,
-      fontColor: white
-    },
-    outline: {
-      font: outline,
-      fontColor: white
-    }
-  },
-  TextFieldStyle: {
-    default: {
-      font: chat,
-      fontColor: white,
-      disabledFontColor: gray,
-      disabledBackground: underline-disabled,
-      selection: selection,
-      background: underline,
-      invalidBackground: underline-red,
-      cursor: cursor,
-      messageFont: default,
-      messageFontColor: gray
-    }
-    textarea: {
-      font: chat,
-      fontColor: white,
-      disabledFontColor: gray,
-      selection: selection,
-      background: underline,
-      cursor: cursor,
-      messageFont: default,
-      messageFontColor: gray
-    }
-  },
-  CheckBoxStyle: {
-    default: {
-      checkboxOn: check-on,
-      checkboxOff: check-off,
-      checkboxOnOver: check-on-over,
-      checkboxOver: check-over,
-      checkboxOnDisabled: check-on-disabled,
-      checkboxOffDisabled: check-disabled,
-      font: default,
-      fontColor: white,
-      disabledFontColor: gray,
-
-    }
-  }
-}

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

@@ -13,6 +13,7 @@ import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.maps.*;
+import io.anuke.mindustry.net.Net;
 
 import static io.anuke.arc.Core.*;
 import static io.anuke.mindustry.Vars.*;
@@ -39,7 +40,9 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
         batch = new SpriteBatch();
         assets = new AssetManager();
         assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader());
+        assets.load("sprites/error.png", Texture.class);
         atlas = TextureAtlas.blankAtlas();
+        Vars.net = new Net(platform.getNet());
 
         UI.loadSystemCursors();
 
@@ -47,7 +50,9 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
         UI.loadDefaultFont();
 
-        assets.load(new AssetDescriptor<>("sprites/sprites.atlas", TextureAtlas.class)).loaded = t -> atlas = (TextureAtlas)t;
+        assets.load(new AssetDescriptor<>("sprites/sprites.atlas", TextureAtlas.class)).loaded = t -> {
+            atlas = (TextureAtlas)t;
+        };
 
         assets.loadRun("maps", Map.class, () -> maps.loadPreviews());
 
@@ -84,10 +89,12 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
     @Override
     public void resize(int width, int height){
-        super.resize(width, height);
+        if(assets == null) return;
 
         if(!assets.isFinished()){
             Draw.proj().setOrtho(0, 0, width, height);
+        }else{
+            super.resize(width, height);
         }
     }
 
@@ -100,6 +107,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
                 for(ApplicationListener listener : modules){
                     listener.init();
                 }
+                super.resize(graphics.getWidth(), graphics.getHeight());
                 finished = true;
                 Events.fire(new ClientLoadEvent());
             }
@@ -149,15 +157,15 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
         Core.graphics.clear(Pal.darkerGray);
         Draw.proj().setOrtho(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());
 
-        float height = UnitScl.dp.scl(50f);
+        float height = Scl.scl(50f);
 
-        Draw.color(Color.BLACK);
+        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);
+        Draw.color(Color.black);
         Fill.rect(graphics.getWidth()/2f, graphics.getHeight()/2f, w, height);
 
         Draw.color(Pal.accent);
@@ -169,13 +177,13 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
         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((int)(assets.getProgress() * 100) + "%", graphics.getWidth() / 2f, graphics.getHeight() / 2f + Scl.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);
+            font.draw(bundle.get("loading", "").replace("[accent]", ""), graphics.getWidth() / 2f, graphics.getHeight() / 2f + height / 2f + Scl.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);
+                font.draw(bundle.get("load." + key, ""), graphics.getWidth() / 2f, graphics.getHeight() / 2f - height / 2f - Scl.scl(10f), Align.center);
             }
         }
         Draw.flush();

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

@@ -3,6 +3,7 @@ package io.anuke.mindustry;
 import io.anuke.arc.Application.*;
 import io.anuke.arc.*;
 import io.anuke.arc.assets.*;
+import io.anuke.arc.collection.*;
 import io.anuke.arc.files.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.scene.ui.layout.*;
@@ -10,9 +11,7 @@ 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.*;
 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.*;
@@ -20,6 +19,7 @@ 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.plugin.*;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
 
 import java.nio.charset.*;
@@ -43,6 +43,8 @@ public class Vars implements Loadable{
     public static final String discordURL = "https://discord.gg/mindustry";
     /** URL for sending crash reports to */
     public static final String crashReportURL = "http://mins.us.to/report";
+    /** list of built-in servers.*/
+    public static final Array<String> defaultServers = Array.with(/*"mins.us.to"*/);
     /** maximum distance between mine and core that supports automatic transferring */
     public static final float mineTransferRange = 220f;
     /** team of the player by default */
@@ -59,14 +61,6 @@ public class Vars implements Loadable{
     public static final float itemSize = 5f;
     /** extra padding around the world; units outside this bound will begin to self-destruct. */
     public static final float worldBounds = 100f;
-    /** default size of UI icons.*/
-    public static final int iconsize = 48;
-    /** size of UI icons (small)*/
-    public static final int iconsizesmall = 32;
-    /** size of UI icons (medium)*/
-    public static final int iconsizemed = 30;
-    /** size of UI icons (medium)*/
-    public static final int iconsizetiny = 16;
     /** units outside of this bound will simply die instantly */
     public static final float finalWorldBounds = worldBounds + 500;
     /** ticks spent out of bound until self destruct. */
@@ -112,6 +106,8 @@ public class Vars implements Loadable{
     public static boolean android;
     /** whether the game is running on a headless server */
     public static boolean headless;
+    /** whether steam is enabled for this game */
+    public static boolean steam;
     /** application data directory, equivalent to {@link io.anuke.arc.Settings#getDataDirectory()} */
     public static FileHandle dataDirectory;
     /** data subdirectory used for screenshots */
@@ -126,8 +122,6 @@ public class Vars implements Loadable{
     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 */
     public static final String mapExtension = "msav";
     /** save file extension */
@@ -136,13 +130,15 @@ public class Vars implements Loadable{
     /** list of all locales that can be switched to */
     public static Locale[] locales;
 
+    public static Net net;
     public static ContentLoader content;
     public static GameState state;
     public static GlobalData data;
     public static EntityCollisions collisions;
     public static DefaultWaves defaultWaves;
     public static LoopControl loops;
-    public static Platform platform;
+    public static Platform platform = new Platform(){};
+    public static Plugins plugins;
 
     public static World world;
     public static Maps maps;
@@ -168,7 +164,6 @@ public class Vars implements Loadable{
     public static EntityGroup<Fire> fireGroup;
     public static EntityGroup<BaseUnit>[] unitGroups;
 
-    /** all local players, currently only has one player. may be used for local co-op in the future */
     public static Player player;
 
     @Override
@@ -226,7 +221,7 @@ public class Vars implements Loadable{
 
         for(EntityGroup<?> group : entities.all()){
             group.setRemoveListener(entity -> {
-                if(entity instanceof SyncTrait && Net.client()){
+                if(entity instanceof SyncTrait && net.client()){
                     netClient.addRemovedEntity((entity).getID());
                 }
             });
@@ -252,11 +247,16 @@ public class Vars implements Loadable{
 
     public static void loadSettings(){
         Core.settings.setAppName(appName);
+
+        if(steam){
+            Core.settings.setDataDirectory(Core.files.local("saves/"));
+        }
+
         Core.settings.defaults("locale", "default");
         Core.keybinds.setDefaults(Binding.values());
         Core.settings.load();
 
-        UnitScl.dp.setProduct(settings.getInt("uiscale", 100) / 100f);
+        Scl.setProduct(settings.getInt("uiscale", 100) / 100f);
 
         if(!loadLocales) return;
 
@@ -268,6 +268,7 @@ public class Vars implements Loadable{
             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."));
             }

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

@@ -143,11 +143,14 @@ public class BlockIndexer{
         returnArray.clear();
         for(Team enemy : state.teams.enemiesOf(team)){
             if(state.teams.isActive(enemy)){
-                for(Tile tile : getFlagged(enemy)[type.ordinal()]){
+                ObjectSet<Tile> set = getFlagged(enemy)[type.ordinal()];
+                if(set != null){
+                    for(Tile tile : set){
                         returnArray.add(tile);
                     }
                 }
             }
+        }
         return returnArray;
     }
 
@@ -242,14 +245,13 @@ public class BlockIndexer{
         int quadrantY = tile.y / quadrantSize;
         itemSet.clear();
 
-        Tile rounded = world.tile(Mathf.clamp(quadrantX * quadrantSize + quadrantSize / 2, 0, world.width() - 1),
+        Tile rounded = world.tile(Mathf.clamp(quadrantX * quadrantSize + quadrantSize / 2, 0, world.width() - 1), Mathf.clamp(quadrantY * quadrantSize + quadrantSize / 2, 0, world.height() - 1));
-        Mathf.clamp(quadrantY * quadrantSize + quadrantSize / 2, 0, world.height() - 1));
 
         //find all items that this quadrant contains
-        for(int x = quadrantX * quadrantSize; x < world.width() && x < (quadrantX + 1) * quadrantSize; x++){
+        for(int x = Math.max(0, rounded.x - quadrantSize / 2); x < rounded.x + quadrantSize / 2 && x < world.width(); x++){
-            for(int y = quadrantY * quadrantSize; y < world.height() && y < (quadrantY + 1) * quadrantSize; y++){
+            for(int y = Math.max(0, rounded.y - quadrantSize / 2); y < rounded.y + quadrantSize / 2 && y < world.height(); y++){
                 Tile result = world.tile(x, y);
-                if(result == null || result.drop() == null || !scanOres.contains(result.drop())) continue;
+                if(result == null || result.drop() == null || !scanOres.contains(result.drop()) || result.block() != Blocks.air) continue;
 
                 itemSet.add(result.drop());
             }

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

@@ -1,165 +1,270 @@
 package io.anuke.mindustry.ai;
 
-import io.anuke.arc.Events;
+import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.collection.IntArray;
+import io.anuke.arc.*;
-import io.anuke.arc.collection.IntQueue;
+import io.anuke.arc.collection.*;
-import io.anuke.arc.math.geom.Geometry;
+import io.anuke.arc.function.*;
-import io.anuke.arc.math.geom.Point2;
+import io.anuke.arc.math.geom.*;
-import io.anuke.arc.util.Structs;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Time;
+import io.anuke.arc.util.async.*;
-import io.anuke.mindustry.game.EventType.TileChangeEvent;
+import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.EventType.WorldLoadEvent;
+import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.game.Teams.TeamData;
+import io.anuke.mindustry.world.*;
-import io.anuke.mindustry.net.Net;
+import io.anuke.mindustry.world.meta.*;
-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.*;
 
-public class Pathfinder{
+public class Pathfinder implements Runnable{
     private static final long maxUpdate = Time.millisToNanos(4);
-    private PathData[] paths;
+    private static final int updateFPS = 60;
-    private IntArray blocked = new IntArray();
+    private static final int updateInterval = 1000 / updateFPS;
+    private static final int impassable = -1;
+
+    /** tile data, see PathTileStruct */
+    private int[][] tiles;
+    /** unordered array of path data for iteration only. DO NOT iterate ot access this in the main thread.*/
+    private Array<PathData> list = new Array<>();
+    /** Maps teams + flags to a valid path to get to that flag for that team. */
+    private PathData[][] pathMap = new PathData[Team.all.length][PathTarget.all.length];
+    /** Grid map of created path data that should not be queued again. */
+    private GridBits created = new GridBits(Team.all.length, PathTarget.all.length);
+    /** handles task scheduling on the update thread. */
+    private TaskQueue queue = new TaskQueue();
+    /** current pathfinding thread */
+    private @Nullable Thread thread;
 
     public Pathfinder(){
-        Events.on(WorldLoadEvent.class, event -> clear());
+        Events.on(WorldLoadEvent.class, event -> {
-        Events.on(TileChangeEvent.class, event -> {
+            stop();
-            if(Net.client()) return;
 
-            for(Team team : Team.all){
+            //reset and update internal tile array
-                TeamData data = state.teams.get(team);
+            tiles = new int[world.width()][world.height()];
-                if(state.teams.isActive(team) && data.team != event.tile.getTeam()){
+            pathMap = new PathData[Team.all.length][PathTarget.all.length];
-                    update(event.tile, data.team);
+            created = new GridBits(Team.all.length, PathTarget.all.length);
+            list = new Array<>();
+
+            for(int x = 0; x < world.width(); x++){
+                for(int y = 0; y < world.height(); y++){
+                    tiles[x][y] = packTile(world.rawTile(x, y));
                 }
             }
 
-            update(event.tile, event.tile.getTeam());
+            //special preset which may help speed things up; this is optional
+            preloadPath(waveTeam, PathTarget.enemyCores);
+
+            start();
+        });
+
+        Events.on(ResetEvent.class, event -> stop());
+
+        Events.on(TileChangeEvent.class, event -> updateTile(event.tile));
+    }
+
+    /** Packs a tile into its internal representation. */
+    private int packTile(Tile tile){
+        return PathTile.get(tile.cost, tile.getTeamID(), (byte)0, !tile.solid() && tile.floor().drownTime <= 0f);
+    }
+
+    /** Starts or restarts the pathfinding thread. */
+    private void start(){
+        stop();
+        thread = Threads.daemon(this);
+    }
+
+    /** Stops the pathfinding thread. */
+    private void stop(){
+        if(thread != null){
+            thread.interrupt();
+            thread = null;
+        }
+        queue.clear();
+    }
+
+    public int debugValue(Team team, int x, int y){
+        if(pathMap[team.ordinal()][PathTarget.enemyCores.ordinal()] == null) return 0;
+        return pathMap[team.ordinal()][PathTarget.enemyCores.ordinal()].weights[x][y];
+    }
+
+    /** Update a tile in the internal pathfinding grid. Causes a complete pathfinding reclaculation. */
+    public void updateTile(Tile tile){
+        if(net.client()) return;
+
+        int x = tile.x, y = tile.y;
+
+        tile.getLinkedTiles(t -> tiles[t.x][t.y] = packTile(t));
+
+        //can't iterate through array so use the map, which should not lead to problems
+        for(PathData[] arr : pathMap){
+            for(PathData path : arr){
+                if(path != null){
+                    synchronized(path.targets){
+                        path.targets.clear();
+                        path.target.getTargets(path.team, path.targets);
+                    }
+                }
+            }
+        }
+
+        queue.post(() -> {
+            for(PathData data : list){
+                updateTargets(data, x, y);
+            }
         });
     }
 
-    public void updateSolid(Tile tile){
+    /** Thread implementation. */
-        update(tile, tile.getTeam());
+    @Override
+    public void run(){
+        while(true){
+            if(net.client()) return;
+            try{
+
+                queue.run();
+
+                //total update time no longer than maxUpdate
+                for(PathData data : list){
+                    updateFrontier(data, maxUpdate / list.size);
                 }
 
-    public void update(){
+                try{
-        if(Net.client() || paths == null) return;
+                    Thread.sleep(updateInterval);
-
+                }catch(InterruptedException e){
-        for(Team team : Team.all){
+                    //stop looping when interrupted externally
-            if(state.teams.isActive(team)){
+                    return;
-                updateFrontier(team, maxUpdate);
+                }
+            }catch(Exception e){
+                e.printStackTrace();
             }
         }
     }
 
-    public Tile getTargetTile(Team team, Tile tile){
+    /** Gets next tile to travel to. Main thread only. */
-        float[][] values = paths[team.ordinal()].weights;
+    public Tile getTargetTile(Tile tile, Team team, PathTarget target){
+        if(tile == null) return null;
 
-        if(values == null || tile == null) return tile;
+        PathData data = pathMap[team.ordinal()][target.ordinal()];
 
-        float value = values[tile.x][tile.y];
+        if(data == null){
+            //if this combination is not found, create it on request
+            if(!created.get(team.ordinal(), target.ordinal())){
+                created.set(team.ordinal(), target.ordinal());
+                //grab targets since this is run on main thread
+                IntArray targets = target.getTargets(team, new IntArray());
+                queue.post(() -> createPath(team, target, targets));
+            }
+            return tile;
+        }
 
-        Tile target = null;
+        int[][] values = data.weights;
-        float tl = 0f;
+        int value = values[tile.x][tile.y];
+
+        Tile current = null;
+        int tl = 0;
         for(Point2 point : Geometry.d8){
             int dx = tile.x + point.x, dy = tile.y + point.y;
 
             Tile other = world.tile(dx, dy);
             if(other == null) continue;
 
-            if(values[dx][dy] < value && (target == null || values[dx][dy] < tl) &&
+            if(values[dx][dy] < value && (current == null || values[dx][dy] < tl) && !other.solid() && other.floor().drownTime <= 0 &&
-            !other.solid() && other.floor().drownTime <= 0 &&
             !(point.x != 0 && point.y != 0 && (world.solid(tile.x + point.x, tile.y) || world.solid(tile.x, tile.y + point.y)))){ //diagonal corner trap
-                target = other;
+                current = other;
                 tl = values[dx][dy];
             }
         }
 
-        if(target == null || tl == Float.MAX_VALUE) return tile;
+        if(current == null || tl == impassable) return tile;
 
-        return target;
+        return current;
     }
 
-    public float getValueforTeam(Team team, int x, int y){
+    /** @return whether a tile can be passed through by this team. Pathfinding thread only.*/
-        return paths == null || paths[team.ordinal()].weights == null || team.ordinal() >= paths.length ? 0 : Structs.inBounds(x, y, paths[team.ordinal()].weights) ? paths[team.ordinal()].weights[x][y] : 0;
+    private boolean passable(int x, int y, Team team){
-    }
+        int tile = tiles[x][y];
-
+        return PathTile.passable(tile) || (PathTile.team(tile) != team.ordinal() && PathTile.team(tile) != Team.derelict.ordinal());
-    private boolean passable(Tile tile, Team team){
-        return (!tile.solid()) || (tile.breakable() && (tile.getTeam() != team));
     }
 
     /**
      * Clears the frontier, increments the search and sets up all flow sources.
      * This only occurs for active teams.
      */
-    private void update(Tile tile, Team team){
+    private void updateTargets(PathData path, int x, int y){
-        //make sure team exists
+        if(!Structs.inBounds(x, y, path.weights)) return;
-        if(paths != null && paths[team.ordinal()] != null && paths[team.ordinal()].weights != null && Structs.inBounds(tile.x, tile.y, paths[team.ordinal()].weights)){
-            PathData path = paths[team.ordinal()];
 
-            if(path.weights[tile.x][tile.y] <= 0.1f){
+        if(path.weights[x][y] == 0){
             //this was a previous target
             path.frontier.clear();
         }else if(!path.frontier.isEmpty()){
+            //skip if this path is processing
             return;
         }
 
-            //impassable tiles have a weight of float.max
+        //assign impassability to the tile
-            if(!passable(tile, team)){
+        if(!passable(x, y, path.team)){
-                path.weights[tile.x][tile.y] = Float.MAX_VALUE;
+            path.weights[x][y] = impassable;
         }
 
         //increment search, clear frontier
         path.search++;
         path.frontier.clear();
-            path.lastSearchTime = Time.millis();
 
-            //add all targets to the frontier
+        synchronized(path.targets){
-            for(Tile other : indexer.getEnemy(team, BlockFlag.target)){
+            //add targets
-                path.weights[other.x][other.y] = 0;
+            for(int i = 0; i < path.targets.size; i++){
-                path.searches[other.x][other.y] = (short)path.search;
+                int pos = path.targets.get(i);
-                path.frontier.addFirst(other.pos());
+                int tx = Pos.x(pos), ty = Pos.y(pos);
+
+                path.weights[tx][ty] = 0;
+                path.searches[tx][ty] = (short)path.search;
+                path.frontier.addFirst(pos);
             }
         }
     }
 
-    private void createFor(Team team){
+    private void preloadPath(Team team, PathTarget target){
-        PathData path = new PathData();
+        updateFrontier(createPath(team, target, target.getTargets(team, new IntArray())), -1);
-        path.weights = new float[world.width()][world.height()];
+    }
-        path.searches = new short[world.width()][world.height()];
-        path.search++;
-        path.frontier.ensureCapacity((world.width() + world.height()) * 3);
 
-        paths[team.ordinal()] = path;
+    /** Created a new flowfield that aims to get to a certain target for a certain team.
+     * Pathfinding thread only. */
+    private PathData createPath(Team team, PathTarget target, IntArray targets){
+        PathData path = new PathData(team, target, world.width(), world.height());
 
+        list.add(path);
+        pathMap[team.ordinal()][target.ordinal()] = path;
+
+        //grab targets from passed array
+        synchronized(path.targets){
+            path.targets.clear();
+            path.targets.addAll(targets);
+        }
+
+        //fill with impassables by default
         for(int x = 0; x < world.width(); x++){
             for(int y = 0; y < world.height(); y++){
-                Tile tile = world.tile(x, y);
+                path.weights[x][y] = impassable;
-
-                if(state.teams.areEnemies(tile.getTeam(), team)
-                && tile.block().flags.contains(BlockFlag.target)){
-                    path.frontier.addFirst(tile.pos());
-                    path.weights[x][y] = 0;
-                    path.searches[x][y] = (short)path.search;
-                }else{
-                    path.weights[x][y] = Float.MAX_VALUE;
-                }
             }
         }
 
-        updateFrontier(team, -1);
+        //add targets
+        for(int i = 0; i < path.targets.size; i++){
+            int pos = path.targets.get(i);
+            path.weights[Pos.x(pos)][Pos.y(pos)] = 0;
+            path.frontier.addFirst(pos);
         }
 
-    private void updateFrontier(Team team, long nsToRun){
+        return path;
-        PathData path = paths[team.ordinal()];
+    }
 
+    /** Update the frontier for a path. Pathfinding thread only. */
+    private void updateFrontier(PathData path, long nsToRun){
         long start = Time.nanos();
 
         while(path.frontier.size > 0 && (nsToRun < 0 || Time.timeSinceNanos(start) <= nsToRun)){
             Tile tile = world.tile(path.frontier.removeLast());
             if(tile == null || path.weights == null) return; //something went horribly wrong, bail
-            float cost = path.weights[tile.x][tile.y];
+            int cost = path.weights[tile.x][tile.y];
 
             //pathfinding overflowed for some reason, time to bail. the next block update will handle this, hopefully
             if(path.frontier.size >= world.width() * world.height()){
@@ -167,14 +272,13 @@ public class Pathfinder{
                 return;
             }
 
-            if(cost < Float.MAX_VALUE){
+            if(cost != impassable){
                 for(Point2 point : Geometry.d4){
 
                     int dx = tile.x + point.x, dy = tile.y + point.y;
                     Tile other = world.tile(dx, dy);
 
-                    if(other != null && (path.weights[dx][dy] > cost + other.cost || path.searches[dx][dy] < path.search)
+                    if(other != null && (path.weights[dx][dy] > cost + other.cost || path.searches[dx][dy] < path.search) && passable(dx, dy, path.team)){
-                    && passable(other, team)){
                         if(other.cost < 0) throw new IllegalArgumentException("Tile cost cannot be negative! " + other);
                         path.frontier.addFirst(Pos.get(dx, dy));
                         path.weights[dx][dy] = cost + other.cost;
@@ -185,27 +289,78 @@ public class Pathfinder{
         }
     }
 
-    private void clear(){
+    /** A path target defines a set of targets for a path.*/
-        Time.mark();
+    public enum PathTarget{
-
+        enemyCores((team, out) -> {
-        paths = new PathData[Team.all.length];
+            for(Tile other : indexer.getEnemy(team, BlockFlag.core)){
-        blocked.clear();
+                out.add(other.pos());
-
-        for(Team team : Team.all){
-            PathData path = new PathData();
-            paths[team.ordinal()] = path;
-
-            if(state.teams.isActive(team)){
-                createFor(team);
-            }
-        }
             }
 
+            //spawn points are also enemies.
+            if(state.rules.waves && team == defaultTeam){
+                for(Tile other : spawner.getGroundSpawns()){
+                    out.add(other.pos());
+                }
+            }
+        }),
+        rallyPoints((team, out) -> {
+            for(Tile other : indexer.getAllied(team, BlockFlag.rally)){
+                out.add(other.pos());
+            }
+        });
+
+        public static final PathTarget[] all = values();
+
+        private final BiConsumer<Team, IntArray> targeter;
+
+        PathTarget(BiConsumer<Team, IntArray> targeter){
+            this.targeter = targeter;
+        }
+
+        /** Get targets. This must run on the main thread.*/
+        public IntArray getTargets(Team team, IntArray out){
+            targeter.accept(team, out);
+            return out;
+        }
+    }
+
+    /** Data for a specific flow field to some set of destinations. */
     class PathData{
-        float[][] weights;
+        /** Team this path is for. */
-        short[][] searches;
+        final Team team;
-        int search = 0;
+        /** Flag that is being targeted. */
-        long lastSearchTime;
+        final PathTarget target;
-        IntQueue frontier = new IntQueue();
+        /** costs of getting to a specific tile */
+        final int[][] weights;
+        /** search IDs of each position - the highest, most recent search is prioritized and overwritten */
+        final short[][] searches;
+        /** search frontier, these are Pos objects */
+        final IntQueue frontier = new IntQueue();
+        /** all target positions; these positions have a cost of 0, and must be synchronized on! */
+        final IntArray targets = new IntArray();
+        /** current search ID */
+        int search = 1;
+
+        PathData(Team team, PathTarget target, int width, int height){
+            this.team = team;
+            this.target = target;
+
+            this.weights = new int[width][height];
+            this.searches = new short[width][height];
+            this.frontier.ensureCapacity((width + height) * 3);
+        }
+    }
+
+    /** Holds a copy of tile data for a specific tile position. */
+    @Struct
+    class PathTileStruct{
+        //traversal cost
+        byte cost;
+        //team of block, if applicable (0 by default)
+        byte team;
+        //type of target; TODO remove
+        byte type;
+        //whether it's viable to pass this block
+        boolean passable;
     }
 }

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

@@ -14,7 +14,6 @@ import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.type.BaseUnit;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
 import io.anuke.mindustry.game.SpawnGroup;
-import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.Tile;
 
 import static io.anuke.mindustry.Vars.*;
@@ -116,7 +115,7 @@ public class WaveSpawner{
     }
 
     public boolean isSpawning(){
-        return spawning && !Net.client();
+        return spawning && !net.client();
     }
 
     private void reset(){

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

@@ -1,6 +1,7 @@
 package io.anuke.mindustry.content;
 
 import io.anuke.arc.*;
+import io.anuke.arc.collection.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
@@ -8,6 +9,7 @@ import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
@@ -17,6 +19,7 @@ import io.anuke.mindustry.world.blocks.*;
 import io.anuke.mindustry.world.blocks.defense.*;
 import io.anuke.mindustry.world.blocks.defense.turrets.*;
 import io.anuke.mindustry.world.blocks.distribution.*;
+import io.anuke.mindustry.world.blocks.logic.*;
 import io.anuke.mindustry.world.blocks.power.*;
 import io.anuke.mindustry.world.blocks.production.*;
 import io.anuke.mindustry.world.blocks.sandbox.*;
@@ -47,7 +50,7 @@ public class Blocks implements ContentList{
     melter, separator, sporePress, pulverizer, incinerator, coalCentrifuge,
 
     //sandbox
-    powerVoid, powerSource, itemSource, liquidSource, itemVoid,
+    powerVoid, powerSource, itemSource, liquidSource, itemVoid, message,
 
     //defense
     scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
@@ -55,7 +58,7 @@ public class Blocks implements ContentList{
     phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, forceProjector, shockMine,
 
     //transport
-    conveyor, titaniumConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, router, overflowGate, massDriver,
+    conveyor, titaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, router, overflowGate, massDriver,
 
     //liquids
     mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
@@ -500,6 +503,7 @@ public class Blocks implements ContentList{
 
             consumes.items(new ItemStack(Items.thorium, 4), new ItemStack(Items.sand, 10));
             consumes.power(5f);
+            itemCapacity = 20;
 
             int bottomRegion = reg("-bottom"), weaveRegion = reg("-weave");
 
@@ -589,7 +593,7 @@ public class Blocks implements ContentList{
 
         pyratiteMixer = new GenericSmelter("pyratite-mixer"){{
             requirements(Category.crafting, ItemStack.with(Items.copper, 50, Items.lead, 25));
-            flameColor = Color.CLEAR;
+            flameColor = Color.clear;
             hasItems = true;
             hasPower = true;
             outputItem = new ItemStack(Items.pyratite, 1);
@@ -660,7 +664,7 @@ public class Blocks implements ContentList{
 
                 Draw.rect(region, tile.drawx(), tile.drawy());
                 Draw.rect(reg(frameRegions[(int)Mathf.absin(entity.totalProgress, 5f, 2.999f)]), tile.drawx(), tile.drawy());
-                Draw.color(Color.CLEAR, tile.entity.liquids.current().color, tile.entity.liquids.total() / liquidCapacity);
+                Draw.color(Color.clear, tile.entity.liquids.current().color, tile.entity.liquids.total() / liquidCapacity);
                 Draw.rect(reg(liquidRegion), tile.drawx(), tile.drawy());
                 Draw.color();
                 Draw.rect(reg(topRegion), tile.drawx(), tile.drawy());
@@ -731,6 +735,9 @@ public class Blocks implements ContentList{
             requirements(Category.liquid, () -> state.rules.infiniteResources, ItemStack.with());
             alwaysUnlocked = true;
         }};
+        message = new MessageBlock("message"){{
+            requirements(Category.effect, ItemStack.with(Items.graphite, 5));
+        }};
 
         //endregion
         //region defense
@@ -899,10 +906,16 @@ public class Blocks implements ContentList{
             speed = 0.08f;
         }};
 
+        armoredConveyor = new ArmoredConveyor("armored-conveyor"){{
+            requirements(Category.distribution, ItemStack.with(Items.metaglass, 1, Items.thorium, 1));
+            health = 180;
+            speed = 0.08f;
+        }};
+
         junction = new Junction("junction"){{
             requirements(Category.distribution, ItemStack.with(Items.copper, 1), true);
             speed = 26;
-            capacity = 15;
+            capacity = 12;
             health = 30;
         }};
 
@@ -910,7 +923,7 @@ public class Blocks implements ContentList{
             requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4));
             range = 4;
             speed = 70f;
-            bufferCapacity = 15;
+            bufferCapacity = 14;
         }};
 
         phaseConveyor = new ItemBridge("phase-conveyor"){{
@@ -982,7 +995,6 @@ public class Blocks implements ContentList{
         pulseConduit = new Conduit("pulse-conduit"){{
             requirements(Category.liquid, ItemStack.with(Items.titanium, 1, Items.metaglass, 1));
             liquidCapacity = 16f;
-            liquidFlowFactor = 4.9f;
             health = 90;
         }};
 
@@ -1397,7 +1409,7 @@ public class Blocks implements ContentList{
             smokeEffect = Fx.lancerLaserShootSmoke;
             chargeEffect = Fx.lancerLaserCharge;
             chargeBeginEffect = Fx.lancerLaserChargeBegin;
-            heatColor = Color.RED;
+            heatColor = Color.red;
             size = 2;
             health = 280 * size * size;
             targetAir = false;
@@ -1405,16 +1417,16 @@ public class Blocks implements ContentList{
         }};
 
         arc = new PowerTurret("arc"){{
-            requirements(Category.turret, ItemStack.with(Items.copper, 35, Items.lead, 35));
+            requirements(Category.turret, ItemStack.with(Items.copper, 35, Items.lead, 50));
             shootType = Bullets.arc;
-            reload = 24f;
+            reload = 35f;
             shootCone = 40f;
             rotatespeed = 8f;
-            powerUse = 0.9f;
+            powerUse = 1.5f;
             targetAir = false;
-            range = 95f;
+            range = 90f;
             shootEffect = Fx.lightningShoot;
-            heatColor = Color.RED;
+            heatColor = Color.red;
             recoil = 1f;
             size = 1;
             health = 260;
@@ -1493,7 +1505,7 @@ public class Blocks implements ContentList{
                 }
 
                 @Override
-                public void init(Bullet b){
+                public void init(io.anuke.mindustry.entities.type.Bullet b){
                     for(int i = 0; i < rays; i++){
                         Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), rayLength - Math.abs(i - (rays / 2)) * 20f);
                     }
@@ -1502,7 +1514,7 @@ public class Blocks implements ContentList{
                 @Override
                 public void draw(Bullet b){
                     super.draw(b);
-                    Draw.color(Color.WHITE, Pal.lancerLaser, b.fin());
+                    Draw.color(Color.white, Pal.lancerLaser, b.fin());
                     //Draw.alpha(b.fout());
                     for(int i = 0; i < 7; i++){
                         Tmp.v1.trns(b.rot(), i * 8f);
@@ -1618,7 +1630,7 @@ public class Blocks implements ContentList{
             type = UnitTypes.draug;
             produceTime = 2500;
             size = 2;
-            maxSpawn = 2;
+            maxSpawn = 1;
             consumes.power(1.1f);
             consumes.items();
         }};
@@ -1645,6 +1657,7 @@ public class Blocks implements ContentList{
 
         commandCenter = new CommandCenter("command-center"){{
             requirements(Category.units, ItemStack.with(Items.copper, 200, Items.lead, 250, Items.silicon, 250, Items.graphite, 100));
+            flags = EnumSet.of(BlockFlag.rally, BlockFlag.comandCenter);
             size = 2;
             health = size * size * 55;
         }};

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

@@ -7,12 +7,14 @@ import io.anuke.arc.util.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.entities.effect.*;
+import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
 
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 public class Bullets implements ContentList{
     public static BulletType
@@ -249,7 +251,7 @@ public class Bullets implements ContentList{
             splashDamageRadius = 25f;
             splashDamage = 10f;
             lifetime = 120f;
-            trailColor = Color.GRAY;
+            trailColor = Color.gray;
             backColor = Pal.bulletYellowBack;
             frontColor = Pal.bulletYellow;
             hitEffect = Fx.blastExplosion;
@@ -395,7 +397,7 @@ public class Bullets implements ContentList{
                 Draw.color(Pal.heal);
                 Lines.stroke(2f);
                 Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f);
-                Draw.color(Color.WHITE);
+                Draw.color(Color.white);
                 Lines.lineAngleCenter(b.x, b.y, b.rot(), 3f);
                 Draw.reset();
             }
@@ -429,7 +431,7 @@ public class Bullets implements ContentList{
 
             @Override
             public void draw(Bullet b){
-                Draw.color(Pal.lightFlame, Pal.darkFlame, Color.GRAY, b.fin());
+                Draw.color(Pal.lightFlame, Pal.darkFlame, Color.gray, b.fin());
                 Fill.circle(b.x, b.y, 3f * b.fout());
                 Draw.reset();
             }
@@ -497,7 +499,7 @@ public class Bullets implements ContentList{
         };
 
         lancerLaser = new BulletType(0.001f, 140){
-            Color[] colors = {Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.WHITE};
+            Color[] colors = {Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.white};
             float[] tscales = {1f, 0.7f, 0.5f, 0.2f};
             float[] lenscales = {1f, 1.1f, 1.13f, 1.14f};
             float length = 160f;
@@ -539,7 +541,7 @@ public class Bullets implements ContentList{
 
         meltdownLaser = new BulletType(0.001f, 70){
             Color tmpColor = new Color();
-            Color[] colors = {Color.valueOf("ec745855"), Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.WHITE};
+            Color[] colors = {Color.valueOf("ec745855"), Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white};
             float[] tscales = {1f, 0.7f, 0.5f, 0.2f};
             float[] strokes = {2f, 1.5f, 1f, 0.3f};
             float[] lenscales = {1f, 1.12f, 1.15f, 1.17f};
@@ -631,11 +633,11 @@ public class Bullets implements ContentList{
 
             @Override
             public void init(Bullet b){
-                Lightning.create(b.getTeam(), Pal.lancerLaser, damage, b.x, b.y, b.rot(), 30);
+                Lightning.create(b.getTeam(), Pal.lancerLaser, damage * (b.getOwner() instanceof Player ? state.rules.playerDamageMultiplier : 1f), b.x, b.y, b.rot(), 30);
             }
         };
 
-        arc = new BulletType(0.001f, 25){
+        arc = new BulletType(0.001f, 21){
             {
                 lifetime = 1;
                 despawnEffect = Fx.none;
@@ -687,7 +689,7 @@ public class Bullets implements ContentList{
                 bulletHeight = 12f;
                 hitEffect = Fx.pulverize;
                 backColor = new Color(0x4f4f4fff);
-                frontColor = Color.GRAY;
+                frontColor = Color.gray;
             }
 
             @Override

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

@@ -1,19 +1,17 @@
 package io.anuke.mindustry.content;
 
-import io.anuke.arc.Core;
+import io.anuke.arc.*;
-import io.anuke.arc.graphics.Color;
+import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.Angles;
+import io.anuke.arc.math.*;
-import io.anuke.arc.math.Mathf;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Tmp;
+import io.anuke.mindustry.entities.Effects.*;
-import io.anuke.mindustry.entities.Effects.Effect;
+import io.anuke.mindustry.entities.effect.GroundEffectEntity.*;
-import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
+import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.entities.type.BaseUnit;
+import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.graphics.*;
-import io.anuke.mindustry.graphics.Pal;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.graphics.Drawf;
+import io.anuke.mindustry.type.Item.*;
-import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.type.Item.Icon;
 
 import static io.anuke.mindustry.Vars.tilesize;
 
@@ -32,7 +30,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, commandSend;
+    unitSpawn, spawnShockwave, magmasmoke, impactShockwave, impactcloud, impactsmoke, dynamicExplosion, padlaunch, commandSend, coreLand;
 
     @Override
     public void load(){
@@ -93,14 +91,14 @@ public class Fx implements ContentList{
         });
 
         smoke = new Effect(100, e -> {
-            Draw.color(Color.GRAY, Pal.darkishGray, e.fin());
+            Draw.color(Color.gray, Pal.darkishGray, e.fin());
             float size = 7f - e.fin() * 7f;
             Draw.rect("circle", e.x, e.y, size, size);
             Draw.reset();
         });
 
         magmasmoke = new Effect(110, e -> {
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
             Fill.circle(e.x, e.y, e.fslope() * 6f);
             Draw.reset();
         });
@@ -180,7 +178,7 @@ public class Fx implements ContentList{
 
 
         hitBulletSmall = new Effect(14, e -> {
-            Draw.color(Color.WHITE, Pal.lightOrange, e.fin());
+            Draw.color(Color.white, Pal.lightOrange, e.fin());
 
             e.scaled(7f, s -> {
                 Lines.stroke(0.5f + s.fout());
@@ -199,7 +197,7 @@ public class Fx implements ContentList{
         });
 
         hitFuse = new Effect(14, e -> {
-            Draw.color(Color.WHITE, Pal.surge, e.fin());
+            Draw.color(Color.white, Pal.surge, e.fin());
 
             e.scaled(7f, s -> {
                 Lines.stroke(0.5f + s.fout());
@@ -218,7 +216,7 @@ public class Fx implements ContentList{
         });
 
         hitBulletBig = new Effect(13, e -> {
-            Draw.color(Color.WHITE, Pal.lightOrange, e.fin());
+            Draw.color(Color.white, Pal.lightOrange, e.fin());
             Lines.stroke(0.5f + e.fout() * 1.5f);
 
             Angles.randLenVectors(e.id, 8, e.finpow() * 30f, e.rotation, 50f, (x, y) -> {
@@ -252,7 +250,7 @@ public class Fx implements ContentList{
         });
 
         hitLancer = new Effect(12, e -> {
-            Draw.color(Color.WHITE);
+            Draw.color(Color.white);
             Lines.stroke(e.fout() * 1.5f);
 
             Angles.randLenVectors(e.id, 8, e.finpow() * 17f, e.rotation, 360f, (x, y) -> {
@@ -276,14 +274,14 @@ public class Fx implements ContentList{
         });
 
         hitLaser = new Effect(8, e -> {
-            Draw.color(Color.WHITE, Pal.heal, e.fin());
+            Draw.color(Color.white, Pal.heal, e.fin());
             Lines.stroke(0.5f + e.fout());
             Lines.circle(e.x, e.y, e.fin() * 5f);
             Draw.reset();
         });
 
         despawn = new Effect(12, e -> {
-            Draw.color(Pal.lighterOrange, Color.GRAY, e.fin());
+            Draw.color(Pal.lighterOrange, Color.gray, e.fin());
             Lines.stroke(e.fout());
 
             Angles.randLenVectors(e.id, 7, e.fin() * 7f, e.rotation, 40f, (x, y) -> {
@@ -302,7 +300,7 @@ public class Fx implements ContentList{
                 Lines.circle(e.x, e.y, 3f + i.fin() * 10f);
             });
 
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 5, 2f + 23f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f);
@@ -326,7 +324,7 @@ public class Fx implements ContentList{
                 Lines.circle(e.x, e.y, 3f + i.fin() * 24f);
             });
 
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 7, 2f + 28f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f);
@@ -350,7 +348,7 @@ public class Fx implements ContentList{
                 Lines.circle(e.x, e.y, 3f + i.fin() * 34f);
             });
 
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 7, 2f + 30f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f);
@@ -374,7 +372,7 @@ public class Fx implements ContentList{
                 Lines.circle(e.x, e.y, 3f + i.fin() * 15f);
             });
 
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 5, 2f + 23f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f);
@@ -423,7 +421,7 @@ public class Fx implements ContentList{
                 Lines.circle(e.x, e.y, 3f + i.fin() * 25f);
             });
 
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 6, 2f + 23f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f);
@@ -461,7 +459,7 @@ public class Fx implements ContentList{
         });
 
         fireSmoke = new Effect(35f, e -> {
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 1, 2f + e.fin() * 7f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f);
@@ -471,7 +469,7 @@ public class Fx implements ContentList{
         });
 
         steam = new Effect(35f, e -> {
-            Draw.color(Color.LIGHT_GRAY);
+            Draw.color(Color.lightGray);
 
             Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f);
@@ -481,7 +479,7 @@ public class Fx implements ContentList{
         });
 
         fireballsmoke = new Effect(25f, e -> {
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 1, 2f + e.fin() * 7f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, 0.2f + e.fout() * 1.5f);
@@ -511,7 +509,7 @@ public class Fx implements ContentList{
         });
 
         melting = new Effect(40f, e -> {
-            Draw.color(Liquids.slag.color, Color.WHITE, e.fout() / 5f + Mathf.randomSeedRange(e.id, 0.12f));
+            Draw.color(Liquids.slag.color, Color.white, e.fout() / 5f + Mathf.randomSeedRange(e.id, 0.12f));
 
             Angles.randLenVectors(e.id, 2, 1f + e.fin() * 3f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, .2f + e.fout() * 1.2f);
@@ -559,35 +557,35 @@ public class Fx implements ContentList{
 
 
         shockwave = new Effect(10f, 80f, e -> {
-            Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
+            Draw.color(Color.white, Color.lightGray, e.fin());
             Lines.stroke(e.fout() * 2f + 0.2f);
             Lines.circle(e.x, e.y, e.fin() * 28f);
             Draw.reset();
         });
 
         bigShockwave = new Effect(10f, 80f, e -> {
-            Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
+            Draw.color(Color.white, Color.lightGray, e.fin());
             Lines.stroke(e.fout() * 3f);
             Lines.circle(e.x, e.y, e.fin() * 50f);
             Draw.reset();
         });
 
         nuclearShockwave = new Effect(10f, 200f, e -> {
-            Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
+            Draw.color(Color.white, Color.lightGray, e.fin());
             Lines.stroke(e.fout() * 3f + 0.2f);
             Lines.circle(e.x, e.y, e.fin() * 140f);
             Draw.reset();
         });
 
         impactShockwave = new Effect(13f, 300f, e -> {
-            Draw.color(Pal.lighterOrange, Color.LIGHT_GRAY, e.fin());
+            Draw.color(Pal.lighterOrange, Color.lightGray, e.fin());
             Lines.stroke(e.fout() * 4f + 0.2f);
             Lines.circle(e.x, e.y, e.fin() * 200f);
             Draw.reset();
         });
 
         spawnShockwave = new Effect(20f, 400f, e -> {
-            Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
+            Draw.color(Color.white, Color.lightGray, e.fin());
             Lines.stroke(e.fout() * 3f + 0.5f);
             Lines.circle(e.x, e.y, e.fin() * (e.rotation + 50f));
             Draw.reset();
@@ -599,14 +597,14 @@ public class Fx implements ContentList{
                 Lines.circle(e.x, e.y, 3f + i.fin() * 10f);
             });
 
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 6, 2f + 19f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f);
                 Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f);
             });
 
-            Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.GRAY, e.fin());
+            Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.gray, e.fin());
             Lines.stroke(1.5f * e.fout());
 
             Angles.randLenVectors(e.id + 1, 8, 1f + 23f * e.finpow(), (x, y) -> {
@@ -624,14 +622,14 @@ public class Fx implements ContentList{
                 Lines.circle(e.x, e.y, (3f + i.fin() * 14f) * intensity);
             });
 
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, e.finpow(), (int)(6 * intensity), 21f * intensity, (x, y, in, out) -> {
                 Fill.circle(e.x + x, e.y + y, out * (2f + intensity) * 3 + 0.5f);
                 Fill.circle(e.x + x / 2f, e.y + y / 2f, out * (intensity) * 3);
             });
 
-            Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.GRAY, e.fin());
+            Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.gray, e.fin());
             Lines.stroke((1.7f * e.fout()) * (1f + (intensity - 1f) / 2f));
 
             Angles.randLenVectors(e.id + 1, e.finpow(), (int)(9 * intensity), 40f * intensity, (x, y, in, out) -> {
@@ -647,14 +645,14 @@ public class Fx implements ContentList{
                 Lines.circle(e.x, e.y, 3f + i.fin() * 14f);
             });
 
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 6, 2f + 19f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f);
                 Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f);
             });
 
-            Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.GRAY, e.fin());
+            Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.gray, e.fin());
             Lines.stroke(1.7f * e.fout());
 
             Angles.randLenVectors(e.id + 1, 9, 1f + 23f * e.finpow(), (x, y) -> {
@@ -665,7 +663,7 @@ public class Fx implements ContentList{
         });
 
         blockExplosionSmoke = new Effect(30, e -> {
-            Draw.color(Color.GRAY);
+            Draw.color(Color.gray);
 
             Angles.randLenVectors(e.id, 6, 4f + 30f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 3f);
@@ -693,7 +691,7 @@ public class Fx implements ContentList{
         });
 
         shootSmallSmoke = new Effect(20f, e -> {
-            Draw.color(Pal.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin());
+            Draw.color(Pal.lighterOrange, Color.lightGray, Color.gray, e.fin());
 
             Angles.randLenVectors(e.id, 5, e.finpow() * 6f, e.rotation, 20f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 1.5f);
@@ -711,7 +709,7 @@ public class Fx implements ContentList{
         });
 
         shootBig2 = new Effect(10, e -> {
-            Draw.color(Pal.lightOrange, Color.GRAY, e.fin());
+            Draw.color(Pal.lightOrange, Color.gray, e.fin());
             float w = 1.2f + 8 * e.fout();
             Drawf.tri(e.x, e.y, w, 29f * e.fout(), e.rotation);
             Drawf.tri(e.x, e.y, w, 5f * e.fout(), e.rotation + 180f);
@@ -719,7 +717,7 @@ public class Fx implements ContentList{
         });
 
         shootBigSmoke = new Effect(17f, e -> {
-            Draw.color(Pal.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin());
+            Draw.color(Pal.lighterOrange, Color.lightGray, Color.gray, e.fin());
 
             Angles.randLenVectors(e.id, 8, e.finpow() * 19f, e.rotation, 10f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 2f + 0.2f);
@@ -729,7 +727,7 @@ public class Fx implements ContentList{
         });
 
         shootBigSmoke2 = new Effect(18f, e -> {
-            Draw.color(Pal.lightOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin());
+            Draw.color(Pal.lightOrange, Color.lightGray, Color.gray, e.fin());
 
             Angles.randLenVectors(e.id, 9, e.finpow() * 23f, e.rotation, 20f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 2.4f + 0.2f);
@@ -739,7 +737,7 @@ public class Fx implements ContentList{
         });
 
         shootSmallFlame = new Effect(32f, e -> {
-            Draw.color(Pal.lightFlame, Pal.darkFlame, Color.GRAY, e.fin());
+            Draw.color(Pal.lightFlame, Pal.darkFlame, Color.gray, e.fin());
 
             Angles.randLenVectors(e.id, 8, e.finpow() * 60f, e.rotation, 10f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.5f);
@@ -749,7 +747,7 @@ public class Fx implements ContentList{
         });
 
         shootPyraFlame = new Effect(33f, e -> {
-            Draw.color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.GRAY, e.fin());
+            Draw.color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.gray, e.fin());
 
             Angles.randLenVectors(e.id, 10, e.finpow() * 70f, e.rotation, 10f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.6f);
@@ -759,7 +757,7 @@ public class Fx implements ContentList{
         });
 
         shootLiquid = new Effect(40f, e -> {
-            Draw.color(e.color, Color.WHITE, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f));
+            Draw.color(e.color, Color.white, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f));
 
             Angles.randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, 0.5f + e.fout() * 2.5f);
@@ -769,7 +767,7 @@ public class Fx implements ContentList{
         });
 
         shellEjectSmall = new GroundEffect(30f, 400f, e -> {
-            Draw.color(Pal.lightOrange, Color.LIGHT_GRAY, Pal.lightishGray, e.fin());
+            Draw.color(Pal.lightOrange, Color.lightGray, Pal.lightishGray, e.fin());
             float rot = Math.abs(e.rotation) + 90f;
 
             int i = Mathf.sign(e.rotation);
@@ -784,7 +782,7 @@ public class Fx implements ContentList{
         });
 
         shellEjectMedium = new GroundEffect(34f, 400f, e -> {
-            Draw.color(Pal.lightOrange, Color.LIGHT_GRAY, Pal.lightishGray, e.fin());
+            Draw.color(Pal.lightOrange, Color.lightGray, Pal.lightishGray, e.fin());
             float rot = e.rotation + 90f;
             for(int i : Mathf.signs){
                 float len = (2f + e.finpow() * 10f) * i;
@@ -795,7 +793,7 @@ public class Fx implements ContentList{
                 2f, 3f, rot);
             }
 
-            Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+            Draw.color(Color.lightGray, Color.gray, e.fin());
 
             for(int i : Mathf.signs){
                 float ex = e.x, ey = e.y, fout = e.fout();
@@ -808,7 +806,7 @@ public class Fx implements ContentList{
         });
 
         shellEjectBig = new GroundEffect(22f, 400f, e -> {
-            Draw.color(Pal.lightOrange, Color.LIGHT_GRAY, Pal.lightishGray, e.fin());
+            Draw.color(Pal.lightOrange, Color.lightGray, Pal.lightishGray, e.fin());
             float rot = e.rotation + 90f;
             for(int i : Mathf.signs){
                 float len = (4f + e.finpow() * 8f) * i;
@@ -820,7 +818,7 @@ public class Fx implements ContentList{
                 rot + e.fin() * 30f * i + Mathf.randomSeedRange(e.id + i + 9, 40f * e.fin()));
             }
 
-            Draw.color(Color.LIGHT_GRAY);
+            Draw.color(Color.lightGray);
 
             for(int i : Mathf.signs){
                 float ex = e.x, ey = e.y, fout = e.fout();
@@ -881,7 +879,7 @@ public class Fx implements ContentList{
         });
 
         lightningShoot = new Effect(12f, e -> {
-            Draw.color(Color.WHITE, Pal.lancerLaser, e.fin());
+            Draw.color(Color.white, Pal.lancerLaser, e.fin());
             Lines.stroke(e.fout() * 1.2f + 0.5f);
 
             Angles.randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> {
@@ -895,7 +893,7 @@ public class Fx implements ContentList{
         reactorsmoke = new Effect(17, e -> {
             Angles.randLenVectors(e.id, 4, e.fin() * 8f, (x, y) -> {
                 float size = 1f + e.fout() * 5f;
-                Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+                Draw.color(Color.lightGray, Color.gray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, size, size);
                 Draw.reset();
             });
@@ -903,7 +901,7 @@ public class Fx implements ContentList{
         nuclearsmoke = new Effect(40, e -> {
             Angles.randLenVectors(e.id, 4, e.fin() * 13f, (x, y) -> {
                 float size = e.fslope() * 4f;
-                Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+                Draw.color(Color.lightGray, Color.gray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, size, size);
                 Draw.reset();
             });
@@ -911,7 +909,7 @@ public class Fx implements ContentList{
         nuclearcloud = new Effect(90, 200f, e -> {
             Angles.randLenVectors(e.id, 10, e.finpow() * 90f, (x, y) -> {
                 float size = e.fout() * 14f;
-                Draw.color(Color.LIME, Color.GRAY, e.fin());
+                Draw.color(Color.lime, Color.gray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, size, size);
                 Draw.reset();
             });
@@ -919,7 +917,7 @@ public class Fx implements ContentList{
         impactsmoke = new Effect(60, e -> {
             Angles.randLenVectors(e.id, 7, e.fin() * 20f, (x, y) -> {
                 float size = e.fslope() * 4f;
-                Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+                Draw.color(Color.lightGray, Color.gray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, size, size);
                 Draw.reset();
             });
@@ -927,7 +925,7 @@ public class Fx implements ContentList{
         impactcloud = new Effect(140, 400f, e -> {
             Angles.randLenVectors(e.id, 20, e.finpow() * 160f, (x, y) -> {
                 float size = e.fout() * 15f;
-                Draw.color(Pal.lighterOrange, Color.LIGHT_GRAY, e.fin());
+                Draw.color(Pal.lighterOrange, Color.lightGray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, size, size);
                 Draw.reset();
             });
@@ -935,7 +933,7 @@ public class Fx implements ContentList{
         redgeneratespark = new Effect(18, e -> {
             Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {
                 float len = e.fout() * 4f;
-                Draw.color(Pal.redSpark, Color.GRAY, e.fin());
+                Draw.color(Pal.redSpark, Color.gray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, len, len);
                 Draw.reset();
             });
@@ -943,7 +941,7 @@ public class Fx implements ContentList{
         generatespark = new Effect(18, e -> {
             Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {
                 float len = e.fout() * 4f;
-                Draw.color(Pal.orangeSpark, Color.GRAY, e.fin());
+                Draw.color(Pal.orangeSpark, Color.gray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, len, len);
                 Draw.reset();
             });
@@ -951,14 +949,14 @@ public class Fx implements ContentList{
         fuelburn = new Effect(23, e -> {
             Angles.randLenVectors(e.id, 5, e.fin() * 9f, (x, y) -> {
                 float len = e.fout() * 4f;
-                Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+                Draw.color(Color.lightGray, Color.gray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, len, len);
                 Draw.reset();
             });
         });
         plasticburn = new Effect(40, e -> {
             Angles.randLenVectors(e.id, 5, 3f + e.fin() * 5f, (x, y) -> {
-                Draw.color(Color.valueOf("e9ead3"), Color.GRAY, e.fin());
+                Draw.color(Color.valueOf("e9ead3"), Color.gray, e.fin());
                 Fill.circle(e.x + x, e.y + y, e.fout() * 1f);
                 Draw.reset();
             });
@@ -1000,21 +998,21 @@ public class Fx implements ContentList{
         });
         producesmoke = new Effect(12, e -> {
             Angles.randLenVectors(e.id, 8, 4f + e.fin() * 18f, (x, y) -> {
-                Draw.color(Color.WHITE, Pal.accent, e.fin());
+                Draw.color(Color.white, Pal.accent, e.fin());
                 Fill.square(e.x + x, e.y + y, 1f + e.fout() * 3f, 45);
                 Draw.reset();
             });
         });
         smeltsmoke = new Effect(15, e -> {
             Angles.randLenVectors(e.id, 6, 4f + e.fin() * 5f, (x, y) -> {
-                Draw.color(Color.WHITE, e.color, e.fin());
+                Draw.color(Color.white, e.color, e.fin());
                 Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45);
                 Draw.reset();
             });
         });
         formsmoke = new Effect(40, e -> {
             Angles.randLenVectors(e.id, 6, 5f + e.fin() * 8f, (x, y) -> {
-                Draw.color(Pal.plasticSmoke, Color.LIGHT_GRAY, e.fin());
+                Draw.color(Pal.plasticSmoke, Color.lightGray, e.fin());
                 Fill.square(e.x + x, e.y + y, 0.2f + e.fout() * 2f, 45);
                 Draw.reset();
             });
@@ -1022,7 +1020,7 @@ public class Fx implements ContentList{
         blastsmoke = new Effect(26, e -> {
             Angles.randLenVectors(e.id, 12, 1f + e.fin() * 23f, (x, y) -> {
                 float size = 2f + e.fout() * 6f;
-                Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fin());
+                Draw.color(Color.lightGray, Color.darkGray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, size, size);
                 Draw.reset();
             });
@@ -1030,7 +1028,7 @@ public class Fx implements ContentList{
         lava = new Effect(18, e -> {
             Angles.randLenVectors(e.id, 3, 1f + e.fin() * 10f, (x, y) -> {
                 float size = e.fslope() * 4f;
-                Draw.color(Color.ORANGE, Color.GRAY, e.fin());
+                Draw.color(Color.orange, Color.gray, e.fin());
                 Draw.rect("circle", e.x + x, e.y + y, size, size);
                 Draw.reset();
             });
@@ -1056,53 +1054,53 @@ public class Fx implements ContentList{
             Draw.reset();
         });
         purify = new Effect(10, e -> {
-            Draw.color(Color.ROYAL, Color.GRAY, e.fin());
+            Draw.color(Color.royal, Color.gray, e.fin());
             Lines.stroke(2f);
             Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
             Draw.reset();
         });
         purifyoil = new Effect(10, e -> {
-            Draw.color(Color.BLACK, Color.GRAY, e.fin());
+            Draw.color(Color.black, Color.gray, e.fin());
             Lines.stroke(2f);
             Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
             Draw.reset();
         });
         purifystone = new Effect(10, e -> {
-            Draw.color(Color.ORANGE, Color.GRAY, e.fin());
+            Draw.color(Color.orange, Color.gray, e.fin());
             Lines.stroke(2f);
             Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
             Draw.reset();
         });
         generate = new Effect(11, e -> {
-            Draw.color(Color.ORANGE, Color.YELLOW, e.fin());
+            Draw.color(Color.orange, Color.yellow, e.fin());
             Lines.stroke(1f);
             Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 8);
             Draw.reset();
         });
         mine = new Effect(20, e -> {
             Angles.randLenVectors(e.id, 6, 3f + e.fin() * 6f, (x, y) -> {
-                Draw.color(e.color, Color.LIGHT_GRAY, e.fin());
+                Draw.color(e.color, Color.lightGray, e.fin());
                 Fill.square(e.x + x, e.y + y, e.fout() * 2f, 45);
                 Draw.reset();
             });
         });
         mineBig = new Effect(30, e -> {
             Angles.randLenVectors(e.id, 6, 4f + e.fin() * 8f, (x, y) -> {
-                Draw.color(e.color, Color.LIGHT_GRAY, e.fin());
+                Draw.color(e.color, Color.lightGray, e.fin());
                 Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.2f, 45);
                 Draw.reset();
             });
         });
         mineHuge = new Effect(40, e -> {
             Angles.randLenVectors(e.id, 8, 5f + e.fin() * 10f, (x, y) -> {
-                Draw.color(e.color, Color.LIGHT_GRAY, e.fin());
+                Draw.color(e.color, Color.lightGray, e.fin());
                 Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45);
                 Draw.reset();
             });
         });
         smelt = new Effect(20, e -> {
             Angles.randLenVectors(e.id, 6, 2f + e.fin() * 5f, (x, y) -> {
-                Draw.color(Color.WHITE, e.color, e.fin());
+                Draw.color(Color.white, e.color, e.fin());
                 Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45);
                 Draw.reset();
             });
@@ -1209,5 +1207,8 @@ public class Fx implements ContentList{
             Lines.poly(e.x, e.y, 6, e.rotation + e.fin(), 90);
             Draw.reset();
         });
+
+        coreLand = new Effect(120f, e -> {
+        });
     }
 }