Better caching

 Conflicts:

	core/src/mindustry/net/ArcNetProvider.java

	gradle.properties

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Create a report to help fix an issue.
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Platform**: *The type of device you were playing on - Android/iOS/Mac/Windows/Linux* ("All" is NOT a platform!)
-
-**Build**: *The build number under the title in the main menu. Required. "LATEST" IS NOT A VERSION, I NEED THE EXACT BUILD NUMBER OF YOUR GAME.*
-
-**Issue**: *Explain your issue in detail.*
-
-**Steps to reproduce**: *How you happened across the issue, and what exactly you did to make the bug happen.*
-
-**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. 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) 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.*
-
----
-
-*Place an X (no spaces) between the brackets to confirm that you have read the line below.*  
-- [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**
-- [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.**

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,74 @@
+name: Bug report
+description: The type of device you were playing on
+labels: ["bug"]
+
+body:
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platforms
+      description: On what platforms do you know the bug happens?
+      multiple: false
+      options:
+        - Android
+        - iOS
+        - Mac
+        - Windows
+        - Linux
+    validations:
+      required: true
+  - type: input
+    id: build
+    attributes:
+      label: Build
+      description: The build number under the title in the main menu.
+      placeholder: LATEST IS NOT A VERSION, I NEED THE EXACT BUILD NUMBER OF YOUR GAME.
+    validations:
+      required: true
+  - type: textarea
+    id: issue
+    attributes:
+      label: Issue
+      description: Explain your issue in detail.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to reproduce
+      description: How you happened across the issue, and what exactly you did to make the bug happen.
+    validations:
+      required: true
+  - type: textarea
+    id: mods
+    attributes:
+      label: Mods used
+      description: The mod repositories or zip files that are related to the issue, if applicable.
+    validations:
+      required: false
+  - type: textarea
+    id: save-file
+    attributes:
+      label: Save file
+      description: The (zipped) save file you were playing on when the bug happened. If this happened in the campaign, specify the sector, and attach the file you get from Settings -> Game Data -> Export Data. For custom games, attach the .msav file exported from the save dialog, zipped.
+      placeholder: THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT 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.
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: (Crash) logs
+      description: Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs.
+      placeholder: REQUIRED if you are reporting a crash.
+    validations:
+      required: false
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: Submission
+      description: Check the boxes to confirm that you have read the lines below.
+      options:
+        - label: I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.
+          required: true
+        - label: I have searched the closed and open issues to make sure that this problem has not already been reported.
+          required: true

.github/workflows/deployment.yml

@@ -23,6 +23,8 @@ jobs:
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     - name: Add Arc release
       run: |
+        git config --global user.email "actions@github.com"
+        git config --global user.name "Github Actions"
         git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
         cd ../Arc
         git tag ${RELEASE_VERSION}
@@ -42,7 +44,7 @@ jobs:
         rm -rf .github
         rm README.md
         git add .
-        git commit --allow-empty -m "${GITHUB_SHA}"
+        git commit --allow-empty -m "Updating"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
         git tag ${RELEASE_VERSION}
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack

.github/workflows/pr.yml

@@ -17,8 +17,10 @@ jobs:
         java-version: 17
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
+    - name: Run unit tests
+      run: ./gradlew clean cleanTest test --stacktrace
     - name: Run unit tests and build JAR
-      run: ./gradlew test desktop:dist
+      run: ./gradlew desktop:dist
     - name: Upload desktop JAR for testing
       uses: actions/upload-artifact@v2
       with:

.github/workflows/push.yml

@@ -33,6 +33,7 @@ jobs:
         ./gradlew updateBundles
 
         if [ -n "$(git status --porcelain)" ]; then
+          git config --global user.name "Github Actions"
           git add core/assets/bundles/*
           git commit -m "Automatic bundle update"
           git push
@@ -40,6 +41,8 @@ jobs:
     - name: Update JITpack repo
       if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |
+        git config --global user.name "Github Actions"
+        git config --global user.email "cli@github.com"
         cd ../
         cp -r ./Mindustry ./MindustryJitpack
         cd MindustryJitpack
@@ -50,7 +53,7 @@ jobs:
         rm -rf .github
         rm README.md
         git add .
-        git commit --allow-empty -m "${GITHUB_SHA}"
+        git commit --allow-empty -m "Updating"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
         cd ../Mindustry
     - name: Run unit tests

.gitignore

@@ -6,6 +6,7 @@ logs/
 /core/assets/.gifimages/
 /deploy/
 /out/
+ios/libs/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/
@@ -43,6 +44,7 @@ steam_appid.txt
 ios/robovm.properties
 packr-out/
 config/
+buildSrc/
 *.gif
 /tests/out
 

LICENSE

@@ -617,58 +617,3 @@ reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

SERVERLIST.md

@@ -1,7 +1,7 @@
 ### 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_v6.json) in this repository.
+This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json) in this repository.
 
 You may want to add your server to this list. The steps for getting this done are as follows:
 
@@ -9,20 +9,22 @@ You may want to add your server to this list. The steps for getting this done ar
 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. 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"]`.
+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 ["canvas", "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. 
+   - 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.
+   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.
+   - 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.
+   - Try to be professional in your text; use common sense.
 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.
 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`).
 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_v6.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_v7.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:
+For example, if your server address is `example.com:6000`, you would add a comma after the last entry and insert:
-```json
+    ```json
-  {
+      {
-    "address": "google.com"
+        "address": "example.com:6000"
-  }
+      }
-```
+    ```
-Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.
+    > Note that Mindustry also support SRV records. This allows you to use a subdomain for your server address instead of specifying the port. For example, if you want to use `play.example.com` instead of `example.com:6000`, in the dns settings of your domain, add an SRV record with `_mindustry` as the service, `tcp` as the protocol, `play` as the target and `6000` as the port. You can also setup fallback servers by modifying the weight or priority of the record. Although SRV records are very convenient, keep in mind they are slower than regular addresses. Avoid using them in the server list, but rather as an easy way to share your server address.
+
+    Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.

android/build.gradle

@@ -29,8 +29,8 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '31.0.0'
+    buildToolsVersion '33.0.2'
-    compileSdkVersion 31
+    compileSdkVersion 33
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -56,7 +56,7 @@ android{
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 33
         
         versionName versionNameResult
         versionCode = vcode
@@ -119,8 +119,8 @@ dependencies{
     implementation arcModule("backends:backend-android")
     implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
 
-    natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
+    natives "com.github.Anuken.Arc:natives-android:$arcHash"
-    natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
+    natives "com.github.Anuken.Arc:natives-freetype-android:$arcHash"
 
     def version;
     def highestVersion;

annotations/src/main/java/mindustry/annotations/Annotations.java

@@ -8,14 +8,12 @@ public class Annotations{
     /** Indicates that a method overrides other methods. */
     @Target({ElementType.METHOD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Replace{
+    public @interface Replace{}
-    }
 
     /** Indicates that a method should be final in all implementing classes. */
     @Target({ElementType.METHOD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Final{
+    public @interface Final{}
-    }
 
     /** Indicates that a field will be interpolated when synced. */
     @Target({ElementType.FIELD})
@@ -30,15 +28,18 @@ public class Annotations{
     /** Indicates that a field will not be read from the server when syncing the local player state. */
     @Target({ElementType.FIELD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface SyncLocal{
+    public @interface SyncLocal{}
+
+    /** Indicates that a field should not be synced to clients (but may still be non-transient) */
+    @Target({ElementType.FIELD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface NoSync{}
 
-    }
 
     /** Indicates that a component field is imported from other components. This means it doesn't actually exist. */
     @Target({ElementType.FIELD})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Import{
+    public @interface Import{}
-    }
 
     /** Indicates that a component field is read-only. */
     @Target({ElementType.FIELD, ElementType.METHOD})
@@ -105,8 +106,7 @@ public class Annotations{
     /** Indicates an internal interface for entity components. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface EntityInterface{
+    public @interface EntityInterface{}
-    }
 
     //endregion
     //region misc. utility
@@ -145,15 +145,12 @@ public class Annotations{
     /** Indicates that a method should always call its super version. */
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface CallSuper{
+    public @interface CallSuper{}
-
-    }
 
     /** Annotation that allows overriding CallSuper annotation. To be used on method that overrides method with CallSuper annotation from parent class. */
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface OverrideCallSuper{
+    public @interface OverrideCallSuper{}
-    }
 
     //endregion
     //region struct
@@ -161,9 +158,7 @@ public class Annotations{
     /** Marks a class as a special value type struct. Class name must end in 'Struct'. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Struct{
+    public @interface Struct{}
-
-    }
 
     /** Marks a field of a struct. Optional. */
     @Target(ElementType.FIELD)
@@ -251,8 +246,7 @@ public class Annotations{
 
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
-    public @interface TypeIOHandler{
+    public @interface TypeIOHandler{ }
-    }
 
     //endregion
 }

annotations/src/main/java/mindustry/annotations/entity/EntityIO.java

@@ -118,13 +118,16 @@ public class EntityIO{
         }
     }
 
-    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> syncFields, Seq<Svar> allFields) throws Exception{
+    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> allFields) throws Exception{
         this.method = method;
         this.write = write;
 
         if(write){
             //write uses most recent revision
             for(RevisionField field : revisions.peek().fields){
+                Svar var = allFields.find(s -> s.name().equals(field.name));
+                if(var == null || var.has(NoSync.class)) continue;
+
                 io(field.type, "this." + field.name, true);
             }
         }else{
@@ -138,6 +141,7 @@ public class EntityIO{
             //add code for reading revision
             for(RevisionField field : rev.fields){
                 Svar var = allFields.find(s -> s.name().equals(field.name));
+                if(var == null || var.has(NoSync.class)) continue;
                 boolean sf = var.has(SyncField.class), sl = var.has(SyncLocal.class);
 
                 if(sl) cont("if(!islocal)");
@@ -223,7 +227,7 @@ public class EntityIO{
 
         if(BaseProcessor.isPrimitive(type)){
             s(type.equals("boolean") ? "bool" : type.charAt(0) + "", field);
-        }else if(instanceOf(type, "mindustry.ctype.Content")){
+        }else if(instanceOf(type, "mindustry.ctype.Content") && !type.equals("mindustry.ai.UnitStance") && !type.equals("mindustry.ai.UnitCommand")){
             if(write){
                 s("s", field + ".id");
             }else{

annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java

@@ -490,7 +490,7 @@ public class EntityProcess extends BaseProcessor{
 
                         //SPECIAL CASE: sync I/O code
                         if((first.name().equals("readSync") || first.name().equals("writeSync"))){
-                            io.writeSync(mbuilder, first.name().equals("writeSync"), syncedFields, allFields);
+                            io.writeSync(mbuilder, first.name().equals("writeSync"), allFields);
                         }
 
                         //SPECIAL CASE: sync I/O code for writing to/from a manual buffer

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:admin,type:boolean},{name:boosting,type:boolean},{name:color,type:arc.graphics.Color},{name:lastCommand,type:mindustry.ai.UnitCommand},{name:mouseX,type:float},{name:mouseY,type:float},{name:name,type:java.lang.String},{name:shooting,type:boolean},{name:team,type:mindustry.game.Team},{name:typing,type:boolean},{name:unit,type:Unit},{name:x,type:float},{name:y,type:float}]}

build.gradle

@@ -1,10 +1,14 @@
 buildscript{
     ext{
-        getArcHash = {
+        arcHash = property("archash")
-            return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"]
-        }
 
-        arcHash = getArcHash()
+        localArc = !project.hasProperty("release") && new File(rootDir.parent, 'Arc').exists() && !project.hasProperty("noLocalArc")
+
+        arcModule = { String name ->
+            //skip to last submodule
+            name = name.substring(name.lastIndexOf(':') + 1)
+            return "com.github.Anuken${localArc ? "" : ".Arc"}:$name:$arcHash"
+        }
     }
     
     repositories{
@@ -16,8 +20,8 @@ buildscript{
     }
 
     dependencies{
-        classpath "com.github.Anuken.Arc:packer:$arcHash"
+        classpath arcModule(":extensions:packer")
-        classpath "com.github.Anuken.Arc:arc-core:$arcHash"
+        classpath arcModule(":arc-core")
     }
 }
 
@@ -48,20 +52,6 @@ allprojects{
             return new File(projectDir.parent, '../Mindustry-Debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
         }
 
-        localArc = {
-            return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists()
-        }
-
-        arcModule = { String name ->
-            if(localArc()){
-                return project(":Arc:$name")
-            }else{
-                //skip to last submodule
-                if(name.contains(':')) name = name.split(':').last()
-                return "com.github.Anuken.Arc:$name:${getArcHash()}"
-            }
-        }
-
         generateDeployName = { String platform ->
             if(platform == "windows"){
                 platform += "64"
@@ -116,12 +106,12 @@ allprojects{
         generateLocales = {
             def output = 'en\n'
             def bundles = new File(project(':core').projectDir, 'assets/bundles/')
-            bundles.listFiles().each{ other ->
+            bundles.list().sort().each{ name ->
-                if(other.name == "bundle.properties") return
+                if(name == "bundle.properties") return
-                output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n"
+                output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
             }
             new File(project(':core').projectDir, 'assets/locales').text = output
-            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().join("\n")
+            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().join("\n")
         }
 
         writeVersion = {
@@ -195,7 +185,7 @@ allprojects{
 
     tasks.withType(JavaCompile){
         targetCompatibility = 8
-        sourceCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_17
         options.encoding = "UTF-8"
         options.compilerArgs += ["-Xlint:deprecation"]
         dependsOn clearCache
@@ -320,11 +310,6 @@ project(":core"){
         }
     }
 
-    artifacts{
-        archives sourcesJar
-        archives assetsJar
-    }
-
     dependencies{
         compileJava.dependsOn(preGen)
 
@@ -336,12 +321,12 @@ project(":core"){
         api arcModule("extensions:fx")
         api arcModule("extensions:arcnet")
         api "com.github.Anuken:rhino:$rhinoVersion"
-        if(localArc() && debugged()) api arcModule("extensions:recorder")
+        if(localArc && debugged()) api arcModule("extensions:recorder")
-        if(localArc()) api arcModule(":extensions:packer")
+        if(localArc) api arcModule(":extensions:packer")
 
         annotationProcessor 'com.github.Anuken:jabel:0.9.0'
         compileOnly project(":annotations")
-        kapt project(":annotations")
+        if(!project.hasProperty("noKapt")) kapt project(":annotations")
     }
 
     afterEvaluate{
@@ -396,6 +381,7 @@ project(":tests"){
         testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
         testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
         testImplementation arcModule("backends:backend-headless")
+        testImplementation "org.json:json:20230618"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
     }
 
@@ -428,7 +414,7 @@ project(":annotations"){
 
     dependencies{
         implementation 'com.squareup:javapoet:1.12.1'
-        implementation "com.github.Anuken.Arc:arc-core:$arcHash"
+        implementation arcModule("arc-core")
     }
 }
 
@@ -442,6 +428,9 @@ configure([":core", ":server"].collect{project(it)}){
         publications{
             maven(MavenPublication){
                 from components.java
+                if(project.name == "core"){
+                    artifact(tasks.named("assetsJar"))
+                }
             }
         }
     }

core/assets-raw/fontgen/extra/admin.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
+        xmlns="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="12"
-   width="12"
+        height="12"
-   height="12"
+        version="1.1"
-   version="1.1"
+        id="svg380"
-   id="svg380"
+        sodipodi:docname="admin.svg"
-   sodipodi:docname="admin.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata386">
     <rdf:RDF>

core/assets-raw/fontgen/extra/distribution.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
+        xmlns="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
-   width="10"
+        height="10"
-   height="10"
+        version="1.1"
-   version="1.1"
+        id="svg192"
-   id="svg192"
+        sodipodi:docname="distribution.svg"
-   sodipodi:docname="distribution.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata198">
     <rdf:RDF>

core/assets-raw/fontgen/extra/effect.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
+        xmlns="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
-   width="10"
+        height="10"
-   height="10"
+        version="1.1"
-   version="1.1"
+        id="svg252"
-   id="svg252"
+        sodipodi:docname="effect.svg"
-   sodipodi:docname="effect.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata258">
     <rdf:RDF>

core/assets-raw/fontgen/extra/file-image.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
+        xmlns="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
-   width="10"
+        height="13"
-   height="13"
+        version="1.1"
-   version="1.1"
+        id="svg310"
-   id="svg310"
+        sodipodi:docname="file-image.svg"
-   sodipodi:docname="file-image.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata316">
     <rdf:RDF>

core/assets-raw/fontgen/extra/info.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
+        xmlns="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="12"
-   width="12"
+        height="12"
-   height="12"
+        version="1.1"
-   version="1.1"
+        id="svg300"
-   id="svg300"
+        sodipodi:docname="info.svg"
-   sodipodi:docname="info.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata306">
     <rdf:RDF>

core/assets-raw/fontgen/extra/logic.svg

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
+        xmlns="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        sodipodi:docname="logic.svg"
-   sodipodi:docname="logic.svg"
+        inkscape:version="1.0 (9f2f71dc58, 2020-08-02)"
-   inkscape:version="1.0 (9f2f71dc58, 2020-08-02)"
+        id="svg8"
-   id="svg8"
+        version="1.1"
-   version="1.1"
+        viewBox="0 0 128 128">
-   viewBox="0 0 128 128">
   <defs
      id="defs2" />
   <sodipodi:namedview

core/assets-raw/fontgen/extra/planet.svg

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
+        xmlns="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16"
-   width="16"
+        height="16"
-   height="16"
+        version="1.1"
-   version="1.1"
+        id="svg542"
-   id="svg542"
+        sodipodi:docname="planet.svg"
-   sodipodi:docname="planet.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
-   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   <metadata
      id="metadata548">
     <rdf:RDF>

core/assets/baseparts/1591389457130.msch

@@ -1 +0,0 @@
-msch
xœ%ŠQƒ0C]RÐÄ>v>9Ê"µˆ¶S(HÜ~)X±_dƒƒÏKŒa•YëD­Ý¹(¼¸äS®¢øü²i©‘§¯ÆmÃ;VIÓ^e
0â–s-@

core/assets/baseparts/1603214918168.msch

@@ -1,2 +0,0 @@
-msch
xœ5<C593>Ë
-!E¯Ïy-J·ý‡ù(q¤£Gú÷<C3BA>„ââä&'›„Î.<Zl.Çž®Vª{lG¸|<7C>ŸK4ÌíúÙðü{»/ùßR±ÅÒ~•^=ÝùäГkÑïG<C3AF>ç	àzRPm!&ÆÌX+ ÉÓ†4©¨²¼H}E“y$9’À˜’¢XQÜÔü‰æd8ZQŠ¡†acf,Œê˜ã"

core/assets/baseparts/1603214945791.msch

@@ -1,2 +0,0 @@
-msch
xœ5<C593>A E¿JkêÊStã<74><08>˜I
-4”šx{¡ðòÿ¼
¸vÐѽpq‘<71>°—”Ý›^˜Ú}æ­pŠ€Æą¼§#{Âã¯Ï>Å}SÆm‹tWØÏKæuÅXGÅq¤àY¬
z\P?E½:<18>ÅYŽ

core/assets/baseparts/772861253630165084.msch

@@ -1,3 +0,0 @@
-msch
xœ%Žknà „ÇØIü¨äV9×È
-ú;¢xS!a@€“úîMÝ%F¬¾Ñ>fz<>Æ©™p¾~:“¯¥}ŽëõbU$%MÈÆ;à
-ãCeŠ’~rT:ûˆ^/6›»*ú#y’A9²’Õ7ϧà#É)%ŒÚ++5¹Ímáꘌ5Ú;™f²ì‹18Zf•<66>–S4Öb0™f™ü5áô¥2w­èƒðÎO„÷ VëÕ$ÙçN+Ÿ1(åíuÞ

core/assets/baseparts/actuallyokrtg.msch

@@ -0,0 +1,4 @@
+msch
xœM<C593>anÂ0…MK[HÚ"Ä9rŠcÚ<63><Ô-4(MaÜ~ÏñŸ)RŸíú{vB':Ô´<C394>ý<EFBFBD>iðç¼ú^ñ'å+Ù/ç4Ýóg"jƒÿä°PõþaÉ~¿dwIStxúÌÉñoNpˆ‰ŽK>¹»Ÿ98DW&û¯DÇ<e?OëÍ<C3AB>ãüà<17>
Ý•gN^Æu¾pú
+ñé®0§S|p´»{Šß\ÆØe…µËñɉš‡_C&;e¾¹%®éÌXú<58>h#gƒxKT!îˆj[ªEª!Ûˆ4*­Jé¬iG¨‡-<2D>’<EFBFBD>ið.<2E>ŽÉvT‰ã@åO¥Ò	Ð
+Þâ`É
+Þ*Þ¢¥<14>‹Uá:á*”ÁwŠ£<C5A0>jÉ€w,/ÅN‹ø+³~¯6{o”7:Þèx£ã<C2A3>no”7…¯Èê-¬ÚXµéÕ¦×5zµéÕ¦×5z½Å Ü ·õ#誅”-FÅGÅG}„QñƒâÁ÷tDçF-b@tõ½ÔO¼

core/assets/baseparts/flar.msch

@@ -0,0 +1 @@
+msch
xœMŽÍNÃ0„'‰›æ¯^<5E>»Ÿq0‰‹,9vd»”¼{ ¬»*KÞ<4B>ogV‹'´„S³†¸XÐO:ŽÁ,Éx ¶êCÛˆòí}@oUÔANÁX‹—d’ræ:ËÑ»/½ú€“7VêïÔ˜Hžo*‘ý
Dc

core/assets/baseparts/rtgbrick1.msch

@@ -0,0 +1,2 @@
+msch
xœŒKà CͯE=
+‹ž§Ê‚<EFBFBD>B%

core/assets/baseparts/rtgbrick2.msch

@@ -0,0 +1,5 @@
+msch
xś
+ŚK
+Ă0CĺOŇ–ĐEâMŻşpśÁ<C59B>Ně0včő;ń$!„	ł<>Żń <däMJúľ±ěÔ“”s”V
Ě7â»~&<u2U’8š`é—d
+ŁýHCt„Ţ.I„Wo%ś±u™°pě$a—¬ż“
+Î(üÖÂŔhyłN˝ó

core/assets/baseparts/scorch.msch

@@ -0,0 +1 @@
+msch
xś5PŃŽ„ @ôáľÄ/şÜ<C59F>Ë’,‰ŠAÝËýýµt5!C§Ó™"FŚÝ6Ż	î<>ĄĆĆg:bÍű™ËŔ-ó#-ô÷ŹĂ׾ĄkťĎ§gÍËËöNĄbŚeßSť~g˘o/WËu&jć3­ÓQ®yNt`Đ>­ `ů®™TźŞőŚTťôş»j=Ëë>rĹw“A`€Öč%˛IĎQV*Ĺ˝6ĐË€—
Ď<1D>fĄ'Ć0Đ6LZ^Âs0™3ée®™y1b$=Hz<48>Ř Ę ĘAž2đo°–6´†‰ <©ţ
/_&‘

core/assets/baseparts/simplemeltdown.msch

@@ -0,0 +1,2 @@
+msch
xœ=‘벓0… å(=¾à³8þà@t¢
jöôÉ<C3B4>qjqmÂq(|Ù—µ’<C2B5>â|˜ºQ㼘ñjõ¨­æÛ5è¥wæêÍ<
8ÙîUÛñç/5òÿ]õkç½v÷Öv²Ý¢];8c-š[ÇR«ß¼ëz?;(ãõØ.óêz<C3AA>¬Ÿ§a5jY)mý|Ó/Þøn2ëزüKß©º\¥ÒNó <C3B3>]šÞÝç¯v5C;š7ª”5?%¢ôš#ø¾Ný~øË‘ £ïÌÄ~à¡A!á"Ž‰üð6À_•ræ$åªF”2U#>çœyò’‹ÃIÄR. `2'ʼD´=¶çö)¿ÏíùجeÛ“ï×Åö›[¤â]Ðâ„D<E2809E>#C&ÓÝ4”HJVx˜ˆÒHj²ÓŽLZr>;XUD"%(BgÁ$QJ”'™X\åÈïµZæS2ÇÎx¯ª` B“zo:M—½©
+¾Uð­p$wI%àÌ“G2ïñ¨Þ¹ A#× Èò€" PHþ
ŸLo´

core/assets/baseparts/steamgobrr.msch

@@ -0,0 +1,2 @@
+msch
xœ%ÐÝrƒ àãJÔ˜fúÜõm:½@³uÌ d“æí»¸^øÁ¸ËYÄÊÕ.„f‹d—É! ½Ñ6†ùg¿¨œÈmÈ¿\^6R0ôƒ£çâm™è_p9N1­ìñupv‹æfçÐïë<C3AF>¯ó/3ñ)¸Æ9ÚuÞ3úõIo®ÿôO
+\ý$óþNGD=ØÈ¡o\7ïl0»’3¼šíi1›ßÃH<뎧H¯\(…Fè„E†•5›s„\(…Fèîä†YÉdÈÃ

core/assets/bundles/bundle.properties

@@ -57,6 +57,7 @@ mods.browser.sortstars = Sort by stars
 schematic = Schematic
 schematic.add = Save Schematic...
 schematics = Schematics
+schematic.search = Search schematics...
 schematic.replace = A schematic by that name already exists. Replace it?
 schematic.exists = A schematic by that name already exists.
 schematic.import = Import Schematic...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Share on Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
 schematic.saved = Schematic saved.
 schematic.delete.confirm = This schematic will be utterly eradicated.
-schematic.rename = Rename Schematic
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} blocks
 schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
 schematic.tags = Tags:
@@ -78,6 +79,7 @@ schematic.addtag = Add Tag
 schematic.texttag = Text Tag
 schematic.icontag = Icon Tag
 schematic.renametag = Rename Tag
+schematic.tagged = {0} tagged
 schematic.tagdelconfirm = Delete this tag completely?
 schematic.tagexists = That tag already exists.
 
@@ -150,12 +152,16 @@ mod.incompatiblemod = [red]Incompatible
 mod.blacklisted = [red]Unsupported
 mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [red]Content Errors
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
 
 mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
 mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
 mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
 mod.missingdependencies.details = This mod is missing dependencies: {0}
 mod.erroredcontent.details = This mod caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
 
 mod.requiresversion = Requires game version: [red]{0}
 
@@ -253,11 +259,21 @@ trace = Trace Player
 trace.playername = Player name: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID: [accent]{0}
+trace.language = Language: [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}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Invalid client ID! Submit a bug report.
+
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
+
 server.bans = Bans
 server.bans.none = No banned players found!
 server.admins = Admins
@@ -271,10 +287,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Are you sure you want to ban "{0}[white]"?
 confirmkick = Are you sure you want to kick "{0}[white]"?
-confirmvotekick = Are you sure you want to vote-kick "{0}[white]"?
 confirmunban = Are you sure you want to unban this player?
 confirmadmin = Are you sure you want to make "{0}[white]" an admin?
 confirmunadmin = Are you sure you want to remove admin status from "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Join Game
 joingame.ip = Address:
 disconnect = Disconnected.
@@ -330,11 +347,23 @@ open = Open
 customize = Customize Rules
 cancel = Cancel
 command = Command
+command.queue = Queue
 command.mine = Mine
 command.repair = Repair
 command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Open Link
 copylink = Copy Link
 back = Back
@@ -381,9 +410,9 @@ custom = Custom
 builtin = Built-In
 map.delete.confirm = Are you sure you want to delete this map? This action cannot be undone!
 map.random = [accent]Random Map
-map.nospawn = This map does not have any cores for the player to spawn in! Add a [#{0}]{1}[] core to this map in the editor.
+map.nospawn = This map does not have any cores for the player to spawn in! Add a {0} core to this map in the editor.
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[scarlet] non-orange[] cores to this map in the editor.
-map.nospawn.attack = This map does not have any enemy cores for player to attack! Add [#{0}]{1}[] cores to this map in the editor.
+map.nospawn.attack = This map does not have any enemy cores for player to attack! Add {0} cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
 workshop.update = Update Item
 workshop.error = Error fetching workshop details: {0}
@@ -415,6 +444,7 @@ editor.waves = Waves
 editor.rules = Rules
 editor.generation = Generation
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Edit In-Game
 editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
@@ -457,6 +487,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
@@ -467,7 +499,7 @@ wavemode.health = health
 
 editor.default = [lightgray]<Default>
 details = Details...
-edit = Edit...
+edit = Edit
 variables = Vars
 editor.name = Name:
 editor.spawn = Spawn Unit
@@ -480,6 +512,7 @@ editor.errorlegacy = This map is too old, and uses a legacy map format that is n
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined. Are you trying to load a save file?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
 editor.moveup = Move Up
@@ -491,6 +524,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Resize
 editor.loadmap = Load Map
 editor.savemap = Save Map
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Saved!
 editor.save.noname = Your map does not have a name! Set one in the 'map info' menu.
 editor.save.overwrite = Your map overwrites a built-in map! Pick a different name in the 'map info' menu.
@@ -529,6 +563,8 @@ toolmode.eraseores = Erase Ores
 toolmode.eraseores.description = Erase only ores.
 toolmode.fillteams = Fill Teams
 toolmode.fillteams.description = Fill teams instead of blocks.
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Draw Teams
 toolmode.drawteams.description = Draw teams instead of blocks.
 #unused
@@ -577,6 +613,24 @@ filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
 
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
+
 width = Width:
 height = Height:
 menu = Menu
@@ -631,6 +685,7 @@ marker.shapetext.name = Shape Text
 marker.minimap.name = Minimap
 marker.shape.name = Shape
 marker.text.name = Text
+marker.line.name = Line
 
 marker.background = Background
 marker.outline = Outline
@@ -659,7 +714,6 @@ resources.max = Max
 bannedblocks = Banned Blocks
 objectives = Objectives
 bannedunits = Banned Units
-rules.hidebannedblocks = Hide Banned Blocks
 bannedunits.whitelist = Banned Units As Whitelist
 bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
@@ -720,7 +774,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 #note: the missing space in the line below is intentional
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
@@ -895,6 +949,7 @@ stat.repairspeed = Repair Speed
 stat.weapons = Weapons
 stat.bullet = Bullet
 stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Speed Increase
 stat.range = Range
 stat.drilltier = Drillables
@@ -942,13 +997,16 @@ stat.healing = Healing
 
 ability.forcefield = Force Field
 ability.repairfield = Repair Field
-ability.statusfield = {0} Status Field
+ability.statusfield = Status Field
-ability.unitspawn = {0} Factory
+ability.unitspawn = Factory
 ability.shieldregenfield = Shield Regen Field
 ability.movelightning = Movement Lightning
 ability.shieldarc = Shield Arc
-ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield = Repair Suppression
-ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets
+ability.energyfield = Energy Field
+ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
+ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.regen = Regeneration
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 bar.drilltierreq = Better Drill Required
@@ -984,10 +1042,13 @@ bar.strength = [stat]{0}[lightgray]x strength
 units.processorcontrol = [lightgray]Processor Controlled
 
 bullet.damage = [stat]{0}[lightgray] damage
-bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
+bullet.splashdamage = [stat]{0}[lightgray] area dmg ~ [stat]{1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary
 bullet.homing = [stat]homing
 bullet.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0}[lightgray] seconds of repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
 bullet.frags = [stat]{0}[lightgray]x frag bullets:
 bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
 bullet.buildingdamage = [stat]{0}%[lightgray] building damage
@@ -1041,6 +1102,7 @@ setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
 setting.doubletapmine.name = Double-Tap to Mine
 setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit
 setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animated Surfaces
 setting.animatedshields.name = Animated Shields
@@ -1087,13 +1149,14 @@ setting.position.name = Show Player Position
 setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Music Volume
 setting.atmosphere.name = Show Planet Atmosphere
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
@@ -1101,8 +1164,10 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display Player Bubble Chat
 setting.showweather.name = Show Weather Graphics
 setting.hidedisplays.name = Hide Logic Displays
-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.
+setting.macnotch.name = Adapt interface to display notch
-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[]?
+setting.macnotch.description = Restart required to apply changes
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 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
@@ -1111,6 +1176,7 @@ keybind.title = Rebind Keys
 keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
 category.general.name = General
 category.view.name = View
+category.command.name = Unit Command
 category.multiplayer.name = Multiplayer
 category.blocks.name = Block Select
 placement.blockselectkeys = \n[lightgray]Key: [{0},
@@ -1128,6 +1194,26 @@ keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
 keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Queue Unit Command
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+
+keybind.unit_command_move = Unit Command: Move
+keybind.unit_command_repair = Unit Command: Repair
+keybind.unit_command_rebuild = Unit Command: Rebuild
+keybind.unit_command_assist = Unit Command: Assist
+keybind.unit_command_mine = Unit Command: Mine
+keybind.unit_command_boost = Unit Command: Boost
+keybind.unit_command_load_units = Unit Command: Load Units
+keybind.unit_command_load_blocks = Unit Command: Load Blocks
+keybind.unit_command_unload_payload = Unit Command: Unload Payload
+
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
@@ -1154,8 +1240,8 @@ keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
-keybind.select_all_units = Select All Units
+keybind.select_all_units.name = Select All Units
-keybind.select_all_unit_factories = Select All Unit Factories
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo
@@ -1192,8 +1278,11 @@ mode.attack.name = Attack
 mode.attack.description = Destroy the enemy's base. \n[gray]Requires a red core in the map to play.
 mode.custom = Custom Rules
 
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 rules.infiniteresources = Infinite Resources
 rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
 rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
@@ -1202,6 +1291,8 @@ rules.wavetimer = Wave Timer
 rules.wavesending = Wave Sending
 rules.waves = Waves
 rules.attack = Attack Mode
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
 rules.rtsai = RTS AI [red](WIP)
 rules.rtsminsquadsize = Min Squad Size
 rules.rtsmaxsquadsize = Max Squad Size
@@ -1229,6 +1320,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves Wait for Enemies
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.unitammo = Units Require Ammo [red](may be removed)
 rules.enemyteam = Enemy Team
@@ -1714,7 +1806,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -1767,18 +1858,18 @@ hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
 hint.breaking = [accent]Right-click[] and drag to break blocks.
 hint.breaking.mobile = Activate the \uE817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
 hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
-hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
+hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources, or repaired.
 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 manually control friendly units or turrets.
 hint.unitControl.mobile = [accent][[Double-tap][] to manually control friendly units or turrets.
 hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
 hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
-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 = Once enough resources are collected, you can [accent]Launch[] to the next sector by opening the \uE827 [accent]Map[] in the bottom right, and panning over to the new location.
 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.
 hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
-
+hint.rebuildSelect.mobile = Select the \uE874 copy button, then tap the \uE80F rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
 hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
 hint.conveyorPathfind.mobile = Enable \uE844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
 hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
@@ -1789,55 +1880,59 @@ 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 \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uF868 [accent]Foundation[] core over the \uF869 [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.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
 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.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
 hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
 
-gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
+gz.mine = Move near the \uF8C4 [accent]copper ore[] on the ground and click to begin mining.
-gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
+gz.mine.mobile = Move near the \uF8C4 [accent]copper ore[] on the ground and tap it to begin mining.
-gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
+gz.research = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the \ue85e menu in the bottom right.\nClick on a copper patch to place it.
-gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \uE800 [accent]checkmark[] at the bottom right to confirm.
+gz.research.mobile = Open the \uE875 tech tree.\nResearch the \uF870 [accent]Mechanical Drill[], then select it from the \ue85e menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \uE800 [accent]checkmark[] at the bottom right to confirm.
-gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+gz.conveyors = Research and place \uF896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
-gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
+gz.conveyors.mobile = Research and place \uF896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
 gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
-gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
+gz.lead = \uF837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
-gz.moveup = \ue804 Move up for further objectives.
+gz.moveup = \uE804 Move up for further objectives.
-gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
+gz.turrets = Research and place 2 \uF861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uF838 [accent]ammo[] from conveyors.
 gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
-gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
+gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uF8AE [accent]copper walls[] around the turrets.
 gz.defend = Enemy incoming, prepare to defend.
-gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
+gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uF860 [accent]Scatter[] turrets provide excellent anti-air, but require \uF837 [accent]lead[] as ammo.
-gz.scatterammo = Supply the Scatter turret with \uf837 [accent]lead[], using conveyors.
+gz.scatterammo = Supply the Scatter turret with \uF837 [accent]lead[], using conveyors.
 gz.supplyturret = [accent]Supply Turret
 gz.zone1 = This is the enemy drop zone.
 gz.zone2 = Anything built in the radius is destroyed when a wave starts.
 gz.zone3 = A wave will begin now.\nGet ready.
 gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
 
-onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
+onset.mine = Click to mine \uF748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
-onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
+onset.mine.mobile = Tap to mine \uF748 [accent]beryllium[] from walls.
-onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
+onset.research = Open the \uE875 tech tree.\nResearch, then place a \uF73E [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
-onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
+onset.bore = Research and place a \uF741 [accent]plasma bore[].\nThis automatically mines resources from walls.
-onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
+onset.power = To [accent]power[] the plasma bore, research and place a \uF73D [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
-onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
+onset.ducts = Research and place \uF799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
-onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
+onset.ducts.mobile = Research and place \uF799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
 onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
-onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
+onset.graphite = More complex blocks require \uF835 [accent]graphite[].\nSet up plasma bores to mine graphite.
-onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
+onset.research2 = Begin researching [accent]factories[].\nResearch the \uF74D [accent]cliff crusher[] and \uF779 [accent]silicon arc furnace[].
-onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
+onset.arcfurnace = The arc furnace needs \uF834 [accent]sand[] and \uF835 [accent]graphite[] to create \uF82F [accent]silicon[].\n[accent]Power[] is also required.
-onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
+onset.crusher = Use \uF74D [accent]cliff crushers[] to mine sand.
-onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
+onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uF6A2 [accent]tank fabricator[].
 onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
-onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
+onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uF6EB [accent]Breach[] turret.\nTurrets require \uF748 [accent]ammo[].
-onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
+onset.turretammo = Supply the turret with [accent]beryllium[] as ammo, using ducts.
-onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
+onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uF6EE [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
-onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
+onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uF725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
 
 split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [[ and ] to pick up and drop)
 split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
@@ -2037,7 +2132,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 
 #Erekir
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
@@ -2075,7 +2169,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge between two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2187,8 +2280,8 @@ unit.collaris.description = Fires long-range fragmenting artillery at enemy targ
 unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
 unit.avert.description = Fires twisting pairs of bullets at enemy targets.
 unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
-unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks. Only attacks ground targets.
-unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks.
+unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks. Only attacks ground targets.
 unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam. Capable of carrying 2x2 structures.
 unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam. Capable of carrying 2x2 structures.
 unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams. Capable of carrying 2x2 structures.
@@ -2196,6 +2289,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 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.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 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.
@@ -2208,7 +2302,7 @@ lst.operation = Perform an operation on 1-2 variables.
 lst.end = Jump to the top of the instruction stack.
 lst.wait = Wait a certain number of seconds.
 lst.stop = Halt execution of this processor.
-lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nFor the inverse operation, sense [accent]@id[] of the object.
 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.
@@ -2228,6 +2322,12 @@ lst.flushmessage = Display a message on the screen from the text buffer.\nWill w
 lst.cutscene = Manipulate the player camera.
 lst.setflag = Set a global flag that can be read by all processors.
 lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nLimited to 20 times a second per variable.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.\n[accent]null []values are ignored.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
@@ -2243,6 +2343,7 @@ 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]@ctrlCommand[] if unit controller is a player command\nOtherwise, 0.
 laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
 laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
 
 lcategory.unknown = Unknown
 lcategory.unknown.description = Uncategorized instructions.
@@ -2270,6 +2371,7 @@ 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[].
+graphicstype.print = Draws text from the print buffer.\nOnly ASCII characters are allowed.\nClears the print buffer.
 
 lenum.always = Always true.
 lenum.idiv = Integer division.
@@ -2289,6 +2391,7 @@ lenum.xor = Bitwise XOR.
 lenum.min = Minimum of two numbers.
 lenum.max = Maximum of two numbers.
 lenum.angle = Angle of vector in degrees.
+lenum.anglediff = Absolute distance between two angles in degrees.
 lenum.len = Length of vector.
 
 lenum.sin = Sine, in degrees.
@@ -2362,7 +2465,8 @@ lenum.stop = Stop moving/mining/building.
 lenum.unbind = Completely disable logic control.\nResume standard AI.
 lenum.move = Move to exact position.
 lenum.approach = Approach a position with a radius.
-lenum.pathfind = Pathfind to the enemy spawn.
+lenum.pathfind = Pathfind to the specified position.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
 lenum.target = Shoot a position.
 lenum.targetp = Shoot a target with velocity prediction.
 lenum.itemdrop = Drop an item.
@@ -2377,7 +2481,7 @@ lenum.getblock = Fetch a building, floor and type at coordinates.\nUnit must be
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
 
-#Don't translate these yet!
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
-onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
-onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
-
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.

core/assets/bundles/bundle_bg.properties

@@ -57,6 +57,7 @@ mods.browser.sortstars = Сортирай по рейтинг
 schematic = Схема
 schematic.add = Запази Схема...
 schematics = Схеми
+schematic.search = Search schematics...
 schematic.replace = Вече съществува схема с това име. Да бъде ли заместена?
 schematic.exists = Вече съществува схема с това име.
 schematic.import = Внасяне на Схема...
@@ -69,7 +70,7 @@ schematic.shareworkshop = Сподели в Работилницата
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Обърни Схемата
 schematic.saved = Схемате беше запазена.
 schematic.delete.confirm = Тази схема ще бъде напълно унищожена.
-schematic.rename = Преименуване на схема
+schematic.edit = Edit Schematic
 schematic.info = {0}x{1}, {2} елемента
 schematic.disabled = [scarlet]Схемите не са достъпни[]\nНе ви е позволено да използвате Схеми на тази [accent]карта[] или [accent]сървър[].
 schematic.tags = Tags:
@@ -78,6 +79,7 @@ schematic.addtag = Add Tag
 schematic.texttag = Text Tag
 schematic.icontag = Icon Tag
 schematic.renametag = Rename Tag
+schematic.tagged = {0} tagged
 schematic.tagdelconfirm = Delete this tag completely?
 schematic.tagexists = That tag already exists.
 
@@ -149,11 +151,15 @@ mod.incompatiblemod = [red]Incompatible
 mod.blacklisted = [red]Unsupported
 mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Грешки в Съдържанието
+mod.circulardependencies = [red]Circular Dependencies
+mod.incompletedependencies = [red]Incomplete Dependencies
 mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
 mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
 mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
 mod.missingdependencies.details = This mod is missing dependencies: {0}
 mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
+mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
 mod.requiresversion = Requires game version: [red]{0}
 mod.errors = Възникнаха грешки при зареждане на съдържанието.
 mod.noerrorplay = [scarlet]Има грешки в някои от модовете, които използвате.[] Трябва да деактивирате тези модове или да поправите грешките преди да играете.
@@ -249,11 +255,19 @@ trace = Проследи Играч
 trace.playername = Име на играча: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Мобилен Клиент: [accent]{0}
 trace.modclient = Модифициран Клиент: [accent]{0}
 trace.times.joined = Пъти участвал в игра: [accent]{0}
 trace.times.kicked = Пъти изхвърлен от игра: [accent]{0}
+trace.ips = IPs:
+trace.names = Names:
 invalidid = Невалидно ID на клиент. Съобщете за грешка.
+player.ban = Ban
+player.kick = Kick
+player.trace = Trace
+player.admin = Toggle Admin
+player.team = Change Team
 server.bans = Банове
 server.bans.none = Няма намерени баннати играчи!
 server.admins = Администратори
@@ -267,10 +281,11 @@ server.version = [gray]в{0} {1}
 server.custombuild = [accent]Персонализирана компилация
 confirmban = Сигурни ли сте, че искате да баннете "{0}[white]"?
 confirmkick = Сигурни ли сте, че искате да изгоните "{0}[white]"?
-confirmvotekick = Сигурни ли сте, че искате да изгоните "{0}[white]" чрез гласуване?
 confirmunban = Сигурни ли сте че, искате да анулирате банването на този играч?
 confirmadmin = Сигурни ли сте че, искате да направите "{0}[white]" администратор?
 confirmunadmin = Сигурни ли сте че, искате да премахнете администраторските права на "{0}[white]"?
+votekick.reason = Vote-Kick Reason
+votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
 joingame.title = Присъединяване в игра
 joingame.ip = IP адрес:
 disconnect = Връзката беше прекъсната.
@@ -326,11 +341,23 @@ open = Отвори
 customize = Персонализирай правилата
 cancel = Отказ
 command = Command
+command.queue = [lightgray][Queuing]
 command.mine = Mine
 command.repair = Repair
 command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
+command.boost = Boost
+command.enterPayload = Enter Payload Block
+command.loadUnits = Load Units
+command.loadBlocks = Load Blocks
+command.unloadPayload = Unload Payload
+stance.stop = Cancel Orders
+stance.shoot = Stance: Shoot
+stance.holdfire = Stance: Hold Fire
+stance.pursuetarget = Stance: Pursue Target
+stance.patrol = Stance: Patrol Path
+stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
 openlink = Отвори Линк
 copylink = Копирай Линк
 back = Назад
@@ -377,9 +404,9 @@ custom = Персонализирано
 builtin = Вградено
 map.delete.confirm = Сигурни ли сте, че искате да изтриете тази карта? Това действие няма да може да бъде отменено!
 map.random = [accent]Случайна Карта
-map.nospawn = Тази карта няма позиция за ядро на играча! Добавете поне едно [accent]оранжево[] ядро от редактора на карти.
+map.nospawn = Тази карта няма позиция за ядро на играча! Добавете поне едно {0} ядро от редактора на карти.
 map.nospawn.pvp = Тази карта няма достатъчно позиции за ядра на други играчи! Добавете поне едно [scarlet]неоранжево[] ядро от редактора на карти.
-map.nospawn.attack = Тази карта няма нито едно вражеско ядро! Добавете поне едно [scarlet]червено[] ядро от редактора на карти.
+map.nospawn.attack = Тази карта няма нито едно вражеско ядро! Добавете поне едно {0} ядро от редактора на карти.
 map.invalid = Грешка при зареждане на карта: увреден или невалиден файл.
 workshop.update = Обновяване на елемент
 workshop.error = Грешка при изтегляне на данни от Работилницата: {0}
@@ -411,6 +438,7 @@ editor.waves = Вълни:
 editor.rules = Правила:
 editor.generation = Генериране:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Редактирай в игра
 editor.playtest = Playtest
 editor.publish.workshop = Публикувай в Работилницата
@@ -453,6 +481,8 @@ waves.sort.reverse = Reverse Sort
 waves.sort.begin = Begin
 waves.sort.health = Health
 waves.sort.type = Type
+waves.search = Search waves...
+waves.filter = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
@@ -476,6 +506,7 @@ editor.errorlegacy = Тази карта е твърде стара, играт
 editor.errornot = Този файл не е карта.
 editor.errorheader = Този файл с карта е повреден или невалиден.
 editor.errorname = Картата няма зададено име. Да не се опитвате да заредите игра?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Обнови
 editor.randomize = Случайно
 editor.moveup = Move Up
@@ -487,6 +518,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Смени размера
 editor.loadmap = Зареди Карта
 editor.savemap = Запиши Карта
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Записано!
 editor.save.noname = Картата няма име! Задайте такова в 'Информация за картата' от менюто.
 editor.save.overwrite = Съществува стандартна карта с такова име! Изберете различно име от 'Информация за картата' от менюто.
@@ -525,6 +557,8 @@ toolmode.eraseores = Изтриване на руди
 toolmode.eraseores.description = Изтрива само руди.
 toolmode.fillteams = Запълване в отбори
 toolmode.fillteams.description = Променя отбора, не типа на обектите, чрез запълване
+toolmode.fillerase = Fill Erase
+toolmode.fillerase.description = Erase blocks of the same type.
 toolmode.drawteams = Рисуване в отбори
 toolmode.drawteams.description = Променя отбора, не типа на обектите, чрез рисуване
 toolmode.underliquid = Under Liquids
@@ -569,6 +603,23 @@ filter.option.floor2 = Втори под
 filter.option.threshold2 = Втори праг
 filter.option.radius = Радиус
 filter.option.percentile = Перцентил
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Дължина:
 height = Височина:
@@ -622,6 +673,7 @@ marker.shapetext.name = Shape Text
 marker.minimap.name = Minimap
 marker.shape.name = Shape
 marker.text.name = Text
+marker.line.name = Line
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -647,7 +699,6 @@ resources.max = Max
 bannedblocks = Забранени блокове
 objectives = Objectives
 bannedunits = Banned Units
-rules.hidebannedblocks = Hide Banned Blocks
 bannedunits.whitelist = Banned Units As Whitelist
 bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Добави Всички
@@ -706,8 +757,7 @@ sector.curlost = Зоната загубена
 sector.missingresources = [scarlet]Недостатъчни ресурси в ядрото
 sector.attacked = Зона [accent]{0}[white] е под атака!
 sector.lost = Зона [accent]{0}[white] беше загубена!
-#note: the missing space in the line below is intentional
+sector.capture = Sector [accent]{0}[white]Captured!
-sector.captured = Зона [accent]{0}[white]беше превзета!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
@@ -881,6 +931,7 @@ stat.repairspeed = Repair Speed
 stat.weapons = Оръжия
 stat.bullet = Муниции
 stat.moduletier = Module Tier
+stat.unittype = Unit Type
 stat.speedincrease = Ускорение
 stat.range = Обхват
 stat.drilltier = Изкопаеми ресурси
@@ -929,12 +980,16 @@ stat.healing = Healing
 ability.forcefield = Енергийно Поле
 ability.repairfield = Възстановяващо Поле
 ability.statusfield = Подсилващо Поле
-ability.unitspawn = {0} Factory
+ability.unitspawn = Factory
 ability.shieldregenfield = Възстановяващо броня Поле
 ability.movelightning = Подвижна светкавица
 ability.shieldarc = Shield Arc
 ability.suppressionfield = Regen Suppression Field
-ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets
+ability.energyfield = Energy Field
+ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
+ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.regen = Regeneration
+
 bar.onlycoredeposit = Only Core Depositing Allowed
 
 bar.drilltierreq = Необходимо е по-добро Свредло
@@ -974,6 +1029,9 @@ bullet.splashdamage = [stat]{0}[lightgray] щети на площ ~[stat] {1}[li
 bullet.incendiary = [stat]Подпалване
 bullet.homing = [stat]Самонасочване
 bullet.armorpierce = [stat]armor piercing
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
+bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
 bullet.frags = [stat]{0}[lightgray]x frag bullets:
 bullet.lightning = [stat]{0}[lightgray]x светкавица ~ [stat]{1}[lightgray] щети
 bullet.buildingdamage = [stat]{0}%[lightgray] щети на сгради
@@ -1027,6 +1085,7 @@ setting.backgroundpause.name = Пауза при загуба на фокус
 setting.buildautopause.name = Автоматична Пауза на Изграждането
 setting.doubletapmine.name = Двоен Клик за Добив на Ресурс
 setting.commandmodehold.name = Hold For Command Mode
+setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
 setting.modcrashdisable.name = Забрани Модовете При Стартиране След Срив
 setting.animatedwater.name = Анимирани Повърхности
 setting.animatedshields.name = Анимирани Щитове
@@ -1073,13 +1132,14 @@ setting.position.name = Показвай Позиция на Играч
 setting.mouseposition.name = Show Mouse Position
 setting.musicvol.name = Сила на Звука
 setting.atmosphere.name = Показвай Атмосферата на Планетата
+setting.drawlight.name = Draw Darkness/Lighting
 setting.ambientvol.name = Сила на Звука на Околната Среда
 setting.mutemusic.name = Заглуши Музиката
 setting.sfxvol.name = Сила на Звуковите Ефекти
 setting.mutesound.name = Заглуши Звука
 setting.crashreport.name = ИЗпращай Анонимни Отчети за Сривове
 setting.savecreate.name = Автоматични Записи
-setting.publichost.name = Видимост на Публичните Игри
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Лимит на Играчи
 setting.chatopacity.name = Плътност на Чата
 setting.lasersopacity.name = Плътност на Енергийните Лазери
@@ -1087,8 +1147,10 @@ setting.bridgeopacity.name = Плътност на Мостовете
 setting.playerchat.name = Показвай Мехурчета с Чат
 setting.showweather.name = Показвай Графики за Климата
 setting.hidedisplays.name = Hide Logic Displays
-public.confirm = Искате ли да направите вашата игра публична?\n[accent]Всеки ще може да се присъедини към вашата игра.\n[lightgray]Това може да бъде променено по-късно в Настройки->Игри->Видимост на Публичните Игри.
+setting.macnotch.name = Адаптирайте интерфейса за показване на прорез
-public.confirm.really = Ако искате да играете с приятел, използвате [green]Покани Приятел[] вместо [scarlet]Публикувай Сървър[]!\nСигурни ли сте, че искате да направите вашата игра [scarlet]публична[]?
+setting.macnotch.description = За прилагане на промените е необходимо рестартиране
+steam.friendsonly = Friends Only
+steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
 public.beta = Имайте в предвид, че бета версии на играта не могат да стартират публични игри.
 uiscale.reset = Размерът на интерфейса беше променен.\nНатиснете "ОК" за да потвърдите този размер.\n[scarlet]Възстановяване и рестартиране след[accent] {0}[] секунди...
 uiscale.cancel = Отакз & Изход
@@ -1097,6 +1159,7 @@ keybind.title = Промени Клавишите
 keybinds.mobile = [scarlet]Повечето клавиши тук не са използваеми за мобилната версия. Само основните движения се поддържат.
 category.general.name = Основни настройки
 category.view.name = Изглед
+category.command.name = Unit Command
 category.multiplayer.name = Мрежова игра
 category.blocks.name = Избор на блок
 placement.blockselectkeys = \n[lightgray]Клавиш: [{0},
@@ -1114,6 +1177,23 @@ keybind.mouse_move.name = Следвай Мишката
 keybind.pan.name = Панорамен Изглед
 keybind.boost.name = Ускорение
 keybind.command_mode.name = Command Mode
+keybind.command_queue.name = Unit Command Queue
+keybind.create_control_group.name = Create Control Group
+keybind.cancel_orders.name = Cancel Orders
+keybind.unit_stance_shoot.name = Unit Stance: Shoot
+keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
+keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
+keybind.unit_stance_patrol.name = Unit Stance: Patrol
+keybind.unit_stance_ram.name = Unit Stance: Ram
+keybind.unit_command_move = Unit Command: Move
+keybind.unit_command_repair = Unit Command: Repair
+keybind.unit_command_rebuild = Unit Command: Rebuild
+keybind.unit_command_assist = Unit Command: Assist
+keybind.unit_command_mine = Unit Command: Mine
+keybind.unit_command_boost = Unit Command: Boost
+keybind.unit_command_load_units = Unit Command: Load Units
+keybind.unit_command_load_blocks = Unit Command: Load Blocks
+keybind.unit_command_unload_payload = Unit Command: Unload Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Избери Регион
 keybind.schematic_menu.name = Меню със Схеми
@@ -1140,8 +1220,8 @@ keybind.select.name = Избери/Стреляй
 keybind.diagonal_placement.name = Диагонално Поставяне
 keybind.pick.name = Вземи Блок
 keybind.break_block.name = Унищожи Блок
-keybind.select_all_units = Select All Units
+keybind.select_all_units.name = Select All Units
-keybind.select_all_unit_factories = Select All Unit Factories
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Премахни избора
 keybind.pickupCargo.name = Вземи Товар
 keybind.dropCargo.name = Остави Товар
@@ -1177,9 +1257,12 @@ mode.pvp.description = Играйте срещу други играчи в ло
 mode.attack.name = Нападение
 mode.attack.description = Унищожете вражеската база. \n[gray]Картата трябва да съдържа червено ядро.
 mode.custom = Персонализирани Правила
+rules.invaliddata = Invalid clipboard data.
+rules.hidebannedblocks = Hide Banned Blocks
 
 rules.infiniteresources = Безкрайни Ресурси
 rules.onlydepositcore = Only Allow Core Depositing
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Експлозиращи Реактори
 rules.coreincinerates = Унищожаване на Ресурси при Преливане
 rules.disableworldprocessors = Disable World Processors
@@ -1188,6 +1271,8 @@ rules.wavetimer = Таймер за Вълни
 rules.wavesending = Wave Sending
 rules.waves = Вълни
 rules.attack = Режим Атака
+rules.buildai = Base Builder AI
+rules.buildaitier = Builder AI Tier
 rules.rtsai = RTS AI
 rules.rtsminsquadsize = Min Squad Size
 rules.rtsmaxsquadsize = Max Squad Size
@@ -1215,6 +1300,7 @@ rules.buildcostmultiplier = Множител на Необходимите Ре
 rules.buildspeedmultiplier = Множител на Скоростта за Строене
 rules.deconstructrefundmultiplier = Множител на Възстановени Ресурси при Деконструкция
 rules.waitForWaveToEnd = Вълните Изчакват за Врагове
+rules.wavelimit = Map Ends After Wave
 rules.dropzoneradius = Радиус на Начална Точка на Враговете:[lightgray] (полета)
 rules.unitammo = Единиците се Нуждаят от Боеприпаси
 rules.enemyteam = Enemy Team
@@ -1694,7 +1780,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -1758,6 +1843,7 @@ hint.launch = След като съберете достатъчно ресур
 hint.launch.mobile = След като съберете достатъчно ресурси, можете да [accent]Изстреляте[] ядро като изберете близък сектор от \ue827 [accent]Глобуса[] в \ue88c [accent]Менюто[].
 hint.schematicSelect = Задръжте [accent][[F][] и плъзнете за да изберете/копирате група от блокчета.\n\n[accent][[Среден клик][] за да копирате едно блокче.
 hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
 hint.conveyorPathfind = Задръжте [accent][[L-Ctrl][] докато поставяте пътека от конвейери за да генерирате пътека автоматично.
 hint.conveyorPathfind.mobile = Позволете \ue844 [accent]Диагонално Поставяне[] за автоматично намиране на пътека при поставяне на конвейери.
 hint.boost = Задръжте [accent][[L-Shift][] за да прелетите над препятствия с тази единица.\n\nСамо някои наземни единици имат двигатели за летене.
@@ -1812,9 +1898,13 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
 split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
 split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
 split.acquire = You must acquire some tungsten to build units.
@@ -2008,7 +2098,6 @@ block.logic-display.description = Позволява изобразяванет
 block.large-logic-display.description = Позволява изобразяването на графика чрез процесор.
 block.interplanetary-accelerator.description = Масивна електромагнитна релсова кула. Ускорява ядрата до необходимата скорост за междупланетно изстрелване.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2044,7 +2133,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2163,6 +2251,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Прочети число от свързано хранилище за памет.
 lst.write = Запиши число в свързано хранилище за памет.
 lst.print = Добави текст в буфера за изписване.\nНе визуализира нищо докато не използвате [accent]Print Flush[].
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Добавя операция в буфера за изображение.\nНе показва нищо докато не използвате [accent]Draw Flush[].
 lst.drawflush = Изпълнява операции, поискани с команда [accent]Draw[] върху посочен дисплей.
 lst.printflush = Извежда текст натрупан с [accent]Print[] върху посочен блок за съобщение.
@@ -2195,6 +2284,12 @@ lst.flushmessage = Display a message on the screen from the text buffer.\nWill w
 lst.cutscene = Manipulate the player camera.
 lst.setflag = Set a global flag that can be read by all processors.
 lst.getflag = Check if a global flag is set.
+lst.setprop = Sets a property of a unit or building.
+lst.effect = Create a particle effect.
+lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
+lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Действия за строене на единици не са позволени тук.
 
@@ -2210,6 +2305,7 @@ laccess.dead = Дали дадена единица/сграда е била у
 laccess.controlled = Връща:\n[accent]@ctrlProcessor[] ако единицата е контролирана от процесор\n[accent]@ctrlPlayer[] ако единицата/сградата е контролирана от играч\n[accent]@ctrlFormation[] ако единицата участва във формация\nИначе, връща 0.
 laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
 laccess.speed = Top speed of a unit, in tiles/sec.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
 lcategory.unknown = Unknown
 lcategory.unknown.description = Uncategorized instructions.
 lcategory.io = Input & Output
@@ -2236,6 +2332,7 @@ graphicstype.poly = Запълва правилен многоъгълник.
 graphicstype.linepoly = Очертава правилен многоъгълник.
 graphicstype.triangle = Запълва триъгълник.
 graphicstype.image = Рисува изображение.\nНапример: [accent]@router[] или [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Винаги вярно
 lenum.idiv = Деление с цели числа.
@@ -2255,6 +2352,7 @@ lenum.xor = Побитово ИЗКЛЮЧВАЩО ИЛИ.
 lenum.min = Минимална стойност от 2 числа.
 lenum.max = Максимална стойност от 2 числа.
 lenum.angle = Ъгъл на вектор в градуси.
+lenum.anglediff = Absolute distance between two angles in degrees.
 lenum.len = Дължина на вектор.
 lenum.sin = Синус, в градуси.
 lenum.cos = Косинус, в градуси.
@@ -2326,6 +2424,7 @@ lenum.unbind = Completely disable logic control.\nResume standard AI.
 lenum.move = Премести се на конкретна позиция.
 lenum.approach = Доближи се до позиция на определено разстояние.
 lenum.pathfind = Намери пътека до вражеската начална точка.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
 lenum.target = Стреляй към позиция.
 lenum.targetp = Стреляй към цел, изчислявайки нейната скорост.
 lenum.itemdrop = Разтовари предмет(и).
@@ -2339,5 +2438,7 @@ lenum.build = Построй структура.
 lenum.getblock = Преверете типът на постройката на дадени координати.\nПозицията трябва да е в обхвата на единицата.\nСолидни не-сгради ще имат типа [accent]@solid[].
 lenum.within = Проверете дали дадена позиция е в обхват на единицата.
 lenum.boost = Започни/Спри ускорението.
-onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
-onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.

core/assets/bundles/bundle_ca.properties

@@ -57,6 +57,7 @@ mods.browser.sortstars = Ordena per valoració
 schematic = Esquema
 schematic.add = Desa l’esquema…
 schematics = Esquemes
+schematic.search = Cerca esquemes...
 schematic.replace = Ja hi ha un esquema amb aquest nom. Voleu reemplaçar-lo?
 schematic.exists = Ja hi ha un esquema amb aquest nom.
 schematic.import = Importa un esquema
@@ -69,7 +70,7 @@ schematic.shareworkshop = Comparteix al Workshop de l’Steam
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Dóna la volta a l’esquema
 schematic.saved = L’esquema s’ha desat.
 schematic.delete.confirm = Aquest esquema s’esborrarà.
-schematic.rename = Reanomena l’esquema
+schematic.edit = Edita l’esquema
 schematic.info = {0}×{1}, {2} blocs
 schematic.disabled = [scarlet]Els esquemes s’han desactivat.[]\nNo podeu fer servir esquemes en aquest [accent]mapa[] o [accent]servidor[].
 schematic.tags = Etiquetes:
@@ -78,6 +79,7 @@ schematic.addtag = Afegeix una etiqueta
 schematic.texttag = Text de l’etiqueta
 schematic.icontag = Icona de l’etiqueta
 schematic.renametag = Canvia el nom de l’etiqueta
+schematic.tagged = {0} d’etiquetades
 schematic.tagdelconfirm = Voleu esborrar del tot aquesta etiqueta?
 schematic.tagexists = Aquesta etiqueta ja existeix.
 
@@ -149,11 +151,15 @@ mod.incompatiblemod = [red]Incompatible
 mod.blacklisted = [red]Unsupported
 mod.unmetdependencies = [red]Depèndencies sense resoldre
 mod.erroredcontent = [scarlet]Errors del contingut
+mod.circulardependencies = [red]Dependències circulars
+mod.incompletedependencies = [red]Dependències incompletes
 mod.requiresversion.details = Requereix la versió: [accent]{0}[]\nCal actualitzar la vostra versió del joc. El mod necessita una versió nova (potser una distribució alfa o beta) per a funcionar.
 mod.outdatedv7.details = Aquest mod és incompatible amb l’última versió del joc. L’autor l’ha d’actualitzar i afegir [accent]minGameVersion: 136[] al seu fitxer [accent]mod.json[].
 mod.blacklisted.details = Aquest mod s’ha afegit manualment a la llista negra perquè causa problemes amb aquesta versió del joc. No el feu servir.
 mod.missingdependencies.details = A aquest mod li falten dependències: {0}
 mod.erroredcontent.details = Aquesta partida ha causat errors mentre es carregava. Pregunteu a l’autor del mod si pot arreglar-ho.
+mod.circulardependencies.details = Aquest mod depèn d’un segon mod que, al seu torn, depèn del mod anterior. No es permeten dependències circulars.
+mod.incompletedependencies.details = Aquest mod no es pot carregar perquè té una dependència no vàlida o que no es pot trobar: {0}.
 mod.requiresversion = Cal la versió [red]{0}[] del joc.
 mod.errors = S’han produït errors quan es carregava el contingut.
 mod.noerrorplay = [scarlet]S’executen mods amb errors.[] Desactiveu els mods afectats o arregleu les errades abans de jugar.
@@ -249,11 +255,19 @@ trace = Rastreja un jugador
 trace.playername = Nom del jugador: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID: [accent]{0}
+trace.language = Language: [accent]{0}
 trace.mobile = Client de mòbil: [accent]{0}
 trace.modclient = Client personalitzat: [accent]{0}
 trace.times.joined = S’ha unit [accent]{0}[] vegades.
 trace.times.kicked = Ha estat expulsat [accent]{0}[] vegades.
+trace.ips = Direccions IP:
+trace.names = Noms:
 invalidid = ID de client no vàlid! Envieu un informe d’error.
+player.ban = Bandeja
+player.kick = Expulsa
+player.trace = Traça
+player.admin = Commuta d’admin
+player.team = Canvia l’equip
 server.bans = Bandejaments
 server.bans.none = No s’ha trobat cap jugador bandejat!
 server.admins = Administradors
@@ -267,10 +281,11 @@ server.version = [gray]v{0} {1}
 server.custombuild = [accent]Versió personalitzada
 confirmban = Esteu segur que voleu bandejar a «{0}[white]»?
 confirmkick = Esteu segur que voleu expulsar a «{0}[white]»?
-confirmvotekick = Esteu segur que voleu votar per a expulsar a «{0}[white]»?
 confirmunban = Esteu segur que voleu treure el bandeig a aquest jugador?
 confirmadmin = Esteu segur que voleu fer administrador a «{0}[white]»?
 confirmunadmin = Esteu segur que voleu treure a «{0}[white]» els permisos d’administrador?
+votekick.reason = Motiu per a la votació d’expulsió
+votekick.reason.message = Esteu segur que voleu votar per a expulsar per votació a «{0}[white]»?\nSi és que sí, escriviu-ne el motiu:
 joingame.title = Uneix-me a la partida
 joingame.ip = Direcció IP:
 disconnect = Desconnectat.
@@ -288,7 +303,7 @@ server.invalidport = El número de port no és vàlid!
 server.error = [scarlet]S’ha produït un error mentre s’allotjava el servidor.
 save.new = Desa en un fitxer nou
 save.overwrite = Esteu segur que voleu sobreescriure\naquesta ranura de desades?
-save.nocampaign = Individual save files from the campaign cannot be imported.
+save.nocampaign = Els fitxers de desades individuals de la campanya no es poden importar.
 overwrite = Sobreescriu
 save.none = No s’ha trobat cap partida desada!
 savefail = No s’ha pogut desar la partida!
@@ -326,11 +341,23 @@ open = Obre
 customize = Personalitza les regles
 cancel = Cancel·la
 command = Ordre
+command.queue = [lightgray][Queuing]
 command.mine = Extreu recursos
 command.repair = Repara
 command.rebuild = Reconstrueix
 command.assist = Assisteix al jugador
 command.move = Mou
+command.boost = Sobrevola
+command.enterPayload = Enter Payload Block
+command.loadUnits = Carrega unitats
+command.loadBlocks = Carrega blocs
+command.unloadPayload = Descarrega
+stance.stop = Cancel·la les ordres
+stance.shoot = Comportament: Dispara
+stance.holdfire = Comportament: Mantén el foc
+stance.pursuetarget = Comportament: Persegueix l’objectiu
+stance.patrol = Comportament: Patrulla el camí
+stance.ram = Comportament: Senzill\n[lightgray]Mou-te en línia recta, sense encaminador
 openlink = Obre l’enllaç
 copylink = Copia l’enllaç
 back = Enrere
@@ -377,9 +404,9 @@ custom = Personalitzat
 builtin = *Integrat*
 map.delete.confirm = Esteu segur que voleu esborrar aquest mapa? Aquesta acció no es pot desfer!
 map.random = [accent]Mapa aleatori
-map.nospawn = Aquest mapa no té cap nucli per tal que el jugador hi pugui aparèixer! Afegiu-hi un nucli [#{0}]{1}[] amb l’editor.
+map.nospawn = Aquest mapa no té cap nucli per tal que el jugador hi pugui aparèixer! Afegiu-hi un nucli {0} amb l’editor.
-map.nospawn.pvp = Aquest mapa no té nuclis enemics per tal que hi puguin aparèixer altres jugadors! Afegiu-hi nuclis[scarlet] d’un altre color[] amb l’editor.
+map.nospawn.pvp = Aquest mapa no té nuclis enemics per tal que hi puguin aparèixer altres jugadors! Afegiu-hi nuclis [scarlet]d’un altre color[] amb l’editor.
-map.nospawn.attack = Aquest mapa no té cap nucli enemic que el jugador pugui atacar! Afegiu-hi nuclis [#{0}]{1}[] amb l’editor.
+map.nospawn.attack = Aquest mapa no té cap nucli enemic que el jugador pugui atacar! Afegiu-hi nuclis {0} amb l’editor.
 map.invalid = S’ha produït un error carregant el mapa: el fitxer està corromput o bé el mapa no és vàlid.
 workshop.update = Actualitza l’element
 workshop.error = S’ha produït un error mentre s’obtenien els detalls del Workshop: {0}
@@ -411,6 +438,7 @@ editor.waves = Onades
 editor.rules = Regles
 editor.generation = Generació
 editor.objectives = Objectius
+editor.locales = Locale Bundles
 editor.ingame = Edita des de la partida
 editor.playtest = Prova el mapa
 editor.publish.workshop = Publica al Workshop
@@ -453,6 +481,8 @@ waves.sort.reverse = Ordre invers
 waves.sort.begin = Comença
 waves.sort.health = Salut
 waves.sort.type = Tipus
+waves.search = Es busquen onades...
+waves.filter = Filtre d'unitats
 waves.units.hide = Amaga-les totes
 waves.units.show = Mostra-les totes
 
@@ -476,6 +506,7 @@ editor.errorlegacy = Aquest mapa és massa antic i fa servir un format obsolet.
 editor.errornot = No és un fitxer de mapa.
 editor.errorheader = Aquest fitxer de mapa no és vàlid o està corromput.
 editor.errorname = No s’ha definit el nom del mapa. Esteu intentant carregar una partida desada?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Actualitza
 editor.randomize = Assigna a l’atzar
 editor.moveup = Mou amunt
@@ -486,7 +517,8 @@ editor.generate = Genera
 editor.sectorgenerate = Generació del sector
 editor.resize = Canvia la mida
 editor.loadmap = Carrega un mapa
-editor.savemap = Desa un mapa
+editor.savemap = Desa el mapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = S’ha desat.
 editor.save.noname = El mapa no té nom! Trieu-ne un des del menú «Informació del mapa».
 editor.save.overwrite = El vostre mapa sobreescriu un mapa incorporat al joc! Trieu un nom diferent des del menú «Informació del mapa».
@@ -525,6 +557,8 @@ toolmode.eraseores = Esborra els minerals
 toolmode.eraseores.description = Esborra només els minerals.
 toolmode.fillteams = Omple els equips
 toolmode.fillteams.description = Omple els equips en lloc dels blocs.
+toolmode.fillerase = Esborra els del mateix tipus
+toolmode.fillerase.description = Esborra els blocs que siguin del mateix tipus.
 toolmode.drawteams = Dibuixa els equips
 toolmode.drawteams.description = Dibuixa els equips en lloc de dibuixar blocs.
 #unused
@@ -572,6 +606,23 @@ filter.option.floor2 = Terra secundari
 filter.option.threshold2 = Llindar secundari
 filter.option.radius = Radi
 filter.option.percentile = Percentil
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Amplada:
 height = Alçada:
@@ -625,6 +676,7 @@ marker.shapetext.name = Forma del text
 marker.minimap.name = Minimapa
 marker.shape.name = Forma
 marker.text.name = Text
+marker.line.name = Línia
 marker.background = Fons
 marker.outline = Contorn
 
@@ -651,7 +703,6 @@ resources.max = Màx.
 bannedblocks = Blocs no permesos
 objectives = Objectius
 bannedunits = Unitats no permeses
-rules.hidebannedblocks = Amaga els blocs no permesos
 bannedunits.whitelist = Unitats no permeses com a llista blanca
 bannedblocks.whitelist = Blocs no permesos com a llista blanca
 addall = Afegeix-ho tot
@@ -710,8 +761,7 @@ sector.curlost = Sector perdut
 sector.missingresources = [scarlet]Recursos insuficients al nucli
 sector.attacked = Ataquen el sector [accent]{0}[white]!
 sector.lost = Heu perdut el sector [accent]{0}[white]!
-#note: the missing space in the line below is intentional
+sector.capture = Sector [accent]{0}[white]Captured!
-sector.captured = S’ha capturat el sector [accent]{0}[white]!
 sector.changeicon = Canvia la icona
 sector.noswitch.title = Els sectors no es poden canviar.
 sector.noswitch = Potser no podeu canviar de sector perquè n’ataquen un altre.\n\nSector: [accent]{0}[] de [accent]{1}[]
@@ -885,6 +935,7 @@ stat.repairspeed = Velocitat de reparació
 stat.weapons = Armes
 stat.bullet = Bala
 stat.moduletier = Nivell del mòdul
+stat.unittype = Tipus d’unitat
 stat.speedincrease = Augment de velocitat
 stat.range = Abast
 stat.drilltier = Perforables
@@ -932,13 +983,16 @@ stat.healing = Reparador
 
 ability.forcefield = Camp de força
 ability.repairfield = Repara el camp de força
-ability.statusfield = Estat del camp: {0}
+ability.statusfield = Estat del camp
-ability.unitspawn = Fàbrica de {0}
+ability.unitspawn = Fàbrica
 ability.shieldregenfield = Regenerador de camps de força
 ability.movelightning = Moviment llampec
 ability.shieldarc = Escut de descàrregues
 ability.suppressionfield = Regen Suppression Field
-ability.energyfield = Camp de força: [accent]{0}[] de dany ~ [accent]{1}[] blocs / [accent]{2}[] objectius
+ability.energyfield = Camp de força
+ability.energyfield.sametypehealmultiplier = [lightgray]Mateix tipus de guarició: [white]{0} %
+ability.energyfield.maxtargets = [lightgray]Objectius màx.: [white]{0}
+ability.regen = Regeneració
 
 bar.onlycoredeposit = Només es permet depositar al nucli.
 bar.drilltierreq = Cal una perforadora millor.
@@ -978,6 +1032,9 @@ bullet.splashdamage = [stat]{0}[lightgray] de dany a l’àrea ~[stat] {1}[light
 bullet.incendiary = [stat]incendiari
 bullet.homing = [stat]munició guiada
 bullet.armorpierce = [stat]perforador d’armadures
+bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.suppression = [stat]Supressió de reparacions cada {0} s[lightgray] ~ [stat]{1}[lightgray] caselles
+bullet.interval = [stat]Interval de bales de {0}/s[lightgray]:
 bullet.frags = [stat]{0}[lightgray]× de bales de fragmentació:
 bullet.lightning = [stat]{0}[lightgray]× llampec ~ [stat]{1}[lightgray] de dany
 bullet.buildingdamage = [stat]{0}%[lightgray] de dany a les estructures
@@ -1031,6 +1088,7 @@ setting.backgroundpause.name = Pausa automàtica quan s’estigui en segon pla
 setting.buildautopause.name = Pausa automàtica quan es construeixi
 setting.doubletapmine.name = Dos tocs/clics per a extreure recursos
 setting.commandmodehold.name = Mantén per al mode de comandament
+setting.distinctcontrolgroups.name = Limita a un grup de control per unitat
 setting.modcrashdisable.name = Desactiva els mods quan no es pugui iniciar el joc
 setting.animatedwater.name = Animacions del terreny
 setting.animatedshields.name = Animacions dels escuts
@@ -1077,13 +1135,14 @@ setting.position.name = Mostra la posició del jugador
 setting.mouseposition.name = Mostra la posició del ratolí
 setting.musicvol.name = Volum de la música
 setting.atmosphere.name = Mostra l’atmosfera del planeta
+setting.drawlight.name = Dibuixa la foscor/llum
 setting.ambientvol.name = Volum del so ambiental
 setting.mutemusic.name = Silencia la música
 setting.sfxvol.name = Volums dels efectes de so
 setting.mutesound.name = Silencia el so
 setting.crashreport.name = Envia informes d’error anònims
 setting.savecreate.name = Desa automàticament la partida
-setting.publichost.name = Visibilitat de la partida pública
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Límit de jugadors
 setting.chatopacity.name = Opacitat del xat
 setting.lasersopacity.name = Opacitat dels làsers d’energia
@@ -1091,8 +1150,10 @@ setting.bridgeopacity.name = Opacitat de cintes i canonades subterrànies
 setting.playerchat.name = Mostra el xat bombolla de jugadors
 setting.showweather.name = Mostra l’estat meteorològic
 setting.hidedisplays.name = Amaga els monitors lògics
-public.confirm = Voleu que la vostra partida sigui pública?\n[accent]Qualsevol jugador s’hi podrà unir.\n[lightgray]Després es pot canviar a Configuració→Partida→Visibilitat de la partida pública.
+setting.macnotch.name = Adapta la interfície per a mostrar el notch
-public.confirm.really = Si voleu jugar amb els vostres amics, feu servir [green]Invita un amic[] en lloc d’emprar un [scarlet]servidor públic[]!\nEsteu segur que voleu que la partida sigui [scarlet]pública[]?
+setting.macnotch.description = Cal reiniciar perquè s’apliquin els canvis
+steam.friendsonly = Només amics
+steam.friendsonly.tooltip = Indica si només els amics de Steam podran unir-se a la vostra partida.\nSi no es selecciona aquesta opció, la vostra partida serà pública i s’hi podrà unir qualsevol jugador.
 public.beta = Tingueu en compte que les versions beta no disposen de sales d’espera.
 uiscale.reset = L’escala de la interfície ha canviat.\nPremeu «D’acord» per a confirmar-ho.\n[scarlet]Es revertiran els canvis en [accent]{0}[] segons.
 uiscale.cancel = Cancel·la i surt
@@ -1101,6 +1162,7 @@ keybind.title = Personalització dels controls
 keybinds.mobile = [scarlet]La majoria de dreceres no estan disponibles en les versions per a pantalles tàctils. Només està inclòs el moviment bàsic.
 category.general.name = General
 category.view.name = Control de la vista i altres
+category.command.name = Ordre d’unitat
 category.multiplayer.name = Multijugador
 category.blocks.name = Selecció d’estructures per construir
 placement.blockselectkeys = \n[lightgray]Tecles: [{0},
@@ -1118,6 +1180,23 @@ keybind.mouse_move.name = Segueix el ratolí
 keybind.pan.name = Desplaça la vista
 keybind.boost.name = Sobrevola
 keybind.command_mode.name = Mode de comandament
+keybind.command_queue.name = Cua d’ordres d’unitat
+keybind.create_control_group.name = Crea un grup de control
+keybind.cancel_orders.name = Cancel·la les ordres
+keybind.unit_stance_shoot.name = Comportament: Dispara
+keybind.unit_stance_hold_fire.name = Comportament: Mantén el foc
+keybind.unit_stance_pursue_target.name = Comportament: Persegueix l’objectiu
+keybind.unit_stance_patrol.name = Comportament: Patrulla
+keybind.unit_stance_ram.name = Comportament: Senzill
+keybind.unit_command_move = Comportament: Mou
+keybind.unit_command_repair = Comportament: Repara
+keybind.unit_command_rebuild = Comportament: Reconstrueix
+keybind.unit_command_assist = Comportament: Assisteix
+keybind.unit_command_mine = Comportament: Extrau
+keybind.unit_command_boost = Comportament: Sobrevola
+keybind.unit_command_load_units = Comportament: Carrega unitats
+keybind.unit_command_load_blocks = Comportament: Carrega blocs
+keybind.unit_command_unload_payload = Comportament: Descarrega
 keybind.rebuild_select.name = Reconstrueix la regió
 keybind.schematic_select.name = Selecciona una regió
 keybind.schematic_menu.name = Menú de plànols
@@ -1144,8 +1223,8 @@ keybind.select.name = Selecciona/Dispara
 keybind.diagonal_placement.name = Construcció diagonal
 keybind.pick.name = Selecciona un tipus de bloc des del mapa
 keybind.break_block.name = Desmunta un bloc
-keybind.select_all_units = Selecciona totes les unitats
+keybind.select_all_units.name = Selecciona totes les unitats
-keybind.select_all_unit_factories = Selecciona totes les unitats fabricadores
+keybind.select_all_unit_factories.name = Selecciona totes les unitats fabricadores
 keybind.deselect.name = Cancel·la la selecció
 keybind.pickupCargo.name = Recull càrrega
 keybind.dropCargo.name = Deixa la càrrega
@@ -1181,9 +1260,12 @@ mode.pvp.description = Lluiteu contra altres jugadors localment.\n[gray]Cal que
 mode.attack.name = Atac
 mode.attack.description = Destruïu la base enemiga. \n[gray]Cal que al mapa hi hagi un nucli vermell.
 mode.custom = Regles personalitzades
+rules.invaliddata = Dades del porta-retalls no vàlides.
+rules.hidebannedblocks = Amaga els blocs no permesos
 
 rules.infiniteresources = Recursos infinits
 rules.onlydepositcore = Al nucli només es poden dipositar recursos
+rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Explosions als reactors
 rules.coreincinerates = El nucli incinera els excedents
 rules.disableworldprocessors = Desactiva els processadors integrats
@@ -1192,6 +1274,8 @@ rules.wavetimer = Temporitzador d’onades
 rules.wavesending = Enviament d’onades
 rules.waves = Onades
 rules.attack = Mode d’atac
+rules.buildai = IA constructora de bases
+rules.buildaitier = Nivell de construcció de la IA
 rules.rtsai = IA avançada (RTS AI)
 rules.rtsminsquadsize = Mida mínima de l’esquadró
 rules.rtsmaxsquadsize = Mida màxima de l’esquadró
@@ -1207,7 +1291,7 @@ rules.unitbuildspeedmultiplier = Multiplicador de la velocitat de producció d
 rules.unitcostmultiplier = Multiplicador del cost de les unitats
 rules.unithealthmultiplier = Multiplicador de la salut de les unitats
 rules.unitdamagemultiplier = Multiplicador del dany de les unitats
-rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitcrashdamagemultiplier = Multiplicador del dany de xoc de les unitats
 rules.solarmultiplier = Multiplicador de l’energia solar
 rules.unitcapvariable = Els nuclis contribueixen al límit d’unitats
 rules.unitcap = Capacitat base d’unitats
@@ -1219,6 +1303,7 @@ rules.buildcostmultiplier = Multiplicador del cost de construcció
 rules.buildspeedmultiplier = Multiplicador de la velocitat de construcció
 rules.deconstructrefundmultiplier = Multiplicador dels elements recuperats per desmuntatge
 rules.waitForWaveToEnd = Les onades esperen fins veure enemics
+rules.wavelimit = El mapa acaba després de l’onada
 rules.dropzoneradius = Radi de la zona d’aterratge:[lightgray] (caselles)
 rules.unitammo = Les unitats necessiten munició
 rules.enemyteam = Equip enemic
@@ -1378,7 +1463,7 @@ block.scrap-wall-large.name = Mur de ferralla gros
 block.scrap-wall-huge.name = Mur de ferralla enorme
 block.scrap-wall-gigantic.name = Mur de ferralla gegantí
 block.thruster.name = Propulsor
-block.kiln.name = Kiln
+block.kiln.name = Forn de vidre
 block.graphite-press.name = Premsa de grafit
 block.multi-press.name = Premsa múltiple
 block.constructing = {0} [lightgray](Construint)
@@ -1460,7 +1545,7 @@ block.distributor.name = Distrïbudor
 block.sorter.name = Classificador
 block.inverted-sorter.name = Classificador invers
 block.message.name = Missatge
-block.reinforced-message.name = Missatge remarcat
+block.reinforced-message.name = Missatge destacat
 block.world-message.name = Missatge mundial
 block.illuminator.name = Il·luminador
 block.overflow-gate.name = Porta de desbordament
@@ -1704,7 +1789,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricadora
 block.tank-refabricator.name = Milloradora de tancs
 block.mech-refabricator.name = Milloradora de meques
 block.ship-refabricator.name = Milloradora de naus
@@ -1768,6 +1852,7 @@ hint.launch = Un cop s’han recollit prou recursos, podeu iniciar un llançamen
 hint.launch.mobile = Un cop s’han recollit prou recursos, podeu iniciar un llançament seleccionant un sector proper del \ue827 [accent]Mapa[] del \ue88c [accent]Menú[].
 hint.schematicSelect = Manteniu premuda la tecla [accent]F[] i arrossegueu per a seleccionar els blocs que vulgueu copiar i enganxar.\n\nFeu clic amb el [accent]botó del mig[] del ratolí per a copiar només un tipus de bloc.
 hint.rebuildSelect = Manteniu premuda la tecla [accent][[B][] i arrossegueu per a seleccionar els plànols dels blocs destruïts.\nAixí, es podran reconstruir automàticament.
+hint.rebuildSelect.mobile = Seleccioneu el botó de copiar \ue874. Després, toqueu el botó de reconstrucció \ue80f i arrossegueu per a triar quins blocs voleu que es reconstrueixin.\nAixò farà que es reconstrueixin de manera automàtica.
 hint.conveyorPathfind = Manteniu premuda la tecla [accent]ControlEsquerra[] i arrossegueu les cintes per a generar un camí automàticament.
 hint.conveyorPathfind.mobile = Activeu el \ue844 [accent]mode diagonal[] i arrossegueu les cintes per a generar un camí automàticament.
 hint.boost = Manteniu premuda la tecla [accent]ControlEsquerra[] per a sobrevolar els obstacles amb la unitat actual.\n\nNomés algunes unitats terrestres tenen elevadors per a poder-ho fer.
@@ -1822,9 +1907,13 @@ onset.turrets = Les unitats són efectives, però les [accent]torretes[] proporc
 onset.turretammo = Subministreu [accent]munició de beril·li[] a la torreta.
 onset.walls = Els [accent]murs[] poden evitar que el dany arribi a les estructures importants.\nConstruïu alguns \uf6ee [accent]murs de beril·li[] al voltant de la torreta.
 onset.enemies = S’apropa un enemic. Prepareu la defensa.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = L’enemic és vulnerable. Contraataqueu.
 onset.cores = Els nuclis nous es poden construir en [accent]caselles de nucli[].\nEls nuclis nous funcionen com a bases i comparteixen un inventari de recursos amb altres nuclis.\nConstruïu un \uf725 nucli.
 onset.detect = L’enemic us detectarà d’aquí 2 minuts.\nEstabliu les defenses i les explotacions mineres i de producció.
+onset.commandmode = Mantingueu premuda [accent]Maj.[] per a entrar al [accent]mode de comandament[].\n[accent]Feu clic amb el botó esquerre i arrossegueu[] per a seleccionar unitats.\n[accent]Feu clic amb el botó dret[] per a ordenar a les unitats seleccionades que ataquin o que es moguin.
+onset.commandmode.mobile = Premeu el [accent]botó de comandament[] per a entrar al [accent]mode de comandament[].\nPremeu i [accent]arrossegueu[] per a seleccionar unitats.\n[accent]Toqueu[] per a ordenar a les unitats seleccionades que ataquin o que es moguin.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
 split.pickup = La unitat nucli pot recollir alguns blocs.\nRecolliu aquest [accent]contenidor[] i poseu-lo al [accent]transportador de blocs a distància[].\n(Les tecles per defecte són [ i ] per a recollir i deixar).
 split.pickup.mobile = La unitat nucli pot recollir alguns blocs.\nRecolliu aquest [accent]contenidor[] i poseu-lo al [accent]transportador de blocs a distància[].\n(Per a deixar o recollir alguna cosa, premeu-la uns segons).
 split.acquire = Heu d’aconseguir una mica de tungstè per a construir unitats.
@@ -1872,7 +1961,7 @@ liquid.neoplasm.details = Neoplasma. Una massa incontrolable de cèl·lules sint
 block.derelict = \uf77e [lightgray]En ruïnes
 block.armored-conveyor.description = Mou objectes. Pels laterals només accepta entrades des d’altres cintes transportadores.
 block.illuminator.description = Emet llum.
-block.message.description = Emmagatzema un missatge. Els aliats ho poden fer servir per a comunicar-se.
+block.message.description = Emmagatzema un missatge. Els aliats el poden fer servir per a comunicar-se.
 block.reinforced-message.description = Emmagatzema un missatge que serveix per a què els aliats es puguin comunicar.
 block.world-message.description = Un bloc de missatge que es far servir per a fer mapes. No es pot destruir.
 block.graphite-press.description = Comprimeix carbó fins obtenir-ne grafit.
@@ -2019,7 +2108,6 @@ block.logic-display.description = Mostra un gràfic des d’un processador lògi
 block.large-logic-display.description = Mostra un gràfic des d’un processador lògic.
 block.interplanetary-accelerator.description = Una torreta amb un canó electromagnètic enorme. Accelera els nuclis fins aconseguir la velocitat d’escapament per a fer llançaments interplanetaris.
 block.repair-turret.description = Repara contínuament la unitat danyada que tingui més a prop al seu voltant. També se li pot subministrar refrigerant perquè funcioni més ràpid.
-block.payload-propulsion-tower.description = Estructura de transport de recursos a distància. Dispara paquets de càrrega a altres torres de transport a distància enllaçades.
 block.core-bastion.description = Nucli de la base. Blindat. Quan es destrueix, es perd el sector.
 block.core-citadel.description = Nucli de la base. Molt ben blindat. Emmagatzema més recursos que un nucli Bastió.
 block.core-acropolis.description = Nucli de la base. Excepcionalment ben blindat. Emmagatzema més recursos que un nucli Ciutadella.
@@ -2055,7 +2143,6 @@ block.impact-drill.description = Quan es posa a sobre de minerals, n’extrau in
 block.eruption-drill.description = Una perforadora d’impacte millorada. Pot extraure tori. Necessita hidrogen.
 block.reinforced-conduit.description = Impulsa i fa circular els fluids. No accepta entrades des dels laterals si no és a través de conductes.
 block.reinforced-liquid-router.description = Distribueix fluids a tots els seus costats.
-block.reinforced-junction.description = Actua com a dues canonades independents que es creuen.
 block.reinforced-liquid-tank.description = Emmagatzema una gran quantitat de fluid.
 block.reinforced-liquid-container.description = Emmagatzema fluids.
 block.reinforced-bridge-conduit.description = Transporta fluids per sota de les estructures i del terreny.
@@ -2174,6 +2261,7 @@ unit.emanate.description = Construeix estructures per defensar el nucli Acròpol
 lst.read = Llegeix un nombre des d’una cel·la de memòria connectada.
 lst.write = Escriu un nombre en una cel·la de memòria connectada.
 lst.print = Afegeix un text a la cua d’impressió.\nEl text no es mostrarà fins que s’apliqui «[accent]Print Flush[]».
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Afegeix una instrucció de dibuix a la cua corresponent.\nEl resultat no es mostrarà fins que s’apliqui «[accent]Draw Flush[]».
 lst.drawflush = Executa les operacions de la cua de dibuix al monitor lògic.
 lst.printflush = Executa les operacions de la cua d’impressió al monitor lògic.
@@ -2206,6 +2294,12 @@ lst.flushmessage = Mostra un missatge a la pantalla a partir dels continguts de
 lst.cutscene = Manipula la càmera del jugador.
 lst.setflag = Estableix un senyal global que es podrà llegir en tots els processadors.
 lst.getflag = Obtén un senyal global.
+lst.setprop = Estableix una propietat d’una unitat o estructura.
+lst.effect = Crea un efecte de particula.
+lst.sync = Sincronitza una variable a través de la xarxa.\nS’invoca com a molt 10 vegades per segon.
+lst.makemarker = Crea una marca lògica al món.\nS’ha de donar un ID per a identificar-la.\nEs poden establir fins a 20.000 marcadors per món.
+lst.setmarker = Estableix una propietat per a la marca.\nL’ID que es faci servir ha de ser el mateix que el de la instrucció de crear la marca.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Aquí no es permet construir blocs de tipus lògic.
 
@@ -2221,6 +2315,7 @@ laccess.dead = Retorna si una unitat o bloc està destruïda o si ja no és vàl
 laccess.controlled = Returna:\n[accent]@ctrlProcessor[] si el controlador de la unitat és un processador;\n[accent]@ctrlPlayer[] si el controlador de la unitat és un jugador;\n[accent]@ctrlCommand[] si el controlador és un comandament del jugador;\naltrament, és 0.
 laccess.progress = Progrés de l’acció, entre 0 i 1.\nRetorna la producció, la recàrrega de la torreta o el progrés de la construcció.
 laccess.speed = Velocitat màxima de la unitat, en caselles/s.
+laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
 lcategory.unknown = Desconegut
 lcategory.unknown.description = Instruccions sense categoria.
 lcategory.io = Entrada i sortida
@@ -2247,6 +2342,7 @@ graphicstype.poly = Omple un polígon regular.
 graphicstype.linepoly = Dibuixa els costats d’un polígon regular.
 graphicstype.triangle = Omple un triangle.
 graphicstype.image = Dibuixa una imatge d’algun element del joc.\nPer exemple: [accent]@router[] o [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Sempre cert.
 lenum.idiv = Divisió entera.
@@ -2266,6 +2362,7 @@ lenum.xor = Operació lògica XOR bit a bit.
 lenum.min = Mínim de dos nombres.
 lenum.max = Màxim de dos nombres.
 lenum.angle = Angle del vector en graus.
+lenum.anglediff = Distància absoluta entre dos angles en graus.
 lenum.len = Llargada (mòdul) del vector.
 
 lenum.sin = Sinus de l’angle (en graus).
@@ -2340,6 +2437,7 @@ lenum.unbind = Desactiva del tot el control lògic.\nContinua amb la IA estànda
 lenum.move = Mou a una posició exacta.
 lenum.approach = Aproxima a una zona determinada amb una posició i un radi.
 lenum.pathfind = Troba un camí i segueix una ruta fins al punt d’aparició d’enemics.
+lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
 lenum.target = Dispara a una posició.
 lenum.targetp = Dispara a un objectiu tenint en compte la seva velocitat a l’hora d’apuntar.
 lenum.itemdrop = Deixa un element.
@@ -2353,5 +2451,7 @@ lenum.build = Construeix una estructura.
 lenum.getblock = Obté un bloc i el seu tipus a les coordenades indicades.\nLa posició escollida ha d’estar a l’abast de la unitat.\nEls blocs que no són construccions tindran el tipus [accent]@solid[].
 lenum.within = Comprova si la unitat està a prop d’una posició.
 lenum.boost = Inicia/Detén el vol.
-onset.commandmode = Mantingueu premuda [accent]Maj.[] per a entrar al [accent]mode de comandament[].\n[accent]Feu clic amb el botó esquerre i arrossegueu[] per a seleccionar unitats.\n[accent]Feu clic amb el botó dret[] per a ordenar a les unitats seleccionades que ataquin o que es moguin.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
-onset.commandmode.mobile = Premeu el [accent]botó de comandament[] per a entrar al [accent]mode de comandament[].\nPremeu i [accent]arrossegueu[] per a seleccionar unitats.\n[accent]Toqueu[] per a ordenar a les unitats seleccionades que ataquin o que es moguin.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.