Gas sprite revert

This reverts commit 1373381554.

.github/workflows/deployment.yml

@@ -5,8 +5,12 @@ on:
     tags:
       - 'v*'
 
+permissions: {}
 jobs:
   deploy:
+    permissions:
+      contents: write # for release creation (svenstaro/upload-release-action)
+
     runs-on: ubuntu-latest
 
     steps:
@@ -19,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}

.github/workflows/pr.yml

@@ -2,6 +2,9 @@ name: Pull Request Tests
 
 on: [pull_request, workflow_dispatch]
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   testPR:
     runs-on: ubuntu-latest

.github/workflows/push.yml

@@ -2,8 +2,12 @@ name: Tests
 
 on: [push, workflow_dispatch]
 
+permissions: {}
 jobs:
   runPush:
+    permissions:
+      contents: write # for Update bundles
+
     runs-on: ubuntu-latest
 
     steps:
@@ -36,6 +40,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

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>.

README.md

@@ -39,10 +39,13 @@ Server builds are bundled with each released build (in Releases). If you'd rathe
 ### Android
 
 1. Install the Android SDK [here.](https://developer.android.com/studio#command-tools) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
-2. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
+2. In the unzipped Android SDK folder, find the cmdline-tools directory. Then create a folder inside of it called `latest` and put all of its contents into the newly created folder.
-3. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
+3. In the same directory run the command `sdkmanager --licenses` (or `./sdkmanager --licenses` if on linux/mac)
+4. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
+5. Enable developer mode on your device/emulator. If you are on testing on a phone you can follow [these instructions](https://developer.android.com/studio/command-line/adb#Enabling), otherwise you need to google how to enable your emulator's developer mode specifically.
+6. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
 
-To debug the application on a connected phone, run `gradlew android:installDebug android:run`.
+To debug the application on a connected device/emulator, run `gradlew android:installDebug android:run`.
 
 ### Troubleshooting
 

SERVERLIST.md

@@ -9,7 +9,7 @@ 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. 
    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.
@@ -19,10 +19,12 @@ You'll need to either hire some moderators, or make use of (currently non-existe
 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.
-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

@@ -122,8 +122,14 @@ dependencies{
     natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
     natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
 
-    //TODO dynamically find best android platform jar instead of hard-coding to 30
+    def version;
-    def sdkFile = new File((String)findSdkDir(), "/platforms/android-30/android.jar")
+    def highestVersion;
+    new File((String)findSdkDir(), "/platforms").eachFileMatch ~/android-\d+/, {
+        version = it.name.find(/\d+/).toInteger();
+        highestVersion = version > highestVersion ? version : highestVersion;
+    }
+
+    def sdkFile = new File((String)findSdkDir(), "/platforms/android-${highestVersion}/android.jar")
     if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
 }
 

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

@@ -42,6 +42,7 @@ public class EntityProcess extends BaseProcessor{
     Seq<Selement> allDefs = new Seq<>();
     Seq<Stype> allInterfaces = new Seq<>();
     Seq<TypeSpec.Builder> baseClasses = new Seq<>();
+    ObjectSet<TypeSpec.Builder> baseClassIndexers = new ObjectSet<>();
     ClassSerializer serializer;
 
     {
@@ -232,9 +233,15 @@ public class EntityProcess extends BaseProcessor{
                 Stype repr = types.first();
                 String groupType = repr.annotation(Component.class).base() ? baseName(repr) : interfaceName(repr);
 
+                String name = group.name().startsWith("g") ? group.name().substring(1) : group.name();
+
                 boolean collides = an.collide();
-                groupDefs.add(new GroupDefinition(group.name().startsWith("g") ? group.name().substring(1) : group.name(),
+                groupDefs.add(new GroupDefinition(name,
                     ClassName.bestGuess(packageName + "." + groupType), types, an.spatial(), an.mapping(), collides));
+
+                TypeSpec.Builder accessor = TypeSpec.interfaceBuilder("IndexableEntity__" + name);
+                accessor.addMethod(MethodSpec.methodBuilder("setIndex__" + name).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).addParameter(int.class, "index").returns(void.class).build());
+                write(accessor);
             }
 
             ObjectMap<String, Selement> usedNames = new ObjectMap<>();
@@ -260,6 +267,8 @@ public class EntityProcess extends BaseProcessor{
                 //get base class type name for extension
                 Stype baseClassType = baseClasses.any() ? baseClasses.first() : null;
                 @Nullable TypeName baseClass = baseClasses.any() ? tname(packageName + "." + baseName(baseClassType)) : null;
+                @Nullable TypeSpec.Builder baseClassBuilder = baseClassType == null ? null : this.baseClasses.find(b -> Reflect.<String>get(b, "name").equals(baseName(baseClassType)));
+                boolean addIndexToBase = baseClassBuilder != null && baseClassIndexers.add(baseClassBuilder);
                 //whether the main class is the base itself
                 boolean typeIsBase = baseClassType != null && type.has(Component.class) && type.annotation(Component.class).base();
 
@@ -381,17 +390,30 @@ public class EntityProcess extends BaseProcessor{
 
                 syncedFields.sortComparing(Selement::name);
 
+                if(!methods.containsKey("toString()")){
                     //override toString method
                     builder.addMethod(MethodSpec.methodBuilder("toString")
                     .addAnnotation(Override.class)
                     .returns(String.class)
                     .addModifiers(Modifier.PUBLIC)
                     .addStatement("return $S + $L", name + "#", "id").build());
+                }
 
                 EntityIO io = new EntityIO(type.name(), builder, allFieldSpecs, serializer, rootDirectory.child("annotations/src/main/resources/revisions").child(type.name()));
                 //entities with no sync comp and no serialization gen no code
                 boolean hasIO = ann.genio() && (components.contains(s -> s.name().contains("Sync")) || ann.serialize());
 
+                TypeSpec.Builder indexBuilder = baseClassBuilder == null ? builder : baseClassBuilder;
+
+                if(baseClassBuilder == null || addIndexToBase){
+                    //implement indexable interfaces.
+                    for(GroupDefinition def : groups){
+                        indexBuilder.addSuperinterface(tname(packageName + ".IndexableEntity__" + def.name));
+                        indexBuilder.addMethod(MethodSpec.methodBuilder("setIndex__" + def.name).addParameter(int.class, "index").addModifiers(Modifier.PUBLIC).addAnnotation(Override.class)
+                        .addCode("index__$L = index;", def.name).build());
+                    }
+                }
+
                 //add all methods from components
                 for(ObjectMap.Entry<String, Seq<Smethod>> entry : methods){
                     if(entry.value.contains(m -> m.has(Replace.class))){
@@ -444,8 +466,15 @@ public class EntityProcess extends BaseProcessor{
                         mbuilder.addStatement("if(added == $L) return", first.name().equals("add"));
 
                         for(GroupDefinition def : groups){
+                            if(first.name().equals("add")){
                                 //remove/add from each group, assume imported
-                            mbuilder.addStatement("Groups.$L.$L(this)", def.name, first.name());
+                                mbuilder.addStatement("index__$L = Groups.$L.addIndex(this)", def.name, def.name);
+                            }else{
+                                //remove/add from each group, assume imported
+                                mbuilder.addStatement("Groups.$L.removeIndex(this, index__$L);", def.name, def.name);
+
+                                mbuilder.addStatement("index__$L = -1", def.name);
+                            }
                         }
                     }
 
@@ -575,6 +604,16 @@ public class EntityProcess extends BaseProcessor{
 
                 skipDeprecated(builder);
 
+                if(!legacy){
+                    TypeSpec.Builder fieldBuilder = baseClassBuilder != null ? baseClassBuilder : builder;
+                    if(addIndexToBase || baseClassBuilder == null){
+                        //add group index int variables
+                        for(GroupDefinition def : groups){
+                            fieldBuilder.addField(FieldSpec.builder(int.class, "index__" + def.name, Modifier.PROTECTED, Modifier.TRANSIENT).initializer("-1").build());
+                        }
+                    }
+                }
+
                 definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs, legacy));
             }
 
@@ -590,7 +629,7 @@ public class EntityProcess extends BaseProcessor{
                 groupsBuilder.addField(ParameterizedTypeName.get(
                     ClassName.bestGuess("mindustry.entities.EntityGroup"), itype), group.name, Modifier.PUBLIC, Modifier.STATIC);
 
-                groupInit.addStatement("$L = new $T<>($L.class, $L, $L)", group.name, groupc, itype, group.spatial, group.mapping);
+                groupInit.addStatement("$L = new $T<>($L.class, $L, $L, (e, pos) -> { if(e instanceof $L.IndexableEntity__$L ix) ix.setIndex__$L(pos); })", group.name, groupc, itype, group.spatial, group.mapping, packageName, group.name, group.name);
             }
 
             //write the groups
@@ -853,7 +892,7 @@ public class EntityProcess extends BaseProcessor{
 
                 for(Smethod method : methods){
                     String signature = method.toString();
-                    if(signatures.contains(signature)) continue;
+                    if(!signatures.add(signature)) continue;
 
                     Stype compType = interfaceToComp(method.type());
                     MethodSpec.Builder builder = MethodSpec.overriding(method.e).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
@@ -864,12 +903,19 @@ public class EntityProcess extends BaseProcessor{
                     builder.addAnnotation(OverrideCallSuper.class); //just in case
 
                     if(!method.isVoid()){
-                        if(method.name().equals("isNull")){
+                        String methodName = method.name();
+                        switch(methodName){
+                            case "isNull":
                                 builder.addStatement("return true");
-                        }else if(method.name().equals("id")){
+                                break;
+                            case "id":
                                 builder.addStatement("return -1");
-                        }else{
+                                break;
-                            Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(method.name()));
+                            case "toString":
+                                builder.addStatement("return $S", className);
+                                break;
+                            default:
+                                Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(methodName));
                                 String desc = variable == null ? null : variable.descString();
                                 if(variable == null || !varInitializers.containsKey(desc)){
                                     builder.addStatement("return " + getDefault(method.ret().toString()));
@@ -879,10 +925,7 @@ public class EntityProcess extends BaseProcessor{
                                 }
                         }
                     }
-
                     nullBuilder.addMethod(builder.build());
-
-                    signatures.add(signature);
                 }
 
                 nullsBuilder.addField(FieldSpec.builder(type, Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build());

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

@@ -97,14 +97,14 @@ public class StructProcess extends BaseProcessor{
                     }
 
                     //[setter] + [constructor building]
-                    if(varType == TypeName.BOOLEAN){
+                    if(isBool){
                         cons.append(" | (").append(varName).append(" ? ").append("1L << ").append(offset).append("L : 0)");
 
                         //bools: single bit, needs special case to clear things
                         setter.beginControlFlow("if(value)");
-                        setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
-                        setter.nextControlFlow("else");
                         setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, offset);
+                        setter.nextControlFlow("else");
+                        setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
                         setter.endControlFlow();
                     }else if(varType == TypeName.FLOAT){
                         cons.append(" | (").append("(").append(structType).append(")").append("Float.floatToIntBits(").append(varName).append(") << ").append(offset).append("L)");

build.gradle

@@ -34,7 +34,7 @@ allprojects{
 
     ext{
         versionNumber = '7'
-        if(!project.hasProperty("versionModifier")) versionModifier = 'alpha'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
@@ -49,7 +49,7 @@ allprojects{
         }
 
         localArc = {
-            return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists()
+            return !project.hasProperty("release") && !project.hasProperty("noLocalArc") && new File(projectDir.parent, '../Arc').exists()
         }
 
         arcModule = { String name ->

core/assets-raw/fontgen/config.json

@@ -1055,6 +1055,20 @@
       "search": [
         "defense"
       ]
+    },
+    {
+      "uid": "99aa5c8f6bbe4d96a3f422a60ff065a9",
+      "css": "planet",
+      "code": 59443,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M343.8 0L312.5 31.3 281.3 62.5 218.8 62.5 187.5 93.8 156.3 125 125 156.3 93.8 187.5 62.5 218.8 62.5 281.3 31.3 312.5 0 343.8 0 406.3 0 468.8 0 531.3 0 593.8 0 656.3 31.3 687.5 62.5 718.8 62.5 781.3 93.8 812.5 125 843.8 156.3 875 187.5 906.3 218.8 937.5 281.3 937.5 312.5 968.8 343.8 1000 406.3 1000 468.8 1000 531.3 1000 593.8 1000 656.3 1000 687.5 968.8 718.8 937.5 781.3 937.5 812.5 906.3 843.8 875 875 843.8 906.3 812.5 937.5 781.3 937.5 718.8 968.8 687.5 1000 656.3 1000 593.8 1000 531.3 1000 468.8 1000 406.3 1000 343.8 968.8 312.5 937.5 281.3 937.5 218.8 906.3 187.5 875 156.3 843.8 125 812.5 93.8 781.3 62.5 718.8 62.5 687.5 31.3 656.3 0 593.8 0 531.3 0 468.8 0 406.3 0 343.8 0ZM406.3 62.5L437.5 93.8 468.8 125 531.3 125 562.5 156.3 562.5 218.8 593.8 250 625 281.3 656.3 312.5 687.5 343.8 718.8 375 781.3 375 843.8 375 906.3 375 937.5 406.3 937.5 468.8 937.5 531.3 937.5 593.8 906.3 625 875 656.3 875 718.8 843.8 750 812.5 781.3 781.3 812.5 750 843.8 718.8 875 656.3 875 625 906.3 593.8 937.5 531.3 937.5 500 906.3 468.8 875 437.5 843.8 437.5 781.3 468.8 750 500 718.8 531.3 687.5 562.5 656.3 562.5 593.8 562.5 531.3 531.3 500 500 468.8 468.8 437.5 406.3 437.5 343.8 437.5 281.3 437.5 250 468.8 218.8 500 187.5 531.3 156.3 562.5 125 593.8 93.8 625 62.5 593.8 62.5 531.3 62.5 468.8 62.5 406.3 93.8 375 125 343.8 125 281.3 156.3 250 187.5 218.8 218.8 187.5 250 156.3 281.3 125 343.8 125 375 93.8 406.3 62.5ZM718.8 562.5L687.5 593.8 687.5 656.3 718.8 687.5 781.3 687.5 812.5 656.3 812.5 593.8 781.3 562.5 718.8 562.5Z",
+        "width": 1000
+      },
+      "search": [
+        "planet"
+      ]
     }
   ]
 }

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

@@ -3,7 +3,6 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

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

@@ -3,7 +3,6 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

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

@@ -3,7 +3,6 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

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

@@ -3,7 +3,6 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

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

@@ -3,7 +3,6 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

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

@@ -3,7 +3,6 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

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

@@ -3,7 +3,6 @@
         xmlns:dc="http://purl.org/dc/elements/1.1/"
         xmlns:cc="http://creativecommons.org/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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
         xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

core/assets/bundles/bundle.properties

@@ -90,7 +90,7 @@ stats.destroyed = Buildings Destroyed
 stats.deconstructed = Buildings Deconstructed
 stats.playtime = Time Played
 
-globalitems = [accent]Total Items
+globalitems = [accent]Planet Items
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
 level.select = Level Select
@@ -139,21 +139,36 @@ mods.reloadexit = The game will now exit, to reload mods.
 mod.installed = [[Installed]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
-mod.disabled = [scarlet]Disabled
+mod.disabled = [red]Disabled
 mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = Disable
 mod.content = Content:
 mod.delete.error = Unable to delete mod. File may be in use.
-mod.requiresversion = [scarlet]Requires min game version: [accent]{0}
+
-mod.outdatedv7 = [scarlet]Incompatible with V7 (no minGameVersion: 136)
+mod.incompatiblegame = [red]Outdated Game
-mod.missingdependencies = [scarlet]Missing dependencies: {0}
+mod.incompatiblemod = [red]Incompatible
-mod.erroredcontent = [scarlet]Content Errors
+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}
+
 mod.errors = Errors have occurred loading content.
-mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
+mod.noerrorplay = [red]You have mods with errors.[] Either disable the affected mods or fix the errors before playing.
-mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
+mod.nowdisabled = [red]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
 mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
-mod.reloadrequired = [scarlet]Restart Required
+mod.reloadrequired = [red]Restart Required
 mod.import = Import Mod
 mod.import.file = Import File
 mod.import.github = Import From GitHub
@@ -176,6 +191,10 @@ filename = File Name:
 unlocked = New content unlocked!
 available = New research available!
 unlock.incampaign = < Unlock in campaign for details >
+campaign.select = Select Starting Campaign
+campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
+campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nMore difficult. Higher quality maps and overall experience.
+campaign.serpulo = Older content; the classic experience. More open-ended, more content.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
 completed = [accent]Completed
 techtree = Tech Tree
 techtree.select = Tech Tree Selection
@@ -277,6 +296,7 @@ server.invalidport = Invalid port number!
 server.error = [scarlet]Error hosting server.
 save.new = New Save
 save.overwrite = Are you sure you want to overwrite\nthis save slot?
+save.nocampaign = Individual save files from the campaign cannot be imported.
 overwrite = Overwrite
 save.none = No saves found!
 savefail = Failed to save game!
@@ -319,6 +339,7 @@ command.repair = Repair
 command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
+command.boost = Boost
 openlink = Open Link
 copylink = Copy Link
 back = Back
@@ -344,6 +365,8 @@ pausebuilding = [accent][[{0}][] to pause building
 resumebuilding = [scarlet][[{0}][] to resume building
 enablebuilding = [scarlet][[{0}][] to enable building
 showui = UI hidden.\nPress [accent][[{0}][] to show UI.
+commandmode.name = [accent]Command Mode
+commandmode.nounits = [no units]
 wave = [accent]Wave {0}
 wave.cap = [accent]Wave {0}/{1}
 wave.waiting = [lightgray]Wave in {0}
@@ -428,6 +451,7 @@ waves.max = max units
 waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
+waves.random = Random
 waves.copy = Copy to Clipboard
 waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
@@ -438,6 +462,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 = Unit Filter
 waves.units.hide = Hide All
 waves.units.show = Show All
 
@@ -626,11 +652,13 @@ objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}
 objective.buildunit = [accent]Build Unit: [][lightgray]{0}[]x\n{1}[lightgray]{2}
 objective.destroyunits = [accent]Destroy: [][lightgray]{0}[]x Units
 objective.enemiesapproaching = [accent]Enemies approaching in [lightgray]{0}[]
+objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0}[]
+objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
 objective.destroycore = [accent]Destroy Enemy Core
 objective.command = [accent]Command Units
 objective.nuclearlaunch = [accent]\u26A0 Nuclear launch detected: [lightgray]{0}
 
-announce.nuclearstrike = [red]\u26A0 NUCLEAR STRIKE INBOUND \u26A0
+announce.nuclearstrike = [red]\u26A0 NUCLEAR STRIKE INBOUND \u26A0\n[lightgray]construct backup cores immediately
 
 loadout = Loadout
 resources = Resources
@@ -638,6 +666,9 @@ 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
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}
@@ -663,6 +694,9 @@ weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
 
+campaign.playtime = \uF129 [lightgray]Sector Playtime: {0}
+campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
+
 sectorlist = Sectors
 sectorlist.attacked = {0} under attack
 sectors.unexplored = [lightgray]Unexplored
@@ -746,6 +780,8 @@ sector.windsweptIslands.description = Further past the shoreline is this remote
 sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
 sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
 sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
+sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
+sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
 
 sector.onset.name = The Onset
 sector.aegis.name = Aegis
@@ -756,14 +792,32 @@ sector.split.name = Split
 sector.basin.name = Basin
 sector.marsh.name = Marsh
 sector.peaks.name = Peaks
+sector.ravine.name = Ravine
+sector.caldera-erekir.name = Caldera
+sector.stronghold.name = Stronghold
+sector.crevice.name = Crevice
+sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
+sector.origin.name = Origin
 
-sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
+sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
-sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
+sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
 sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
 sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
-sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
+sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past certain enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
 sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
 sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
+sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
+sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
+sector.ravine.description = An important transportation route for the enemy. No cores detected in the sector, but expect a variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
+sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
+sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
+sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
+sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
+sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
+sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
+sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
 
 status.burning.name = Burning
 status.freezing.name = Freezing
@@ -848,6 +902,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
@@ -899,6 +954,8 @@ ability.statusfield = {0} Status Field
 ability.unitspawn = {0} Factory
 ability.shieldregenfield = Shield Regen Field
 ability.movelightning = Movement Lightning
+ability.shieldarc = Shield Arc
+ability.suppressionfield = Repair Suppression Field
 ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets
 
 bar.onlycoredeposit = Only Core Depositing Allowed
@@ -935,10 +992,12 @@ 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.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
@@ -948,7 +1007,7 @@ bullet.infinitepierce = [stat]pierce
 bullet.healpercent = [stat]{0}[lightgray]% repair
 bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
-bullet.reload = [stat]{0}[lightgray]x fire rate
+bullet.reload = [stat]{0}%[lightgray] fire rate
 bullet.range = [stat]{0}[lightgray] tiles range
 
 unit.blocks = blocks
@@ -1052,8 +1111,8 @@ 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.
+steam.friendsonly = Friends Only
-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[]?
+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
@@ -1079,6 +1138,7 @@ keybind.mouse_move.name = Follow Mouse
 keybind.pan.name = Pan View
 keybind.boost.name = Boost
 keybind.command_mode.name = Command Mode
+keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -1104,6 +1164,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.name = Select All Units
+keybind.select_all_unit_factories.name = Select All Unit Factories
 keybind.deselect.name = Deselect
 keybind.pickupCargo.name = Pickup Cargo
 keybind.dropCargo.name = Drop Cargo
@@ -1147,9 +1209,10 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
 rules.waves = Waves
 rules.attack = Attack Mode
-rules.rtsai = RTS AI
+rules.rtsai = RTS AI [red](WIP)
 rules.rtsminsquadsize = Min Squad Size
 rules.rtsmaxsquadsize = Max Squad Size
 rules.rtsminattackweight = Min Attack Weight
@@ -1157,12 +1220,14 @@ rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
 rules.corecapture = Capture Core On Destruction
 rules.polygoncoreprotection = Polygonal Core Protection
 rules.placerangecheck = Placement Range Check
-rules.enemyCheat = Infinite AI (Red Team) Resources
+rules.enemyCheat = Infinite Enemy Team Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
+rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
 rules.unitcap = Base Unit Cap
@@ -1174,8 +1239,9 @@ 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
+rules.unitammo = Units Require Ammo [red](may be removed)
 rules.enemyteam = Enemy Team
 rules.playerteam = Player Team
 rules.title.waves = Waves
@@ -1415,6 +1481,8 @@ block.distributor.name = Distributor
 block.sorter.name = Sorter
 block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
+block.reinforced-message.name = Reinforced Message
+block.world-message.name = World Message
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Overflow Gate
 block.underflow-gate.name = Underflow Gate
@@ -1511,7 +1579,7 @@ block.payload-router.name = Payload Router
 block.duct.name = Duct
 block.duct-router.name = Duct Router
 block.duct-bridge.name = Duct Bridge
-block.payload-propulsion-tower.name = Payload Propulsion Tower
+block.large-payload-mass-driver.name = Large Payload Mass Driver
 block.payload-void.name = Payload Void
 block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
@@ -1522,7 +1590,7 @@ block.constructor.name = Constructor
 block.constructor.description = Fabricates structures up to 2x2 tiles in size.
 block.large-constructor.name = Large Constructor
 block.large-constructor.description = Fabricates structures up to 4x4 tiles in size.
-block.deconstructor.name = Deconstructor
+block.deconstructor.name = Large Deconstructor
 block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost.
 block.payload-loader.name = Payload Loader
 block.payload-loader.description = Load liquids and items into blocks.
@@ -1554,6 +1622,7 @@ block.carbon-vent.name = Carbon Vent
 block.arkyic-vent.name = Arkyic Vent
 block.yellow-stone-vent.name = Yellow Stone Vent
 block.red-stone-vent.name = Red Stone Vent
+block.crystalline-vent.name = Crystalline Vent
 block.redmat.name = Redmat
 block.bluemat.name = Bluemat
 block.core-zone.name = Core Zone
@@ -1593,6 +1662,7 @@ block.electric-heater.name = Electric Heater
 block.slag-heater.name = Slag Heater
 block.phase-heater.name = Phase Heater
 block.heat-redirector.name = Heat Redirector
+block.heat-router.name = Heat Router
 block.slag-incinerator.name = Slag Incinerator
 block.carbide-crucible.name = Carbide Crucible
 block.slag-centrifuge.name = Slag Centrifuge
@@ -1665,11 +1735,10 @@ block.mech-assembler.name = Mech Assembler
 block.reinforced-payload-conveyor.name = Reinforced Payload Conveyor
 block.reinforced-payload-router.name = Reinforced Payload Router
 block.payload-mass-driver.name = Payload Mass Driver
-block.small-deconstructor.name = Small Deconstructor
+block.small-deconstructor.name = Deconstructor
 block.canvas.name = Canvas
 block.world-processor.name = World Processor
 block.world-cell.name = World Cell
-block.shield-breaker.name = Shield Breaker (temp name/sprite)
 block.tank-fabricator.name = Tank Fabricator
 block.mech-fabricator.name = Mech Fabricator
 block.ship-fabricator.name = Ship Fabricator
@@ -1701,28 +1770,26 @@ team.blue.name = Blue
 hint.skip = Skip
 hint.desktopMove = Use [accent][[WASD][] to move.
 hint.zoom = [accent]Scroll[] to zoom in or out.
-hint.mine = Move near the \uF8C4 copper ore and [accent]tap[] it to mine manually.
 hint.desktopShoot = [accent][[Left-click][] to shoot.
 hint.depositItems = To transfer items, drag from your ship to the core.
 hint.respawn = To respawn as a ship, press [accent][[V][].
 hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
 hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
-hint.placeDrill = Select the \uE85E [accent]Drill[] tab in the menu at the bottom right, then select a \uF870 [accent]Drill[] and click on a copper patch to place it.
-hint.placeDrill.mobile = Select the \uE85E [accent]Drill[] tab in the menu at the bottom right, then select a \uF870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \uE800 [accent]checkmark[] at the bottom right to confirm.
-hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uF896 [accent]Conveyor[] from the \uE814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
-hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uF896 [accent]Conveyor[] from the \uE814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors.
-hint.placeTurret = Place \uF861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uF838copper.\nUse conveyors and drills to supply them.
 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.research = Use the \uE875 [accent]Research[] button to research new technology.
 hint.research.mobile = Use the \uE875 [accent]Research[] button in the \uE88C [accent]Menu[] to research new technology.
-hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
+hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to manually control friendly units or turrets.
-hint.unitControl.mobile = [accent][[Double-tap][] to 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.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.
@@ -1733,14 +1800,62 @@ 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 \u00EF\u00A1\u00A8 [accent]Foundation[] core over the \u00EF\u00A1\u00A9 [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.coopCampaign = When playing the [accent]co-op campaign[], items that are produced in the current map will also be sent [accent]to your local sectors[].\n\nAny new research done by the host also carries over.
 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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.
+
+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.
+split.build = Units must be transported to the other side of the wall.\nPlace two [accent]Payload Mass Drivers[], one on each side of the wall.\nSet up the link by pressing one of them, then selecting the other.
+split.container = Similar to the container, units can also be transported using a [accent]Payload Mass Driver[].\nPlace a unit fabricator adjacent to a mass driver to load them, then send them across the wall to attack the enemy base.
+
 item.copper.description = Used in all types of construction and ammunition.
 item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Used in liquid transportation and electrical structures.
@@ -1787,6 +1902,8 @@ block.derelict = \uF77E [lightgray]Derelict
 block.armored-conveyor.description = Moves items forward. Does not accept non-conveyor inputs from the sides.
 block.illuminator.description = Emits light.
 block.message.description = Stores a message for communication between allies.
+block.reinforced-message.description = Stores a message for communication between allies.
+block.world-message.description = A message block for use in mapmaking. Cannot be destroyed.
 block.graphite-press.description = Compresses coal into graphite.
 block.multi-press.description = Compresses coal into graphite. Requires water as coolant.
 block.silicon-smelter.description = Refines silicon from sand and coal.
@@ -1953,7 +2070,8 @@ block.electric-heater.description = Applies heat to structures. Requires large a
 block.slag-heater.description = Applies heat to structures. Requires slag.
 block.phase-heater.description = Applies heat to structures. Requires phase fabric.
 block.heat-redirector.description = Redirects accumulated heat to other blocks.
-block.electrolyzer.description = Converts water into hydrogen and ozone gas.
+block.heat-router.description = Spreads accumulated heat in three output directions.
+block.electrolyzer.description = Converts water into hydrogen and ozone gas. Outputs resulting gases in two opposite directions, marked by corresponding colors.
 block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
 block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat.
 block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.
@@ -1961,8 +2079,8 @@ block.carbide-crucible.description = Fuses graphite and tungsten into carbide. R
 block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat.
 block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag.
 block.vent-condenser.description = Condenses vent gases into water. Consumes power.
-block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.
+block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.\nOptionally uses hydrogen to boost efficiency.
-block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.
+block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.\nOptionally uses nitrogen to boost efficiency.
 block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
 block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
@@ -1979,9 +2097,9 @@ block.tungsten-wall.description = Protects structures from enemy projectiles.
 block.tungsten-wall-large.description = Protects structures from enemy projectiles.
 block.carbide-wall.description = Protects structures from enemy projectiles.
 block.carbide-wall-large.description = Protects structures from enemy projectiles.
-block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
-block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically launching electric arcs upon projectile contact.
+block.reinforced-surge-wall-large.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
-block.shielded-wall.description = Protects structures from enemy projectiles. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
+block.shielded-wall.description = Protects structures from enemy projectiles, reflecting most bullets upon impact. Deploys a shield that absorbs most projectiles when power is provided. Conducts power.
 block.blast-door.description = A wall that opens when allied ground units are in range. Cannot be manually controlled.
 block.duct.description = Moves items forward. Only capable of storing a single item.
 block.armored-duct.description = Moves items forward. Does not accept non-duct inputs from the sides.
@@ -2003,7 +2121,7 @@ block.pyrolysis-generator.description = Generates large amounts of power from ar
 block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided.
 block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits.
 block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction.
-block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.
+block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.\nOptionally uses phase fabric to boost efficiency.
 block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
 block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity.
 block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading.
@@ -2021,9 +2139,11 @@ block.small-deconstructor.description = Deconstructs inputted structures and uni
 block.reinforced-payload-conveyor.description = Moves payloads forward.
 block.reinforced-payload-router.description = Distributes payloads into adjacent blocks. Functions as a sorter when a filter is set.
 block.payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
+block.large-payload-mass-driver.description = Long-range payload transport structure. Shoots received payloads to linked payload mass drivers.
 block.unit-repair-tower.description = Repairs all units in its vicinity. Requires ozone.
 block.radar.description = Gradually uncovers terrain and enemy units in a large radius. Requires power.
 block.shockwave-tower.description = Damages and destroys enemy projectiles in a radius. Requires cyanogen.
+block.canvas.description = Displays a simple image with a pre-defined palette. Editable.
 
 unit.dagger.description = Fires standard bullets at enemy targets.
 unit.mace.description = Fires streams of flame at enemy targets.
@@ -2098,6 +2218,7 @@ lst.set = Set a variable.
 lst.operation = Perform an operation on 1-2 variables.
 lst.end = Jump to the top of the instruction stack.
 lst.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.jump = Conditionally jump to another statement.
 lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
@@ -2108,7 +2229,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a unit.
-lst.spawnwave = Simulate a wave being spawned at an arbitrary location.\nWill not increment the wave counter.
+lst.spawnwave = Spawn a wave.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
 lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
@@ -2118,6 +2239,7 @@ 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.
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
@@ -2252,7 +2374,7 @@ 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.target = Shoot a position.
 lenum.targetp = Shoot a target with velocity prediction.
 lenum.itemdrop = Drop an item.
@@ -2263,7 +2385,7 @@ lenum.payenter = Enter/land on the payload block the unit is on.
 lenum.flag = Numeric unit flag.
 lenum.mine = Mine at a position.
 lenum.build = Build a structure.
-lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
+lenum.getblock = Fetch a building, floor and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.