Change ip hub (#5014)

transition to new hosting

.github/ISSUE_TEMPLATE/bug_report.md

@@ -17,11 +17,11 @@ assignees: ''
 
 **Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.*
 
-**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.*
+**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME. IF YOU DO NOT HAVE A SAVE, DON'T WASTE TIME OPENING THIS ISSUE.*
 
 If you remove the line above without reading it properly and understanding what it means, I will reap your soul. Even if you're playing on someone's server, you can still save the game to a slot.
 
-**Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.*
+**(Crash) logs**: *Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs. REQUIRED if you are reporting a crash.*
 
 ---
 

.github/workflows/deployment.yml

@@ -17,21 +17,6 @@ jobs:
         java-version: 14
     - name: Set env
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-    - name: Create artifacts
-      run: |
-        ./gradlew desktop:dist server:dist core:javadoc -Pbuildversion=${RELEASE_VERSION:1}
-    - name: Update docs
-      run: |
-        cd ../
-        git config --global user.email "cli@github.com"
-        git config --global user.name "Github Actions"
-        git clone --depth=1 https://github.com/MindustryGame/docs.git
-        cp -a Mindustry/core/build/docs/javadoc/. docs/
-        cd docs
-        git add .
-        git commit -m "Update ${RELEASE_VERSION:1}"
-        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
-        cd ../Mindustry
     - name: Add Arc release
       run: |
         git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
@@ -39,6 +24,24 @@ jobs:
         git tag ${RELEASE_VERSION}
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${RELEASE_VERSION};
         cd ../Mindustry
+    - name: Create artifacts
+      run: |
+        ./gradlew desktop:dist server:dist core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1}
+    - name: Update docs
+      run: |
+        cd ../
+        git config --global user.email "cli@github.com"
+        git config --global user.name "Github Actions"
+        git clone --depth=1 https://github.com/MindustryGame/docs.git
+        cd docs
+        find . -maxdepth 1 ! -name ".git" ! -name . -exec rm -r {} \;
+        cd ../
+        cp -a Mindustry/core/build/javadoc/. docs/
+        cd docs
+        git add .
+        git commit -m "Update ${RELEASE_VERSION:1}"
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
+        cd ../Mindustry
     - name: Update F-Droid build string
       run: |
         git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
@@ -47,6 +50,7 @@ jobs:
         echo versionName=6-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${RELEASE_VERSION:1} > version_fdroid.txt
         git add .
         git commit -m "Updating to build ${RELEASE_VERSION:1}"
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds
         cd ../Mindustry
     - name: Upload client artifacts
       uses: svenstaro/upload-release-action@v2

.github/workflows/push.yml

@@ -13,7 +13,7 @@ jobs:
       with:
         java-version: 14
     - name: Run unit tests
-      run: ./gradlew test
+      run: ./gradlew clean cleanTest test
     - name: Trigger BE build
       if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |

.gitignore

@@ -43,10 +43,17 @@ ios/robovm.properties
 packr-out/
 config/
 *.gif
+/tests/out
 
 /core/assets/basepartnames
 version.properties
 
+#sprites
+
+core/assets/sprites/sprites*
+core/assets/sprites/fallback/
+core/assets/sprites/block_colors.png
+
 .attach_*
 ## Java
 

CONTRIBUTING.md

@@ -15,9 +15,6 @@ If you are submitting a new block, make sure it has a name and description, and
 If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*).  
 For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it.
 
-### Do not include packed sprites in your pull request.
-When making a pull request that changes or adds new sprites, do not add the modified atlas & `spritesX.png` files to your final pull request. These are a frequent source of conflicts.
-
 
 ## Style Guidelines
 

ISSUES.md

@@ -0,0 +1,52 @@
+# Why was my issue closed?
+
+This document goes over some common causes for issue closures.
+
+## You did not fill in the template
+
+I can't debug the problem unless you provide the information the template asks for. 
+If you cannot put in the effort to fill out a template, then don't expect me to put in the effort to fix it.
+
+## Your issue was already reported
+
+If the problem in your issue has already been encountered before, it will be closed - especially if your report doesn't provide any new information.
+Make sure you search the *closed* issues before making an issue.
+
+I do not link the specific issue(s) that report the same problem, because searching takes time - if you're interested in finding them, you should be able to do so without my help.
+
+To be clear: I do **not** expect users to look at *all* previous issues, or do a comprehensive stack trace analysis to see if their crash was already reported.
+
+## Your issue was already fixed
+
+The problem you reported has been addressed. Note that this does **not** mean that the latest stable version of Mindustry has the fix! 
+It simply means that I have committed (or am about to commit) a patch that fixes it *on the current development branch*.
+
+## Your issue is missing a crash report or log
+
+If the game crashes without a specific cause, and you don't send me a log, I can't fix it. There is no way for me to know what went wrong.
+
+During a normal crash, the game should tell you where the log is saved. If not, you should still be able to look in the game's crash folder on most operating systems, or export the logs in *Settings -> Game Data -> Export Crash Logs*.
+
+## Your issue is missing saves or screenshots
+
+Even if you think your problem happens everywhere and saves/screenshots are redundant, this is frequently not the case.
+If I cannot reproduce the problem on my own saves and you have not linked any of your own, then the problem is likely to be save-specific. If you do not send me any, the problem cannot be investigated further.
+
+## Your issue is related to an external program
+
+If Mindustry causes something else to crash or misbehave, I am very unlikely to fix it. Unless the problem is serious, widespread and/or clearly a bug *in Mindustry*, it is not my responsibility.
+
+Similarly, if you use another (invasive) program to change how Mindustry works, and something goes wrong, that is not my problem. Don't do it.
+
+## Your issue is caused by mods
+
+Crashes and bugs related to installed mods should be reported in the relevant mod repository, not here.
+*Note that problems with the Mindustry modding API are a separate problem, and do not apply.*
+
+## I cannot reproduce your issue
+
+If I follow your instructions and am repeatedly unable to reproduce the problem you've reported, then it is very unlikely to be fixed. 
+Either the problem is device-specific, or there is not enough information given for me to be able to reproduce it.
+
+I may attempt to change some code if I think it will make the issue less likely to occur, but without knowing for sure, the issue cannot be considered truly "fixed". 
+As I cannot make any further progress on the problem, there is no reason to keep it open. If it is a common bug/crash, other people will come along with information that may shed some light on the issue.

README.md

@@ -1,7 +1,7 @@
 ![Logo](core/assets-raw/sprites/ui/logo.png)
 
-[![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry) 
+[![Build Status](https://github.com/Anuken/Mindustry/workflows/Tests/badge.svg?event=push)](https://github.com/Anuken/Mindustry/actions)
-[![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord)](https://discord.gg/mindustry)  
+[![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord&color=17cf48)](https://discord.gg/mindustry)  
 
 A sandbox tower defense game written in Java.
 

SERVERLIST.md

@@ -1,22 +1,23 @@
 ### Adding a server to the list
 
 Mindustry now has a public list of servers that everyone can see and connect to. 
-This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers.json) in this repository.
+This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json) in this repository.
 
 You may want to add your server to this list. The steps for getting this done are as follows:
 
 1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well.
 You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins.
 *Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example.
-2. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
+2. Make sure that your server is able to handle inappropriate content - this includes NSFW display/sorter art and abusive messages. **Servers that allow such content will be removed immediately.** Consider banning display blocks if it is a problem for your server: `rules add bannedBlocks ["logic-display", "large-logic-display"]`.
+3. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
   - Your name or description must reflect the type of server you're hosting. 
   Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
   - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
   - Try to be professional in your text; use common sense.
-3. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
+4. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
-4. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
+5. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
-5. Finally, **submit a pull request** to add your server's IP to the list. 
+6. Finally, **submit a pull request** to add your server's IP to the list. 
-This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers.json), then add a JSON object with a single key, indicating your server address.
+This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json), then add a JSON object with a single key, indicating your server address.
 For example, if your server address is `google.com`, you would add a comma after the last entry and insert:
 ```json
   {

android/build.gradle

@@ -4,7 +4,6 @@ buildscript{
         mavenCentral()
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
     }
 
     dependencies{
@@ -20,8 +19,8 @@ configurations{ natives }
 
 repositories{
     mavenCentral()
-    jcenter()
     maven{ url "https://maven.google.com" }
+    jcenter() //remove later once google fixes the dependency
 }
 
 dependencies{
@@ -152,3 +151,9 @@ task run(type: Exec){
     def adb = path + "/platform-tools/adb"
     commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
 }
+
+if(!project.ext.hasSprites()){
+    println "Scheduling sprite pack."
+    run.dependsOn ":tools:pack"
+    deploy.dependsOn ":tools:pack"
+}

android/src/mindustry/android/AndroidLauncher.java

@@ -44,7 +44,7 @@ public class AndroidLauncher extends AndroidApplication{
             if(handler != null){
                 handler.uncaughtException(thread, error);
             }else{
-                error.printStackTrace();
+                Log.err(error);
                 System.exit(1);
             }
         });
@@ -71,9 +71,8 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             @Override
-            public Class<?> loadJar(Fi jar, String mainClass) throws Exception{
+            public ClassLoader loadJar(Fi jar, String mainClass) throws Exception{
-                DexClassLoader loader = new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, getClassLoader());
+                return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, getClassLoader());
-                return Class.forName(mainClass, true, loader);
             }
 
             @Override
@@ -161,7 +160,6 @@ public class AndroidLauncher extends AndroidApplication{
         }, new AndroidApplicationConfiguration(){{
             useImmersiveMode = true;
             hideStatusBar = true;
-            stencil = 8;
         }});
         checkFiles(getIntent());
 

annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java

@@ -117,7 +117,6 @@ public class AssetsProcess extends BaseProcessor{
 
     void processSounds(String classname, String path, String rtype) throws Exception{
         TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
-        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<>();
@@ -137,8 +136,6 @@ public class AssetsProcess extends BaseProcessor{
             String filename = "\"" + filepath + "\"";
             loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3"));
 
-            dispose.addStatement("arc.Core.assets.unload(" + filename + ")");
-            dispose.addStatement(name + " = null");
             type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
         });
 
@@ -147,7 +144,6 @@ public class AssetsProcess extends BaseProcessor{
         }
 
         type.addMethod(loadBegin.build());
-        type.addMethod(dispose.build());
         JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
     }
 

annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java

@@ -26,7 +26,8 @@ public class LogicStatementProcessor extends BaseProcessor{
         MethodSpec.Builder reader = MethodSpec.methodBuilder("read")
             .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
             .returns(tname("mindustry.logic.LStatement"))
-            .addParameter(String[].class, "tokens");
+            .addParameter(String[].class, "tokens")
+            .addParameter(int.class, "length");
 
         Seq<Stype> types = types(RegisterStatement.class);
 
@@ -76,7 +77,7 @@ public class LogicStatementProcessor extends BaseProcessor{
                     "");
 
                 //reading primitives, strings and enums is supported; nothing else is
-                reader.addStatement("if(tokens.length > $L) result.$L = $L(tokens[$L])",
+                reader.addStatement("if(length > $L) result.$L = $L(tokens[$L])",
                 index + 1,
                 field.name(),
                 field.mirror().toString().equals("java.lang.String") ?

annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java

@@ -63,7 +63,7 @@ public class RemoteProcess extends BaseProcessor{
             classes = new Seq<>();
 
             Seq<Smethod> orderedElements = elements.copy();
-            orderedElements.sortComparing(Object::toString);
+            orderedElements.sort((a, b) -> -a.toString().compareTo(b.toString()));
 
             //create methods
             for(Smethod element : orderedElements){
@@ -71,12 +71,12 @@ public class RemoteProcess extends BaseProcessor{
 
                 //check for static
                 if(!element.is(Modifier.STATIC) || !element.is(Modifier.PUBLIC)){
-                    err("All @Remote methods must be public and static: ", element);
+                    err("All @Remote methods must be public and static", element);
                 }
 
                 //can't generate none methods
                 if(annotation.targets() == Loc.none){
-                    err("A @Remote method's targets() cannot be equal to 'none':", element);
+                    err("A @Remote method's targets() cannot be equal to 'none'", element);
                 }
 
                 //get and create class entry if needed

annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java

@@ -107,7 +107,7 @@ public class RemoteReadGenerator{
             }
 
             readBlock.nextControlFlow("catch (java.lang.Exception e)");
-            readBlock.addStatement("throw new java.lang.RuntimeException(\"Failed to to read remote method '" + entry.element.getSimpleName() + "'!\", e)");
+            readBlock.addStatement("throw new java.lang.RuntimeException(\"Failed to read remote method '" + entry.element.getSimpleName() + "'!\", e)");
             readBlock.endControlFlow();
         }
 

annotations/src/main/resources/revisions/alpha/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/arkyid/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/beta/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/block/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/corvus/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/flare/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/gamma/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mace/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mega/3.json

@@ -0,0 +1 @@
+{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mono/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/nova/3.json

@@ -0,0 +1 @@
+{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/oct/3.json

@@ -0,0 +1 @@
+{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/poly/3.json

@@ -0,0 +1 @@
+{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/pulsar/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/quad/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/quasar/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/risso/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/spiroct/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/toxopid/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

build.gradle

@@ -12,7 +12,6 @@ buildscript{
         mavenCentral()
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
         maven{ url 'https://jitpack.io' }
     }
 
@@ -32,11 +31,11 @@ allprojects{
 
     ext{
         versionNumber = '6'
-        if(!project.hasProperty("versionModifier")) versionModifier = 'beta'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
-        rhinoVersion = '2617981f706e50b8753155d8e15e326308be3b22'
+        rhinoVersion = '378626d8abc552bba57864358358045d2f2dbe9b'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -83,6 +82,10 @@ allprojects{
             return "v$buildVersion"
         }
 
+        hasSprites = {
+            return new File(rootDir, "core/assets/sprites/sprites.atlas").exists()
+        }
+
         getModifierString = {
             if(versionModifier != "release"){
                 return "[${versionModifier.toUpperCase()}]"
@@ -180,7 +183,6 @@ allprojects{
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven{ url "https://oss.sonatype.org/content/repositories/releases/" }
         maven{ url 'https://jitpack.io' }
-        jcenter()
     }
 
     task clearCache{
@@ -253,18 +255,22 @@ project(":ios"){
 
     task incrementConfig{
         def vfile = file('robovm.properties')
+        def bversion = getBuildVersion()
         def props = new Properties()
         if(vfile.exists()){
             props.load(new FileInputStream(vfile))
         }else{
             props['app.id'] = 'io.anuke.mindustry'
-            props['app.version'] = '5.0'
+            props['app.version'] = '6.0'
             props['app.mainclass'] = 'mindustry.IOSLauncher'
             props['app.executable'] = 'IOSLauncher'
             props['app.name'] = 'Mindustry'
         }
         
         props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
+        if(bversion != "custom build"){
+            props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0")
+        }
         props.store(vfile.newWriter(), null)
     }
 
@@ -297,9 +303,10 @@ project(":core"){
             def props = loadVersionProps()
             def androidVersion = props['androidBuildCode'].toInteger() - 2
             def loglines = file("../changelog").text.split("\n")
+            def notice = "[This is a truncated changelog, see Github for full notes]"
             def maxLength = 460
 
-            def androidLogList = loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
+            def androidLogList = [notice] + loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
             def result = ""
             androidLogList.forEach{line ->
                 if(result.length() + line.length() + 1 < maxLength){
@@ -311,6 +318,30 @@ project(":core"){
         }
     }
 
+    task sourcesJar(type: Jar, dependsOn: classes){
+        archiveClassifier = 'sources'
+        from sourceSets.main.allSource
+    }
+
+    task assetsJar(type: Jar, dependsOn: ":tools:pack"){
+        archiveClassifier = 'assets'
+        from files("assets"){
+            exclude "config", "cache", "music", "sounds"
+        }
+    }
+
+    task musicJar(type: Jar){
+        archiveClassifier = 'music'
+        from files("assets"){
+            include "music/*", "sounds/*"
+        }
+    }
+
+    artifacts{
+        archives sourcesJar
+        archives assetsJar
+    }
+
     dependencies{
         compileJava.dependsOn(preGen)
 
@@ -328,6 +359,28 @@ project(":core"){
         annotationProcessor 'com.github.Anuken:jabel:34e4c172e65b3928cd9eabe1993654ea79c409cd'
 
     }
+
+    afterEvaluate{
+        task mergedJavadoc(type: Javadoc){
+            def blacklist = [project(":ios"), project(":desktop"), project(":server"), project(":annotations")]
+            if(findProject(":android") != null){
+                blacklist += project(":android")
+            }
+
+            source rootProject.subprojects.collect{ project ->
+                if(!blacklist.contains(project) && project.hasProperty("sourceSets")){
+                    return project.sourceSets.main.allJava
+                }
+            }
+
+            classpath = files(rootProject.subprojects.collect { project ->
+                if(!blacklist.contains(project) && project.hasProperty("sourceSets")){
+                    return project.sourceSets.main.compileClasspath
+                }
+            })
+            destinationDir = new File(buildDir, 'javadoc')
+        }
+    }
 }
 
 project(":server"){
@@ -378,7 +431,6 @@ project(":annotations"){
     dependencies{
         implementation 'com.squareup:javapoet:1.12.1'
         implementation "com.github.Anuken.Arc:arc-core:$arcHash"
-        implementation files("${System.getProperty('java.home')}/../lib/tools.jar")
     }
 }
 
@@ -402,3 +454,12 @@ task deployAll{
     dependsOn "server:deploy"
     dependsOn "android:deploy"
 }
+
+task resolveDependencies{
+    doLast{
+        rootProject.allprojects{ project ->
+            Set<Configuration> configurations = project.buildscript.configurations + project.configurations
+            configurations.findAll{c -> c.canBeResolved}.forEach{c -> c.resolve()}
+        }
+    }
+}

core/assets/bundles/bundle.properties

@@ -13,6 +13,7 @@ link.google-play.description = Google Play store listing
 link.f-droid.description = F-Droid listing
 link.wiki.description = Official Mindustry wiki
 link.suggestions.description = Suggest new features
+link.bug.description = Found one? Report it here
 linkfail = Failed to open link!\nThe URL has been copied to your clipboard.
 screenshot = Screenshot saved to {0}
 screenshot.invalid = Map too large, potentially not enough memory for screenshot.
@@ -40,6 +41,14 @@ be.ignore = Ignore
 be.noupdates = No updates found.
 be.check = Check for updates
 
+mods.browser = Mod Browser
+mods.browser.selected = Selected mod
+mods.browser.add = Install
+mods.browser.reinstall = Reinstall
+mods.github.open = Repo
+mods.browser.sortdate = Sort by recent
+mods.browser.sortstars = Sort by stars
+
 schematic = Schematic
 schematic.add = Save Schematic...
 schematics = Schematics
@@ -69,7 +78,7 @@ stat.delivered = Resources Launched:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Final Rank: [accent]{0}
 
-globalitems = [accent]Global Items
+globalitems = [accent]Total Items
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
 level.select = Level Select
@@ -83,6 +92,7 @@ joingame = Join Game
 customgame = Custom Game
 newgame = New Game
 none = <none>
+none.found = [lightgray]<none found>
 minimap = Minimap
 position = Position
 close = Close
@@ -99,21 +109,24 @@ preparingconfig = Preparing Config
 preparingcontent = Preparing Content
 uploadingcontent = Uploading Content
 uploadingpreviewfile = Uploading Preview File
-committingchanges = Comitting Changes
+committingchanges = Committing Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
 
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub.
+mods.initfailed = [red]⚠[] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]\n\nTo disable this feature, turn it off in [accent]Settings->Game->Disable Mods On Startup Crash[].
 mods = Mods
 mods.none = [lightgray]No mods found!
 mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Folder
+mods.viewcontent = View Content
 mods.reload = Reload
 mods.reloadexit = The game will now exit, to reload mods.
+mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
+mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = Disable
 mod.content = Content:
 mod.delete.error = Unable to delete mod. File may be in use.
@@ -196,6 +209,7 @@ servers.local = Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
 
+servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
 server.hidden = Hidden
@@ -203,9 +217,11 @@ server.hidden = Hidden
 trace = Trace Player
 trace.playername = Player name: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = Unique ID: [accent]{0}
+trace.id = ID: [accent]{0}
 trace.mobile = Mobile Client: [accent]{0}
 trace.modclient = Custom Client: [accent]{0}
+trace.times.joined = Times Joined: [accent]{0}
+trace.times.kicked = Times Kicked: [accent]{0}
 invalidid = Invalid client ID! Submit a bug report.
 server.bans = Bans
 server.bans.none = No banned players found!
@@ -279,6 +295,7 @@ cancel = Cancel
 openlink = Open Link
 copylink = Copy Link
 back = Back
+max = Max
 crash.export = Export Crash Logs
 crash.none = No crash logs found.
 crash.exported = Crash logs exported.
@@ -298,6 +315,7 @@ cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
 resumebuilding = [scarlet][[{0}][] to resume building
+enablebuilding = [scarlet][[{0}][] to enable building
 showui = UI hidden.\nPress [accent][[{0}][] to show UI.
 wave = [accent]Wave {0}
 wave.cap = [accent]Wave {0}/{1}
@@ -353,7 +371,6 @@ editor.center = Center
 workshop = Workshop
 waves.title = Waves
 waves.remove = Remove
-waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
 waves.perspawn = per spawn
@@ -382,7 +399,7 @@ editor.removeunit = Remove Unit
 editor.teams = Teams
 editor.errorload = Error loading file.
 editor.errorsave = Error saving file.
-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.errorimage = That's an image, not a map.
 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.
@@ -603,6 +620,19 @@ sector.extractionOutpost.description = A remote outpost, constructed by the enem
 sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
 sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
 
+status.burning.name = Burning
+status.freezing.name = Freezing
+status.wet.name = Wet
+status.muddy.name = Muddy
+status.melting.name = Melting
+status.sapped.name = Sapped
+status.spore-slowed.name = Spore Slowed
+status.tarred.name = Tarred
+status.overclock.name = Overclock
+status.shocked.name = Shocked
+status.blasted.name = Blasted
+status.unmoving.name = Unmoving
+
 settings.language = Language
 settings.data = Game Data
 settings.reset = Reset to Defaults
@@ -639,6 +669,7 @@ stat.output = Output
 stat.booster = Booster
 stat.tiles = Required Tiles
 stat.affinities = Affinities
+stat.opposites = Opposites
 stat.powercapacity = Power Capacity
 stat.powershot = Power/Shot
 stat.damage = Damage
@@ -670,6 +701,7 @@ stat.drillspeed = Base Drill Speed
 stat.boosteffect = Boost Effect
 stat.maxunits = Max Active Units
 stat.health = Health
+stat.armor = Armor
 stat.buildtime = Build Time
 stat.maxconsecutive = Max Consecutive
 stat.buildcost = Build Cost
@@ -685,6 +717,7 @@ stat.lightningchance = Lightning Chance
 stat.lightningdamage = Lightning Damage
 stat.flammability = Flammability
 stat.radioactivity = Radioactivity
+stat.charge = Charge
 stat.heatcapacity = Heat Capacity
 stat.viscosity = Viscosity
 stat.temperature = Temperature
@@ -697,6 +730,13 @@ stat.commandlimit = Command Limit
 stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
+stat.ammouse = Ammo Use
+stat.damagemultiplier = Damage Multiplier
+stat.healthmultiplier = Health Multiplier
+stat.speedmultiplier = Speed Multiplier
+stat.reloadmultiplier = Reload Multiplier
+stat.buildspeedmultiplier = Build Speed Multiplier
+stat.reactive = Reacts
 
 ability.forcefield = Force Field
 ability.repairfield = Repair Field
@@ -711,6 +751,7 @@ bar.corereq = Core Base Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
+bar.boost = Boost: {0}%
 bar.powerbalance = Power: {0}/s
 bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
@@ -719,7 +760,6 @@ bar.powerlines = Connections: {0}/{1}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
@@ -732,16 +772,14 @@ units.processorcontrol = [lightgray]Processor Controlled
 bullet.damage = [stat]{0}[lightgray] damage
 bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary
-bullet.sapping = [stat]sapping
 bullet.homing = [stat]homing
-bullet.shock = [stat]shock
 bullet.frag = [stat]frag
+bullet.lightning = [stat]{0}[lightgray]x lightning ~[stat]{1}[lightgray] damage
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
 bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
 bullet.healpercent = [stat]{0}[lightgray]% healing
-bullet.freezing = [stat]freezing
-bullet.tarred = [stat]tarred
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
 bullet.reload = [stat]{0}[lightgray]x fire rate
 
@@ -764,6 +802,7 @@ unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.pershot = /shot
 category.purpose = Purpose
 category.general = General
 category.power = Power
@@ -777,9 +816,12 @@ setting.shadows.name = Shadows
 setting.blockreplace.name = Automatic Block Suggestions
 setting.linear.name = Linear Filtering
 setting.hints.name = Hints
+setting.logichints.name = Logic Hints
 setting.flow.name = Display Resource Flow Rate
 setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
+setting.doubletapmine.name = Double-Tap to Mine
+setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animated Surfaces
 setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
@@ -831,7 +873,9 @@ setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
 setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display Player Bubble Chat
+setting.showweather.name = Show Weather Graphics
 public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
+public.confirm.really = If you want to play with friends, use [green]Invite Friend[] instead of a [scarlet]Public server[]!\nAre you sure you want to make your game [scarlet]public[]?
 public.beta = Note that beta versions of the game cannot make public lobbies.
 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
@@ -897,6 +941,7 @@ keybind.pause_building.name = Pause/Resume Building
 keybind.minimap.name = Minimap
 keybind.planet_map.name = Planet Map
 keybind.research.name = Research
+keybind.block_info.name = Block Info
 keybind.chat.name = Chat
 keybind.player_list.name = Player List
 keybind.console.name = Console
@@ -906,6 +951,7 @@ keybind.toggle_menus.name = Toggle Menus
 keybind.chat_history_prev.name = Chat History Prev
 keybind.chat_history_next.name = Chat History Next
 keybind.chat_scroll.name = Chat Scroll
+keybind.chat_mode.name = Change Chat Mode
 keybind.drop_unit.name = Drop Unit
 keybind.zoom_minimap.name = Zoom Minimap
 mode.help.title = Description of modes
@@ -922,6 +968,7 @@ mode.custom = Custom Rules
 
 rules.infiniteresources = Infinite Resources
 rules.reactorexplosions = Reactor Explosions
+rules.coreincinerates = Core Incinerates Overflow
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
 rules.waves = Waves
@@ -933,6 +980,8 @@ rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitcap = Base Unit Cap
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
@@ -954,12 +1003,14 @@ rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
 rules.weather = Weather
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
 
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
 content.block.name = Blocks
+content.status.name = Status Effects
 content.sector.name = Sectors
 
 item.copper.name = Copper
@@ -1159,7 +1210,7 @@ block.item-void.name = Item Void
 block.liquid-source.name = Liquid Source
 block.liquid-void.name = Liquid Void
 block.power-void.name = Power Void
-block.power-source.name = Power Infinite
+block.power-source.name = Power Source
 block.unloader.name = Unloader
 block.vault.name = Vault
 block.wave.name = Wave
@@ -1251,7 +1302,7 @@ hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manuall
 hint.desktopShoot = [accent][[Left-click][] to shoot.
 hint.depositItems = To transfer items, drag from your ship to the core.
 hint.respawn = To respawn as a ship, press [accent][[V][].
-hint.respawn.mobile = You have switched control a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
+hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
 hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
 hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it.
 hint.placeDrill.mobile = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
@@ -1263,7 +1314,7 @@ hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right
 hint.research = Use the \ue875 [accent]Research[] button to research new technology.
 hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
 hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
-hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets.
+hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
 hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
 hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
 hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
@@ -1279,6 +1330,10 @@ hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a pay
 hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
 hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
 hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a  [accent]Foundation[] core over the  [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
+hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
+hint.coopCampaign = When playing the [accent]co-op campaign[], items that are produced in the current map will also be sent [accent]to your local sectors[].\n\nAny new research done by the host also carries over.
 
 item.copper.description = Used in all types of construction and ammunition.
 item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
@@ -1363,8 +1418,8 @@ block.inverted-sorter.description = Similar to a standard sorter, but outputs se
 block.router.description = Distributes input items to 3 output directions equally.
 block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = Distributes input items to 7 output directions equally.
-block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates.
+block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked.
-block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates.
+block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked.
 block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers.
 block.mechanical-pump.description = Pumps and outputs liquids. Does not require power.
 block.rotary-pump.description = Pumps and outputs liquids. Requires power.
@@ -1424,7 +1479,7 @@ block.ripple.description = Shoots clusters of shells at ground enemies over long
 block.cyclone.description = Fires explosive clumps of flak at nearby enemies.
 block.spectre.description = Fires large armor-piercing bullets at air and ground targets.
 block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.foreshadow.description = Fires a large single-target bolt over long distances.
+block.foreshadow.description = Fires a large single-target bolt over long distances. Prioritizes enemies with higher max health.
 block.repair-point.description = Continuously repairs the closest damaged unit in its vicinity.
 block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
 block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
@@ -1473,7 +1528,7 @@ unit.zenith.description = Fires salvos of missiles at all nearby enemies.
 unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
 unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
 unit.mono.description = Automatically mines copper and lead, depositing it into the core.
-unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction.
+unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
 unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
 unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
 unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
@@ -1485,3 +1540,146 @@ unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Co
 unit.alpha.description = Defends the Shard core from enemies. Builds structures.
 unit.beta.description = Defends the Foundation core from enemies. Builds structures.
 unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+
+lst.read = Read a number from a linked memory cell.
+lst.write = Write a number to a linked memory cell.
+lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
+lst.drawflush = Flush queued [accent]Draw[] operations to a display.
+lst.printflush = Flush queued [accent]Print[] operations to a message block.
+lst.getlink = Get a processor link by index. Starts at 0.
+lst.control = Control a building.
+lst.radar = Locate units around a building with range.
+lst.sensor = Get data from a building or unit.
+lst.set = Set a variable.
+lst.operation = Perform an operation on 1-2 variables.
+lst.end = Jump to the top of the instruction stack.
+lst.jump = Conditionally jump to another statement.
+lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
+lst.unitcontrol = Control the currently bound unit.
+lst.unitradar = Locate units around the currently bound unit.
+lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
+
+logic.nounitbuild = [red]Unit building logic is not allowed here.
+
+lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
+lenum.shoot = Shoot at a position.
+lenum.shootp = Shoot at a unit/building with velocity prediction.
+lenum.configure = Building configuration, e.g. sorter item.
+lenum.enabled = Whether the block is enabled.
+
+laccess.color = Illuminator color.
+laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
+laccess.dead = Whether a unit/building is dead or no longer valid.
+laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
+laccess.commanded = [red]Deprecated. Will be removed![]\nUse [accent]controlled[] instead.
+
+graphicstype.clear = Fill the display with a color.
+graphicstype.color = Set color for next drawing operations.
+graphicstype.stroke = Set line width.
+graphicstype.line = Draw line segment.
+graphicstype.rect = Fill a rectangle.
+graphicstype.linerect = Draw a rectangle outline.
+graphicstype.poly = Fill a regular polygon.
+graphicstype.linepoly = Draw a regular polygon outline.
+graphicstype.triangle = Fill a triangle.
+graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+
+lenum.always = Always true.
+lenum.idiv = Integer division.
+lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
+lenum.mod = Modulo.
+lenum.equal = Equal. Coerces types.\nNon-null objects compared with numbers become 1, otherwise 0.
+lenum.notequal = Not equal. Coerces types.
+lenum.strictequal = Strict equality. Does not coerce types.\nCan be used to check for [accent]null[].
+lenum.shl = Bit-shift left.
+lenum.shr = Bit-shift right.
+lenum.or = Bitwise OR.
+lenum.land = Logical AND.
+lenum.and = Bitwise AND.
+lenum.not = Bitwise flip.
+lenum.xor = Bitwise XOR.
+
+lenum.min = Minimum of two numbers.
+lenum.max = Maximum of two numbers.
+lenum.angle = Angle of vector in degrees.
+lenum.len = Length of vector.
+lenum.sin = Sine, in degrees.
+lenum.cos = Cosine, in degrees.
+lenum.tan = Tangent, in degrees.
+#not a typo, look up 'range notation'
+lenum.rand = Random decimal in range [0, value).
+lenum.log = Natural logarithm (ln).
+lenum.log10 = Base 10 logarithm.
+lenum.noise = 2D simplex noise.
+lenum.abs = Absolute value.
+lenum.sqrt = Square root.
+
+lenum.any = Any unit.
+lenum.ally = Ally unit.
+lenum.attacker = Unit with a weapon.
+lenum.enemy = Enemy unit.
+lenum.boss = Guardian unit.
+lenum.flying = Flying unit.
+lenum.ground = Ground unit.
+lenum.player = Unit controlled by a player.
+
+lenum.ore = Ore deposit.
+lenum.damaged = Damaged ally building.
+lenum.spawn = Enemy spawn point.\nMay be a core or a position.
+lenum.building = Building in a specific group.
+
+lenum.core = Any core.
+lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.rally = Command center.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
+
+sensor.in = The building/unit to sense.
+
+radar.from = Building to sense from.\nSensor range is limited by building range.
+radar.target = Filter for units to sense.
+radar.and = Additional filters.
+radar.order = Sorting order. 0 to reverse.
+radar.sort = Metric to sort results by.
+radar.output = Variable to write output unit to.
+
+unitradar.target = Filter for units to sense.
+unitradar.and = Additional filters.
+unitradar.order = Sorting order. 0 to reverse.
+unitradar.sort = Metric to sort results by.
+unitradar.output = Variable to write output unit to.
+
+control.of = Building to control.
+control.unit = Unit/building to aim at.
+control.shoot = Whether to shoot.
+
+unitlocate.enemy = Whether to locate enemy buildings.
+unitlocate.found = Whether the object was found.
+unitlocate.building = Output variable for located building.
+unitlocate.outx = Output X coordinate.
+unitlocate.outy = Output Y coordinate.
+unitlocate.group = Building group to look for.
+
+lenum.idle = Don't move, but keep building/mining.\nThe default state.
+lenum.stop = Stop moving/mining/building.
+lenum.move = Move to exact position.
+lenum.approach = Approach a position with a radius.
+lenum.pathfind = Pathfind to the enemy spawn.
+lenum.target = Shoot a position.
+lenum.targetp = Shoot a target with velocity prediction.
+lenum.itemdrop = Drop an item.
+lenum.itemtake = Take an item from a building.
+lenum.paydrop = Drop current payload.
+lenum.paytake = Pick up payload at current location.
+lenum.flag = Numeric unit flag.
+lenum.mine = Mine at a position.
+lenum.build = Build a structure.
+lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
+lenum.within = Check if unit is near a position.
+lenum.boost = Start/stop boosting.

core/assets/bundles/bundle_be.properties

@@ -1,4 +1,4 @@
-credits.text = Стваральнiк [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЁсць недапрацоўкі ў перакладзе або хочаце знайсці саюзнікаў для сумеснай гульні?\nПішыце ў аф. [accent]discord-сервер Mindustry[] у канал [accent]#translations[].\n\nРэдактар і перакладчык на беларускую мову:\n[cyan]K[gray]evi[cyan]TV[gray]#9923
+credits.text = Стваральнiк [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЁсць недапрацоўкі ў перакладзе або хочаце знайсці саюзнікаў для сумеснай гульні?\nПішыце ў аф. [accent]discord-сервер Mindustry[] у канал [accent]#translations[].\n\nРэдактар і перакладчык на беларускую мову:\n[cyan]K[gray]evi[cyan]TV[gray]#9923\nVit_log выправіў памылкі і дапоўніў пераклад.
 credits = Аўтары
 contributors = Перакладчык
 discord = Далучайцеся да нашага Discord!
@@ -20,8 +20,8 @@ gameover = Гульня скончана
 gameover.pvp = [accent]{0}[] каманда перамагла!
 highscore = [accent]Новы рэкорд!
 copied = Скапіявана.
-indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.popup = [accent]в6[] яшчэ в [accent]альфе[].\n[lightgray]Гэта значыць:[]\n[scarlet]- Кампанія не завершана[]\n- Часткі гульні адсутнічаюць\n - Большая частка [scarlet]ШІ юнітав[] можа працаваць не правільна\n- Мноства юнітав не дароблена\n- Ўсё што тут ёсць можа быць ізменена.\n\nАб багах і крашах пісаць на [accent]Github[].
-indev.notready = This part of the game isn't ready yet
+indev.notready = Гэта частка гульні яшчэ не зроблена.
 
 load.sound = Звукі
 load.map = Карты
@@ -41,8 +41,8 @@ be.check = Праверыць абнаўленні
 schematic = Схема
 schematic.add = Захаваць схему...
 schematics = Схемы
-schematic.replace = A schematic by that name already exists. Replace it?
+schematic.replace = Схема с данным імем ўжо існуе. Замяніць яе?
-schematic.exists = A schematic by that name already exists.
+schematic.exists = Схема с данным імем ўжо існуе.
 schematic.import = Імпартаваць схему...
 schematic.exportfile = Экспартаваць файл
 schematic.importfile = Імпартаваць файл
@@ -55,7 +55,7 @@ schematic.saved = Схема захавана.
 schematic.delete.confirm = Гэтая схема будзе выдалена.
 schematic.rename = Перайменаваць схему
 schematic.info = {0}x{1}, {2} блокаў
-schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.disabled = [scarlet]Схемы забаронены[]\nВам нельга выкарыстоўваць схемы на гэтай [accent]карце[] альбо [accent]серверы.
 
 stat.wave = Хваляў адлюстравана:[accent] {0}
 stat.enemiesDestroyed = Ворагаў знішчана:[accent] {0}
@@ -103,19 +103,19 @@ feature.unsupported = Ваша прылада не падтрымлівае гэ
 mods.alphainfo = Майце на ўвазе, што мадыфікацыі знаходзяцца ў альфа-версіі і [scarlet]могуць утрымліваць шмат памылак[]. Дакладвайце аб любых праблемах, якія Вы знойдзеце ў Mindustry Github або Discord.
 mods = Мадыфікацыі
 mods.none = [lightgray]Мадыфікацыі не знойдзены!
-mods.guide = Кіраўніцтва па модам
+mods.guide = Кіраўніцтва па мадам
 mods.report = Паведаміць пра памылку
 mods.openfolder = Адкрыць тэчку з мадыфікацыямі
 mods.reload = Reload
-mods.reloadexit = The game will now exit, to reload mods.
+mods.reloadexit = Гульня зараз закроецца, каб ўсталяваць мады.
 mod.display = [gray]Мадыфікацыя:[orange] {0}
 mod.enabled = [lightgray]Уключана
 mod.disabled = [scarlet]Выключана
 mod.disable = Выкл.
-mod.content = Content:
+mod.content = Змест:
 mod.delete.error = Немагчыма выдаліць мадыфікацыю. Магчыма, файл выкарыстоўваецца.
 mod.requiresversion = [scarlet]Мінімальная патрабаваная версія гульні: [accent]{0}
-mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
+mod.outdated = [scarlet]Не сумяшчальна з в6 (няма minGameVersion: 105)
 mod.missingdependencies = [scarlet]Не знойдзены бацькоўскія мадыфікацыі: {0}
 mod.erroredcontent = [scarlet]Памылкі змесціва
 mod.errors = Памылкі былі выкліканыя загружаным змесцівам.
@@ -127,20 +127,20 @@ mod.reloadrequired = [scarlet]Неабходны перазапуск
 mod.import = Імпартаваць мадыфікацыю
 mod.import.file = Import File
 mod.import.github = Імпартаваць мод з GitHub
-mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
+mod.jarwarn = [scarlet]JAR-мады не бяспечны па прынцыпу.[]\nПраверце, што імпартуеце гэты мод с надзейнай крыніцы!
 mod.item.remove = Гэты прадмет з’яўляецца часткай мадыфікацыі [accent]«{0}»[]. Каб выдаліць яго, выдаліце саму мадыфікацыю.
 mod.remove.confirm = Гэтая мадыфікацыя будзе выдалена.
 mod.author = [lightgray]Аўтар:[] {0}
 mod.missing = Гэта захаванне ўтрымлівае мадыфікацыю, якое вы нядаўна абнавілі ці яна больш не ўсталяваная. Можа здарыцца пашкоджанне захавання. Вы ўпэўненыя, што хочаце загрузіць яго?\n[lightgray]Мадыфікацыі:\n{0}
 mod.preview.missing = Перад публікацыяй гэтай мадыфікацыі ў майстэрні, вы павінны дадаць малюнак прадпрагляду.\nРазмесціце малюнак з імем[accent] preview.png[] у тэчцы мадыфікацыі і паспрабуйце зноў.
 mod.folder.missing = Мадыфікацыі могуць быць апублікаваныя ў майстэрні толькі ў выглядзе тэчкі.\nКаб канвертаваць любы мод у тэчку, проста выміце яго з архіва і выдаліце стары архіў .zip, затым перазапусціце гульню ці перазагрузіце мадыфікацыі.
-mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
+mod.scripts.disable = Ваша прылада не падтрымлівае мадыфікацыі з скріптамі. Выключайце такіе мады, как гуляць.
 
 about.button = Аб гульні
 name = Імя:
 noname = Для пачатку, прыдумайце[accent] сабе iмя[].
-planetmap = Planet Map
+planetmap = Карта планеты
-launchcore = Launch Core
+launchcore = Запусціць ядро
 filename = Iмя файла:
 unlocked = Новы кантэнт адмыкнуты!
 completed = [accent]Завершаны
@@ -148,11 +148,11 @@ techtree = Дрэва\n тэхналогій
 research.list = [lightgray]Дасьледуйце:
 research = Даследаваць
 researched = [lightgray] {0} даследавана.
-research.progress = {0}% complete
+research.progress = {0}% завершана
 players = Гульцоў: {0}
 players.single = {0} гулец
 players.search = search
-players.notfound = [gray]no players found
+players.notfound = [gray]гульцоу не знойдзена
 server.closing = [accent]Закрыццё сервера…
 server.kicked.kick = Вас выгналі з сервера!
 server.kicked.whitelist = Вы не ў белым спісе сервера.
@@ -278,7 +278,7 @@ quit.confirm.tutorial = Вы ўпэўненыя, што ведаеце, што
 loading = [accent]Загрузка…
 reloading = [accent]Перазагрузка мадыфікацый...
 saving = [accent]Захаванне…
-respawn = [accent][[{0}][] to respawn in core
+respawn = [accent][[{0}][] да вазраджэння з ядра
 cancelbuilding = [accent][[{0}][] для ачысткі плана
 selectschematic = [accent][[{0}][] вылучыць і скапіяваць
 pausebuilding = [accent][[{0}][] для прыпынення будаўніцтва
@@ -291,8 +291,8 @@ waiting = [lightgray]Чаканне…
 waiting.players = Чаканне гульцоў…
 wave.enemies = Ворагаў: [lightgray]{0}
 wave.enemy = Застаўся [lightgray]{0}[] ворагаў
-wave.guardianwarn = Guardian approaching in [accent]{0}[] waves.
+wave.guardianwarn = Вартаўнік будзе пасля [accent]{0}[] хвалей.
-wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave.
+wave.guardianwarn.one = Вартаўнік будзе пасля [accent]{0}[] хвалі.
 loadimage = Загрузіць малюнак
 saveimage = Захаваць малюнак
 unknown = Невядома
@@ -339,9 +339,9 @@ waves.never = <ніколі>
 waves.every = кожны
 waves.waves = хваля (ы)
 waves.perspawn = за з’яўленне
-waves.shields = shields/wave
+waves.shields = адзінак шчыта/хвалю
 waves.to = да
-waves.guardian = Guardian
+waves.guardian = Вартаўнік
 waves.preview = Папярэдні прагляд
 waves.edit = Рэдагавацью...
 waves.copy = Капіяваць у буфер абмену
@@ -350,9 +350,9 @@ waves.invalid = Няслушныя хвалі ў буферы абмену.
 waves.copied = Хвалі скапіяваныя.
 waves.none = Ворагі не былі вызначаныя. \nЗвярнiце ўвагу, што пустыя хвалі будуць аўтаматычна замененыя звычайнай хваляй.
 
-wavemode.counts = counts
+wavemode.counts = колькацсь адзінак
-wavemode.totals = totals
+wavemode.totals = усяго здароўя
-wavemode.health = health
+wavemode.health = здароўе
 
 editor.default = [lightgray]<Па змаўчанні>
 details = Падрабязнасці...
@@ -508,11 +508,11 @@ error.io = Сеткавая памылка ўводу-высновы.
 error.any = Невядомая сеткавая памылка.
 error.bloom = Не атрымалася ініцыялізаваць свячэнне (Bloom). \nМагчыма, зараз Вашая прылада не падтрымлівае яго.
 
-weather.rain.name = Rain
+weather.rain.name = Дождж
-weather.snow.name = Snow
+weather.snow.name = Снег
-weather.sandstorm.name = Sandstorm
+weather.sandstorm.name = Пясочныя бурі
-weather.sporestorm.name = Sporestorm
+weather.sporestorm.name = Споравыя бурі
-weather.fog.name = Fog
+weather.fog.name = Туман
 
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
@@ -891,9 +891,9 @@ rules.enemyLights = Enemy Lights
 rules.fire = Fire
 rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Навакольны свет
-rules.weather = Weather
+rules.weather = Надвор'е
-rules.weather.frequency = Frequency:
+rules.weather.frequency = Частата:
-rules.weather.duration = Duration:
+rules.weather.duration = Працягласць:
 
 content.item.name = Рэчывы
 content.liquid.name = Вадкасці
@@ -922,62 +922,62 @@ liquid.oil.name = Нафта
 liquid.cryofluid.name = Крыягенная вадкасць
 
 unit.dagger.name = Кінжал
-unit.mace.name = Mace
+unit.mace.name = Булава
 unit.fortress.name = Крэпасць
-unit.nova.name = Nova
+unit.nova.name = Нова
-unit.pulsar.name = Pulsar
+unit.pulsar.name = Пульсар
-unit.quasar.name = Quasar
+unit.quasar.name = Квазар
-unit.crawler.name = Камікадзэ
+unit.crawler.name = Палзун
-unit.atrax.name = Atrax
+unit.atrax.name = Атракс
-unit.spiroct.name = Spiroct
+unit.spiroct.name = Спірокт
-unit.arkyid.name = Arkyid
+unit.arkyid.name = Аркід
-unit.toxopid.name = Toxopid
+unit.toxopid.name = Токсопойд
-unit.flare.name = Flare
+unit.flare.name = Успышка
-unit.horizon.name = Horizon
+unit.horizon.name = Гарызонт
-unit.zenith.name = Zenith
+unit.zenith.name = Зеніт
-unit.antumbra.name = Antumbra
+unit.antumbra.name = Зацемь
-unit.eclipse.name = Eclipse
+unit.eclipse.name = Затменне
-unit.mono.name = Mono
+unit.mono.name = Моно
-unit.poly.name = Poly
+unit.poly.name = Полі
-unit.mega.name = Mega
+unit.mega.name = Мега
-unit.quad.name = Quad
+unit.quad.name = Квад
-unit.oct.name = Oct
+unit.oct.name = Окт
-unit.risso.name = Risso
+unit.risso.name = Ріссо
-unit.minke.name = Minke
+unit.minke.name = Мінкі
-unit.bryde.name = Bryde
+unit.bryde.name = Брайд
-unit.sei.name = Sei
+unit.sei.name = Сэй
-unit.omura.name = Omura
+unit.omura.name = Амура
-unit.alpha.name = Alpha
+unit.alpha.name = Альфа
-unit.beta.name = Beta
+unit.beta.name = Бэта
-unit.gamma.name = Gamma
+unit.gamma.name = Гамма
-unit.scepter.name = Scepter
+unit.scepter.name = Скіпетр
-unit.reign.name = Reign
+unit.reign.name = Улада
-unit.vela.name = Vela
+unit.vela.name = Ветразь
-unit.corvus.name = Corvus
+unit.corvus.name = Корвус
 
-block.resupply-point.name = Resupply Point
+block.resupply-point.name = Цэнтр аммуніцыі
-block.parallax.name = Parallax
+block.parallax.name = Парралакс
 block.cliff.name = Скала
 block.sand-boulder.name = Пяшчаны валун
 block.grass.name = Трава
 block.slag.name = Шлак
 block.space.name = Space
 block.salt.name = Соль
-block.salt-wall.name = Salt Wall
+block.salt-wall.name = Саляная сцяна
 block.pebbles.name = Галька
 block.tendrils.name = Споравыя вусікі
-block.sand-wall.name = Sand Wall
+block.sand-wall.name = Пяшчаная сцяна
 block.spore-pine.name = Спорава хвоя
-block.spore-wall.name = Spore Wall
+block.spore-wall.name = Споравая сцяна
 block.boulder.name = Boulder
-block.snow-boulder.name = Snow Boulder
+block.snow-boulder.name = Снежны валун
 block.snow-pine.name = Заснежаная хвоя
 block.shale.name = Сланец
 block.shale-boulder.name = Сланцавы валун
 block.moss.name = Мох
 block.shrubs.name = Кусты
 block.spore-moss.name = Спорава мох
-block.shale-wall.name = Shale Wall
+block.shale-wall.name = Сланцавая сцяна
 block.scrap-wall.name = Сцяна з металалому
 block.scrap-wall-large.name = Вялікая сцяна з металалому
 block.scrap-wall-huge.name = Велізарная сцяна з металалому
@@ -1005,18 +1005,18 @@ block.craters.name = Кратэры
 block.sand-water.name = Пясок з вадой
 block.darksand-water.name = Тёмный пясок з вадой
 block.char.name = Выпаленая зямля
-block.dacite.name = Dacite
+block.dacite.name = Дацыт
-block.dacite-wall.name = Dacite Wall
+block.dacite-wall.name = Дацытавая сцяна
-block.dacite-boulder.name = Dacite Boulder
+block.dacite-boulder.name = Дацытавы валун
 block.ice-snow.name = Заснежаны лёд
-block.stone-wall.name = Stone Wall
+block.stone-wall.name = Каменная сцяна
-block.ice-wall.name = Ice Wall
+block.ice-wall.name = Лядовая сцяна
-block.snow-wall.name = Snow Wall
+block.snow-wall.name = Снежная сцяна
-block.dune-wall.name = Dune Wall
+block.dune-wall.name = Тёмнапясчаная сцяна
 block.pine.name = Сасна
-block.dirt.name = Dirt
+block.dirt.name = Зямля
-block.dirt-wall.name = Dirt Wall
+block.dirt-wall.name = Брудная сцяна
-block.mud.name = Mud
+block.mud.name = Бруд
 block.white-tree-dead.name = Мёртвае белае дрэва
 block.white-tree.name = Белае дрэва
 block.spore-cluster.name = Навала спрэчка
@@ -1147,28 +1147,28 @@ block.container.name = Кантэйнер
 block.launch-pad.name = Пускавая пляцоўка
 block.launch-pad-large.name = Вялікая пускавая пляцоўка
 block.segment.name = Segment
-block.command-center.name = Command Center
+block.command-center.name = Каммандны цэнтр
-block.ground-factory.name = Ground Factory
+block.ground-factory.name = Завод наземных адзінак
-block.air-factory.name = Air Factory
+block.air-factory.name = Завод паветраных адзінак
-block.naval-factory.name = Naval Factory
+block.naval-factory.name = Завод марскіх адзінак
-block.additive-reconstructor.name = Additive Reconstructor
+block.additive-reconstructor.name = Злучальны рэканструктар
-block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.multiplicative-reconstructor.name = Мультыплікацыйны рэканструктар
-block.exponential-reconstructor.name = Exponential Reconstructor
+block.exponential-reconstructor.name = Экспаненцыяльны рэканструктар
-block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.tetrative-reconstructor.name = Тэтрацыйны рэканструктар
-block.payload-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Канвеер для тяжёлай зброі
-block.payload-router.name = Payload Router
+block.payload-router.name = Роутар для тяжёлай зброі
-block.disassembler.name = Disassembler
+block.disassembler.name = Разборшчык
-block.silicon-crucible.name = Silicon Crucible
+block.silicon-crucible.name = Крэмніевы тыгель
-block.overdrive-dome.name = Overdrive Dome
+block.overdrive-dome.name = Сверхпрывадны купал
 
-block.switch.name = Switch
+block.switch.name = Пераключальнік
-block.micro-processor.name = Micro Processor
+block.micro-processor.name = Мікропрацэсар
-block.logic-processor.name = Logic Processor
+block.logic-processor.name = Працэсар логікі
-block.hyper-processor.name = Hyper Processor
+block.hyper-processor.name = Гіперпрацэсар
-block.logic-display.name = Logic Display
+block.logic-display.name = Экран
-block.large-logic-display.name = Large Logic Display
+block.large-logic-display.name = Вялікі экран
-block.memory-cell.name = Memory Cell
+block.memory-cell.name = Ячэйка памяці
-block.memory-bank.name = Memory Bank
+block.memory-bank.name = Банк памяці
 
 team.blue.name = Сіняя
 team.crux.name = Чырвоная
@@ -1196,14 +1196,14 @@ tutorial.breaking = Часта, блокі даводзіцца руйнавац
 tutorial.breaking.mobile = Часта, блокі даводзіцца руйнаваць. \n [accent] Вылучыце рэжым дэканструкцыі[], пасля чаго націсніце на патрэбны блок, каб разбурыць яго. \nРазрушьте блокі ў абранай зоне, трымаючы палец на некалькі секунд[], і правёўшы яго ў патрэбным кірунку. \nНажмите на галачку, каб пацвердзіць разбурэнне. \n \n [accent] разбурце усе сцены з металалому злева ад Вашага ядра.
 tutorial.withdraw = У некаторых сітуацыях, неабходна забраць прадметы з блокаў ўручную. \nКаб зрабіць гэта, [accent] націсніце на блок[], у якім знаходзяцца прадметы, затым [accent] націсніце на прадмет[] ў інвентары. \nМожно забраць некалькі прадметаў [accent] націскам з заціскам[].\n [accent] Забярыце трохі медзі з ядра[]
 tutorial.deposit = Пакладзеце прадметы ў блок, перацягнуўшы іх ад свайго карабля ў патрэбны блок. \n \n [accent] Перанясіце медзь назад у ядро []
-tutorial.waves = [lightgray] Праціўнікі[] набліжаюцца. \nЗащитите ядро ​​ад двух хваль. Выкарыстоўвайце [accent] левую кнопку мышы[] для стральбы. \nПостройте больш турэляў і бураў. Добудьте больш медзі.
+tutorial.waves = [lightgray] Праціўнікі[] набліжаюцца. \nЗащіціце ядро ​​ад двух хваль. Выкарыстоўвайце [accent] левую кнопку мышы[] для стральбы. \nПостройте больш турэляў і бураў. Добудьте больш медзі.
-tutorial.waves.mobile = [lightgray] Праціўнікі[] набліжаюцца. \n \nЗащитите ядро ​​ад двух хваль. Ваш карабель будзе аўтаматычна атакаваць праціўніка. \nПостройте больш турэляў і бураў. Добудьте больш медзі.
+tutorial.waves.mobile = [lightgray] Праціўнікі[] набліжаюцца. \n \nЗащіціце ядро ​​ад двух хваль. Ваш карабель будзе аўтаматычна атакаваць праціўніка. \nПостройте больш турэляў і бураў. Добудьте больш медзі.
 tutorial.launch = Калі Вы дасягаеце пэўнай хвалі, Вы можаце ажыццявіць [accent] запуск ядра[], пакінуўшы базу і [accent] перанесці рэсурсы з ядра.[] \nЭти рэсурсы могуць быць выкарыстаны для вывучэння новых тэхналогій.\n [accent] Націсніце кнопку запуску.
 
 item.copper.description = Самы асноўны будаўнічы матэрыял. Шырока выкарыстоўваецца ва ўсіх тыпах блокаў.
 item.lead.description = Асноўны стартавы матэрыял. Шырока выкарыстоўваецца ў электроніцы і блоках для транспарціроўкі вадкасцяў.
-item.metaglass.description = звышмоцнага сплаў шкла. Шырока выкарыстоўваецца для размеркавання і захоўвання вадкасці.
+item.metaglass.description = Звышмоцны сплаў шкла. Шырока выкарыстоўваецца для размеркавання і захоўвання вадкасці.
-item.graphite.description = мінералізаваныя вуглярод, які выкарыстоўваецца для боепрыпасаў і электрычных кампанентаў.
+item.graphite.description = Мінералізаваны вуглярод, які выкарыстоўваецца для боепрыпасаў і электрычных кампанентаў.
 item.sand.description = Звычайны матэрыял, які шырока выкарыстоўваецца пры выплаўленні, як пры легіравання, так і ў якасці флюсу.
 item.coal.description = Закамянеласцевае мінеральнае рэчыва, якое ўтварылася задоўга да пасева. Шырока выкарыстоўваецца для вытворчасці паліва і рэсурсаў.
 item.titanium.description = Рэдкі звышлёгкі метал, шырока выкарыстоўваецца для транспарціроўкі вадкасцяў, бураў і авіяцыі.
@@ -1332,4 +1332,4 @@ block.cyclone.description = Вялікая турэль, якая можа ве
 block.spectre.description = Масіўная двуствольное гармата. Страляе буйнымі бранябойнымі кулямі па паветраных і наземных мэтах.
 block.meltdown.description = Масіўная лазерная гармата. Зараджае і страляе пастаянным лазерным прамянём ў бліжэйшых ворагаў. Патрабуецца астуджальная вадкасць для працы.
 block.repair-point.description = Бесперапынна лечыць бліжэйшую пашкоджаную баявую адзінку або мех у сваім радыусе.
-block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
+block.segment.description = Пашкоджвае і знішчае снарады. Лазерныя снарады не шкодзяца.

core/assets/bundles/bundle_cs.properties

@@ -17,15 +17,11 @@ linkfail = Nepodařilo se otevřít odkaz!\nAdresa URL byla zkopírována do sch
 screenshot = Snímek obrazovky uložen {0}
 screenshot.invalid = Mapa je moc velká, nemusí být dost paměti pro získání snímku obrazovky.
 gameover = Konec hry
-gameover.disconnect = Odpojit se
 gameover.pvp = Vyhrál tým [accent]{0}[]!
-gameover.waiting = [accent]Hra čeká na další mapu...
 highscore = [accent]Nový rekord!
 copied = Zkopírováno.
-indev.popup = Mindustry [accent]v6[] je aktuálně ve verzi [accent]beta[].\n[lightgray]To znamená:[]\n[scarlet]- Kampaň je nedokončená[]\n- Cokoli, co vidíte, se může změnit nebo být odstraněno.\n\nHlaste prosím chyby na [accent]Github[].
 indev.notready = Tato část hry ještě není připravena
-indev.campaign = [accent]Dovršil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích.
+indev.campaign = [accent]Blahopřejeme! Završil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích.
-
 
 load.sound = Zvuky
 load.map = Mapy
@@ -148,8 +144,12 @@ planetmap = Planetární mapa
 launchcore = Vyslat jádro
 filename = Název souboru:
 unlocked = Byl odemmknut nový blok!
+available = Je zpřístupněn nový výzkum!
 completed = [accent]Dokončeno[]
 techtree = Technologie
+research.legacy = Nalezena výzkumná data z verze [accent]5.0[].\nChceš [accent]tato data načíst[], nebo [accent]je zahodit[] a začít výzkum v nové kampani (což doporučujeme)?
+research.load = Načíst
+research.discard = Zahodit
 research.list = [lightgray]Výzkum:[]
 research = Výzkum
 researched = Dokončen výzkum technologie: [lightgray]{0}[].
@@ -194,6 +194,7 @@ servers.local = Místní servery
 servers.remote = Vzdálené servery
 servers.global = Komunitní servery
 
+servers.disclaimer = Komunitní servery [accent]nejsou[] vlastněny ani kontrolovány vývojářem této hry.\n\nServery mohou obsahovat obsah vytvořený uživateli, který může na některé uživatele působit nepatřičně či nevhodně.
 servers.showhidden = Zobraz skryté servery
 server.shown = Zobrazené
 server.hidden = Skryté
@@ -231,6 +232,7 @@ disconnect.timeout = Vypršel čas pro připojení.
 disconnect.data = Chyba načtení dat ze serveru!
 cantconnect = Není možno se připojit ke hře ([accent]{0}[]).
 connecting = [accent]Připojuji se...[]
+reconnecting = [accent]Znovu se připojuji...
 connecting.data = [accent]Načítám data ze serveru...[]
 server.port = Port:
 server.addressinuse = Adresu již někdo používá!
@@ -498,10 +500,10 @@ requirement.produce = Vyrob {0}
 requirement.capture = Polap {0}
 launch.text = Vyslat
 research.multiplayer = Jen hostitel hry může vynalézat nové technologie.
+map.multiplayer = Jen hostitel může prohlížet sektory.
 uncover = Odkrýt mapu
 configure = Přizpůsobit vybavení
 
-#TODO
 loadout = Načtení
 resources = Zdroje 
 bannedblocks = Zakázané bloky
@@ -509,12 +511,6 @@ addall = Přidat vše
 launch.from = Vysláno z: [accent]{0}
 launch.destination = Cíl: {0}
 configure.invalid = Hodnota musí být číslo mezi 0 a {0}.
-zone.unlocked = [lightgray]Mapa {0} byla odemknuta.[]
-zone.requirement.complete = Bylo dosaženo vlny {0},\nčímž byla splněna podmínka pro mapu {1}.
-zone.resources = [lightgray]Byly detekovány tyto suroviny:[]
-zone.objective = [lightgray]Úkol: [][accent]{0}[]
-zone.objective.survival = Přežij
-zone.objective.attack = Znič nepřátelské jádro
 add = Přidat...
 boss.health = Životy Strážce
 
@@ -548,12 +544,17 @@ sectors.launch = Vyslat
 sectors.select = Vybrat
 sectors.nonelaunch = [lightgray]bez (slunce)[]
 sectors.rename = Přejmenovat sektor
-
+sectors.enemybase = [scarlet]Nepřátelská základna
+sectors.vulnerable = [scarlet]Zranitelný
+sectors.underattack = [scarlet]Pod palbou! [accent]{0}% poškozeno
+sectors.survives = [accent]Přežívá již {0} vln
+sectors.go = Jdi
 sector.curcapture = Sektor polapen
+sector.curlost = Sektor ztracen
 sector.missingresources = [scarlet]Nedostatečné zdroje v jádře
 sector.attacked = Sektor [accent]{0}[white] pod útokem!
 sector.lost = Sektor [accent]{0}[white] ztracen! :(
-#note: the missing space in the line below is intentional
+#note: chybějící mezera v řádce níže je záměrná :)
 sector.captured = Sektor [accent]{0}[white]polapen! :)
 
 threat.low = Nízké
@@ -584,20 +585,22 @@ sector.windsweptIslands.name = Větrné ostrovy
 sector.extractionOutpost.name = Extrakční základna
 sector.planetaryTerminal.name = Planetární odpalovací terminál
 
-#unused
-#sector.crags.name = Crags
-
 sector.groundZero.description = Optimální místo, kde znovu začít. Nízký výskyt nepřátel. Několik málo surovin.\nPosbírej co nejvíce olova a mědi.\nBěž dál.
 sector.frozenForest.description = Dokonce až sem, blízko hor, se  dokázaly spóry rozrůst. Mráz je však nemůže zadržet navěky.\n\nPusť se do práce za pomocí energie. Stav spalovací generátory. Nauč se, jak používat opravovací věže.
 sector.saltFlats.description = Na okraji pouště leží Solné nížiny. V této lokaci se nachází jen několik málo surovin.\n\nNepřítel zde vybudoval zásobovací komplex. Znič jádro v jeho základně. Nenechej kámen na kameni.
 sector.craters.description = V těchto relikviích starých válek se nahromadilo velké množství vody. Znovu získej tuto oblast. Sbírej písek. Vyrob z něj metasklo. Použij vodu k chlazení svých vrtů a střílen.
 sector.ruinousShores.description = Za pustinou se nachází pobřeží. Kdysi zde stál obranný pobřežní systém. Moc z něj už dneska nezbylo. Jen základní konstrukce zůstaly ušetřeny, zbytek se rozpadl na šrot.\nPokračuj ve své expanzi hlouběji. Objev ztracenou technologii.
 sector.stainedMountains.description = Dále ve vnitrozemí leží hory, dosud neposkvrněny spórami.\nVytěž titan, kterým tato oblast oplývá. Nauč se jej používat.\n\nPřítomnost nepřátelských jednotek je zde větší. Radši jim nedej moc času na vyslání jejich nejsilnějších jednotech.
-sector.overgrowth.description = Tato přerostlá džungle se nachází blíže ke zdroji spór.\nNepřítel zde zbudoval předsunutou hlídku. Stav jednotky Dýka a znič s jejich pomocí jádro základny. Získej znovu to, co bylo již dávno ztraceno.
+sector.overgrowth.description = Tato přerostlá džungle se nachází blíže ke zdroji spór.\nNepřítel zde zbudoval předsunutou hlídku. Stav jednotky Palcát a znič s jejich pomocí jádro základny.
 sector.tarFields.description = Rozhraní produkční naftové oblasti mezi horami a pouští. Jedna z mála oblastí, kde se stále nachází dehet.\nAčkoliv je oblast opuštěná, stále se v jejím okolí nachází nebezpečné nepřátelské síly. Není radno je podcenit.\n\n[lightgray]Vyzkoumej technologii na zpracování nafty.[]
 sector.desolateRift.description = Extrémně nebezpečná mapa. Na úkor prostoru se zde nachází přehršel surovin. Vysoká pravděpodobnost zničení. Opusť tuto oblast co nejdříve to půjde. Nenech se zmást dlouhými prodlevami mezi vlnami nepřátel.
 sector.nuclearComplex.description = Bývalá továrna na zpracování thoria, dnes v troskách.\n[lightgray]Objev thorium a jeho široké využití.[]\n\nNepřátelské jednotky se zde nacházejí v hojném počtu, a neustále prohledávají oblast.
 sector.fungalPass.description = Přechodová oblast mezi vysokými horami a spórami nasycenou zemí. Nachází se zde malá průzkumná základna Tvého nepřítele.\nZnič ji.\nPoužij mechy Dýka a Slídil. Znič obě nepřátelské jádra.
+sector.biomassFacility.description = Prapůvod všech spór. Toto je zařízení, be kterém byly spóry vynalezeny a zpočátku u vyráběny.\nVynalezni technologii, která se skrýbá uvnitř. Kultivuj spóry k výrobě paliva a plastů.\n\n[lightgray]Po vypnutí tohoto zařízení byly spóry vypuštěny. V okolním ekosystému však tomuto invazivnímu druhu nebylo nic schopné konkurovat.
+sector.windsweptIslands.description = Vzdálen od pevniny je tento řetízek ostrovů. Záznamy ukazují, že zde kdysi byly zařízení na výrobu [accent]Plastany[].\n\nPoraž nepřátelské námořní jednotky. Vybuduj základnu na ostrově. Vynalezni továrny.
+sector.extractionOutpost.description = Vzdálená pevnost, postavená nepřítelem za účelem vysílání zdrojů do okolních sektorů.\n\nDoprava položek napříč sektory je nezbytná pro lapení dalších sektorů. Znič základnu. Vyzkoumej jejich Vysílací plošiny.
+sector.impact0078.description = Zde leží zbytky mezihvězdné lodi, která vstoupila d otohoto systému.\n\nZachraň z vraku vše, co se dá. Vyzkoumej nepoškozenou technologii.
+sector.planetaryTerminal.description = Konečný cíl.\n\nTato pobřežní základna obsahuje konstrukce schopné vyslat jádra na okolní planety. Je mimořádně dobře opevněna.\n\nVyrob námořní jednotky. Odstraň nepřítele tak rychle, jak umíš. Vyzkoumej vysílací konstrukci.
 
 settings.language = Jazyk
 settings.data = Data hry
@@ -803,16 +806,15 @@ setting.conveyorpathfinding.name = Hledat cestu při umisťování pásu
 setting.sensitivity.name = Citlivost ovladače
 setting.saveinterval.name = Interval automatického ukládání
 setting.seconds = {0} sekund
-setting.blockselecttimeout.name = Časový limit pro výběr bloku
 setting.milliseconds = {0} milisekund
 setting.fullscreen.name = Celá obrazovka
-setting.borderlesswindow.name = Bezokrajové okno[lightgray] (může výt vyžadován restart)[]
+setting.borderlesswindow.name = Bezokrajové okno [lightgray](může výt vyžadován restart)
 setting.fps.name = Ukázat FPS a ping
 setting.smoothcamera.name = Plynulá kamera
 setting.vsync.name = Vertikální synchronizace
 setting.pixelate.name = Rozpixlovat
 setting.minimap.name = Ukázat mapičku
-setting.coreitems.name = Ukázat položky jádra (WIP)
+setting.coreitems.name = Ukázat položky jádra
 setting.position.name = Ukázat pozici hráče
 setting.musicvol.name = Hlasitost hudby
 setting.atmosphere.name = Ukázat atmosféru planety
@@ -892,6 +894,8 @@ keybind.menu.name = Hlavní nabídka
 keybind.pause.name = Pozastavení hry
 keybind.pause_building.name = Pozastavit nebo spustit stavění
 keybind.minimap.name = Mapička
+keybind.planet_map.name = Planetární mapa
+keybind.research.name = Výzkum
 keybind.chat.name = Kanál zpráv
 keybind.player_list.name = Seznam hráčů
 keybind.console.name = Terminál
@@ -1016,6 +1020,7 @@ block.resupply-point.name = Zásobovací místo
 block.parallax.name = Paralaxa
 block.cliff.name = Útes
 block.sand-boulder.name = Pískovec
+block.basalt-boulder.name = Čedičový balvan
 block.grass.name = Tráva
 block.slag.name = Struska
 block.space.name = Vesmír   
@@ -1239,34 +1244,52 @@ team.derelict.name = opuštěný
 team.green.name = zelený
 team.purple.name = fialový
 
-tutorial.next = [lightgray]<Klikni pro pokračování>
+hint.skip = Přeskočit
-tutorial.intro = Vítej ve [scarlet]výuce Mindustry[]. Zde se dozvíš základy hraní.\nPoznámka: výuka předpokládá [accent]výchozí klávesy[] v nastavení, pokud jsi je změnil, bude třeba to vzít v potaz.\nPoužij [accent][[WASD][] pro pohyb a [accent]kolečko myši[] pro přibližování a oddalování.\nZačni [accent]těžením mědi[]. Přibliž se k měděné žíle u Tvého jádra a klikni na ni pro zahájení těžby.\n\n[accent]{0}/{1} mědi[]
+hint.desktopMove = Použij [accent][[WASD][] k pohybu.
-tutorial.intro.mobile = Vítej ve [scarlet]výuce Mindustry[].\nPohybuj se táhnutím prstem do strany.\nPřibližuj a oddaluj mapu [accent]2 prsty[].\nZačni [accent] těžením mědi[]. Přibliž se k měděné žíle u Tvého jádra a ťupni na ni pro zahájení těžby.\n\n[accent]{0}/{1} mědi[]
+hint.zoom = [accent]Roluj[] prp přiblížení a oddalování obrazvky.
-tutorial.drill = Sám vidíš, že ruční těžba není moc efektivní.\n[accent]Vrty[] umožňují těžit automaticky.\nKlikni na vrt v nabídce v pravém dolním rohu.\nVyber [accent]mechanický vrt[]. Umisti jej kliknutím na měděnou žílu.\nTaké můžeš vybrat mechanický vrt stiskem kláves [accent][[2][] a následně [accent][[1][] rychle po sobě, nezávisle na tom, jaká záložka je v nabídce zrovna otevřena.\n[accent]Pravým klikem[] přerušíš stavění.
+hint.mine = Přesuň se poblíž \uf8c4 měděné rudy a [accent]ťupni[] na ni pro zahájení těžby.
-tutorial.drill.mobile = Sám vidíš, že ruční těžba není moc efektivní.\n[accent]Vrty[] umožňují těžit automaticky.\nŤupni na vrt v nabídce v pravém dolním rohu.\nVyber [accent]mechanický vrt[]. Umisti jej klikutím na měděnou žílu ťupnutím a následně zaškrtni [accent]fajfku[] na spodku nabídky pro potvrzení volby.\nŤupnutím na [accent]X[] přerušíš stavění.
+hint.desktopShoot = Klikni na [accent][[levé tlačítko][] myši pro střelbu.
-tutorial.blockinfo = Každý blok má jiné vlastnosti. Každý vrt může těžit pouze některé suroviny.\nPro zobrazení informací a statistik o bloku [accent]zvol "?" při vybraném bloku ve stavební nabídce[].\n\nNyní se podívej na [accent]vlastnosti mechanického vrtu[].
+hint.depositItems = Pro přesun položek je přetáhni ze své lodi do jádra.
-tutorial.conveyor = Pro dopravu materiálu k jádru jsou zapotřebí [accent]dopravníky[].\nVytvoř řadu dopravníků od vrtu až k jádru.\nDrž zmáčknuté [accent]levé tlačítko myši[], abys umístil dopravníky v jedné řadě.\nKdyž zmáčkneš [accent]Ctrl[], řada dopravníků se bude umisťovat navíc úhlopříčně.\nPoužij [accent]kolečko myši[] pro otáčení bloku před umístěním.\n[accent]Umísti dopravníky tak, abys dopravil měď do jádra[]. 
+hint.respawn = Aby ses znovu přepnul na loď, zmáčkni [accent][[V][].
-tutorial.conveyor.mobile = Pro dopravu materiálu k jádru jsou zapotřebí [accent]dopravníky[].\nVytvoř řadu dopravníků od vrtu až k jádru.\n[accent]Pokládej dopravníky v řadě ťupnutím a delším prstu[] a táhnutím v požadovaném směru.\n[accent]Umísti dopravníky tak, abys dopravil měď do jádra[]. 
+hint.respawn.mobile = Přepnul ses na ovládání jednotky nebo konstrukce. Aby ses přepnul zpět na loď, klikni na avatara vlevo nahoře.
-tutorial.turret = Jakmile se materiál dostane do jádra, může být použit pro konstrukci.\nPamatuj si, že ne všechno lze použít pro konstrukci.\nVěci, které melze použít jako stavební materiál, jako například [accent]uhlí[] nebo [accent]šrot[], nelze do jádra uložit, a zasekne tak celý dopravník na vstupu.\nPro odehnání útočných jednotek [lightgray]nepřítele[] od jádra je třeba postavit obranné konstrukce.\nPostav [accent]střílnu Duo[] poblíž svého jádra.
+hint.desktopPause = Zmáčkni [accent][[mezerník][] k pozastavení a zase spuštění hry.
-tutorial.drillturret = Střílny Duo potřebují jako střelivo [accent]měď[].\nPolož mechanický vrt blízko střílny.\nPro zásobování mědí veď dopravníky od vrtu ke střílně.\n\n[accent]Doručeno střeliva: {0}/{1}[]
+hint.placeDrill = Vyber si záložku \ue85e [accent]Vrtů[] v nabídce vpravo dole, potom vyber \uf870 [accent]Vrt[] a klikni na oblast s mědí k umístění.
-tutorial.pause = Během hry, například v boji, můžeš [accent]pozastavit hru[].\nPři pozastavení můžeš naplánovat konstrukci do fronty.\n\n[accent]Pozastav hru mezerníkem[].
+hint.placeDrill.mobile = Vyber si záložku \ue85e [accent]Vrtů[] v nabídce vpravo dole, potom vyber \uf870 [accent]Vrt[] a ťupni na oblast s mědí k umístění.\n\Ťupni na \ue800 [accent]zaškrtnutí[] vpravo dole pro potvrzení.
-tutorial.pause.mobile = Během hry, například v boji, můžeš [accent]pozastavit hru[].\nPři pozastavení můžeš naplánovat konstrukci do fronty.\n\n[accent]Pozastavení hry probedeš ťupnutím na dvě čárky vlevo nahoře.
+hint.placeConveyor = Dopravníky přesouvají materiál z vrtu do dalších bloků. Vyber \uf896 [accent]Dopravník[] ze záložky \ue814 [accent]Distribuce[].\n\nKlikni a táhni pro umístění vícero dopravníků.\n[accent]Roluj[] pro otočení.
-tutorial.unpause = Teď zmáčkni mezerník znova a pokračuj ve hře.
+hint.placeConveyor.mobile = Dopravníky přesouvají materiál z vrtu do dalších bloků. Vyber \uf896 [accent]Dopravník[] ze záložky \ue814 [accent]Distribuce[].\n\nPodrž chvíli prst a táhni pro umístění vícero dopravníků.
-tutorial.unpause.mobile = Teď ťupni na ikonu na stejném místě a pokračuj ve hře.
+hint.placeTurret = Umisti \uf861 [accent]Věž[], abys ubránil Tvoji základnu před nepřáteli.\n\nVěže vyžaduj munici - v tomto případě je jí \uf838měď.\nPoužij vrty a dopravníky, abys nějakou získal.
-tutorial.breaking = Bloky je třeba nejen stavět, ale Často rozbít.\n[accent]Drž pravé tlačítko myšu[] a táhni s ní pro výběr bloků, které potřebuješ rozbít.\n\n[accent]Znič všechen šrot vlevo od Tvého jádra použitím blokového výběru[].
+hint.breaking = Klikni [accent]pravým tlačítkem[] a potáhni pro rozbití bloků.
-tutorial.breaking.mobile = Bloky je třeba nejen stavět, ale Často rozbít.\n[accent]Ťupnu na ikonku kladiva dole[] a pak ťupni na blok, který chceš rozbít.\nRozbití více bloků se provádí delším  podržením prstu a táhnutím.\nRozbití dokončíš ťupnutím na fajfku.\n\n[accent]Znič všechen šrot vlevo od Tvého jádra použitím blokového výběru[].
+hint.breaking.mobile = Použij \ue817 [accent]kladivo[] v pravém spodním  rohu a pak ťupni pro rozbití bloků.\n\nPodrž chvíli prst a táhni pro rozbití bloků ve výběru.
-tutorial.withdraw = Někdy je třeba odebírat předměty přímo z bloků.\n[accent]Klikni na blok[], ve kterém jsou předměty a pak [accent]klikni na předmět[] z inventáře bloku.\nVícero předmětů může být odebráno [accent]ťupnutím a držením[].\n\n[accent]Odeber trochu mědi z jádra[].
+hint.research = Použij tlačítko \ue875 [accent]Výzkum[] pro vyzkoumání nové technologie.
-tutorial.deposit = Vložit předměty do bloku můžeš přetažením z Tvé lodi na cílový blok.\n\n[accent]Vlož odebranou měď zprátky do Tvého jádra[].
+hint.research.mobile = Použij tlačítko \ue875 [accent]Výzkum[] v \ue88c [accent]nabídce[] pro vyzkoumání nové technologie.
-tutorial.waves = [lightgray]Nepřítel[] se přibližuje.\n\nUbraň své jádro po dobu 2 vln. [accent]Klikni levým tlačítkem[] pro střílení.\nPostav více střílen a vrtů. Natěž více mědi.
+hint.unitControl = Podrž [accent][[Levý Ctrl][] a [accent]klikni[] pro ovládání spřátelených jednotek nebo věží.
-tutorial.waves.mobile = [lightgray]Nepřítel[] se přibližuje.\n\nUbraň své jádro po dobu 2 vln. Tvá loď bude automaticky střílet po nepřátelských jednotkách.\nPostav více střílen a vrtů. Natěž více mědi.
+hint.unitControl.mobile = [accent][[Dvojťupni][] pro ovládání spřátelených jednotek nebo věží.
-tutorial.launch = Jakmile dosáhneš určité vlny, budeš moci [accent]vyslat své jádro zpět[]. Opustíš tím svou základnu a [accent]získáš suroviny uložené v jádře[].\nZískané suroviny mohou být použity pro výzkum nových technologií.\n\n[accent]Stiskni tlačítko pro vyslání jádra zpět[].
+hint.launch = Jakmile je nasbíráno dostatek zdrojových materiálů, můžeš se [accent]vyslat[] do přilehlých sektorů z \ue827 [accent]mapy[] v pravém dolním rohu.
+hint.launch.mobile = Jakmile je nasbíráno dostatek zdrojových materiálů, můžeš se [accent]vyslat[] do přilehlých sektorů z \ue827 [accent]mapy[] v the \ue88c [accent]nabídce[].
+hint.schematicSelect = Podrž [accent][[F][] a potáhni pro výběr bloků, které chceš zkopírovat.\n\nKlikni na [accent][[prostřední tlačítko][] myši pro zkopírování jednoho typu bloku.
+hint.conveyorPathfind = Podrž [accent][[levý Ctrl][], když táhneš dopravníky, pro automatické vygenerování cesty.
+hint.conveyorPathfind.mobile = Povol \ue844 [accent]úhlopříčný režim[] a potáhni dopravníky pro automatické generování cesty.
+hint.boost = Podrž [accent][[levý Shift][], abys přeletěl přes překážky se svou současnou jednotkou.\n\nPouze některé jednotky však mají takový posilovač.
+hint.command = Zmáčkni [accent][[G][] pro vytvoření formace z blízkých jednotek [accent]podobného typu[].\n\nAbys mohl velet pozemní jednotce, musíš nejprve ovládat jinou pozemní jednotku.
+hint.command.mobile = [accent][[Dvojťupni][] na Tvoji jednotku pro vytvoření formace z blízkých jednotek.
+hint.payloadPickup = Zmáčkni [accent][[[] pro sebrání malých bloků nebo jednotek.
+hint.payloadPickup.mobile = [accent]Ťupni a podrž[] na malém bloku nebo jednotce pro sebrání.
+hint.payloadDrop = Zmáčkni [accent]][] pro položení nákladu.
+hint.payloadDrop.mobile = [accent]Ťupni a drž[] na prázdném místě pro položení nákladu.
+hint.waveFire = [accent]Naplň[] věže vodou místo munice pro automatické hašení okolních požárů.
+hint.generator = \uf879 [accent]Spalovací generátory[] pálí uhlí a přenášení energii do sousedících bloků.\n\nPřenos energie na delší vzdálenost se provádí pomocí \uf87f [accent]Energetických uzlů[].
+hint.guardian = Jednotky [accent]Strážce[] jsou obrněné. Měkká munice, jako je například [accent]měď[] a [accent]olovo[] je [scarlet]neefektivní[].\n\nPoužij vylepšené věže nebo \uf835 [accent]grafitovou[] munici pro \uf861 Střílnu Duo/\uf859 Salvu, abys Strážce sejmul.
+hint.coreUpgrade = Jádro může být vylepšeno [accent]překrytím  jádrem vyšší úrovně[].\n\nUmísti jádro typu [accent]Základ[] přes jádro typu [accent]Odštěpek[]. Ujisti se, že v okolí nejsou žádné překážky.
+hint.presetLaunch = Na šedé [accent]sektory v přistávací zóně[], jako je například [accent]Zamrzlý les[], se lze vyslat kdykoli. Nevyžadují polapení okolního teritoria.\n\n[accent]Číslované sektory[], jako je tento, jsou [accent]volitelné[].
+hint.coreIncinerate = Poté, co je kapacita jádra určité položky  naplněna, jakékoliv další stejné přijaté položky budou [accent]zničeny[].
+hint.coopCampaign = Když hraješ [accent]kooperativní kampaň[], položky, které jsou vyrobeny v této mapě, budou též zaslány [accent]do Tvých místních sektorů[].\n\nJakýkoliv vývoj dosažený hostitelem se též přenáší.
 
 item.copper.description = Používá se ve všech typech bloků a munice.
 item.copper.details = Měď. Nezvykle nadpočetný kov na Serpulu. Konstrukčně slabý, pokud není rafinovaná.
-item.lead.description = Používá se v přepravě kapalin a elektrických konstrukcích.
+item.lead.description = Používá se v přepravě kapalin a energetických konstrukcích.
 item.lead.details = Hutný, netečný materiál. Hojně používán v bateriích.\nPoznámka: Pravděpodobně toxický pro biologické formy života. Ne že by jich tady moc zbývalo.
 item.metaglass.description = Používá se v přepravě kapalin a úložných konstrukcích.
-item.graphite.description = Používá se v elektrických komponentách a nábojích do věží.
+item.graphite.description = Používá se v energerických komponentách a nábojích do věží.
 item.sand.description = Používá se ve výrobě ostatních rafinovaných materiálů.
 item.coal.description = Používá se na palivo a výrobu rafinovaný materiálů.
 item.coal.details = Jeví se být zkamenělou rostlinou hmotou, zformovaou dávno před událostí vytvoření tohoto světa náhodným číslem.
@@ -1318,21 +1341,21 @@ block.copper-wall.description = Chrání konstrukce před nepřátelskými stře
 block.copper-wall-large.description = Chrání konstrukce před nepřátelskými střelami.
 block.titanium-wall.description = Chrání konstrukce před nepřátelskými střelami.
 block.titanium-wall-large.description = Chrání konstrukce před nepřátelskými střelami.
-block.plastanium-wall.description = Chrání konstrukce před nepřátelskými střelami. Pohlcuje laserové a elektrické výboje. Automaticky blokuje energetické spoje.
+block.plastanium-wall.description = Chrání konstrukce před nepřátelskými střelami. Pohlcuje laserové a energetické výboje. Automaticky blokuje energetické spoje.
 block.plastanium-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Absorbs lasers and electric arcs. Automaticky blokuje energetické spoje.
 block.thorium-wall.description = Chrání konstrukce před nepřátelskými střelami.
 block.thorium-wall-large.description = Chrání konstrukce před nepřátelskými střelami.
 block.phase-wall.description = Chrání konstrukce před nepřátelskými střelami, reflecting most bullets upon impact.
 block.phase-wall-large.description = Chrání konstrukce před nepřátelskými střelami, reflecting most bullets upon impact.
-block.surge-wall.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává elektrické výboje.
+block.surge-wall.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává energetické výboje.
-block.surge-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává elektrické výboje.
+block.surge-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává energetické výboje.
 block.door.description = Zeď, která může být otevřena a zavřena.
 block.door-large.description = Zeď, která může být otevřena a zavřena.
 block.mender.description = Opakovaně opravuje bloky ve svém dosahu.\nVolitelně umí použít křemík pro posílení dosahu a efektivity.
 block.mend-projector.description = Opakovaně opravuje bloky ve svém dosahu.\nVolitelně umí použít fázovou tkaninu pro posílení dosahu a efektivity.
 block.overdrive-projector.description = Zrychluje funkce budov v okolí.\nVolitelně umí využít fázovou tkaninu pro posílení dosahu a efektivity.
 block.force-projector.description = Vytváří okolo sebe šestiúhelníkové silové pole. Chrání konstrukce a jednotky uvnitř pole před poškozením.\nPřehřívá se, pokud obdrží moc poškození. Přehřátí lze eliminovat použitím chlazení. Fázová tkanina zvyšje velikost pole.
-block.shock-mine.description = Vydává elektrické výboje při dotyku nepřátelskou jednotkou.
+block.shock-mine.description = Vydává energetické výboje při dotyku nepřátelskou jednotkou.
 block.conveyor.description = Přepravuje předměty vpřed.
 block.titanium-conveyor.description = Přepravuje předměty vpřed. Rychlejší, než standardní dopravník.
 block.plastanium-conveyor.description =  Přepravuje předměty vpřed in batches. Přijímá předměty zezadu, a vykládá je do tří směrů vpředu. Vyžaduje více nakládacích a vykládacích bodů pro špičkový průtok.
@@ -1438,7 +1461,7 @@ unit.fortress.description = Střílí dělostřelecké salvy na pozemní cíle.
 unit.scepter.description = Střílí palbu nabitých střel na všechny okolní nepřátele.
 unit.reign.description = Střílí palbu masivních střel pronikajících brněním na všechny okolní nepřátele.
 unit.nova.description = Střílí laserové výboje, které poškozují nepřátele a opravují spojenecké konstrukce. Je schopný letu.
-unit.pulsar.description = Střílí oblouky elektřiny, které poškozují nepřátele a opravují spojenecké struktury. Schopný letu.
+unit.pulsar.description = Střílí energetické oblouky, které poškozují nepřátele a opravují spojenecké struktury. Schopný letu.
 unit.quasar.description = Střílí pronikavé laserové paprsky, které poškozují nepřátele a opravují spojenecké struktury. Schopný letu. Oštítovaný.
 unit.vela.description = Střílí masivní nepřetržitý laserový paprsek, který poškozuje nepřátele, způsobuje požáry a opravuje spojenecké struktury. Schopný letu.
 unit.corvus.description = Střílí masivní laserový paprsek, který poškozuje nepřátele a opravuje spojenecké struktury. Může překonat většinu z terénů.
@@ -1446,14 +1469,14 @@ unit.crawler.description = Běží směrem k nepřátelům, vybuchne a způsobí
 unit.atrax.description = Střílí oslabující koule strusky na pozemní cíle. Může překonat většinu z terénů.
 unit.spiroct.description = Střílí mířené laserové paprsky na nepřátele, a zároveň se tím opravuje. Může překročit většinu terénu.
 unit.arkyid.description = Střílí velké mířené laserové paprsky na nepřátele, a zároveň se tím opravuje. Může překročit většinu terénu.
-unit.toxopid.description = Střílí na nepřátele velké elektrické kazetové střely a lasery pronikající brněním. Může překročit většinu z terénů.
+unit.toxopid.description = Střílí na nepřátele velké energetické kazetové střely a lasery pronikající brněním. Může překročit většinu z terénů.
 unit.flare.description =  Střílí základní střely na okolní nepřátele.
 unit.horizon.description =  Pouští shluky bomb na pozemní cíle.
 unit.zenith.description = Střílí salvy raket na všechny blízké nepřátele.
 unit.antumbra.description = Střílí palbu střel na všechny blízké nepřátele.
 unit.eclipse.description = Vystřelí dva pronikavé lasery a záplavu protivzdušných střel na všechny blízké nepřátele.
 unit.mono.description = Samočinně těží měď a olovo a ukládá je do jádra.
-unit.poly.description = Samočinně obnovuje poškozené konstrukce a pomáhá ostatním jednotkám při stavbě.
+unit.poly.description = Samočinně obnovuje zničené konstrukce a pomáhá ostatním jednotkám při stavbě.
 unit.mega.description = Samočinně opravuje poškozené konstrukce. Je schopný přenést bloky a malé pozemní jednotky.
 unit.quad.description = Pouští velké bomby na pozemní cíle, opravuje spojenecké konstrukce a poškozuje nepřátele. Je schopen přenést středně velké pozemní jednotky.
 unit.oct.description = Chrání blízké spojence pomocí regeneračního štítu. Je schopen přenést většinu pozemních jednotek.