diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 50fa001df5..dea711fef0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,17 +7,21 @@ assignees: ''
 
 ---
 
+**Note**: Do not report any new bugs directly relating to the v6 campaign. They will not be fixed or considered at this time.
+
 **Platform**: *Android/iOS/Mac/Windows/Linux*
 
 **Build**: *The build number under the title in the main menu. Required.*
 
 **Issue**: *Explain your issue in detail.*
 
-**Steps to reproduce**: *How you happened across the issue, and what you were doing at the time.*
+**Steps to reproduce**: *How you happened across the issue, and what exactly you did to make the bug happen.*
 
-**Link to mod(s) used, if applicable**: *The mod repositories or zip files that are related to the issue.*
+**Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.*
 
-**Crash report, if applicable**: *The contents of relevant crash report files.*
+**Save file**: *The save file you were playing on when the bug happened. REQUIRED for any issue that happens in-game.*
+
+**Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.*
 
 ---
 
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index c2326a4d0a..490c317f03 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -3,18 +3,6 @@ name: Java CI
 on: [push]
 
 jobs:
-  buildJava8:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - name: Run unit tests with gradle and Java 8
-      run: ./gradlew test
-      
   buildJava14:
     runs-on: ubuntu-latest
 
@@ -25,4 +13,15 @@ jobs:
       with:
         java-version: 14
     - name: Run unit tests with gradle and Java 14
-      run: ./gradlew test
+      run: ./gradlew compileJava
+  buildJava15:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 15
+      uses: actions/setup-java@v1
+      with:
+        java-version: 15
+    - name: Run unit tests with gradle and Java 15
+      run: ./gradlew compileJava
diff --git a/.gitignore b/.gitignore
index 1a50ef27f2..543197c2f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,9 +79,11 @@ com_crashlytics_export_strings.xml
 /android/bin/
 /core/bin/
 /desktop/bin/
-/html/bin/
 /ios/bin/
-/ios-moe/bin/
+/annotations/bin/
+/server/bin/
+/tests/bin/
+/tools/bin/
 *.tmp
 *.bak
 *.swp
diff --git a/.travis.yml b/.travis.yml
index ef04618dc9..6b1dfd72ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 jdk:
-- openjdk8
+- openjdk14
 dist: xenial
 android:
   components:
@@ -26,6 +26,7 @@ script:
 - cp -a Mindustry/core/build/docs/javadoc/. docs/
 - cd docs
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git add .; git commit -m "Update ${TRAVIS_BUILD_NUMBER}"; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/docs; fi
+- cd ../Mindustry
 deploy:
 - provider: releases
   skip_cleanup: true
@@ -38,11 +39,11 @@ deploy:
   on:
     repo: Anuken/Mindustry
     tags: true
-- provider: script
-  script: bash update_wiki.sh
-  on:
-    repo: Anuken/Mindustry
-    tags: true
+#- provider: script
+#  script: bash update_wiki.sh
+#  on:
+#    repo: Anuken/Mindustry
+#    tags: true
 env:
   global:
   - secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c79ce649fc..143a73d6b8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,33 +4,38 @@ This is for code contributions. For translations, see [TRANSLATING](TRANSLATING.
 
 ## Basic Guidelines
 
-#### Use an IDE.
+### Use an IDE.
 Specifically, IntelliJ IDEA. Download the (free) Community Edition of it [here](https://www.jetbrains.com/idea/download/). Some people use other tools, like VS Code, but I would personally not recommend them for Java development.
 
-#### Always test your changes.
+### Always test your changes.
 Do not submit something without at least running the game to see if it compiles.  
 If you are submitting a new block, make sure it has a name and description, and that it works correctly in-game. If you are changing existing block mechanics, test them out first.
 
-
-#### Do not make large changes before discussing them first.
+### Do not make large changes before discussing them first.
 If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*).  
 For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it.
 
+### Do not include packed sprites in your pull request.
+When making a pull request that changes or adds new sprites, do not add the modified atlas & `spritesX.png` files to your final pull request. These are a frequent source of conflicts.
+
 
 ## Style Guidelines
 
-#### Follow the formatting guidelines.
+### Follow the formatting guidelines.
 This means:
 - No spaces around parentheses: `if(condition){`, `SomeType s = (SomeType)object`
 - Same-line braces.
 - 4 spaces indentation
-- `camelCase`, **even for constants or enums**. Why? Because `SCREAMING_CASE` is ugly, annoying to type and does not achieve anything useful. Constants are *less* dangerous than variables, not more.
+- `camelCase`, **even for constants or enums**. Why? Because `SCREAMING_CASE` is ugly, annoying to type and does not achieve anything useful. Constants are *less* dangerous than variables, not more. Any reasonable IDE should highlight them for you anyway.
 - No underscores for anything. (Yes, I know `Bindings` violates this principle, but that's for legacy reasons and really should be cleaned up some day)
 - Do not use braceless `if/else` statements. `if(x) statement else statement2` should **never** be done. In very specific situations, having braceless if-statements on one line is allowed: `if(cond) return;` would be valid.
+- Prefer single-line javadoc `/** @return for example */` instead of multiline javadoc whenver possible
+- Short method/variable names (multipleLongWords should be avoided if it's possible to so reasonably, especially for variables)
+- Use wildcard imports - `import some.package.*` - for everything. This makes incorrect class usage more obvious (*e.g. arc.util.Timer vs java.util.Timer*) and leads to cleaner-looking code.
 
 Import [this style file](.github/Mindustry-CodeStyle-IJ.xml) into IntelliJ to get correct formatting when developing Mindustry.
 
-#### Do not use incompatible Java features (java.util.function, java.awt).
+### Do not use incompatible Java features (java.util.function, java.awt).
 Android and RoboVM (iOS) do not support many of Java 8's features, such as the packages `java.util.function`, `java.util.stream` or `forEach` in collections. Do not use these in your code.  
 If you need to use functional interfaces, use the ones in `arc.func`, which are more or less the same with different naming schemes.
   
@@ -39,32 +44,35 @@ The same applies to any class *outside* of the standard `java.[n]io` / `java.net
 In general, if you are using IntelliJ, you should be warned about platform incompatiblities.
 
 
-#### Use `arc` collections and classes when possible.
-Instead of using `java.util.List`, `java.util.HashMap`, and other standard Java collections, use `Array`, `ObjectMap` and other equivalents from `arc.struct`.
+### Use `arc` collections and classes when possible.
+Instead of using `java.util.List`, `java.util.HashMap`, and other standard Java collections, use `Seq`, `ObjectMap` and other equivalents from `arc.struct`.
 Why? Because that's what the rest of the codebase uses, and the standard collections have a lot of cruft and usability issues associated with them.  
 In the rare case that concurrency is required, you may use the standard Java classes for that purpose (e.g. `CopyOnWriteArrayList`).  
 
 What you'll usually need to change:
 - `HashSet` -> `ObjectSet`
 - `HashMap` -> `ObjectMap`
-- `List` / `ArrayList` / `Stack` -> `Array`
+- `List` / `ArrayList` / `Stack` -> `Seq`
 - `java.util.Queue` -> `arc.struct.Queue`
 - *Many others*
 
 
-#### Avoid boxed types (Integer, Boolean)
-Never create variables or collections with boxed types `Array<Integer>` or `ObjectMap<Integer, ...>`. Use the collections specialized for this task, e.g. `IntArray` and `IntMap`.
+### Avoid boxed types (Integer, Boolean)
+Never create variables or collections with boxed types `Seq<Integer>` or `ObjectMap<Integer, ...>`. Use the collections specialized for this task, e.g. `IntSeq` and `IntMap`.
 
 
-#### Do not allocate anything if possible.
+### Do not allocate anything if possible.
 Never allocate `new` objects in the main loop. If you absolutely require new objects, use `Pools` to obtain and free object instances. 
 Otherwise, use the `Tmp` variables for things like vector/shape operations, or create `static` variables for re-use.
 If using a list, make it a static variable and clear it every time it is used. Re-use as much as possible.
 
-#### Avoid bloated code and unnecessary getters/setters.
+### Avoid bloated code and unnecessary getters/setters.
 This is situational, but in essence what it means is to avoid using any sort of getters and setters unless absolutely necessary. Public or protected fields should suffice for most things. 
 If something needs to be encapsulated in the future, IntelliJ can handle it with a few clicks.
 
 
-#### Do not create methods unless necessary.
+### Do not create methods unless necessary.
 Unless a block of code is very large or used in more than 1-2 places, don't split it up into a separate method. Making unnecessary methods only creates confusion, and may slightly decrease performance.  
+
+## Other Notes
+If you would like your name to appear in the game's credits, add it to the [list of contributors](https://github.com/Anuken/Mindustry/blob/master/core/assets/contributors) as part of your PR.
diff --git a/README.md b/README.md
index aab377402d..5c9c797297 100644
--- a/README.md
+++ b/README.md
@@ -15,16 +15,16 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 
 ### Building
 
-Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases). Old builds might still be on [jenkins](https://jenkins.hellomouse.net/job/mindustry/).
+Bleeding-edge builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases).
 
 If you'd rather compile on your own, follow these instructions.
 First, make sure you have [JDK 14](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands:
 
 #### Windows
 
-_Running:_ `gradlew.bat desktop:run`  
-_Building:_ `gradlew.bat desktop:dist`  
-_Sprite Packing:_ `gradlew.bat tools:pack`
+_Running:_ `gradlew desktop:run`  
+_Building:_ `gradlew desktop:dist`  
+_Sprite Packing:_ `gradlew tools:pack`
 
 #### Linux/Mac OS
 
@@ -39,9 +39,10 @@ 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#downloads) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
-2. Create a file named `local.properties` inside the Mindustry directory, with its contents looking like this: `sdk.dir=<Path to Android SDK you just downloaded, without these bracket>`. For example, if you're on Windows and installed the tools to C:\\tools, your local.properties would contain `sdk.dir=C:\\tools` (*note the double backslashes are required instead of single ones!*).
+2. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
 3. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
-4. (Optional) To debug the application on a connected phone, do `gradlew android:installDebug android:run`. It is **highly recommended** to use IntelliJ for this instead, however.
+
+To debug the application on a connected phone, run `gradlew android:installDebug android:run`.
 
 ##### Troubleshooting
 
@@ -69,3 +70,7 @@ Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Su
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/packages/io.anuke.mindustry/)
+
+[<img src="https://flathub.org/assets/badges/flathub-badge-en.svg"
+     alt="Download On Flathub"
+     height="60">](https://flathub.org/apps/details/com.github.Anuken.Mindustry)
diff --git a/android/build.gradle b/android/build.gradle
index 412ed1c441..59b698955a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript{
     }
 
     dependencies{
-        //IMPORTANT NOTICE: any version of the plugin after 3.4.1 will break builds for every API level < 24, perhaps even higher.
+        //IMPORTANT NOTICE: any version of the plugin after 3.4.1 will break builds
         //it appears abstract methods don't get desugared properly (if at all)
         classpath 'com.android.tools.build:gradle:3.4.1'
     }
@@ -33,6 +33,9 @@ dependencies{
     natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
     natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
     natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}"
+
+    //android dependencies magically disappear during compilation, thanks gradle!
+    if(new File(projectDir.parent, '../Arc').exists()) compileOnly fileTree(dir: '../../Arc/backends/backend-android/libs', include: ['*.jar'])
 }
 
 task deploy(type: Copy){
@@ -96,7 +99,7 @@ android{
                 keyAlias RELEASE_KEY_ALIAS
                 keyPassword RELEASE_KEY_PASSWORD
             }else{
-                println("No keystore info property found!")
+                println("No keystore property found. Releases will be unsigned.")
             }
         }
     }
diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java
index 60735d9f7d..7400bd37a8 100644
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -1,14 +1,12 @@
 package mindustry.android;
 
 import android.*;
-import android.annotation.*;
 import android.app.*;
 import android.content.*;
 import android.content.pm.*;
 import android.net.*;
 import android.os.Build.*;
 import android.os.*;
-import android.provider.Settings.*;
 import android.telephony.*;
 import arc.*;
 import arc.backend.android.*;
@@ -16,7 +14,7 @@ import arc.files.*;
 import arc.func.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
-import arc.util.serialization.*;
+import dalvik.system.*;
 import mindustry.*;
 import mindustry.game.Saves.*;
 import mindustry.io.*;
@@ -24,7 +22,7 @@ import mindustry.net.*;
 import mindustry.ui.dialogs.*;
 
 import java.io.*;
-import java.lang.System;
+import java.lang.Thread.*;
 import java.util.*;
 
 import static mindustry.Vars.*;
@@ -38,6 +36,20 @@ public class AndroidLauncher extends AndroidApplication{
 
     @Override
     protected void onCreate(Bundle savedInstanceState){
+        UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
+
+        Thread.setDefaultUncaughtExceptionHandler((thread, error) -> {
+            CrashSender.log(error);
+
+            //try to forward exception to system handler
+            if(handler != null){
+                handler.uncaughtException(thread, error);
+            }else{
+                error.printStackTrace();
+                System.exit(1);
+            }
+        });
+
         super.onCreate(savedInstanceState);
         if(doubleScaleTablets && isTablet(this.getContext())){
             Scl.setAddition(0.5f);
@@ -50,24 +62,6 @@ public class AndroidLauncher extends AndroidApplication{
                 moveTaskToBack(true);
             }
 
-            @Override
-            public String getUUID(){
-                try{
-                    String s = Secure.getString(getContext().getContentResolver(), Secure.ANDROID_ID);
-                    int len = s.length();
-                    byte[] data = new byte[len / 2];
-                    for(int i = 0; i < len; i += 2){
-                        data[i / 2] = (byte)((Character.digit(s.charAt(i), 16) << 4)
-                        + Character.digit(s.charAt(i + 1), 16));
-                    }
-                    String result = new String(Base64Coder.encode(data));
-                    if(result.equals("AAAAAAAAAOA=")) throw new RuntimeException("Bad UUID.");
-                    return result;
-                }catch(Exception e){
-                    return super.getUUID();
-                }
-            }
-
             @Override
             public rhino.Context getScriptContext(){
                 return AndroidRhinoContext.enter(getContext().getCacheDir());
@@ -77,12 +71,25 @@ public class AndroidLauncher extends AndroidApplication{
             public void shareFile(Fi file){
             }
 
+            @Override
+            public Class<?> loadJar(Fi jar, String mainClass) throws Exception{
+                DexClassLoader loader = new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, getClassLoader());
+                return Class.forName(mainClass, true, loader);
+            }
+
             @Override
             public void showFileChooser(boolean open, String extension, Cons<Fi> cons){
+                showFileChooser(open, cons, extension);
+            }
+
+            void showFileChooser(boolean open, Cons<Fi> cons, String... extensions){
+                String extension = extensions[0];
+
                 if(VERSION.SDK_INT >= VERSION_CODES.Q){
                     Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
                     intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.setType(extension.equals("zip") && !open ? "application/zip" : "*/*");
+                    intent.setType(extension.equals("zip") && !open && extensions.length == 1 ? "application/zip" : "*/*");
+
                     addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
                         if(code == Activity.RESULT_OK && in != null && in.getData() != null){
                             Uri uri = in.getData();
@@ -112,7 +119,7 @@ public class AndroidLauncher extends AndroidApplication{
                     });
                 }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                     checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    chooser = new FileChooser(open ? "$open" : "$save", file -> file.extension().equalsIgnoreCase(extension), open, file -> {
+                    chooser = new FileChooser(open ? "@open" : "@save", file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
                         if(!open){
                             cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
                         }else{
@@ -129,10 +136,19 @@ public class AndroidLauncher extends AndroidApplication{
                     }
                     requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
                 }else{
-                    super.showFileChooser(open, extension, cons);
+                    if(open){
+                        new FileChooser("@open", file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+                    }else{
+                        super.showFileChooser(open, extension, cons);
+                    }
                 }
             }
 
+            @Override
+            public void showMultiFileChooser(Cons<Fi> cons, String... extensions){
+                showFileChooser(true, cons, extensions);
+            }
+
             @Override
             public void beginForceLandscape(){
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
@@ -146,7 +162,6 @@ public class AndroidLauncher extends AndroidApplication{
         }, new AndroidApplicationConfiguration(){{
             useImmersiveMode = true;
             hideStatusBar = true;
-            errorHandler = CrashSender::log;
             stencil = 8;
         }});
         checkFiles(getIntent());
@@ -221,10 +236,10 @@ public class AndroidLauncher extends AndroidApplication{
                                 SaveSlot slot = control.saves.importSave(file);
                                 ui.load.runLoadSave(slot);
                             }catch(IOException e){
-                                ui.showException("$save.import.fail", e);
+                                ui.showException("@save.import.fail", e);
                             }
                         }else{
-                            ui.showErrorMessage("$save.import.invalid");
+                            ui.showErrorMessage("@save.import.invalid");
                         }
                     }else if(map){ //open map
                         Fi file = Core.files.local("temp-map." + mapExtension);
diff --git a/android/src/mindustry/android/AndroidRhinoContext.java b/android/src/mindustry/android/AndroidRhinoContext.java
index 513911820d..d3e80c7427 100644
--- a/android/src/mindustry/android/AndroidRhinoContext.java
+++ b/android/src/mindustry/android/AndroidRhinoContext.java
@@ -41,6 +41,11 @@ public class AndroidRhinoContext{
                 public Object getDynamicSecurityDomain(Object o){
                     return null;
                 }
+
+                @Override
+                public Object callWithDomain(Object o, Context context, Callable callable, Scriptable scriptable, Scriptable scriptable1, Object[] objects){
+                    return null;
+                }
             });
 
         AndroidContextFactory factory;
@@ -121,7 +126,7 @@ public class AndroidRhinoContext{
                 }
                 return loadClass(dex, name);
             }catch(IOException | ClassNotFoundException e){
-                throw new FatalLoadingException(e);
+                throw new RuntimeException("Failed to define class", e);
             }
         }
 
@@ -151,14 +156,6 @@ public class AndroidRhinoContext{
         }
     }
 
-
-    /** Might be thrown in any Rhino method that loads bytecode if the loading failed. */
-    public static class FatalLoadingException extends RuntimeException{
-        FatalLoadingException(Throwable t){
-            super("Failed to define class", t);
-        }
-    }
-
     static class FileAndroidClassLoader extends BaseAndroidClassLoader{
         private static int instanceCounter = 0;
         private final File dexFile;
diff --git a/annotations/src/main/java/mindustry/annotations/Annotations.java b/annotations/src/main/java/mindustry/annotations/Annotations.java
index 7aae9e1165..501c255d2e 100644
--- a/annotations/src/main/java/mindustry/annotations/Annotations.java
+++ b/annotations/src/main/java/mindustry/annotations/Annotations.java
@@ -128,6 +128,13 @@ public class Annotations{
         String fallback() default "error";
     }
 
+    /** Registers a statement for auto serialization. */
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface RegisterStatement{
+        String value();
+    }
+
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
     public @interface StyleDefaults{
diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
index 341b26df3a..0bd3aa6b32 100644
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
@@ -38,6 +38,8 @@ public class EntityIO{
         this.serializer = serializer;
         this.name = name;
 
+        json.setIgnoreUnknownFields(true);
+
         directory.mkdirs();
 
         //load old revisions
@@ -45,6 +47,8 @@ public class EntityIO{
             revisions.add(json.fromJson(Revision.class, fi));
         }
 
+        revisions.sort(r -> r.version);
+
         //next revision to be used
         int nextRevision = revisions.isEmpty() ? 0 : revisions.max(r -> r.version).version + 1;
 
@@ -61,11 +65,13 @@ public class EntityIO{
         //keep track of fields present in the entity
         presentFields.addAll(fields.map(f -> f.name));
 
+        Revision previous = revisions.isEmpty() ? null : revisions.peek();
+
         //add new revision if it doesn't match or there are no revisions
         if(revisions.isEmpty() || !revisions.peek().equal(fields)){
             revisions.add(new Revision(nextRevision,
-                fields.map(f -> new RevisionField(f.name, f.type.toString(),
-                f.type.isPrimitive() ? BaseProcessor.typeSize(f.type.toString()) : -1))));
+                fields.map(f -> new RevisionField(f.name, f.type.toString()))));
+            Log.warn("Adding new revision @ for @.\nPre = @\nNew = @\n", nextRevision, name, previous == null ? null : previous.fields.toString(", ", f -> f.name + ":" + f.type), fields.toString(", ", f -> f.name + ":" + f.type.toString()));
             //write revision
             directory.child(nextRevision + ".json").writeString(json.toJson(revisions.peek()));
         }
@@ -147,6 +153,12 @@ public class EntityIO{
 
                     io(field.type, "");
 
+                    //just assign the two values so jumping does not occur on de-possession
+                    if(sf){
+                        st(field.name + lastSuf + " = this." + field.name);
+                        st(field.name + targetSuf + " = this." + field.name);
+                    }
+
                     econt();
                 }
             }
@@ -316,8 +328,7 @@ public class EntityIO{
             for(int i = 0; i < fields.size; i++){
                 RevisionField field = fields.get(i);
                 FieldSpec spec = specs.get(i);
-                //TODO when making fields, their primitive size may be overwritten by an annotation; check for that
-                if(!(field.type.equals(spec.type.toString()) && (!spec.type.isPrimitive() || BaseProcessor.typeSize(spec.type.toString()) == field.size))){
+                if(!field.type.replace("mindustry.gen.", "").equals(spec.type.toString().replace("mindustry.gen.", ""))){
                     return false;
                 }
             }
@@ -327,11 +338,9 @@ public class EntityIO{
 
     public static class RevisionField{
         String name, type;
-        int size; //in bytes
 
-        RevisionField(String name, String type, int size){
+        RevisionField(String name, String type){
             this.name = name;
-            this.size = size;
             this.type = type;
         }
 
diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
index 3350d0e226..dd47acd2b9 100644
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
@@ -1,6 +1,5 @@
 package mindustry.annotations.entity;
 
-import arc.*;
 import arc.files.*;
 import arc.func.*;
 import arc.struct.*;
@@ -77,7 +76,12 @@ public class EntityProcess extends BaseProcessor{
                 for(Smethod elem : component.methods()){
                     if(elem.is(Modifier.ABSTRACT) || elem.is(Modifier.NATIVE)) continue;
                     //get all statements in the method, store them
-                    methodBlocks.put(elem.descString(), elem.tree().getBody().toString());
+                    methodBlocks.put(elem.descString(), elem.tree().getBody().toString()
+                        .replaceAll("this\\.<(.*)>self\\(\\)", "this") //fix parameterized self() calls
+                        .replaceAll("self\\(\\)", "this") //fix self() calls
+                        .replaceAll(" yield ", "") //fix enchanced switch
+                        .replaceAll("\\/\\*missing\\*\\/", "var") //fix vars
+                    );
                 }
             }
 
@@ -285,8 +289,6 @@ public class EntityProcess extends BaseProcessor{
 
                 TypeSpec.Builder builder = TypeSpec.classBuilder(name).addModifiers(Modifier.PUBLIC);
 
-                if(isFinal && !typeIsBase) builder.addModifiers(Modifier.FINAL);
-
                 //add serialize() boolean
                 builder.addMethod(MethodSpec.methodBuilder("serialize").addModifiers(Modifier.PUBLIC).returns(boolean.class).addStatement("return " + ann.serialize()).build());
 
@@ -470,6 +472,17 @@ public class EntityProcess extends BaseProcessor{
                                 mbuilder.addStatement("$L = $L", field.name(), field.name() + EntityIO.targetSuf);
                             }
                         }
+
+                        //SPECIAL CASE: method to snap to current position so interpolation doesn't go wild
+                        if(first.name().equals("snapInterpolation")){
+                            mbuilder.addStatement("updateSpacing = 16");
+                            mbuilder.addStatement("lastUpdated = $T.millis()", Time.class);
+                            for(Svar field : syncedFields){
+                                //reset last+current state to target position
+                                mbuilder.addStatement("$L = $L", field.name() + EntityIO.lastSuf, field.name());
+                                mbuilder.addStatement("$L = $L", field.name() + EntityIO.targetSuf, field.name());
+                            }
+                        }
                     }
 
                     for(Smethod elem : entry.value){
@@ -507,7 +520,7 @@ public class EntityProcess extends BaseProcessor{
                     //add free code to remove methods - always at the end
                     //this only gets called next frame.
                     if(first.name().equals("remove") && ann.pooled()){
-                        mbuilder.addStatement("$T.app.post(() -> $T.free(this))", Core.class, Pools.class);
+                        mbuilder.addStatement("mindustry.gen.Groups.queueFree(($T)this)", Poolable.class);
                     }
 
                     builder.addMethod(mbuilder.build());
@@ -574,6 +587,17 @@ public class EntityProcess extends BaseProcessor{
             //write clear
             groupsBuilder.addMethod(groupClear.build());
 
+            //add method for pool storage
+            groupsBuilder.addField(FieldSpec.builder(ParameterizedTypeName.get(Seq.class, Poolable.class), "freeQueue", Modifier.PRIVATE, Modifier.STATIC).initializer("new Seq<>()").build());
+
+            //method for freeing things
+            MethodSpec.Builder groupFreeQueue = MethodSpec.methodBuilder("queueFree")
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .addParameter(Poolable.class, "obj")
+                .addStatement("freeQueue.add(obj)");
+
+            groupsBuilder.addMethod(groupFreeQueue.build());
+
             //add method for resizing all necessary groups
             MethodSpec.Builder groupResize = MethodSpec.methodBuilder("resize")
                 .addParameter(TypeName.FLOAT, "x").addParameter(TypeName.FLOAT, "y").addParameter(TypeName.FLOAT, "w").addParameter(TypeName.FLOAT, "h")
@@ -582,6 +606,11 @@ public class EntityProcess extends BaseProcessor{
             MethodSpec.Builder groupUpdate = MethodSpec.methodBuilder("update")
                 .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
 
+            //free everything pooled at the start of each updaet
+            groupUpdate
+                .addStatement("for($T p : freeQueue) $T.free(p)", Poolable.class, Pools.class)
+                .addStatement("freeQueue.clear()");
+
             //method resize
             for(GroupDefinition group : groupDefs){
                 if(group.spatial){
@@ -633,10 +662,10 @@ public class EntityProcess extends BaseProcessor{
 
             //build mapping class for sync IDs
             TypeSpec.Builder idBuilder = TypeSpec.classBuilder("EntityMapping").addModifiers(Modifier.PUBLIC)
-            .addField(FieldSpec.builder(TypeName.get(Prov[].class), "idMap", Modifier.PRIVATE, Modifier.STATIC).initializer("new Prov[256]").build())
+            .addField(FieldSpec.builder(TypeName.get(Prov[].class), "idMap", Modifier.PUBLIC, Modifier.STATIC).initializer("new Prov[256]").build())
             .addField(FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(ObjectMap.class),
                 tname(String.class), tname(Prov.class)),
-                "nameMap", Modifier.PRIVATE, Modifier.STATIC).initializer("new ObjectMap<>()").build())
+                "nameMap", Modifier.PUBLIC, Modifier.STATIC).initializer("new ObjectMap<>()").build())
             .addMethod(MethodSpec.methodBuilder("map").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
                 .returns(TypeName.get(Prov.class)).addParameter(int.class, "id").addStatement("return idMap[id]").build())
             .addMethod(MethodSpec.methodBuilder("map").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
index e3e70e8ddd..8e22e33db9 100644
--- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
@@ -3,6 +3,8 @@ package mindustry.annotations.impl;
 import arc.files.*;
 import arc.scene.style.*;
 import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
 import arc.util.serialization.*;
 import com.squareup.javapoet.*;
 import mindustry.annotations.Annotations.*;
@@ -33,6 +35,17 @@ public class AssetsProcess extends BaseProcessor{
         String resources = rootDirectory + "/core/assets-raw/sprites/ui";
         Jval icons = Jval.read(Fi.get(rootDirectory + "/core/assets-raw/fontgen/config.json").readString());
 
+        ObjectMap<String, String> texIcons = new OrderedMap<>();
+        PropertiesUtils.load(texIcons, Fi.get(rootDirectory + "/core/assets/icons/icons.properties").reader());
+
+        texIcons.each((key, val) -> {
+            String[] split = val.split("\\|");
+            String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", "");
+            if(SourceVersion.isKeyword(name) || name.equals("char")) name = name + "i";
+
+            ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("(char)" + key).build());
+        });
+
         ictype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectMap.class, String.class, TextureRegionDrawable.class),
                 "icons", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new ObjectMap<>()").build());
 
diff --git a/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java b/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java
index b43a2d3eef..e28ecf13a0 100644
--- a/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java
@@ -68,9 +68,9 @@ public class CallSuperProcess extends AbstractProcessor{
     }
 
     static class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees>{
-        private String methodName;
-        private MethodTree method;
-        private boolean callSuperUsed;
+        String methodName;
+        MethodTree method;
+        boolean callSuperUsed;
 
         @Override
         public Object visitClass(ClassTree classTree, Trees trees){
@@ -83,6 +83,9 @@ public class CallSuperProcess extends AbstractProcessor{
 
             if(extendTree instanceof JCIdent){
                 JCIdent tree = (JCIdent)extendTree;
+
+                if(tree == null || tree.sym == null)  return super.visitClass(classTree, trees);
+
                 com.sun.tools.javac.code.Scope members = tree.sym.members();
 
                 if(checkScope(members))
diff --git a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
index 8138fe398f..d2e3e99c17 100644
--- a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
@@ -103,11 +103,11 @@ public class LoadRegionProcessor extends BaseProcessor{
 
     private String parse(String value){
         value = '"' + value + '"';
+        value = value.replace("@size", "\" + ((mindustry.world.Block)content).size + \"");
         value = value.replace("@", "\" + content.name + \"");
         value = value.replace("#1", "\" + INDEX0 + \"");
         value = value.replace("#2", "\" + INDEX1 + \"");
         value = value.replace("#", "\" + INDEX0 + \"");
-        value = value.replace("$size", "\" + ((mindustry.world.Block)content).size + \"");
         return value;
     }
 
diff --git a/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java b/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java
new file mode 100644
index 0000000000..64adc37c89
--- /dev/null
+++ b/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java
@@ -0,0 +1,104 @@
+package mindustry.annotations.misc;
+
+import arc.func.*;
+import arc.struct.*;
+import com.squareup.javapoet.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+import mindustry.annotations.util.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+
+@SupportedAnnotationTypes("mindustry.annotations.Annotations.RegisterStatement")
+public class LogicStatementProcessor extends BaseProcessor{
+
+    @Override
+    public void process(RoundEnvironment env) throws Exception{
+        TypeSpec.Builder type = TypeSpec.classBuilder("LogicIO")
+            .addModifiers(Modifier.PUBLIC);
+
+        MethodSpec.Builder writer = MethodSpec.methodBuilder("write")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .addParameter(Object.class, "obj")
+            .addParameter(StringBuilder.class, "out");
+
+        MethodSpec.Builder reader = MethodSpec.methodBuilder("read")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .returns(tname("mindustry.logic.LStatement"))
+            .addParameter(String[].class, "tokens");
+
+        Seq<Stype> types = types(RegisterStatement.class);
+
+        type.addField(FieldSpec.builder(
+            ParameterizedTypeName.get(
+            ClassName.get(Seq.class),
+            ParameterizedTypeName.get(ClassName.get(Prov.class),
+                tname("mindustry.logic.LStatement"))), "allStatements", Modifier.PUBLIC, Modifier.STATIC)
+            .initializer("Seq.with(" + types.toString(", ", t -> "" + t.toString() + "::new") + ")").build());
+
+        boolean beganWrite = false, beganRead = false;
+
+        for(Stype c : types){
+            String name = c.annotation(RegisterStatement.class).value();
+
+            if(beganWrite){
+                writer.nextControlFlow("else if(obj instanceof $T)", c.mirror());
+            }else{
+                writer.beginControlFlow("if(obj instanceof $T)", c.mirror());
+                beganWrite = true;
+            }
+
+            //write the name & individual fields
+            writer.addStatement("out.append($S)", name);
+
+            Seq<Svar> fields = c.fields();
+
+            String readSt = "if(tokens[0].equals($S))";
+            if(beganRead){
+                reader.nextControlFlow("else " + readSt, name);
+            }else{
+                reader.beginControlFlow(readSt, name);
+                beganRead = true;
+            }
+
+            reader.addStatement("$T result = new $T()", c.mirror(), c.mirror());
+
+            int index = 0;
+
+            for(Svar field : fields){
+                if(field.isAny(Modifier.TRANSIENT, Modifier.STATIC)) continue;
+
+                writer.addStatement("out.append(\" \")");
+                writer.addStatement("out.append((($T)obj).$L$L)", c.mirror(), field.name(),
+                    Seq.with(typeu.directSupertypes(field.mirror())).contains(t -> t.toString().contains("java.lang.Enum")) ? ".name()" :
+                    "");
+
+                //reading primitives, strings and enums is supported; nothing else is
+                reader.addStatement("if(tokens.length > $L) result.$L = $L(tokens[$L])",
+                index + 1,
+                field.name(),
+                field.mirror().toString().equals("java.lang.String") ?
+                "" : (field.tname().isPrimitive() ? field.tname().box().toString() :
+                field.mirror().toString()) + ".valueOf", //if it's not a string, it must have a valueOf method
+                index + 1
+                );
+
+                index ++;
+            }
+
+            reader.addStatement("result.afterRead()");
+            reader.addStatement("return result");
+        }
+
+        reader.endControlFlow();
+        writer.endControlFlow();
+
+        reader.addStatement("return null");
+
+        type.addMethod(writer.build());
+        type.addMethod(reader.build());
+
+        write(type);
+    }
+}
diff --git a/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java b/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java
index c785582157..b3a473795a 100644
--- a/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java
@@ -19,7 +19,7 @@ import java.util.*;
 })
 public class RemoteProcess extends BaseProcessor{
     /** Maximum size of each event packet. */
-    public static final int maxPacketSize = 4096;
+    public static final int maxPacketSize = 8192;
     /** Warning on top of each autogenerated file. */
     public static final String autogenWarning = "Autogenerated file. Do not modify!\n";
 
diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties
index 0920fbaca5..86ca440e1c 100644
--- a/annotations/src/main/resources/classids.properties
+++ b/annotations/src/main/resources/classids.properties
@@ -1,43 +1,29 @@
 #Maps entity names to IDs. Autogenerated.
 
 alpha=0
-arkyid=37
-atrax=38
-block=1
-bryde=40
-cix=2
-draug=3
-flare=36
-horizon=35
+atrax=1
+block=2
+corvus=24
+flare=3
 mace=4
-mega=28
-mindustry.entities.comp.BuildingComp=22
-mindustry.entities.comp.Buildingomp=11
-mindustry.entities.comp.BulletComp=24
-mindustry.entities.comp.Bulletomp=5
-mindustry.entities.comp.DecalComp=6
-mindustry.entities.comp.EffectComp=7
-mindustry.entities.comp.EffectInstanceComp=23
-mindustry.entities.comp.EffectStateComp=25
-mindustry.entities.comp.FireComp=8
-mindustry.entities.comp.LaunchCoreComp=21
-mindustry.entities.comp.PlayerComp=9
-mindustry.entities.comp.PuddleComp=10
-mindustry.type.Weather.WeatherComp=12
-mindustry.type.Weather.WeatherStateComp=26
-mindustry.world.blocks.campaign.CoreLauncher.LaunchCoreComp=13
-mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=14
-mono=29
-nova=30
-oculon=15
-phantom=16
-poly=31
-pulsar=34
-quasar=32
-risse=33
-spirit=27
-spiroct=39
-tau=17
-trident=18
-vanguard=19
-wraith=20
\ No newline at end of file
+mega=5
+mindustry.entities.comp.BuildingComp=6
+mindustry.entities.comp.BulletComp=7
+mindustry.entities.comp.DecalComp=8
+mindustry.entities.comp.EffectStateComp=9
+mindustry.entities.comp.FireComp=10
+mindustry.entities.comp.LaunchCoreComp=11
+mindustry.entities.comp.PlayerComp=12
+mindustry.entities.comp.PuddleComp=13
+mindustry.type.Weather.WeatherStateComp=14
+mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=15
+mindustry.world.blocks.defense.ForceProjector.ForceDrawComp=22
+mono=16
+nova=17
+oct=26
+poly=18
+pulsar=19
+quad=23
+risso=20
+spiroct=21
+vela=25
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/0.json b/annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/0.json
new file mode 100644
index 0000000000..826bd02faf
--- /dev/null
+++ b/annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/0.json
@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:health,type:float},{name:isShooting,type:boolean},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BlockUnitUnit/0.json b/annotations/src/main/resources/revisions/BlockUnitUnit/0.json
index 2160b1858b..5431957381 100644
--- a/annotations/src/main/resources/revisions/BlockUnitUnit/0.json
+++ b/annotations/src/main/resources/revisions/BlockUnitUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BlockUnitUnit/2.json b/annotations/src/main/resources/revisions/BlockUnitUnit/2.json
deleted file mode 100644
index a73abd7000..0000000000
--- a/annotations/src/main/resources/revisions/BlockUnitUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/0.json b/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/0.json
index d5684055f5..c743f3567d 100644
--- a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/0.json
+++ b/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/2.json b/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/2.json
deleted file mode 100644
index 36a9e50333..0000000000
--- a/annotations/src/main/resources/revisions/BuilderCommanderMechMinerUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderCommanderPayloadUnit/0.json b/annotations/src/main/resources/revisions/BuilderCommanderPayloadUnit/0.json
new file mode 100644
index 0000000000..826bd02faf
--- /dev/null
+++ b/annotations/src/main/resources/revisions/BuilderCommanderPayloadUnit/0.json
@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:health,type:float},{name:isShooting,type:boolean},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderLegsUnit/0.json b/annotations/src/main/resources/revisions/BuilderLegsUnit/0.json
index 719d06eac9..56602f78f3 100644
--- a/annotations/src/main/resources/revisions/BuilderLegsUnit/0.json
+++ b/annotations/src/main/resources/revisions/BuilderLegsUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderLegsUnit/2.json b/annotations/src/main/resources/revisions/BuilderLegsUnit/2.json
deleted file mode 100644
index f6efa6f663..0000000000
--- a/annotations/src/main/resources/revisions/BuilderLegsUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMechUnit/0.json b/annotations/src/main/resources/revisions/BuilderMechUnit/0.json
index b0bacdb1c1..0588266557 100644
--- a/annotations/src/main/resources/revisions/BuilderMechUnit/0.json
+++ b/annotations/src/main/resources/revisions/BuilderMechUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMechUnit/1.json b/annotations/src/main/resources/revisions/BuilderMechUnit/1.json
deleted file mode 100644
index a5d726ded8..0000000000
--- a/annotations/src/main/resources/revisions/BuilderMechUnit/1.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:1,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMechUnit/2.json b/annotations/src/main/resources/revisions/BuilderMechUnit/2.json
deleted file mode 100644
index 08f1b277b3..0000000000
--- a/annotations/src/main/resources/revisions/BuilderMechUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/0.json b/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/0.json
index 26faae9a77..8d62f2ee4f 100644
--- a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/0.json
+++ b/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>,size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>,size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/2.json b/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/2.json
deleted file mode 100644
index 025bfc439c..0000000000
--- a/annotations/src/main/resources/revisions/BuilderMinerPayloadUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>,size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/0.json b/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/0.json
index 94f48a7b63..a4e818fd35 100644
--- a/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/0.json
+++ b/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/2.json b/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/2.json
deleted file mode 100644
index d30cd7ad51..0000000000
--- a/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMinerUnit/0.json b/annotations/src/main/resources/revisions/BuilderMinerUnit/0.json
index 94f48a7b63..a4e818fd35 100644
--- a/annotations/src/main/resources/revisions/BuilderMinerUnit/0.json
+++ b/annotations/src/main/resources/revisions/BuilderMinerUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMinerUnit/2.json b/annotations/src/main/resources/revisions/BuilderMinerUnit/2.json
deleted file mode 100644
index d30cd7ad51..0000000000
--- a/annotations/src/main/resources/revisions/BuilderMinerUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/1.json b/annotations/src/main/resources/revisions/BuilderPayloadUnit/0.json
similarity index 50%
rename from annotations/src/main/resources/revisions/BuilderMinerTrailUnit/1.json
rename to annotations/src/main/resources/revisions/BuilderPayloadUnit/0.json
index 3a92a12856..a85d764f8c 100644
--- a/annotations/src/main/resources/revisions/BuilderMinerTrailUnit/1.json
+++ b/annotations/src/main/resources/revisions/BuilderPayloadUnit/0.json
@@ -1 +1 @@
-{version:1,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>,size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderPayloadUnit/1.json b/annotations/src/main/resources/revisions/BuilderPayloadUnit/1.json
new file mode 100644
index 0000000000..8ca4ac4388
--- /dev/null
+++ b/annotations/src/main/resources/revisions/BuilderPayloadUnit/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>,size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/Bullet/0.json b/annotations/src/main/resources/revisions/Bullet/0.json
index f9e8a830d5..df860d9a0f 100644
--- a/annotations/src/main/resources/revisions/Bullet/0.json
+++ b/annotations/src/main/resources/revisions/Bullet/0.json
@@ -1 +1 @@
-{fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:mindustry.gen.Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:fdata,type:float,size:4},{name:lifetime,type:float,size:4},{name:owner,type:mindustry.gen.Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/CommanderLegsUnit/0.json b/annotations/src/main/resources/revisions/CommanderLegsUnit/0.json
new file mode 100644
index 0000000000..5431957381
--- /dev/null
+++ b/annotations/src/main/resources/revisions/CommanderLegsUnit/0.json
@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/CommanderLegsUnit/1.json b/annotations/src/main/resources/revisions/CommanderLegsUnit/1.json
new file mode 100644
index 0000000000..dd8fdb2784
--- /dev/null
+++ b/annotations/src/main/resources/revisions/CommanderLegsUnit/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderUnit/0.json b/annotations/src/main/resources/revisions/CommanderMechUnit/0.json
similarity index 50%
rename from annotations/src/main/resources/revisions/BuilderUnit/0.json
rename to annotations/src/main/resources/revisions/CommanderMechUnit/0.json
index 719d06eac9..1779e118de 100644
--- a/annotations/src/main/resources/revisions/BuilderUnit/0.json
+++ b/annotations/src/main/resources/revisions/CommanderMechUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/CommanderMechUnit/1.json b/annotations/src/main/resources/revisions/CommanderMechUnit/1.json
new file mode 100644
index 0000000000..66897ee06f
--- /dev/null
+++ b/annotations/src/main/resources/revisions/CommanderMechUnit/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/CommanderPayloadUnitWaterMove/0.json b/annotations/src/main/resources/revisions/CommanderPayloadUnitWaterMove/0.json
deleted file mode 100644
index dbb981dfd1..0000000000
--- a/annotations/src/main/resources/revisions/CommanderPayloadUnitWaterMove/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/CommanderUnitWaterMove/0.json b/annotations/src/main/resources/revisions/CommanderUnitWaterMove/0.json
index 2160b1858b..5431957381 100644
--- a/annotations/src/main/resources/revisions/CommanderUnitWaterMove/0.json
+++ b/annotations/src/main/resources/revisions/CommanderUnitWaterMove/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/CommanderUnitWaterMove/2.json b/annotations/src/main/resources/revisions/CommanderUnitWaterMove/2.json
deleted file mode 100644
index a73abd7000..0000000000
--- a/annotations/src/main/resources/revisions/CommanderUnitWaterMove/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/EffectState/1.json b/annotations/src/main/resources/revisions/EffectState/1.json
new file mode 100644
index 0000000000..530155f361
--- /dev/null
+++ b/annotations/src/main/resources/revisions/EffectState/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/EffectState/2.json b/annotations/src/main/resources/revisions/EffectState/2.json
new file mode 100644
index 0000000000..a1ea72acf0
--- /dev/null
+++ b/annotations/src/main/resources/revisions/EffectState/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:mindustry.gen.Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/EffectState/3.json b/annotations/src/main/resources/revisions/EffectState/3.json
new file mode 100644
index 0000000000..eae3fd4ac8
--- /dev/null
+++ b/annotations/src/main/resources/revisions/EffectState/3.json
@@ -0,0 +1 @@
+{version:3,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/EffectState/4.json b/annotations/src/main/resources/revisions/EffectState/4.json
new file mode 100644
index 0000000000..223affa87a
--- /dev/null
+++ b/annotations/src/main/resources/revisions/EffectState/4.json
@@ -0,0 +1 @@
+{version:4,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/EffectState/5.json b/annotations/src/main/resources/revisions/EffectState/5.json
new file mode 100644
index 0000000000..f9deac32e3
--- /dev/null
+++ b/annotations/src/main/resources/revisions/EffectState/5.json
@@ -0,0 +1 @@
+{version:5,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/Fire/1.json b/annotations/src/main/resources/revisions/Fire/1.json
new file mode 100644
index 0000000000..b410469512
--- /dev/null
+++ b/annotations/src/main/resources/revisions/Fire/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:lifetime,type:float,size:4},{name:tile,type:mindustry.world.Tile,size:-1},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/ForceDraw/0.json b/annotations/src/main/resources/revisions/ForceDraw/0.json
new file mode 100644
index 0000000000..9a76fbe28e
--- /dev/null
+++ b/annotations/src/main/resources/revisions/ForceDraw/0.json
@@ -0,0 +1 @@
+{fields:[{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/LegsUnit/0.json b/annotations/src/main/resources/revisions/LegsUnit/0.json
index 2160b1858b..5431957381 100644
--- a/annotations/src/main/resources/revisions/LegsUnit/0.json
+++ b/annotations/src/main/resources/revisions/LegsUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/LegsUnit/2.json b/annotations/src/main/resources/revisions/LegsUnit/2.json
deleted file mode 100644
index a73abd7000..0000000000
--- a/annotations/src/main/resources/revisions/LegsUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/MechUnit/0.json b/annotations/src/main/resources/revisions/MechUnit/0.json
index 32f895e075..1779e118de 100644
--- a/annotations/src/main/resources/revisions/MechUnit/0.json
+++ b/annotations/src/main/resources/revisions/MechUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/MechUnit/2.json b/annotations/src/main/resources/revisions/MechUnit/2.json
deleted file mode 100644
index b113f6564d..0000000000
--- a/annotations/src/main/resources/revisions/MechUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/MinerUnit/0.json b/annotations/src/main/resources/revisions/MinerUnit/0.json
index 5df97253d8..3f9c01dbd8 100644
--- a/annotations/src/main/resources/revisions/MinerUnit/0.json
+++ b/annotations/src/main/resources/revisions/MinerUnit/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/MinerUnit/2.json b/annotations/src/main/resources/revisions/MinerUnit/2.json
deleted file mode 100644
index 048458ea23..0000000000
--- a/annotations/src/main/resources/revisions/MinerUnit/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/UnitEntity/0.json b/annotations/src/main/resources/revisions/UnitEntity/0.json
index 2160b1858b..5431957381 100644
--- a/annotations/src/main/resources/revisions/UnitEntity/0.json
+++ b/annotations/src/main/resources/revisions/UnitEntity/0.json
@@ -1 +1 @@
-{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/UnitEntity/2.json b/annotations/src/main/resources/revisions/UnitEntity/2.json
deleted file mode 100644
index a73abd7000..0000000000
--- a/annotations/src/main/resources/revisions/UnitEntity/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/WeatherState/1.json b/annotations/src/main/resources/revisions/WeatherState/1.json
new file mode 100644
index 0000000000..03b9e9b8ce
--- /dev/null
+++ b/annotations/src/main/resources/revisions/WeatherState/1.json
@@ -0,0 +1 @@
+{version:1,fields:[{name:effectTimer,type:float,size:4},{name:intensity,type:float,size:4},{name:life,type:float,size:4},{name:opacity,type:float,size:4},{name:weather,type:mindustry.type.Weather,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/WeatherState/2.json b/annotations/src/main/resources/revisions/WeatherState/2.json
new file mode 100644
index 0000000000..d085d4d22f
--- /dev/null
+++ b/annotations/src/main/resources/revisions/WeatherState/2.json
@@ -0,0 +1 @@
+{version:2,fields:[{name:effectTimer,type:float,size:4},{name:intensity,type:float,size:4},{name:life,type:float,size:4},{name:opacity,type:float,size:4},{name:weather,type:mindustry.type.Weather,size:-1},{name:windVector,type:arc.math.geom.Vec2,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a986b4e058..e2a00358b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,11 +32,11 @@ allprojects{
 
     ext{
         versionNumber = '6'
-        if(!project.hasProperty("versionModifier")) versionModifier = 'pre-alpha'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'alpha'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
-        rhinoVersion = 'eeb327d141146663ff3924bd20d2a5da8a6439cc'
+        rhinoVersion = '8437435dab9993769d72739608580d40c5343285'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -173,13 +173,41 @@ allprojects{
     }
 
     tasks.withType(JavaCompile){
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        targetCompatibility = 8
+        sourceCompatibility = 14
         options.encoding = "UTF-8"
         options.compilerArgs += ["-Xlint:deprecation"]
     }
 }
 
+configure(project(":annotations")){
+    tasks.withType(JavaCompile){
+        targetCompatibility = 8
+        sourceCompatibility = 8
+    }
+}
+
+//compile with java 8 compatibility for everything except the annotation project
+configure(subprojects - project(":annotations")){
+    tasks.withType(JavaCompile){
+        if(JavaVersion.current() != JavaVersion.VERSION_1_8){
+            options.compilerArgs.addAll(['--release', '8', '--enable-preview'])
+        }
+
+        doFirst{
+            options.compilerArgs = options.compilerArgs.findAll{it != '--enable-preview' }
+        }
+    }
+
+    tasks.withType(Javadoc){
+        options{
+            addStringOption('Xdoclint:none', '-quiet')
+            addBooleanOption('-enable-preview', true)
+            addStringOption('-release', '14')
+        }
+    }
+}
+
 project(":desktop"){
     apply plugin: "java"
 
@@ -187,7 +215,6 @@ project(":desktop"){
 
     dependencies{
         implementation project(":core")
-        implementation arcModule("natives:natives-box2d-desktop")
         implementation arcModule("natives:natives-desktop")
         implementation arcModule("natives:natives-freetype-desktop")
         implementation 'com.github.MinnDevelopment:java-discord-rpc:v2.0.1'
@@ -226,7 +253,6 @@ project(":ios"){
 
         implementation arcModule("natives:natives-ios")
         implementation arcModule("natives:natives-freetype-ios")
-        implementation arcModule("natives:natives-box2d-ios")
         implementation arcModule("backends:backend-robovm")
 
         compileOnly project(":annotations")
@@ -248,7 +274,6 @@ project(":core"){
         doLast{
             def props = loadVersionProps()
             def androidVersion = props['androidBuildCode'].toInteger() - 2
-            def buildVersion = props["build"]
             def loglines = file("../changelog").text.split("\n")
             def maxLength = 460
 
@@ -260,7 +285,6 @@ project(":core"){
                 }
             }
             def changelogs = file("../fastlane/metadata/android/en-US/changelogs/")
-            new File(changelogs, buildVersion + ".txt").text = (result)
             new File(changelogs, androidVersion + ".txt").text = (result)
         }
     }
@@ -271,7 +295,6 @@ project(":core"){
         api "org.lz4:lz4-java:1.4.1"
         api arcModule("arc-core")
         api arcModule("extensions:freetype")
-        api arcModule("extensions:box2d")
         api arcModule("extensions:g3d")
         api arcModule("extensions:fx")
         api arcModule("extensions:arcnet")
@@ -280,6 +303,8 @@ project(":core"){
 
         compileOnly project(":annotations")
         annotationProcessor project(":annotations")
+        annotationProcessor 'com.github.Anuken:jabel:40eec868af'
+
     }
 }
 
@@ -288,7 +313,6 @@ project(":server"){
 
     dependencies{
         implementation project(":core")
-        implementation arcModule("natives:natives-box2d-desktop")
         implementation arcModule("backends:backend-headless")
     }
 }
@@ -301,7 +325,6 @@ project(":tests"){
         testImplementation "org.junit.jupiter:junit-jupiter-params:5.3.1"
         testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
         testImplementation arcModule("backends:backend-headless")
-        testImplementation arcModule("natives:natives-box2d-desktop")
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
     }
 
@@ -310,6 +333,7 @@ project(":tests"){
         workingDir = new File("../core/assets")
         testLogging {
             exceptionFormat = 'full'
+            showStandardStreams = true
         }
     }
 }
@@ -322,10 +346,7 @@ project(":tools"){
 
         implementation arcModule("natives:natives-desktop")
         implementation arcModule("natives:natives-freetype-desktop")
-        implementation arcModule("natives:natives-box2d-desktop")
         implementation arcModule("backends:backend-headless")
-
-        implementation "org.reflections:reflections:0.9.11"
     }
 }
 
diff --git a/core/assets-raw/fontgen/config.json b/core/assets-raw/fontgen/config.json
index f2421542a9..1c25eac26c 100644
--- a/core/assets-raw/fontgen/config.json
+++ b/core/assets-raw/fontgen/config.json
@@ -886,20 +886,6 @@
         "command-retreat"
       ]
     },
-    {
-      "uid": "1bc31b80669cb5edc2ee5d1370554bc9",
-      "css": "players",
-      "code": 59483,
-      "src": "custom_icons",
-      "selected": true,
-      "svg": {
-        "path": "M370.1 55.1Q401.6 23.6 448.8 7.9 496.1-7.9 543.3 7.9 590.6 23.6 622 55.1 653.5 86.6 685 118.1 716.5 149.6 732.3 196.9 748 244.1 732.3 291.3 716.5 338.6 685 370.1 653.5 401.6 653.5 433.1 653.5 464.6 685 496.1 716.5 527.6 748 559.1 779.5 590.6 811 622 842.5 653.5 874 685 905.5 716.5 937 748 968.5 779.5 984.3 826.8 1000 874 984.3 921.3 968.5 968.5 921.3 984.3 874 1000 811 1000 748 1000 685 1000 622 1000 559.1 1000 496.1 1000 433.1 1000 370.1 1000 307.1 1000 244.1 1000 181.1 1000 118.1 1000 70.9 984.3 23.6 968.5 7.9 921.3-7.9 874 7.9 826.8 23.6 779.5 55.1 748 86.6 716.5 118.1 685 149.6 653.5 181.1 622 212.6 590.6 244.1 559.1 275.6 527.6 307.1 496.1 338.6 464.6 338.6 433.1 338.6 401.6 307.1 370.1 275.6 338.6 259.8 291.3 244.1 244.1 259.8 196.9 275.6 149.6 307.1 118.1 338.6 86.6 370.1 55.1",
-        "width": 992
-      },
-      "search": [
-        "players"
-      ]
-    },
     {
       "uid": "2073dbd997e5d8e1ffc1322d13ba5585",
       "css": "chat",
@@ -919,6 +905,34 @@
       "css": "zoom",
       "code": 59415,
       "src": "fontawesome"
+    },
+    {
+      "uid": "1bc31b80669cb5edc2ee5d1370554bc9",
+      "css": "players",
+      "code": 59483,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M370.1 55.1Q401.6 23.6 448.8 7.9 496.1-7.9 543.3 7.9 590.6 23.6 622 55.1 653.5 86.6 685 118.1 716.5 149.6 732.3 196.9 748 244.1 732.3 291.3 716.5 338.6 685 370.1 653.5 401.6 653.5 433.1 653.5 464.6 685 496.1 716.5 527.6 748 559.1 779.5 590.6 811 622 842.5 653.5 874 685 905.5 716.5 937 748 968.5 779.5 984.3 826.8 1000 874 984.3 921.3 968.5 968.5 921.3 984.3 874 1000 811 1000 748 1000 685 1000 622 1000 559.1 1000 496.1 1000 433.1 1000 370.1 1000 307.1 1000 244.1 1000 181.1 1000 118.1 1000 70.9 984.3 23.6 968.5 7.9 921.3-7.9 874 7.9 826.8 23.6 779.5 55.1 748 86.6 716.5 118.1 685 149.6 653.5 181.1 622 212.6 590.6 244.1 559.1 275.6 527.6 307.1 496.1 338.6 464.6 338.6 433.1 338.6 401.6 307.1 370.1 275.6 338.6 259.8 291.3 244.1 244.1 259.8 196.9 275.6 149.6 307.1 118.1 338.6 86.6 370.1 55.1",
+        "width": 992
+      },
+      "search": [
+        "players"
+      ]
+    },
+    {
+      "uid": "dd1e5d774d1ced68cb7c439d8ed102f5",
+      "css": "logic",
+      "code": 59420,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M375 0L250 125H125V250L0 375 125 500 0 625 125 750V875H250L375 1000 500 875 625 1000 750 875H875V750L1000 625 875 500 1000 375 875 250V125H750L625 0 500 125ZM250 250H750V750H250ZM375 375V625H625V375Z",
+        "width": 1000
+      },
+      "search": [
+        "logic"
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/core/assets-raw/fontgen/icons/logic.svg b/core/assets-raw/fontgen/icons/logic.svg
new file mode 100644
index 0000000000..431ce25d42
--- /dev/null
+++ b/core/assets-raw/fontgen/icons/logic.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   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"
+   sodipodi:docname="logic.svg"
+   inkscape:version="1.0 (9f2f71dc58, 2020-08-02)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 128 128">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     units="px"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1316"
+     inkscape:window-width="2560"
+     showgrid="true"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="325.95853"
+     inkscape:cx="195.60221"
+     inkscape:zoom="1.28"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#000000"
+     id="base">
+    <inkscape:grid
+       empspacing="5"
+       spacingy="4.2333332"
+       spacingx="4.2333332"
+       id="grid10"
+       type="xygrid"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       id="path19"
+       style="fill:#ffffff;stroke-width:3.77953;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 48,0 32,16 H 16 V 32 L 0,48 16,64 0,80 16,96 v 16 h 16 l 16,16 16,-16 16,16 16,-16 h 16 V 96 L 128,80 112,64 128,48 112,32 V 16 H 96 L 80,0 64,16 Z M 32,32 H 96 V 96 H 32 Z M 48,48 V 80 H 80 V 48 Z" />
+  </g>
+</svg>
diff --git a/core/assets-raw/fonts/Arturito Slab_v2.ttf b/core/assets-raw/fonts/Arturito Slab_v2.ttf
new file mode 100755
index 0000000000..04096503fa
Binary files /dev/null and b/core/assets-raw/fonts/Arturito Slab_v2.ttf differ
diff --git a/core/assets-raw/fonts/RussoOne-Regular.ttf b/core/assets-raw/fonts/RussoOne-Regular.ttf
deleted file mode 100644
index c0236b0547..0000000000
Binary files a/core/assets-raw/fonts/RussoOne-Regular.ttf and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/campaign/core-silo.png b/core/assets-raw/sprites/blocks/campaign/core-silo.png
deleted file mode 100644
index dbb0b6d70c..0000000000
Binary files a/core/assets-raw/sprites/blocks/campaign/core-silo.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/campaign/data-processor-2.png b/core/assets-raw/sprites/blocks/campaign/data-processor-2.png
deleted file mode 100644
index 7071b2b02c..0000000000
Binary files a/core/assets-raw/sprites/blocks/campaign/data-processor-2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/campaign/data-processor-top.png b/core/assets-raw/sprites/blocks/campaign/data-processor-top.png
deleted file mode 100644
index 2596221950..0000000000
Binary files a/core/assets-raw/sprites/blocks/campaign/data-processor-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/campaign/data-processor.png b/core/assets-raw/sprites/blocks/campaign/data-processor.png
deleted file mode 100644
index 92bbec2528..0000000000
Binary files a/core/assets-raw/sprites/blocks/campaign/data-processor.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/defense/large-overdrive-projector.png b/core/assets-raw/sprites/blocks/defense/large-overdrive-projector.png
deleted file mode 100644
index 61515689d0..0000000000
Binary files a/core/assets-raw/sprites/blocks/defense/large-overdrive-projector.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/defense/large-overdrive-projector-top.png b/core/assets-raw/sprites/blocks/defense/overdrive-dome-top.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/defense/large-overdrive-projector-top.png
rename to core/assets-raw/sprites/blocks/defense/overdrive-dome-top.png
diff --git a/core/assets-raw/sprites/blocks/defense/overdrive-dome.png b/core/assets-raw/sprites/blocks/defense/overdrive-dome.png
new file mode 100644
index 0000000000..6bf8371b21
Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/overdrive-dome.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/parallax.png b/core/assets-raw/sprites/blocks/defense/parallax.png
index d9224ab066..2b6109e0b1 100644
Binary files a/core/assets-raw/sprites/blocks/defense/parallax.png and b/core/assets-raw/sprites/blocks/defense/parallax.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/segment.png b/core/assets-raw/sprites/blocks/defense/segment.png
index 57bd53d61d..57da490c5f 100644
Binary files a/core/assets-raw/sprites/blocks/defense/segment.png and b/core/assets-raw/sprites/blocks/defense/segment.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png
index 5a113d8e02..2995011050 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png
index 0312349cc8..4e3d884d60 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png
index 97ff507f6e..ca1ca5e98f 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png
index f0555606e1..b5afa99ceb 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png
index caab53e98b..961cfc9290 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png
index 26c760e325..3c2cb422da 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png
index 652dff1730..d3e7cac664 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png
index 8af227bd04..ba02b11f2f 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png
index a10e7d2c30..dde9319f48 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png
index babb8c9d7b..c1c73953ac 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png
index 31af8a221e..5401d769aa 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png
index 4bd89f0199..feb39f4ab1 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png
index 5a665f713b..868b0f4798 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png
index a9647797fe..2d7f0902f6 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png
index fc36ed94f0..a1d8c76dd9 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png
index 6db61c006e..e707dd80d4 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png
index aed4c7decb..c50b281985 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png
index 213168b5ea..6dfe694ec0 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png
index a69604d6fe..ef313ad576 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png
index 6cd887f110..e5ccf27dbb 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-edge.png b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-edge.png
index 0eaf09d5a4..5041f028ed 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-edge.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-edge.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor.png b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor.png
index b19a7aaab7..3f5fbf0184 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png
index 16b0938f9f..0f8b73714d 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png
index 98d03b428e..89ad916de7 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png
index f166ec32f7..fa082af1be 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png
index 0694b091f6..fd22fd478c 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor-edge.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png
rename to core/assets-raw/sprites/blocks/distribution/payload-conveyor-edge.png
diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-icon.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor-icon.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/mass-conveyor-icon.png
rename to core/assets-raw/sprites/blocks/distribution/payload-conveyor-icon.png
diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor-top.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png
rename to core/assets-raw/sprites/blocks/distribution/payload-conveyor-top.png
diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/mass-conveyor.png
rename to core/assets-raw/sprites/blocks/distribution/payload-conveyor.png
diff --git a/core/assets-raw/sprites/blocks/environment/ignarock1.png b/core/assets-raw/sprites/blocks/environment/basalt1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/ignarock1.png
rename to core/assets-raw/sprites/blocks/environment/basalt1.png
diff --git a/core/assets-raw/sprites/blocks/environment/ignarock2.png b/core/assets-raw/sprites/blocks/environment/basalt2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/ignarock2.png
rename to core/assets-raw/sprites/blocks/environment/basalt2.png
diff --git a/core/assets-raw/sprites/blocks/environment/ignarock3.png b/core/assets-raw/sprites/blocks/environment/basalt3.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/ignarock3.png
rename to core/assets-raw/sprites/blocks/environment/basalt3.png
diff --git a/core/assets-raw/sprites/blocks/environment/cliffs1.png b/core/assets-raw/sprites/blocks/environment/cliffs1.png
deleted file mode 100644
index eb60a159df..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/cliffs1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/dacite-wall-large.png b/core/assets-raw/sprites/blocks/environment/dacite-wall-large.png
new file mode 100644
index 0000000000..93e88e2888
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dacite-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dacite-wall1.png b/core/assets-raw/sprites/blocks/environment/dacite-wall1.png
new file mode 100644
index 0000000000..3f0f70e0a2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dacite-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dacite-wall2.png b/core/assets-raw/sprites/blocks/environment/dacite-wall2.png
new file mode 100644
index 0000000000..07dd33ae40
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dacite-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dacite1.png b/core/assets-raw/sprites/blocks/environment/dacite1.png
new file mode 100644
index 0000000000..07a7a19ece
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dacite1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dacite2.png b/core/assets-raw/sprites/blocks/environment/dacite2.png
new file mode 100644
index 0000000000..f4e2ebe0d9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dacite2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dacite3.png b/core/assets-raw/sprites/blocks/environment/dacite3.png
new file mode 100644
index 0000000000..1580a22f07
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dacite3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt-wall-large.png b/core/assets-raw/sprites/blocks/environment/dirt-wall-large.png
new file mode 100644
index 0000000000..649410e18a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dirt-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt-wall1.png b/core/assets-raw/sprites/blocks/environment/dirt-wall1.png
new file mode 100644
index 0000000000..6250affd44
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dirt-wall1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt-wall2.png b/core/assets-raw/sprites/blocks/environment/dirt-wall2.png
new file mode 100644
index 0000000000..4840a10535
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dirt-wall2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt1.png b/core/assets-raw/sprites/blocks/environment/dirt1.png
new file mode 100644
index 0000000000..1f2b788140
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dirt1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt2.png b/core/assets-raw/sprites/blocks/environment/dirt2.png
new file mode 100644
index 0000000000..40e84864b8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dirt2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt3.png b/core/assets-raw/sprites/blocks/environment/dirt3.png
new file mode 100644
index 0000000000..0bf0e1c7e8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/dirt3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dunerocks-large.png b/core/assets-raw/sprites/blocks/environment/dune-wall-large.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/dunerocks-large.png
rename to core/assets-raw/sprites/blocks/environment/dune-wall-large.png
diff --git a/core/assets-raw/sprites/blocks/environment/dunerocks1.png b/core/assets-raw/sprites/blocks/environment/dune-wall1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/dunerocks1.png
rename to core/assets-raw/sprites/blocks/environment/dune-wall1.png
diff --git a/core/assets-raw/sprites/blocks/environment/dunerocks2.png b/core/assets-raw/sprites/blocks/environment/dune-wall2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/dunerocks2.png
rename to core/assets-raw/sprites/blocks/environment/dune-wall2.png
diff --git a/core/assets-raw/sprites/blocks/environment/holostone1.png b/core/assets-raw/sprites/blocks/environment/holostone1.png
deleted file mode 100644
index 4f25d079a3..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/holostone1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/holostone2.png b/core/assets-raw/sprites/blocks/environment/holostone2.png
deleted file mode 100644
index e226a0497b..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/holostone2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/holostone3.png b/core/assets-raw/sprites/blocks/environment/holostone3.png
deleted file mode 100644
index c11a6ce03e..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/holostone3.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/icerocks-large.png b/core/assets-raw/sprites/blocks/environment/ice-wall-large.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/icerocks-large.png
rename to core/assets-raw/sprites/blocks/environment/ice-wall-large.png
diff --git a/core/assets-raw/sprites/blocks/environment/icerocks1.png b/core/assets-raw/sprites/blocks/environment/ice-wall1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/icerocks1.png
rename to core/assets-raw/sprites/blocks/environment/ice-wall1.png
diff --git a/core/assets-raw/sprites/blocks/environment/icerocks2.png b/core/assets-raw/sprites/blocks/environment/ice-wall2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/icerocks2.png
rename to core/assets-raw/sprites/blocks/environment/ice-wall2.png
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-3.png b/core/assets-raw/sprites/blocks/environment/metal-floor-3.png
index 7fbb9243b4..8b87059487 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-3.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/mud1.png b/core/assets-raw/sprites/blocks/environment/mud1.png
new file mode 100644
index 0000000000..2f5963cef9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/mud1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/mud2.png b/core/assets-raw/sprites/blocks/environment/mud2.png
new file mode 100644
index 0000000000..2407ae4449
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/mud2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/mud3.png b/core/assets-raw/sprites/blocks/environment/mud3.png
new file mode 100644
index 0000000000..a602c93469
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/mud3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks-large.png b/core/assets-raw/sprites/blocks/environment/salt-wall-large.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/saltrocks-large.png
rename to core/assets-raw/sprites/blocks/environment/salt-wall-large.png
diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks1.png b/core/assets-raw/sprites/blocks/environment/salt-wall1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/saltrocks1.png
rename to core/assets-raw/sprites/blocks/environment/salt-wall1.png
diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks2.png b/core/assets-raw/sprites/blocks/environment/salt-wall2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/saltrocks2.png
rename to core/assets-raw/sprites/blocks/environment/salt-wall2.png
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png b/core/assets-raw/sprites/blocks/environment/sand-wall-large.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sandrocks-large.png
rename to core/assets-raw/sprites/blocks/environment/sand-wall-large.png
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks1.png b/core/assets-raw/sprites/blocks/environment/sand-wall1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sandrocks1.png
rename to core/assets-raw/sprites/blocks/environment/sand-wall1.png
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks2.png b/core/assets-raw/sprites/blocks/environment/sand-wall2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sandrocks2.png
rename to core/assets-raw/sprites/blocks/environment/sand-wall2.png
diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks-large.png b/core/assets-raw/sprites/blocks/environment/shale-wall-large.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/shalerocks-large.png
rename to core/assets-raw/sprites/blocks/environment/shale-wall-large.png
diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks1.png b/core/assets-raw/sprites/blocks/environment/shale-wall1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/shalerocks1.png
rename to core/assets-raw/sprites/blocks/environment/shale-wall1.png
diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks2.png b/core/assets-raw/sprites/blocks/environment/shale-wall2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/shalerocks2.png
rename to core/assets-raw/sprites/blocks/environment/shale-wall2.png
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png b/core/assets-raw/sprites/blocks/environment/snow-wall-large.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/snowrocks-large.png
rename to core/assets-raw/sprites/blocks/environment/snow-wall-large.png
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks1.png b/core/assets-raw/sprites/blocks/environment/snow-wall1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/snowrocks1.png
rename to core/assets-raw/sprites/blocks/environment/snow-wall1.png
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks2.png b/core/assets-raw/sprites/blocks/environment/snow-wall2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/snowrocks2.png
rename to core/assets-raw/sprites/blocks/environment/snow-wall2.png
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png b/core/assets-raw/sprites/blocks/environment/spore-wall-large.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sporerocks-large.png
rename to core/assets-raw/sprites/blocks/environment/spore-wall-large.png
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks1.png b/core/assets-raw/sprites/blocks/environment/spore-wall1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sporerocks1.png
rename to core/assets-raw/sprites/blocks/environment/spore-wall1.png
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks2.png b/core/assets-raw/sprites/blocks/environment/spore-wall2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/sporerocks2.png
rename to core/assets-raw/sprites/blocks/environment/spore-wall2.png
diff --git a/core/assets-raw/sprites/blocks/environment/rocks-large.png b/core/assets-raw/sprites/blocks/environment/stone-wall-large.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/rocks-large.png
rename to core/assets-raw/sprites/blocks/environment/stone-wall-large.png
diff --git a/core/assets-raw/sprites/blocks/environment/rocks1.png b/core/assets-raw/sprites/blocks/environment/stone-wall1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/rocks1.png
rename to core/assets-raw/sprites/blocks/environment/stone-wall1.png
diff --git a/core/assets-raw/sprites/blocks/environment/rocks2.png b/core/assets-raw/sprites/blocks/environment/stone-wall2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/rocks2.png
rename to core/assets-raw/sprites/blocks/environment/stone-wall2.png
diff --git a/core/assets-raw/sprites/blocks/environment/tar.png b/core/assets-raw/sprites/blocks/environment/tar.png
index 8ad3f8ec68..d959f6df4b 100644
Binary files a/core/assets-raw/sprites/blocks/environment/tar.png and b/core/assets-raw/sprites/blocks/environment/tar.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/message.png b/core/assets-raw/sprites/blocks/extra/message.png
deleted file mode 100644
index 60f8659d12..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/message.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png
index ecd147450a..e673a4c6cf 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png
index a94e604467..4e33a6bfba 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png
index 85533fef2f..961a9f82c7 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png
index 255c710915..c1c36e33be 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png
index 6e7321360b..be533536a7 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png
index 050aa16f7a..f4e6379a31 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/hyper-processor.png b/core/assets-raw/sprites/blocks/logic/hyper-processor.png
new file mode 100644
index 0000000000..74dc55f3ea
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/hyper-processor.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/large-logic-display.png b/core/assets-raw/sprites/blocks/logic/large-logic-display.png
new file mode 100644
index 0000000000..fb10d438bb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/large-logic-display.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/logic-display.png b/core/assets-raw/sprites/blocks/logic/logic-display.png
new file mode 100644
index 0000000000..ffb2404f09
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/logic-display.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/logic-processor.png b/core/assets-raw/sprites/blocks/logic/logic-processor.png
new file mode 100644
index 0000000000..7746f89935
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/logic-processor.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/memory-bank.png b/core/assets-raw/sprites/blocks/logic/memory-bank.png
new file mode 100644
index 0000000000..59bd139f2d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/memory-bank.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/memory-cell.png b/core/assets-raw/sprites/blocks/logic/memory-cell.png
new file mode 100644
index 0000000000..1ef2998c51
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/memory-cell.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/message.png b/core/assets-raw/sprites/blocks/logic/message.png
new file mode 100644
index 0000000000..00bd9c8b95
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/message.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/micro-processor.png b/core/assets-raw/sprites/blocks/logic/micro-processor.png
new file mode 100644
index 0000000000..2b1de7cd5f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/micro-processor.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/switch-on.png b/core/assets-raw/sprites/blocks/logic/switch-on.png
new file mode 100644
index 0000000000..a439bd281d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/switch-on.png differ
diff --git a/core/assets-raw/sprites/blocks/logic/switch.png b/core/assets-raw/sprites/blocks/logic/switch.png
new file mode 100644
index 0000000000..5519fc789c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/logic/switch.png differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-cap.png b/core/assets-raw/sprites/blocks/power/steam-generator-cap.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/power/turbine-generator-cap.png
rename to core/assets-raw/sprites/blocks/power/steam-generator-cap.png
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png b/core/assets-raw/sprites/blocks/power/steam-generator-liquid.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png
rename to core/assets-raw/sprites/blocks/power/steam-generator-liquid.png
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-top.png b/core/assets-raw/sprites/blocks/power/steam-generator-top.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/power/turbine-generator-top.png
rename to core/assets-raw/sprites/blocks/power/steam-generator-top.png
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-turbine0.png b/core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/power/turbine-generator-turbine0.png
rename to core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-turbine1.png b/core/assets-raw/sprites/blocks/power/steam-generator-turbine1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/power/turbine-generator-turbine1.png
rename to core/assets-raw/sprites/blocks/power/steam-generator-turbine1.png
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator.png b/core/assets-raw/sprites/blocks/power/steam-generator.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/power/turbine-generator.png
rename to core/assets-raw/sprites/blocks/power/steam-generator.png
diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png b/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png
index fb10892472..5af4b45d78 100644
Binary files a/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png and b/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png
rename to core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png
diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-liquid.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png
rename to core/assets-raw/sprites/blocks/production/cryofluid-mixer-liquid.png
diff --git a/core/assets-raw/sprites/blocks/production/cryofluid-mixer-top.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-top.png
new file mode 100644
index 0000000000..3bb5abe3cb
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png
deleted file mode 100644
index e90db33565..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver.png b/core/assets-raw/sprites/blocks/production/phase-weaver.png
index 4cbda78f1b..282d9bcd6a 100644
Binary files a/core/assets-raw/sprites/blocks/production/phase-weaver.png and b/core/assets-raw/sprites/blocks/production/phase-weaver.png differ
diff --git a/core/assets-raw/sprites/blocks/props/rock1.png b/core/assets-raw/sprites/blocks/props/boulder1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/props/rock1.png
rename to core/assets-raw/sprites/blocks/props/boulder1.png
diff --git a/core/assets-raw/sprites/blocks/props/rock2.png b/core/assets-raw/sprites/blocks/props/boulder2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/props/rock2.png
rename to core/assets-raw/sprites/blocks/props/boulder2.png
diff --git a/core/assets-raw/sprites/blocks/props/dacite-boulder1.png b/core/assets-raw/sprites/blocks/props/dacite-boulder1.png
new file mode 100644
index 0000000000..ffddeef34b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/dacite-boulder1.png differ
diff --git a/core/assets-raw/sprites/blocks/props/dacite-boulder2.png b/core/assets-raw/sprites/blocks/props/dacite-boulder2.png
new file mode 100644
index 0000000000..aa258941cd
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/dacite-boulder2.png differ
diff --git a/core/assets-raw/sprites/blocks/props/snowrock1.png b/core/assets-raw/sprites/blocks/props/snow-boulder1.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/props/snowrock1.png
rename to core/assets-raw/sprites/blocks/props/snow-boulder1.png
diff --git a/core/assets-raw/sprites/blocks/props/snowrock2.png b/core/assets-raw/sprites/blocks/props/snow-boulder2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/props/snowrock2.png
rename to core/assets-raw/sprites/blocks/props/snow-boulder2.png
diff --git a/core/assets-raw/sprites/blocks/props/white-tree-dead-shadow.png b/core/assets-raw/sprites/blocks/props/white-tree-dead-shadow.png
new file mode 100644
index 0000000000..f95d982188
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/white-tree-dead-shadow.png differ
diff --git a/core/assets-raw/sprites/blocks/props/white-tree-dead.png b/core/assets-raw/sprites/blocks/props/white-tree-dead.png
index 4e7a5c9292..cfb6d65cf1 100644
Binary files a/core/assets-raw/sprites/blocks/props/white-tree-dead.png and b/core/assets-raw/sprites/blocks/props/white-tree-dead.png differ
diff --git a/core/assets-raw/sprites/blocks/props/white-tree-shadow.png b/core/assets-raw/sprites/blocks/props/white-tree-shadow.png
new file mode 100644
index 0000000000..8ce60aa712
Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/white-tree-shadow.png differ
diff --git a/core/assets-raw/sprites/blocks/props/white-tree.png b/core/assets-raw/sprites/blocks/props/white-tree.png
index bfc3d3629e..91f17de316 100644
Binary files a/core/assets-raw/sprites/blocks/props/white-tree.png and b/core/assets-raw/sprites/blocks/props/white-tree.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/container-team.png b/core/assets-raw/sprites/blocks/storage/container-team.png
new file mode 100644
index 0000000000..5ee1dd3226
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/container-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/container.png b/core/assets-raw/sprites/blocks/storage/container.png
index 368cec3a21..959e2b6edf 100644
Binary files a/core/assets-raw/sprites/blocks/storage/container.png and b/core/assets-raw/sprites/blocks/storage/container.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/vault-team.png b/core/assets-raw/sprites/blocks/storage/vault-team.png
new file mode 100644
index 0000000000..0ce6a50222
Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/vault-team.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/vault.png b/core/assets-raw/sprites/blocks/storage/vault.png
index 38f46d97aa..36a4ee5ea5 100644
Binary files a/core/assets-raw/sprites/blocks/storage/vault.png and b/core/assets-raw/sprites/blocks/storage/vault.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/arc.png b/core/assets-raw/sprites/blocks/turrets/arc.png
index f214c4aa0f..106963aa68 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/arc.png and b/core/assets-raw/sprites/blocks/turrets/arc.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone.png
index 7e1ae002b1..a0e34e20e7 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/cyclone.png and b/core/assets-raw/sprites/blocks/turrets/cyclone.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/duo.png
index c234ccb38c..147d78f16f 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/duo.png and b/core/assets-raw/sprites/blocks/turrets/duo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/foreshadow-heat.png b/core/assets-raw/sprites/blocks/turrets/foreshadow-heat.png
new file mode 100644
index 0000000000..e0902e17d4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/foreshadow-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/foreshadow.png b/core/assets-raw/sprites/blocks/turrets/foreshadow.png
new file mode 100644
index 0000000000..5a27960a73
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/foreshadow.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png
index 7322029f77..61ff3c7b2d 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/fuse.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png
index 4333d6ef7e..10001df6ed 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/hail.png and b/core/assets-raw/sprites/blocks/turrets/hail.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png
index d3bbc2d909..08f1ea9e30 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/lancer.png and b/core/assets-raw/sprites/blocks/turrets/lancer.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png b/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png
deleted file mode 100644
index de0af2f724..0000000000
Binary files a/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo-panel-right.png b/core/assets-raw/sprites/blocks/turrets/salvo-panel-right.png
deleted file mode 100644
index 462f082f2a..0000000000
Binary files a/core/assets-raw/sprites/blocks/turrets/salvo-panel-right.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png
index 63db15cded..4904a913a5 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/salvo.png and b/core/assets-raw/sprites/blocks/turrets/salvo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/scatter.png
index 82d01d22c2..f4f0d73954 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/scatter.png and b/core/assets-raw/sprites/blocks/turrets/scatter.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scorch.png b/core/assets-raw/sprites/blocks/turrets/scorch.png
index 54616726e5..abbd3b5188 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/scorch.png and b/core/assets-raw/sprites/blocks/turrets/scorch.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/swarmer.png b/core/assets-raw/sprites/blocks/turrets/swarmer.png
index c8c5cd54cf..6f98a1ba7a 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/swarmer.png and b/core/assets-raw/sprites/blocks/turrets/swarmer.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/tsunami-liquid.png b/core/assets-raw/sprites/blocks/turrets/tsunami-liquid.png
new file mode 100644
index 0000000000..8c88e9a0be
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/tsunami-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/tsunami-top.png b/core/assets-raw/sprites/blocks/turrets/tsunami-top.png
new file mode 100644
index 0000000000..fc3b172fd2
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/tsunami-top.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/tsunami.png b/core/assets-raw/sprites/blocks/turrets/tsunami.png
new file mode 100644
index 0000000000..b11d2c2307
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/tsunami.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/wave-top.png b/core/assets-raw/sprites/blocks/turrets/wave-top.png
new file mode 100644
index 0000000000..66f9939101
Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/wave-top.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/wave.png b/core/assets-raw/sprites/blocks/turrets/wave.png
index f7823cc437..58d5d46e55 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/wave.png and b/core/assets-raw/sprites/blocks/turrets/wave.png differ
diff --git a/core/assets-raw/sprites/blocks/units/command-center-team.png b/core/assets-raw/sprites/blocks/units/command-center-team.png
new file mode 100644
index 0000000000..b9d27f73c9
Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/command-center-team.png differ
diff --git a/core/assets-raw/sprites/blocks/units/command-center.png b/core/assets-raw/sprites/blocks/units/command-center.png
index 1a829c1cfd..a0de4888a9 100644
Binary files a/core/assets-raw/sprites/blocks/units/command-center.png and b/core/assets-raw/sprites/blocks/units/command-center.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/copper-wall-large.png b/core/assets-raw/sprites/blocks/walls/copper-wall-large.png
index dbc59dd808..00e890dabc 100644
Binary files a/core/assets-raw/sprites/blocks/walls/copper-wall-large.png and b/core/assets-raw/sprites/blocks/walls/copper-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/surge-wall-large.png b/core/assets-raw/sprites/blocks/walls/surge-wall-large.png
index 285cfb52e8..e0cc1b8b86 100644
Binary files a/core/assets-raw/sprites/blocks/walls/surge-wall-large.png and b/core/assets-raw/sprites/blocks/walls/surge-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/surge-wall.png b/core/assets-raw/sprites/blocks/walls/surge-wall.png
index 786ea64867..8dd6798b02 100644
Binary files a/core/assets-raw/sprites/blocks/walls/surge-wall.png and b/core/assets-raw/sprites/blocks/walls/surge-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png
index 80564101f8..ef8f313f09 100644
Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall.png b/core/assets-raw/sprites/blocks/walls/thorium-wall.png
index 4fb0aaf1da..deb9edeea0 100644
Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png b/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png
index 2bf8ad2aec..9242df7d20 100644
Binary files a/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png and b/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png differ
diff --git a/core/assets-raw/sprites/effects/large-bomb-back.png b/core/assets-raw/sprites/effects/large-bomb-back.png
new file mode 100644
index 0000000000..7a7b643de6
Binary files /dev/null and b/core/assets-raw/sprites/effects/large-bomb-back.png differ
diff --git a/core/assets-raw/sprites/effects/large-bomb.png b/core/assets-raw/sprites/effects/large-bomb.png
new file mode 100644
index 0000000000..e670244c35
Binary files /dev/null and b/core/assets-raw/sprites/effects/large-bomb.png differ
diff --git a/core/assets-raw/sprites/ui/button-right-disabled.9.png b/core/assets-raw/sprites/ui/button-right-disabled.9.png
new file mode 100644
index 0000000000..4201ec590a
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-right-disabled.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right-down.9.png b/core/assets-raw/sprites/ui/button-right-down.9.png
index 00b41dabe4..e0f26e84af 100644
Binary files a/core/assets-raw/sprites/ui/button-right-down.9.png and b/core/assets-raw/sprites/ui/button-right-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right-over.9.png b/core/assets-raw/sprites/ui/button-right-over.9.png
index a8f83eee16..af7f6d1d6d 100644
Binary files a/core/assets-raw/sprites/ui/button-right-over.9.png and b/core/assets-raw/sprites/ui/button-right-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right.9.png b/core/assets-raw/sprites/ui/button-right.9.png
index e43fe0c11c..2fd7ee856d 100644
Binary files a/core/assets-raw/sprites/ui/button-right.9.png and b/core/assets-raw/sprites/ui/button-right.9.png differ
diff --git a/core/assets-raw/sprites/ui/logic-node.png b/core/assets-raw/sprites/ui/logic-node.png
new file mode 100644
index 0000000000..9ea7fa6a9b
Binary files /dev/null and b/core/assets-raw/sprites/ui/logic-node.png differ
diff --git a/core/assets-raw/sprites/ui/logo.png b/core/assets-raw/sprites/ui/logo.png
index 0a1778c104..e064a8a450 100644
Binary files a/core/assets-raw/sprites/ui/logo.png and b/core/assets-raw/sprites/ui/logo.png differ
diff --git a/core/assets-raw/sprites/ui/underline-white.9.png b/core/assets-raw/sprites/ui/underline-white.9.png
new file mode 100644
index 0000000000..3f5f7ffba8
Binary files /dev/null and b/core/assets-raw/sprites/ui/underline-white.9.png differ
diff --git a/core/assets-raw/sprites/ui/wavepane.9.png b/core/assets-raw/sprites/ui/wavepane.9.png
new file mode 100644
index 0000000000..29ae8b9852
Binary files /dev/null and b/core/assets-raw/sprites/ui/wavepane.9.png differ
diff --git a/core/assets-raw/sprites/ui/white-pane.9.png b/core/assets-raw/sprites/ui/white-pane.9.png
new file mode 100644
index 0000000000..bf35b6daae
Binary files /dev/null and b/core/assets-raw/sprites/ui/white-pane.9.png differ
diff --git a/core/assets-raw/sprites/units/arkyid-cell.png b/core/assets-raw/sprites/units/arkyid-cell.png
index 0806581f78..2cfccc7afb 100644
Binary files a/core/assets-raw/sprites/units/arkyid-cell.png and b/core/assets-raw/sprites/units/arkyid-cell.png differ
diff --git a/core/assets-raw/sprites/units/arkyid-leg-base.png b/core/assets-raw/sprites/units/arkyid-leg-base.png
index 5586043b4a..114665d7a1 100644
Binary files a/core/assets-raw/sprites/units/arkyid-leg-base.png and b/core/assets-raw/sprites/units/arkyid-leg-base.png differ
diff --git a/core/assets-raw/sprites/units/arkyid.png b/core/assets-raw/sprites/units/arkyid.png
index 78c84e44c6..184ea910ae 100644
Binary files a/core/assets-raw/sprites/units/arkyid.png and b/core/assets-raw/sprites/units/arkyid.png differ
diff --git a/core/assets-raw/sprites/units/beta.png b/core/assets-raw/sprites/units/beta.png
index b1bca129e6..5bba30659e 100644
Binary files a/core/assets-raw/sprites/units/beta.png and b/core/assets-raw/sprites/units/beta.png differ
diff --git a/core/assets-raw/sprites/units/bryde.png b/core/assets-raw/sprites/units/bryde.png
index b362cb5f17..5191b39b4a 100644
Binary files a/core/assets-raw/sprites/units/bryde.png and b/core/assets-raw/sprites/units/bryde.png differ
diff --git a/core/assets-raw/sprites/units/chaos-array-cell.png b/core/assets-raw/sprites/units/chaos-array-cell.png
deleted file mode 100644
index 2b55fff00e..0000000000
Binary files a/core/assets-raw/sprites/units/chaos-array-cell.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/chaos-array-leg.png b/core/assets-raw/sprites/units/chaos-array-leg.png
deleted file mode 100644
index a7df74e158..0000000000
Binary files a/core/assets-raw/sprites/units/chaos-array-leg.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/chaos-array.png b/core/assets-raw/sprites/units/chaos-array.png
deleted file mode 100644
index 78c84e44c6..0000000000
Binary files a/core/assets-raw/sprites/units/chaos-array.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/corvus-base.png b/core/assets-raw/sprites/units/corvus-base.png
new file mode 100644
index 0000000000..448484ab53
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus-base.png differ
diff --git a/core/assets-raw/sprites/units/corvus-cell.png b/core/assets-raw/sprites/units/corvus-cell.png
new file mode 100644
index 0000000000..a0be843703
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus-cell.png differ
diff --git a/core/assets-raw/sprites/units/corvus-foot.png b/core/assets-raw/sprites/units/corvus-foot.png
new file mode 100644
index 0000000000..3dcb61c7fc
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus-foot.png differ
diff --git a/core/assets-raw/sprites/units/corvus-joint-base.png b/core/assets-raw/sprites/units/corvus-joint-base.png
new file mode 100644
index 0000000000..921a27e55c
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus-joint-base.png differ
diff --git a/core/assets-raw/sprites/units/corvus-joint.png b/core/assets-raw/sprites/units/corvus-joint.png
new file mode 100644
index 0000000000..2a83e1f3bc
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus-joint.png differ
diff --git a/core/assets-raw/sprites/units/corvus-leg-base.png b/core/assets-raw/sprites/units/corvus-leg-base.png
new file mode 100644
index 0000000000..07d18a1a44
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus-leg-base.png differ
diff --git a/core/assets-raw/sprites/units/corvus-leg.png b/core/assets-raw/sprites/units/corvus-leg.png
new file mode 100644
index 0000000000..581dc52032
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus-leg.png differ
diff --git a/core/assets-raw/sprites/units/corvus-weapon-heat.png b/core/assets-raw/sprites/units/corvus-weapon-heat.png
new file mode 100644
index 0000000000..6ea3ffe1e7
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/corvus.png b/core/assets-raw/sprites/units/corvus.png
new file mode 100644
index 0000000000..59c20e2566
Binary files /dev/null and b/core/assets-raw/sprites/units/corvus.png differ
diff --git a/core/assets-raw/sprites/units/dagger-leg.png b/core/assets-raw/sprites/units/dagger-leg.png
index f67d4257cf..d27c010dbc 100644
Binary files a/core/assets-raw/sprites/units/dagger-leg.png and b/core/assets-raw/sprites/units/dagger-leg.png differ
diff --git a/core/assets-raw/sprites/units/eradicator-base.png b/core/assets-raw/sprites/units/eradicator-base.png
deleted file mode 100644
index 57b1c796ba..0000000000
Binary files a/core/assets-raw/sprites/units/eradicator-base.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/eradicator-cell.png b/core/assets-raw/sprites/units/eradicator-cell.png
deleted file mode 100644
index c527cdd01a..0000000000
Binary files a/core/assets-raw/sprites/units/eradicator-cell.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/eradicator-leg.png b/core/assets-raw/sprites/units/eradicator-leg.png
deleted file mode 100644
index aeeaaf98f3..0000000000
Binary files a/core/assets-raw/sprites/units/eradicator-leg.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/eradicator.png b/core/assets-raw/sprites/units/eradicator.png
deleted file mode 100644
index 1203ed33b3..0000000000
Binary files a/core/assets-raw/sprites/units/eradicator.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/gamma.png b/core/assets-raw/sprites/units/gamma.png
index bbc3c7a57a..c603be37d1 100644
Binary files a/core/assets-raw/sprites/units/gamma.png and b/core/assets-raw/sprites/units/gamma.png differ
diff --git a/core/assets-raw/sprites/units/mace-leg.png b/core/assets-raw/sprites/units/mace-leg.png
index 82aba38b82..bb1b501dfa 100644
Binary files a/core/assets-raw/sprites/units/mace-leg.png and b/core/assets-raw/sprites/units/mace-leg.png differ
diff --git a/core/assets-raw/sprites/units/mega.png b/core/assets-raw/sprites/units/mega.png
index 9fdade2d20..3cbd6cc822 100644
Binary files a/core/assets-raw/sprites/units/mega.png and b/core/assets-raw/sprites/units/mega.png differ
diff --git a/core/assets-raw/sprites/units/minke.png b/core/assets-raw/sprites/units/minke.png
index 99079defd5..32ec1fadfe 100644
Binary files a/core/assets-raw/sprites/units/minke.png and b/core/assets-raw/sprites/units/minke.png differ
diff --git a/core/assets-raw/sprites/units/oct-cell.png b/core/assets-raw/sprites/units/oct-cell.png
new file mode 100644
index 0000000000..436242ed95
Binary files /dev/null and b/core/assets-raw/sprites/units/oct-cell.png differ
diff --git a/core/assets-raw/sprites/units/oct.png b/core/assets-raw/sprites/units/oct.png
new file mode 100644
index 0000000000..067ebb857b
Binary files /dev/null and b/core/assets-raw/sprites/units/oct.png differ
diff --git a/core/assets-raw/sprites/units/omura-cannon-heat.png b/core/assets-raw/sprites/units/omura-cannon-heat.png
new file mode 100644
index 0000000000..5e2b0dc212
Binary files /dev/null and b/core/assets-raw/sprites/units/omura-cannon-heat.png differ
diff --git a/core/assets-raw/sprites/units/omura-cell.png b/core/assets-raw/sprites/units/omura-cell.png
new file mode 100644
index 0000000000..504824b015
Binary files /dev/null and b/core/assets-raw/sprites/units/omura-cell.png differ
diff --git a/core/assets-raw/sprites/units/omura.png b/core/assets-raw/sprites/units/omura.png
new file mode 100644
index 0000000000..02befddd78
Binary files /dev/null and b/core/assets-raw/sprites/units/omura.png differ
diff --git a/core/assets-raw/sprites/units/pulsar.png b/core/assets-raw/sprites/units/pulsar.png
index eb49cd3751..af014df891 100644
Binary files a/core/assets-raw/sprites/units/pulsar.png and b/core/assets-raw/sprites/units/pulsar.png differ
diff --git a/core/assets-raw/sprites/units/quad-cell.png b/core/assets-raw/sprites/units/quad-cell.png
new file mode 100644
index 0000000000..13222f495b
Binary files /dev/null and b/core/assets-raw/sprites/units/quad-cell.png differ
diff --git a/core/assets-raw/sprites/units/quad.png b/core/assets-raw/sprites/units/quad.png
new file mode 100644
index 0000000000..95435c1f38
Binary files /dev/null and b/core/assets-raw/sprites/units/quad.png differ
diff --git a/core/assets-raw/sprites/units/reign-base.png b/core/assets-raw/sprites/units/reign-base.png
new file mode 100644
index 0000000000..6d47effdc9
Binary files /dev/null and b/core/assets-raw/sprites/units/reign-base.png differ
diff --git a/core/assets-raw/sprites/units/reign-cell.png b/core/assets-raw/sprites/units/reign-cell.png
new file mode 100644
index 0000000000..28aea20f24
Binary files /dev/null and b/core/assets-raw/sprites/units/reign-cell.png differ
diff --git a/core/assets-raw/sprites/units/reign-leg.png b/core/assets-raw/sprites/units/reign-leg.png
new file mode 100644
index 0000000000..1bf212125e
Binary files /dev/null and b/core/assets-raw/sprites/units/reign-leg.png differ
diff --git a/core/assets-raw/sprites/units/reign.png b/core/assets-raw/sprites/units/reign.png
new file mode 100644
index 0000000000..6a3d838582
Binary files /dev/null and b/core/assets-raw/sprites/units/reign.png differ
diff --git a/core/assets-raw/sprites/units/risse.png b/core/assets-raw/sprites/units/risse.png
deleted file mode 100644
index e063474798..0000000000
Binary files a/core/assets-raw/sprites/units/risse.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/risse-cell.png b/core/assets-raw/sprites/units/risso-cell.png
similarity index 100%
rename from core/assets-raw/sprites/units/risse-cell.png
rename to core/assets-raw/sprites/units/risso-cell.png
diff --git a/core/assets-raw/sprites/units/risso.png b/core/assets-raw/sprites/units/risso.png
new file mode 100644
index 0000000000..6cee60313b
Binary files /dev/null and b/core/assets-raw/sprites/units/risso.png differ
diff --git a/core/assets-raw/sprites/units/chaos-array-base.png b/core/assets-raw/sprites/units/scepter-base.png
similarity index 100%
rename from core/assets-raw/sprites/units/chaos-array-base.png
rename to core/assets-raw/sprites/units/scepter-base.png
diff --git a/core/assets-raw/sprites/units/scepter-cell.png b/core/assets-raw/sprites/units/scepter-cell.png
new file mode 100644
index 0000000000..86aec9412d
Binary files /dev/null and b/core/assets-raw/sprites/units/scepter-cell.png differ
diff --git a/core/assets-raw/sprites/units/scepter-leg.png b/core/assets-raw/sprites/units/scepter-leg.png
new file mode 100644
index 0000000000..80e25079bf
Binary files /dev/null and b/core/assets-raw/sprites/units/scepter-leg.png differ
diff --git a/core/assets-raw/sprites/units/scepter.png b/core/assets-raw/sprites/units/scepter.png
new file mode 100644
index 0000000000..5d1ae6f59b
Binary files /dev/null and b/core/assets-raw/sprites/units/scepter.png differ
diff --git a/core/assets-raw/sprites/units/sei-cell.png b/core/assets-raw/sprites/units/sei-cell.png
new file mode 100644
index 0000000000..c440ce3ee6
Binary files /dev/null and b/core/assets-raw/sprites/units/sei-cell.png differ
diff --git a/core/assets-raw/sprites/units/sei.png b/core/assets-raw/sprites/units/sei.png
new file mode 100644
index 0000000000..724fe9559b
Binary files /dev/null and b/core/assets-raw/sprites/units/sei.png differ
diff --git a/core/assets-raw/sprites/units/toxopid-cannon.png b/core/assets-raw/sprites/units/toxopid-cannon.png
new file mode 100644
index 0000000000..535ef3b5d7
Binary files /dev/null and b/core/assets-raw/sprites/units/toxopid-cannon.png differ
diff --git a/core/assets-raw/sprites/units/toxopid-cell.png b/core/assets-raw/sprites/units/toxopid-cell.png
new file mode 100644
index 0000000000..b58dba388d
Binary files /dev/null and b/core/assets-raw/sprites/units/toxopid-cell.png differ
diff --git a/core/assets-raw/sprites/units/toxopid-foot.png b/core/assets-raw/sprites/units/toxopid-foot.png
new file mode 100644
index 0000000000..fffa78f2a6
Binary files /dev/null and b/core/assets-raw/sprites/units/toxopid-foot.png differ
diff --git a/core/assets-raw/sprites/units/toxopid-joint-base.png b/core/assets-raw/sprites/units/toxopid-joint-base.png
new file mode 100644
index 0000000000..921a27e55c
Binary files /dev/null and b/core/assets-raw/sprites/units/toxopid-joint-base.png differ
diff --git a/core/assets-raw/sprites/units/toxopid-leg-base.png b/core/assets-raw/sprites/units/toxopid-leg-base.png
new file mode 100644
index 0000000000..8684da9f26
Binary files /dev/null and b/core/assets-raw/sprites/units/toxopid-leg-base.png differ
diff --git a/core/assets-raw/sprites/units/toxopid-leg.png b/core/assets-raw/sprites/units/toxopid-leg.png
new file mode 100644
index 0000000000..c8b18eb794
Binary files /dev/null and b/core/assets-raw/sprites/units/toxopid-leg.png differ
diff --git a/core/assets-raw/sprites/units/toxopid.png b/core/assets-raw/sprites/units/toxopid.png
new file mode 100644
index 0000000000..a84e453f40
Binary files /dev/null and b/core/assets-raw/sprites/units/toxopid.png differ
diff --git a/core/assets-raw/sprites/units/vela-base.png b/core/assets-raw/sprites/units/vela-base.png
new file mode 100644
index 0000000000..1ec4aac230
Binary files /dev/null and b/core/assets-raw/sprites/units/vela-base.png differ
diff --git a/core/assets-raw/sprites/units/vela-cell.png b/core/assets-raw/sprites/units/vela-cell.png
new file mode 100644
index 0000000000..595fbce8be
Binary files /dev/null and b/core/assets-raw/sprites/units/vela-cell.png differ
diff --git a/core/assets-raw/sprites/units/vela-leg.png b/core/assets-raw/sprites/units/vela-leg.png
new file mode 100644
index 0000000000..80e25079bf
Binary files /dev/null and b/core/assets-raw/sprites/units/vela-leg.png differ
diff --git a/core/assets-raw/sprites/units/vela-weapon-heat.png b/core/assets-raw/sprites/units/vela-weapon-heat.png
new file mode 100644
index 0000000000..68e264c5d3
Binary files /dev/null and b/core/assets-raw/sprites/units/vela-weapon-heat.png differ
diff --git a/core/assets-raw/sprites/units/vela.png b/core/assets-raw/sprites/units/vela.png
new file mode 100644
index 0000000000..db1fdbb9c7
Binary files /dev/null and b/core/assets-raw/sprites/units/vela.png differ
diff --git a/core/assets-raw/sprites/units/weapons/antumbra-missiles.png b/core/assets-raw/sprites/units/weapons/antumbra-missiles.png
deleted file mode 100644
index a37cbfa449..0000000000
Binary files a/core/assets-raw/sprites/units/weapons/antumbra-missiles.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/weapons/chaos.png b/core/assets-raw/sprites/units/weapons/chaos.png
deleted file mode 100644
index 442d5b0417..0000000000
Binary files a/core/assets-raw/sprites/units/weapons/chaos.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/weapons/eclipse-weapon.png b/core/assets-raw/sprites/units/weapons/eclipse-weapon.png
deleted file mode 100644
index 016e6dacf4..0000000000
Binary files a/core/assets-raw/sprites/units/weapons/eclipse-weapon.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/weapons/eradication.png b/core/assets-raw/sprites/units/weapons/eradication.png
deleted file mode 100644
index 231158b058..0000000000
Binary files a/core/assets-raw/sprites/units/weapons/eradication.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/weapons/heal-shotgun-weapon.png b/core/assets-raw/sprites/units/weapons/heal-shotgun-weapon.png
index 5b85b778a7..a519b8e8c0 100644
Binary files a/core/assets-raw/sprites/units/weapons/heal-shotgun-weapon.png and b/core/assets-raw/sprites/units/weapons/heal-shotgun-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/large-bullet-mount.png b/core/assets-raw/sprites/units/weapons/large-bullet-mount.png
new file mode 100644
index 0000000000..92b785ef65
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/large-bullet-mount.png differ
diff --git a/core/assets-raw/sprites/units/weapons/large-laser-mount.png b/core/assets-raw/sprites/units/weapons/large-laser-mount.png
new file mode 100644
index 0000000000..9cad74c69b
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/large-laser-mount.png differ
diff --git a/core/assets-raw/sprites/units/weapons/large-purple-mount.png b/core/assets-raw/sprites/units/weapons/large-purple-mount.png
new file mode 100644
index 0000000000..4940a5b049
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/large-purple-mount.png differ
diff --git a/core/assets-raw/sprites/units/weapons/omura-cannon-heat.png b/core/assets-raw/sprites/units/weapons/omura-cannon-heat.png
new file mode 100644
index 0000000000..c3c0d6378c
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/omura-cannon-heat.png differ
diff --git a/core/assets-raw/sprites/units/weapons/omura-cannon.png b/core/assets-raw/sprites/units/weapons/omura-cannon.png
new file mode 100644
index 0000000000..e751f29572
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/omura-cannon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/reign-weapon.png b/core/assets-raw/sprites/units/weapons/reign-weapon.png
new file mode 100644
index 0000000000..bfe5c921fd
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/reign-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/scepter-weapon.png b/core/assets-raw/sprites/units/weapons/scepter-weapon.png
new file mode 100644
index 0000000000..07ff2b1629
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/scepter-weapon.png differ
diff --git a/core/assets-raw/sprites/units/weapons/sei-launcher.png b/core/assets-raw/sprites/units/weapons/sei-launcher.png
new file mode 100644
index 0000000000..0b1e0b1932
Binary files /dev/null and b/core/assets-raw/sprites/units/weapons/sei-launcher.png differ
diff --git a/core/assets-raw/sprites/units/weapons/zenith-missiles.png b/core/assets-raw/sprites/units/weapons/zenith-missiles.png
index e482202c65..f9b614d611 100644
Binary files a/core/assets-raw/sprites/units/weapons/zenith-missiles.png and b/core/assets-raw/sprites/units/weapons/zenith-missiles.png differ
diff --git a/core/assets/baseparts/1591385575600.msch b/core/assets/baseparts/1591385575600.msch
index a086e7d8a2..597351c682 100644
Binary files a/core/assets/baseparts/1591385575600.msch and b/core/assets/baseparts/1591385575600.msch differ
diff --git a/core/assets/baseparts/1599594352859.msch b/core/assets/baseparts/1599594352859.msch
new file mode 100644
index 0000000000..3b73103fa9
Binary files /dev/null and b/core/assets/baseparts/1599594352859.msch differ
diff --git a/core/assets/baseparts/4125616123544.msch b/core/assets/baseparts/4125616123544.msch
new file mode 100644
index 0000000000..7e1ee81811
Binary files /dev/null and b/core/assets/baseparts/4125616123544.msch differ
diff --git a/core/assets/baseparts/752911659508695080.msch b/core/assets/baseparts/752911659508695080.msch
new file mode 100644
index 0000000000..9f1e10578e
--- /dev/null
+++ b/core/assets/baseparts/752911659508695080.msch
@@ -0,0 +1,2 @@
+msch
x�E�}r�@ŵ|�.0���%��޺Llpא4�iz47C�[e�a�Z==ie��d�x��N>|��Z��5�N��2�����0}�N^���c���m��!֬�<m��̯�}	bò��}�n��?yX��i����=n�*�3�i��:���K�����7��F������.��<��:���`P�4�H[x�f?����Hq��^d�+�ty&�I�H#V�DRI��'9P#
DeBIr	�h�J+&E�0�!������}����g�@e&�Zj
{�<�Fd�\Q+�U81�2*t���
+p������L��.���b_#�~�?��1Zi��Y�����00F˅�i
`�D#)WI�	R���;�i��)ZEGe�ʆJު�	��V�QjUj�"�=���m����Y�V�VEG"������)��3�x�R�Z�k��es��:�uzَ���ct�fTKB4*��9������I�#�:R�#�)���RXE+I-���r ���!V�G�u
\ No newline at end of file
diff --git a/core/assets/baseparts/752912199781056583.msch b/core/assets/baseparts/752912199781056583.msch
new file mode 100644
index 0000000000..be0fe8f10e
Binary files /dev/null and b/core/assets/baseparts/752912199781056583.msch differ
diff --git a/core/assets/baseparts/752912460620496957.msch b/core/assets/baseparts/752912460620496957.msch
new file mode 100644
index 0000000000..7557179096
Binary files /dev/null and b/core/assets/baseparts/752912460620496957.msch differ
diff --git a/core/assets/baseparts/752915237476368385.msch b/core/assets/baseparts/752915237476368385.msch
new file mode 100644
index 0000000000..cfff6b7269
Binary files /dev/null and b/core/assets/baseparts/752915237476368385.msch differ
diff --git a/core/assets/baseparts/752915746673131550.msch b/core/assets/baseparts/752915746673131550.msch
new file mode 100644
index 0000000000..db0125a825
Binary files /dev/null and b/core/assets/baseparts/752915746673131550.msch differ
diff --git a/core/assets/baseparts/752918895291007041.msch b/core/assets/baseparts/752918895291007041.msch
new file mode 100644
index 0000000000..54f4b360c8
Binary files /dev/null and b/core/assets/baseparts/752918895291007041.msch differ
diff --git a/core/assets/baseparts/752918896331456582.msch b/core/assets/baseparts/752918896331456582.msch
new file mode 100644
index 0000000000..755ff98c0b
Binary files /dev/null and b/core/assets/baseparts/752918896331456582.msch differ
diff --git a/core/assets/baseparts/752919619894902997.msch b/core/assets/baseparts/752919619894902997.msch
new file mode 100644
index 0000000000..c8c143ca23
Binary files /dev/null and b/core/assets/baseparts/752919619894902997.msch differ
diff --git a/core/assets/baseparts/752921320802746461.msch b/core/assets/baseparts/752921320802746461.msch
new file mode 100644
index 0000000000..e0333bb511
Binary files /dev/null and b/core/assets/baseparts/752921320802746461.msch differ
diff --git a/core/assets/baseparts/752923816967012442.msch b/core/assets/baseparts/752923816967012442.msch
new file mode 100644
index 0000000000..44c566dfcf
--- /dev/null
+++ b/core/assets/baseparts/752923816967012442.msch
@@ -0,0 +1 @@
+msch
x�5�[�� �k��i�5�;�B4E�K�T��{]k>�����G��ӔqJ��q��៩�����\������K�����YZ�ך�
�.{���~[�:d��9�Sje�+Wx���	Dѻh�w���U����-�Y����-�:Gt�:�)��h.2�8X����oDt��E���6ϚT:����A�\8���`��
#`
\ No newline at end of file
diff --git a/core/assets/baseparts/752926963076694047.msch b/core/assets/baseparts/752926963076694047.msch
new file mode 100644
index 0000000000..6e26296729
Binary files /dev/null and b/core/assets/baseparts/752926963076694047.msch differ
diff --git a/core/assets/baseparts/752927009641857205.msch b/core/assets/baseparts/752927009641857205.msch
new file mode 100644
index 0000000000..7943fb1481
Binary files /dev/null and b/core/assets/baseparts/752927009641857205.msch differ
diff --git a/core/assets/baseparts/752930133874049034.msch b/core/assets/baseparts/752930133874049034.msch
new file mode 100644
index 0000000000..93941bdff3
Binary files /dev/null and b/core/assets/baseparts/752930133874049034.msch differ
diff --git a/core/assets/baseparts/752930845685448825.msch b/core/assets/baseparts/752930845685448825.msch
new file mode 100644
index 0000000000..594f46b9ee
--- /dev/null
+++ b/core/assets/baseparts/752930845685448825.msch
@@ -0,0 +1,4 @@
+msch
x�-�Mn� `���b�t5��I\�$# j�?~q���32Mt3���1}�p垗T�V��q�ؖ�;W
+�8���k~���t�|nIz��R���$4�_�iAbjGIu~��M��6���C~d���΂SF�0��A��X4�2��2�p
+�FD<"F����8��e��^�H^
AG
+ؠ�����S�kA��S�8�+A�d��ˌ�}�)*o
\ No newline at end of file
diff --git a/core/assets/baseparts/752932257538506823.msch b/core/assets/baseparts/752932257538506823.msch
new file mode 100644
index 0000000000..097246d11c
Binary files /dev/null and b/core/assets/baseparts/752932257538506823.msch differ
diff --git a/core/assets/baseparts/752937073991745554.msch b/core/assets/baseparts/752937073991745554.msch
new file mode 100644
index 0000000000..fe8d7ccc9c
--- /dev/null
+++ b/core/assets/baseparts/752937073991745554.msch
@@ -0,0 +1 @@
+msch
x�-�k� �)[����S�PHI$�mB���w�5��L��70�_"�=�Zc����¶��g+�-1������\R�h�A�9����Q)�R�˴oG	���#����E���ģ$�8���A��ж�Ih�N8����p�5\��r��;K����%
\ No newline at end of file
diff --git a/core/assets/baseparts/752937145978716332.msch b/core/assets/baseparts/752937145978716332.msch
new file mode 100644
index 0000000000..c3b5dbb923
Binary files /dev/null and b/core/assets/baseparts/752937145978716332.msch differ
diff --git a/core/assets/baseparts/752937230456193185.msch b/core/assets/baseparts/752937230456193185.msch
new file mode 100644
index 0000000000..558a0a3c63
--- /dev/null
+++ b/core/assets/baseparts/752937230456193185.msch
@@ -0,0 +1 @@
+msch
x�MI�0��"qh�����,��8�ϯӃǣYlL���˜O�X��5�G<��,��*1�!xi�%W�
�إ9+�pM�Y8}b�)�a���v���A��-��S%/���7�ރ���
o­��r�	�m;s
���&��.���^�'�
\ No newline at end of file
diff --git a/core/assets/baseparts/752939992300388483.msch b/core/assets/baseparts/752939992300388483.msch
new file mode 100644
index 0000000000..6d4d56c904
--- /dev/null
+++ b/core/assets/baseparts/752939992300388483.msch
@@ -0,0 +1 @@
+msch
x�=�	n�0E�}	!]U���M��J����n���×�@_~�瑁�)K(5j��o�uz�?ڭ�2���f?}+ou�����l��Qq��&O��:=>��n�6���We�L���]3�G���o���n����q�_j��v���5,+}�$>���!I�*%!#�a«x�یx͜v"�K4%t	=L�g\�H(1v=����Cϡ���KL/�W�+4+�����`z��
�z�f���
v�\�b���{�=�=���}��
��9�H�|XF'F��ψ�+GA�x�t/��t�#���?1"����V9�
\ No newline at end of file
diff --git a/core/assets/baseparts/752941306489077823.msch b/core/assets/baseparts/752941306489077823.msch
new file mode 100644
index 0000000000..d98f3b2a11
--- /dev/null
+++ b/core/assets/baseparts/752941306489077823.msch
@@ -0,0 +1 @@
+msch
x�-�K�0D'���]���E�lB@D�_!�c��
��W��|�$N㺜,c]w�6�3�ϋ�‘L��Ă�vH�ao6�JB��A���׆�5ЊN�[�U�a����-
�xۇ���o�]��&�
\ No newline at end of file
diff --git a/core/assets/baseparts/752942460573057196.msch b/core/assets/baseparts/752942460573057196.msch
new file mode 100644
index 0000000000..6f81df2b4e
Binary files /dev/null and b/core/assets/baseparts/752942460573057196.msch differ
diff --git a/core/assets/baseparts/752944648628076745.msch b/core/assets/baseparts/752944648628076745.msch
new file mode 100644
index 0000000000..090ffe0155
--- /dev/null
+++ b/core/assets/baseparts/752944648628076745.msch
@@ -0,0 +1,2 @@
+msch
x�M�an� ����mM����tC�`��{�]:��&��
=����zh��`���WiS�Oa!�w)(��A/��zc��yw�6͢�`��^)�HE'�]��j!��L7�{4Q;�6�x�E?ܡ>�L{y��_���̇�����Ȗ����$ʎ����j7C�n�6����ѳ!Ot-G+ĉ��o���.?�d�
�̏�kr/��8N4@Ϩ�d41�SqÂ��c%
+��ɏM
\ No newline at end of file
diff --git a/core/assets/baseparts/752955880965799966.msch b/core/assets/baseparts/752955880965799966.msch
new file mode 100644
index 0000000000..4cda9322ea
Binary files /dev/null and b/core/assets/baseparts/752955880965799966.msch differ
diff --git a/core/assets/baseparts/752961534690328648.msch b/core/assets/baseparts/752961534690328648.msch
new file mode 100644
index 0000000000..15dbc9618c
Binary files /dev/null and b/core/assets/baseparts/752961534690328648.msch differ
diff --git a/core/assets/baseparts/752961607314702336.msch b/core/assets/baseparts/752961607314702336.msch
new file mode 100644
index 0000000000..f7ea7664db
Binary files /dev/null and b/core/assets/baseparts/752961607314702336.msch differ
diff --git a/core/assets/baseparts/752965444419453010.msch b/core/assets/baseparts/752965444419453010.msch
new file mode 100644
index 0000000000..008b1f015b
Binary files /dev/null and b/core/assets/baseparts/752965444419453010.msch differ
diff --git a/core/assets/baseparts/752967201597947924.msch b/core/assets/baseparts/752967201597947924.msch
new file mode 100644
index 0000000000..76607f758f
Binary files /dev/null and b/core/assets/baseparts/752967201597947924.msch differ
diff --git a/core/assets/baseparts/752980871690059906.msch b/core/assets/baseparts/752980871690059906.msch
new file mode 100644
index 0000000000..360d04733b
Binary files /dev/null and b/core/assets/baseparts/752980871690059906.msch differ
diff --git a/core/assets/baseparts/752982341865046126.msch b/core/assets/baseparts/752982341865046126.msch
new file mode 100644
index 0000000000..360d04733b
Binary files /dev/null and b/core/assets/baseparts/752982341865046126.msch differ
diff --git a/core/assets/baseparts/752995421667721307.msch b/core/assets/baseparts/752995421667721307.msch
new file mode 100644
index 0000000000..bd3313b2c3
Binary files /dev/null and b/core/assets/baseparts/752995421667721307.msch differ
diff --git a/core/assets/baseparts/753005578997071974.msch b/core/assets/baseparts/753005578997071974.msch
new file mode 100644
index 0000000000..747c61f453
Binary files /dev/null and b/core/assets/baseparts/753005578997071974.msch differ
diff --git a/core/assets/baseparts/753035709576642631.msch b/core/assets/baseparts/753035709576642631.msch
new file mode 100644
index 0000000000..c1955436b5
Binary files /dev/null and b/core/assets/baseparts/753035709576642631.msch differ
diff --git a/core/assets/baseparts/753035713162903572.msch b/core/assets/baseparts/753035713162903572.msch
new file mode 100644
index 0000000000..4d262d3fa3
--- /dev/null
+++ b/core/assets/baseparts/753035713162903572.msch
@@ -0,0 +1,2 @@
+msch
x�%�Q
+� Dgu�BIz�^�C-fiMD����|̃7�#�!Y��3	��KL�����C�,=�՘ޱk���jP��*eƗ��
x�=E�d�
��{�L��<5�
�p�
\ No newline at end of file
diff --git a/core/assets/baseparts/753043453876895784.msch b/core/assets/baseparts/753043453876895784.msch
new file mode 100644
index 0000000000..013e2b4e23
Binary files /dev/null and b/core/assets/baseparts/753043453876895784.msch differ
diff --git a/core/assets/baseparts/753059583450415175.msch b/core/assets/baseparts/753059583450415175.msch
new file mode 100644
index 0000000000..a3ed4cf154
--- /dev/null
+++ b/core/assets/baseparts/753059583450415175.msch
@@ -0,0 +1,5 @@
+msch
x�%�Ar�0E?
<5�Yy9Yp�lr���ت�)l\B)��	�O/�Cݿ��%��>C~�
�^��bXχ��<����p��iz��\R����
��y\���i���ЦKoR�Q\��"�E-�?���R�i���q�۾����S@�6�K��
�ȇ�
��`QB�C~��*r�S�JQ+�N�[XK9����a�aj`��2�
+�RP{*�
+Y���ڄQR���^MJ�y�,3���C��p�7؄�z+�԰b��x�ԜH2فCղ�ۀT6��Q��щ�4�y�+�P�~Z�<�-�:S��N�S�N��ӳ�B`���y��H
+뷜��j�$Þ�f��{�1��a��AF�
+����J*
֊F!���zE�
\ No newline at end of file
diff --git a/core/assets/baseparts/753087301323718736.msch b/core/assets/baseparts/753087301323718736.msch
new file mode 100644
index 0000000000..59390e07c6
--- /dev/null
+++ b/core/assets/baseparts/753087301323718736.msch
@@ -0,0 +1,2 @@
+msch
x�5�AN�0E�k;	i��X�f���
7�Vh�$��R��3���?�͗��:�ƅ���L+��%S)����[
+��E�H|F����<])l=T%�+e4cZo��2���s\�1��3O�=חP�O	����Jx��1;
��Z[��r�ɚQ'-�&�J�ql�V٨lTީlU�*���N��e���{]�B��r��F�Q� �/'PoU��[9ᨇE�
̃'�
\ No newline at end of file
diff --git a/core/assets/baseparts/753087303836106812.msch b/core/assets/baseparts/753087303836106812.msch
new file mode 100644
index 0000000000..ee1626b42b
--- /dev/null
+++ b/core/assets/baseparts/753087303836106812.msch
@@ -0,0 +1,2 @@
+msch
x�5��n�0D���[�֯�!U���LDH��}��"��vg�q�9 �ie|~�K��������}����?������r�:>��>3>�t,�xݗ�
�E^�����'
+RDWQU��$�A��>L�*�	�)��AM���H�Q+N���'E���|������Q�m��=;������),�<�<�<����fB`?����j*Lu�:W������A�/�J�
\ No newline at end of file
diff --git a/core/assets/baseparts/753087308881985706.msch b/core/assets/baseparts/753087308881985706.msch
new file mode 100644
index 0000000000..893d913288
--- /dev/null
+++ b/core/assets/baseparts/753087308881985706.msch
@@ -0,0 +1 @@
+msch
x�M��N�0��M�#*$np��,�/��fSYJ�ʱ)�=����gfgq���M�Lx|�i�K�"���F����tz鱏�f��V�x*O_������9&�JT�B��m�1����C���8Mܸؔ}�链9�?O�R�l��:8��a`4�AFXF-��a�E�/���l���k�p'�Z%skV�d��qᵝ���2�p���b[��h�Y���R�^p��b7�
\ No newline at end of file
diff --git a/core/assets/baseparts/753232120369119314.msch b/core/assets/baseparts/753232120369119314.msch
new file mode 100644
index 0000000000..f68d33fae5
Binary files /dev/null and b/core/assets/baseparts/753232120369119314.msch differ
diff --git a/core/assets/baseparts/753389428575043614.msch b/core/assets/baseparts/753389428575043614.msch
new file mode 100644
index 0000000000..f33e2db052
Binary files /dev/null and b/core/assets/baseparts/753389428575043614.msch differ
diff --git a/core/assets/baseparts/753644716297289769.msch b/core/assets/baseparts/753644716297289769.msch
new file mode 100644
index 0000000000..eba46613ca
--- /dev/null
+++ b/core/assets/baseparts/753644716297289769.msch
@@ -0,0 +1,2 @@
+msch
x�5N[n!�gU��~�\!wA�VH, `���Iӭ�U0x<�02��	�AO�E��:睉A��K���C
+v�tuF�����n�	/�'fK�:������/��UW����Y�J���}u������Jٖ����+cC��s毯%�d=��|&KU㕉�vR%��X�%fVl�T�g꭫���R�x�
R�C��)W�|��Yì�	uZ@2{*[�It٥cƉ,z�r �X9P�tl�dž*��^[�Z4��[��v,��
��Q�.�g�-w�w�o���'�
C���?E�g�
\ No newline at end of file
diff --git a/core/assets/baseparts/753646105383927950.msch b/core/assets/baseparts/753646105383927950.msch
new file mode 100644
index 0000000000..500ab29da2
--- /dev/null
+++ b/core/assets/baseparts/753646105383927950.msch
@@ -0,0 +1,2 @@
+msch
x�%L��0�1@P>�f	~��l	��(A��{i���
��[G8?��{��ݻ�+�n�)�p��������8�e��hߞVgy�+N��\�.<oF��^�8��Qp�F
���.d�2h�JT�����:Q	��]˓��RZ��R&d�
+�e�<O	�M�?W'�
\ No newline at end of file
diff --git a/core/assets/baseparts/753652015078310049.msch b/core/assets/baseparts/753652015078310049.msch
new file mode 100644
index 0000000000..01683891b8
Binary files /dev/null and b/core/assets/baseparts/753652015078310049.msch differ
diff --git a/core/assets/baseparts/753653426667257906.msch b/core/assets/baseparts/753653426667257906.msch
new file mode 100644
index 0000000000..a5b60b4c99
Binary files /dev/null and b/core/assets/baseparts/753653426667257906.msch differ
diff --git a/core/assets/baseparts/753659989050261756.msch b/core/assets/baseparts/753659989050261756.msch
new file mode 100644
index 0000000000..9c14628e26
Binary files /dev/null and b/core/assets/baseparts/753659989050261756.msch differ
diff --git a/core/assets/baseparts/753663419592212490.msch b/core/assets/baseparts/753663419592212490.msch
new file mode 100644
index 0000000000..309594ffbe
--- /dev/null
+++ b/core/assets/baseparts/753663419592212490.msch
@@ -0,0 +1 @@
+msch
x�M�A� E��Ғv�����N�
���BA6.&���e0a ��x��F?��b��fB0gZY����e���g���_�r�drL��Z���1<�U�e|z���Kr��RB$@T�,CB�#��NE�wi����1Ԡ�k�ɱɱɱJ	U�R�h�A_�*>
\ No newline at end of file
diff --git a/core/assets/baseparts/753938078997151744.msch b/core/assets/baseparts/753938078997151744.msch
new file mode 100644
index 0000000000..6a666a246c
Binary files /dev/null and b/core/assets/baseparts/753938078997151744.msch differ
diff --git a/core/assets/baseparts/core1.msch b/core/assets/baseparts/core1.msch
index 43439698d7..a9df583d3b 100644
Binary files a/core/assets/baseparts/core1.msch and b/core/assets/baseparts/core1.msch differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 1c4a24cf93..647901a572 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io page with PC downloads
 link.google-play.description = Google Play store listing
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Official Mindustry wiki
-link.feathub.description = Suggest new features
+link.suggestions.description = Suggest new features
 linkfail = Failed to open link!\nThe URL has been copied to your clipboard.
 screenshot = Screenshot saved to {0}
 screenshot.invalid = Map too large, potentially not enough memory for screenshot.
@@ -20,6 +20,8 @@ gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]New highscore!
 copied = Copied.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Sounds
 load.map = Maps
@@ -53,6 +55,7 @@ schematic.saved = Schematic saved.
 schematic.delete.confirm = This schematic will be utterly eradicated.
 schematic.rename = Rename 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.
 
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
@@ -63,8 +66,7 @@ stat.delivered = Resources Launched:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Final Rank: [accent]{0}
 
-launcheditems = [accent]Launched Items
-launchinfo = [unlaunched][[LAUNCH] your core to obtain the items indicated in blue.
+globalitems = [accent]Global Items
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
 level.select = Level Select
@@ -114,6 +116,7 @@ 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.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -137,6 +140,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = About
 name = Name:
 noname = Pick a[accent] player name[] first.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = File Name:
 unlocked = New content unlocked!
 completed = [accent]Completed
@@ -144,6 +149,7 @@ techtree = Tech Tree
 research.list = [lightgray]Research:
 research = Research
 researched = [lightgray]{0} researched.
+research.progress = {0}% complete
 players = {0} players
 players.single = {0} player
 players.search = search
@@ -170,7 +176,7 @@ host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \n
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] or [accent]global[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]If you want to connect to someone by IP, you would need to ask the host for their IP, which can be found by googling "my ip" from their device.
 hostserver = Host Multiplayer Game
 invitefriends = Invite Friends
-hostserver.mobile = Host\nGame
+hostserver.mobile = Host Game
 host = Host
 hosting = [accent]Opening server...
 hosts.refresh = Refresh
@@ -340,6 +346,12 @@ waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+
+#these are intentionally in lower case
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
@@ -379,7 +391,7 @@ editor.exportimage = Export Terrain Image
 editor.exportimage.description = Export an image file containing only basic terrain
 editor.loadimage = Import Terrain
 editor.saveimage = Export Terrain
-editor.unsaved = [scarlet]You have unsaved changes![]\nAre you sure you want to exit?
+editor.unsaved = Are you sure you want to exit?\n[scarlet]Any unsaved changes will be lost.
 editor.resizemap = Resize Map
 editor.mapname = Map Name:
 editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
@@ -459,24 +471,19 @@ locked = Locked
 complete = [lightgray]Complete:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
-requirement.unlock = Unlock {0}
-resume = Resume Zone:\n[lightgray]{0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 bestwave = [lightgray]Best Wave: {0}
-#TODO fix/remove this
-launch = < LAUNCH >
 launch.text = Launch
-launch.title = Launch Successful
-launch.next = [lightgray]next opportunity at wave {0}
-launch.unable2 = [scarlet]Unable to LAUNCH.[]
-launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
-launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
+campaign.multiplayer = While playing multiplayer in campaign, you can only research using items from [accent]your[] sectors, [scarlet]not[] the host's sector that you are on right now.\n\nTo get items to [accent]your[] sectors in multiplayer, use a [accent]launch pad[].
 uncover = Uncover
 configure = Configure Loadout
 #TODO
 loadout = Loadout
-resources = Resources 
+resources = Resources
 bannedblocks = Banned Blocks
 addall = Add All
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Requirement for {0} completed:[lightgray]\n{1}
@@ -498,6 +505,20 @@ error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
+
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
 #NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -539,6 +560,8 @@ settings.graphics = Graphics
 settings.cleardata = Clear Game Data...
 settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone!
 settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Paused >
 clear = Clear
 banned = [scarlet]Banned
@@ -564,12 +587,16 @@ blocks.itemsmoved = Move Speed
 blocks.launchtime = Time Between Launches
 blocks.shootrange = Range
 blocks.size = Size
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Liquid Capacity
 blocks.powerrange = Power Range
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
 blocks.itemcapacity = Item Capacity
+blocks.memorycapacity = Memory Capacity
 blocks.basepowergeneration = Base Power Generation
 blocks.productiontime = Production Time
 blocks.repairtime = Block Full Repair Time
@@ -581,11 +608,14 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
 blocks.ammo = Ammo
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Better Drill Required
 bar.noresources = Missing Resources
@@ -628,12 +658,16 @@ unit.liquidunits = liquid units
 unit.powerunits = power units
 unit.degrees = degrees
 unit.seconds = seconds
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x speed
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = items
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = General
 category.power = Power
 category.liquids = Liquids
@@ -716,6 +750,7 @@ category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
 keybind.respawn.name = Respawn
 keybind.control.name = Control Unit
@@ -728,6 +763,7 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Move X
 keybind.move_y.name = Move Y
 keybind.mouse_move.name = Follow Mouse
+keybind.pan.name = Pan View
 keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
@@ -755,6 +791,9 @@ keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Shoot
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -786,9 +825,11 @@ mode.custom = Custom Rules
 
 rules.infiniteresources = Infinite Resources
 rules.reactorexplosions = Reactor Explosions
+rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
+rules.buildai = AI Building
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
@@ -810,8 +851,13 @@ rules.title.unit = Units
 rules.title.experimental = Experimental
 rules.title.environment = Environment
 rules.lighting = Lighting
+rules.enemyLights = Enemy Lights
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Items
 content.liquid.name = Liquids
@@ -837,9 +883,11 @@ liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
+
 item.explosiveness = [lightgray]Explosiveness: {0}%
 item.flammability = [lightgray]Flammability: {0}%
 item.radioactivity = [lightgray]Radioactivity: {0}%
+
 unit.health = [lightgray]Health: {0}
 unit.speed = [lightgray]Speed: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -848,30 +896,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viscosity: {0}
 liquid.temperature = [lightgray]Temperature: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
 block.grass.name = Grass
 block.slag.name = Slag
 block.salt.name = Salt
-block.saltrocks.name = Salt Rocks
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pebbles
 block.tendrils.name = Tendrils
-block.sandrocks.name = Sand Rocks
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spore Pine
-block.sporerocks.name = Spore Rocks
-block.rock.name = Rock
-block.snowrock.name = Snow Rock
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
 block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
-block.shalerocks.name = Shale Rocks
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -899,13 +984,17 @@ block.craters.name = Craters
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ice Snow
-block.rocks.name = Rocks
-block.icerocks.name = Ice rocks
-block.snowrocks.name = Snow Rocks
-block.dunerocks.name = Dune Rocks
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pine
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
@@ -921,10 +1010,9 @@ block.dark-panel-4.name = Dark Panel 4
 block.dark-panel-5.name = Dark Panel 5
 block.dark-panel-6.name = Dark Panel 6
 block.dark-metal.name = Dark Metal
-block.ignarock.name = Igna Rock
+block.basalt.name = Basalt
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
-block.cliffs.name = Cliffs
 block.copper-wall.name = Copper Wall
 block.copper-wall-large.name = Large Copper Wall
 block.titanium-wall.name = Titanium Wall
@@ -960,7 +1048,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Pulverizer
-block.cryofluidmixer.name = Cryofluid Mixer
+block.cryofluid-mixer.name = Cryofluid Mixer
 block.melter.name = Melter
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
@@ -973,7 +1061,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Steam Generator
+block.steam-generator.name = Steam Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -992,6 +1080,7 @@ block.power-source.name = Power Infinite
 block.unloader.name = Unloader
 block.vault.name = Vault
 block.wave.name = Wave
+block.tsunami.name = Tsunami
 block.swarmer.name = Swarmer
 block.salvo.name = Salvo
 block.ripple.name = Ripple
@@ -1003,7 +1092,6 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
-block.command-center.name = Command Center
 block.repair-point.name = Repair Point
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
@@ -1032,10 +1120,12 @@ block.arc.name = Arc
 block.rtg-generator.name = RTG Generator
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
+block.foreshadow.name = Foreshadow
 block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 block.segment.name = Segment
+block.command-center.name = Command Center
 block.ground-factory.name = Ground Factory
 block.air-factory.name = Air Factory
 block.naval-factory.name = Naval Factory
@@ -1043,11 +1133,21 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Payload Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
-block.large-overdrive-projector.name = Large Overdrive Projector
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+block.memory-bank.name = Memory Bank
+
 team.blue.name = blue
 team.crux.name = red
 team.sharded.name = orange
@@ -1107,7 +1207,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function.
 block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy.
-block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
+block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
 block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets.
@@ -1143,7 +1243,7 @@ block.force-projector.description = Creates a hexagonal force field around itsel
 block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
 block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into blocks. Rotatable.
 block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
-block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.
+block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.\nRequires multiple loading and unloading points for peak throughput.
 block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
@@ -1173,7 +1273,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.
@@ -1209,7 +1309,6 @@ block.ripple.description = An extremely powerful artillery turret. Shoots cluste
 block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
 block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
 
diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 348bea8ad4..f62aba4377 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Старонка itch.io з загрузкамi гу
 link.google-play.description = Спампаваць для Android з Google Play
 link.f-droid.description = Спампаваць для Android з F-Droid
 link.wiki.description = Афіцыйная вікі
-link.feathub.description = Прапанаваць новыя функцыі
+link.suggestions.description = Прапанаваць новыя функцыі
 linkfail = Не атрымалася адкрыць спасылку!\nURL-адрэс быў скапіяваны ў буфер абмена.
 screenshot = Cкрыншот захаваны ў {0}
 screenshot.invalid = Карта занадта вялікая, магчыма, не хапае памяці для скрыншота.
@@ -20,6 +20,8 @@ gameover = Гульня скончана
 gameover.pvp = [accent]{0}[] каманда перамагла!
 highscore = [accent]Новы рэкорд!
 copied = Скапіявана.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Звукі
 load.map = Карты
@@ -63,8 +65,7 @@ stat.delivered = Рэсурсаў запушчана:
 stat.playtime = Час гульні:[accent] {0}
 stat.rank = Фінальны ранг: [accent]{0}
 
-launcheditems = [accent]Запушчаныя прадметы
-launchinfo = [unlaunched]Націсніце на кнопку [ЗАПУСК], каб атрымаць прадметы, якія адзначаны сінім колера.
+globalitems = [accent]Global Items
 map.delete = Вы сапраўды хочаце выдаліць карту «[accent]{0}[]»?
 level.highscore = Рэкорд: [accent]{0}
 level.select = Выбар карты
@@ -106,6 +107,7 @@ mods.guide = Кіраўніцтва па модам
 mods.report = Паведаміць пра памылку
 mods.openfolder = Адкрыць тэчку з мадыфікацыямі
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Мадыфікацыя:[orange] {0}
 mod.enabled = [lightgray]Уключана
 mod.disabled = [scarlet]Выключана
@@ -113,6 +115,7 @@ mod.disable = Выкл.
 mod.content = Content:
 mod.delete.error = Немагчыма выдаліць мадыфікацыю. Магчыма, файл выкарыстоўваецца.
 mod.requiresversion = [scarlet]Мінімальная патрабаваная версія гульні: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Не знойдзены бацькоўскія мадыфікацыі: {0}
 mod.erroredcontent = [scarlet]Памылкі змесціва
 mod.errors = Памылкі былі выкліканыя загружаным змесцівам.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Неабходны перазапуск
 mod.import = Імпартаваць мадыфікацыю
 mod.import.file = Import File
 mod.import.github = Імпартаваць мод з GitHub
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Гэты прадмет з’яўляецца часткай мадыфікацыі [accent]«{0}»[]. Каб выдаліць яго, выдаліце саму мадыфікацыю.
 mod.remove.confirm = Гэтая мадыфікацыя будзе выдалена.
 mod.author = [lightgray]Аўтар:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Аб гульні
 name = Імя:
 noname = Для пачатку, прыдумайце[accent] сабе iмя[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Iмя файла:
 unlocked = Новы кантэнт адмыкнуты!
 completed = [accent]Завершаны
@@ -142,6 +148,7 @@ techtree = Дрэва\n тэхналогій
 research.list = [lightgray]Дасьледуйце:
 research = Даследаваць
 researched = [lightgray] {0} даследавана.
+research.progress = {0}% complete
 players = Гульцоў: {0}
 players.single = {0} гулец
 players.search = search
@@ -224,7 +231,6 @@ save.new = Новае захаванне
 save.overwrite = Вы ўпэўненыя, што жадаеце перазапісаць\nгэты слот для захавання?
 overwrite = Перазапісаць
 save.none = Захавання не знойдзены!
-saveload = Захаванне…
 savefail = Не атрымалася захаваць гульню!
 save.delete.confirm = Вы ўпэўненыя, што хочаце выдаліць гэта захаванне?
 save.delete = Выдаліць
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Вы ўпэўненыя, што ведаеце, што 
 loading = [accent]Загрузка…
 reloading = [accent]Перазагрузка мадыфікацый...
 saving = [accent]Захаванне…
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] для ачысткі плана
 selectschematic = [accent][[{0}][] вылучыць і скапіяваць
 pausebuilding = [accent][[{0}][] для прыпынення будаўніцтва
@@ -328,8 +335,9 @@ waves.never = <ніколі>
 waves.every = кожны
 waves.waves = хваля (ы)
 waves.perspawn = за з’яўленне
+waves.shields = shields/wave
 waves.to = да
-waves.boss = Бос
+waves.guardian = Guardian
 waves.preview = Папярэдні прагляд
 waves.edit = Рэдагавацью...
 waves.copy = Капіяваць у буфер абмену
@@ -337,6 +345,11 @@ waves.load = Загрузіць з буфера абмену
 waves.invalid = Няслушныя хвалі ў буферы абмену.
 waves.copied = Хвалі скапіяваныя.
 waves.none = Ворагі не былі вызначаныя. \nЗвярнiце ўвагу, што пустыя хвалі будуць аўтаматычна замененыя звычайнай хваляй.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Па змаўчанні>
 details = Падрабязнасці...
 edit = Рэдагаваць...
@@ -456,10 +469,12 @@ locked = Блякаваны
 complete = [lightgray]Выканаць:
 requirement.wave = дасягнем {0} хвалі ў зоне {1}
 requirement.core = Знішчыце варожае ядро ​​ў зоне {0}
-requirement.unlock = разблакуюцца {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Аднавіць зону: \n[lightgray] {0}
 bestwave = [lightgray]Лепшая хваля: {0}
 launch = <Запуск>
+launch.text = Launch
 launch.title = Запуск паспяховы
 launch.next = [lightgray]наступная магчымасць на {0} -той хвалі
 launch.unable2 = [scarlet]Запуск немагчымы.[]
@@ -467,13 +482,14 @@ launch.confirm = Гэта [accent]запусціць[] усе рэсурсы ў
 launch.skip.confirm = Калі Вы прапусціце цяпер, то Вы не зможаце вырабіць [accent] запуск[] да пазнейшых хваль.
 uncover = Раскрыць
 configure = Канфігурацыя выгрузкі
+loadout = Loadout
+resources = Resources 
 bannedblocks = Забароненыя блокі
 addall = Дадаць всё
-configure.locked = [lightgray] Разблакіроўка выгрузкі рэсурсаў: {0}.
+launch.destination = Destination: {0}
 configure.invalid = Колькасць павінна быць лікам паміж 0 і {0}.
 zone.unlocked = Зона «[lightgray] {0}» зараз адмыкнутая.
 zone.requirement.complete = Умовы для зоны «{0}» выкананы: [lightgray] \n {1}
-zone.config.unlocked = Выгрузка рэсурсаў адмыкнутая: [lightgray] \n {0}
 zone.resources = [lightgray] Выяўленыя рэсурсы:
 zone.objective = [lightgray] Мэта: [accent] {0}
 zone.objective.survival = Выжыць
@@ -492,35 +508,43 @@ error.io = Сеткавая памылка ўводу-высновы.
 error.any = Невядомая сеткавая памылка.
 error.bloom = Не атрымалася ініцыялізаваць свячэнне (Bloom). \nМагчыма, зараз Вашая прылада не падтрымлівае яго.
 
-zone.groundZero.name = Адпраўным пункт
-zone.desertWastes.name = Пакінутыя пусткі
-zone.craters.name = Кратэры
-zone.frozenForest.name = Ледзяны лес
-zone.ruinousShores.name = Разбураныя берага
-zone.stainedMountains.name = Афарбаваныя горы
-zone.desolateRift.name = Пустынны разлом
-zone.nuclearComplex.name = Ядзерны вытворчы комплекс
-zone.overgrowth.name = Зараснікі
-zone.tarFields.name = Дзеграныя палi
-zone.saltFlats.name = Саляныя раўніны
-zone.impact0078.name = Уздзеянне 0078
-zone.crags.name = Скалы
-zone.fungalPass.name = Грыбны перавал
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Аптымальная лакацыя для паўторных гульняў. Нізкая варожая пагроза. Трохі рэсурсаў. \nСабярыце як мага больш свінцу і медзі. \nДвигайцесь далей.
-zone.frozenForest.description = Нават тут, бліжэй да гор, спрэчкі распаўсюдзіліся. Халодныя тэмпературы не могуць стрымліваць іх вечна. \nПачните ўкладвацца ў энергію. Пабудуйце генератары ўнутранага згарання. Навучыцеся карыстацца рэгенератарам.
-zone.desertWastes.description = Гэтыя пусткі велізарныя, непрадказальныя і працятыя закінутымі сектаральным структурамі. \nУ рэгіёне прысутнічае вугаль. Спаліце ​​яго для атрымання энергіі, або сінтэзуе графіт. \n[lightgray]Месца пасадкі тут можа не быць гарантаванае.
-zone.saltFlats.description = На ўскраіне пустыні ляжаць саляныя раўніны. У гэтай мясцовасці можна знайсці крыху рэсурсаў. \nВорагi ўзвялі тут комплекс захоўвання рэсурсаў. Выкараніць іх ядро. Ня пакіньце каменя на камені.
-zone.craters.description = Вада сабралася ў гэтым кратары, рэліквіі часоў старых войнаў. Адновіце вобласць. Збярыце пясок. Выплавьте меташкло. Пампуйце ваду для астуджэння турэляў і бураў.
-zone.ruinousShores.description = Міма пустак праходзіць берагавая лінія. Калісьці тут размяшчаўся масіў берагавой абароны. Не так шмат ад яго засталося. Толькі самыя базавыя абарончыя збудаванні засталіся цэлымі, усё астатняе ператварылася ў металалом. \nПродолжайте экспансію па-за. Переоткройте для сябе тэхналогіі.
-zone.stainedMountains.description = Далей, углыб мясцовасці, ляжаць горы, яшчэ не заплямленыя спрэчкамі. \nВынямiце багацце тытана ў гэтай галіне. Навучыцеся ім карыстацца. \nВоражскае прысутнасць тут мацней. Не дайце ім часу для адпраўкі сваіх мацнейшых баявых адзінак.
-zone.overgrowth.description = Гэтая зарослая вобласць знаходзіцца бліжэй да крыніцы спрэчка. \nВраг арганізаваў тут фарпост. Пабудуйце баявыя адзінкі «Тытан». Зьнішчыце яго. Вярніце тое, што было страчана.
-zone.tarFields.description = Ускраіна зоны нафтаздабычы, паміж гарамі і пустыняй. Адзін з нямногіх раёнаў з карыснымі запасамі дзёгцю. \nХотя гэтая вобласць закінутыя, у ёй паблізу прысутнічаюць некаторыя небяспечныя варожыя сілы. Не варта іх недаацэньваць.\n [lightgray] Дасьледуйце тэхналогію перапрацоўкі нафты, калі магчыма.
-zone.desolateRift.description = Надзвычай небяспечная зона. Багацце рэсурсаў, але мала месца. Высокі рызыка разбурэння. Эвакуявацца трэба як мага хутчэй. Ня расслабляйцеся падчас вялікіх перапынкаў паміж варожымі нападамі.
-zone.nuclearComplex.description = Былы завод па вытворчасці і перапрацоўцы торыя, пераўтвораны ў руіны. \n[lightgray] Дасьледуйце торый і варыянты яго шматлікага прымянення. \nВраг прысутнічае тут у вялікім ліку, пастаянна разведывая нападнікаў.
-zone.fungalPass.description = Пераходная вобласць паміж высокімі гарамі і больш нізкімі, пакрытымі спрэчкамі землямі. Тут размешчана невялікая выведвальная база суперніка. \nУничтожьте яе. \nИспользуйте адзінкі «Кінжал» і «Камікадзэ». Дастаньце да абодвух ядраў.
-zone.impact0078.description = <ўставіць апісанне тут>
-zone.crags.description = <ўставіць апісанне тут>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Мова
 settings.data = Гульнявыя дадзеныя
@@ -534,9 +558,12 @@ settings.graphics = Графіка
 settings.cleardata = Ачысціць гульнявыя дадзеныя...
 settings.clear.confirm = Вы сапраўды хочаце ачысціць свае дадзеныя? \nГэта нельга адмяніць!
 settings.clearall.confirm = [scarlet] АСЦЯРОЖНА![] \nГэта сатрэ ўсе дадзеныя, уключаючы захавання, карты, прагрэс кампаніі і налады кіравання. \nПосле таго як Вы націснеце [accent] [ОК][], гульня знішчыць усе дадзеныя і аўтаматычна зачыніцца.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent] <Паўза>
 clear = Ачысціць
 banned = [scarlet] Забаронена
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Так
 no = Не
 info.title = Інфармацыя
@@ -558,8 +585,11 @@ blocks.itemsmoved = Хуткасць перамяшчэння
 blocks.launchtime = Інтэрвал запускаў
 blocks.shootrange = Радыус дзеяння
 blocks.size = Памер
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Умяшчальнасць вадкасці
 blocks.powerrange = Далёкасць перадачы энергіі
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Колькасць злучэнняў
 blocks.poweruse = Спажывае энергіі
 blocks.powerdamage = Энергія/страты
@@ -575,13 +605,18 @@ blocks.boosteffect = паскараўся эфект
 blocks.maxunits = Максімальная колькасць актыўных адзінак
 blocks.health = Здароўе
 blocks.buildtime = Час будаўніцтва
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Кошт будаўніцтва
 blocks.inaccuracy = Роскід
 blocks.shots = Стрэлы
 blocks.reload = Стрэлы/секунду
 blocks.ammo = Боепрыпасы
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Патрабуецца свідар лепей
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Хуткасць бурэння: {0}/с
 bar.pumpspeed = Хуткасць выкачванне: {0}/с
 bar.efficiency = Эфектыўнасць: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Энергія: {0}
 bar.poweroutput = Выхад энергіі: {0}
 bar.items = Прадметы: {0}
 bar.capacity = Умяшчальнасць: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Вадкасці
 bar.heat = Нагрэў
 bar.power = Энергія
 bar.progress = Прагрэс будаўніцтва
-bar.spawned = Адзінкі: {0}/{1}
 bar.input = Уваход
 bar.output = Выхад
 
@@ -619,12 +655,16 @@ unit.liquidunits = вадкасных адзінак
 unit.powerunits = энерг. адзінак
 unit.degrees = град.
 unit.seconds = сек.
+unit.minutes = mins
 unit.persecond = /сек
+unit.perminute = /min
 unit.timesspeed = x хуткасць
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = прадметаў
 unit.thousands = Тыс.
 unit.millions = М.
+unit.billions = b
 category.general = Асноўныя
 category.power = Энергія
 category.liquids = Вадкасці
@@ -639,6 +679,7 @@ setting.linear.name = Лінейная фільтраванне
 setting.hints.name = Падказкі
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Аўтаматычная прыпыненне будаўніцтва
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Аніміраваныя вада
 setting.animatedshields.name = Аніміраваныя шчыты
 setting.antialias.name = Згладжванне [lightgray] (патрабуе перазапуску)[]
@@ -663,7 +704,6 @@ setting.effects.name = Эфекты
 setting.destroyedblocks.name = Адлюстроўваць знішчаныя блокі
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Пошук шляху для ўстаноўкі канвеераў
-setting.coreselect.name = Дазволiць вылучэнне ядраў у схемах
 setting.sensitivity.name = Адчувальнасць кантролера
 setting.saveinterval.name = Інтэрвал захавання
 setting.seconds = {0} секунд
@@ -672,12 +712,15 @@ setting.milliseconds = {0} мілісекунд
 setting.fullscreen.name = Поўнаэкранны рэжым
 setting.borderlesswindow.name = Безрамочное акно [lightgray] (можа спатрэбіцца перазапуск)
 setting.fps.name = Паказваць FPS і пінг
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Паказаць клавішы выбару блока
 setting.vsync.name = Вертыкальная сінхранізацыя
 setting.pixelate.name = Пікселізацыя
 setting.minimap.name = Адлюстроўваць міні-карту
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Адлюстроўваць каардынаты гульца
 setting.musicvol.name = Гучнасць музыкі
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Гучнасць акружэння
 setting.mutemusic.name = Заглушыць музыку
 setting.sfxvol.name = Гучнасць эфектаў
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet] Большасць камбінацый клавіш
 category.general.name = Асноўнае
 category.view.name = Прагляд
 category.multiplayer.name = Сеткавая гульня
+category.blocks.name = Block Select
 command.attack = Атакаваць
 command.rally = Кропка збору
 command.retreat = Адступіць
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Клавіша: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Ачысціць план будаўніцтва
 keybind.press = Націсніце клавішу ...
 keybind.press.axis = Націсніце восі або клавішу ...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Рух па восі X
 keybind.move_y.name = Рух па восі Y
 keybind.mouse_move.name = наследуе курсорам
-keybind.dash.name = Палёт/Паскарэнне
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Абраць вобласць
 keybind.schematic_menu.name = Меню схем
 keybind.schematic_flip_x.name = Адлюстраваць схему па восі X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Дыяганальнае размяшчэнн
 keybind.pick.name = Абраць блок
 keybind.break_block.name = Разбурыць блок
 keybind.deselect.name = Зняць вылучэнне
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Стрэл
 keybind.zoom.name = Маштабаванне
 keybind.menu.name = Меню
@@ -774,34 +825,34 @@ rules.reactorexplosions = Выбухі рэактараў
 rules.wavetimer = Інтэрвал хваляў
 rules.waves = Хвалі
 rules.attack = Рэжым атакі
+rules.buildai = AI Building
 rules.enemyCheat = Бясконцыя рэсурсы ІІ (чырвоная каманда)
-rules.unitdrops = Рэсурсы за знішчэнне баёў. адз.
+rules.blockhealthmultiplier = Множнік здароўя блокаў
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Множнік хуткасці вытворчасці баёў. адз.
 rules.unithealthmultiplier = Множнік здароўя баёў. адз.
-rules.blockhealthmultiplier = Множнік здароўя блокаў
-rules.playerhealthmultiplier = Множнік здароўя гульца
-rules.playerdamagemultiplier = Множнік страт гульца
 rules.unitdamagemultiplier = Множнік страт баёў. адз.
 rules.enemycorebuildradius = Радыус абароны варожае. ядраў: [lightgray] (блок.)
-rules.respawntime = Час адраджэння: [lightgray](сек)
 rules.wavespacing = Інтэрвал хваль: [lightgray](сек)
 rules.buildcostmultiplier = Множнік выдаткаў на будаўніцтва
 rules.buildspeedmultiplier = Множнік хуткасці будаўніцтва
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Хвалі чакаюць ворагаў
 rules.dropzoneradius = Радыус зоны высадкі ворагаў: [lightgray] (блокаў)
-rules.respawns = Макс. кол-у адраджэнняў за хвалю
-rules.limitedRespawns = Абмежаванне адраджэнняў
+rules.unitammo = Units Require Ammo
 rules.title.waves = Хвалі
-rules.title.respawns = Адраджэнне
 rules.title.resourcesbuilding = Рэсурсы & будаўніцтва
-rules.title.player = Гульцы
 rules.title.enemy = Ворагі
 rules.title.unit = Баёў. адз.
 rules.title.experimental = эксперыментальнай
+rules.title.environment = Environment
 rules.lighting = Асвятленне
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Навакольны свет
-rules.solarpowermultiplier = Множнік сонечнай энергіі
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Рэчывы
 content.liquid.name = Вадкасці
@@ -827,10 +878,11 @@ liquid.water.name = Вада
 liquid.slag.name = Шлак
 liquid.oil.name = Нафта
 liquid.cryofluid.name = Крыягенная вадкасць
-item.corestorable = [lightgray]Можна захоўваць у ядры: {0}
+
 item.explosiveness = [lightgray]Выбуханебяспека: {0}%
 item.flammability = [lightgray]Узгаральнасць: {0}%
 item.radioactivity = [lightgray]Радыёактыўнасць: {0}%
+
 unit.health = [lightgray]Здароўе: {0}
 unit.speed = [lightgray]Хуткасць: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Цеплаёмістасць: {0}
 liquid.viscosity = [lightgray]Глейкасць: {0}
 liquid.temperature = [lightgray]Тэмпература: {0}
 
+unit.dagger.name = Кінжал
+unit.mace.name = Mace
+unit.fortress.name = Крэпасць
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Камікадзэ
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Скала
 block.sand-boulder.name = Пяшчаны валун
 block.grass.name = Трава
 block.slag.name = Шлак
 block.salt.name = Соль
-block.saltrocks.name = Саляныя камяні
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Галька
 block.tendrils.name = Споравыя вусікі
-block.sandrocks.name = Пяшчаныя камяні
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Спорава хвоя
-block.sporerocks.name = Споравыя камяні
-block.rock.name = Каменны валун
-block.snowrock.name = Заснежаны валун
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Заснежаная хвоя
 block.shale.name = Сланец
 block.shale-boulder.name = Сланцавы валун
 block.moss.name = Мох
 block.shrubs.name = Кусты
 block.spore-moss.name = Спорава мох
-block.shalerocks.name = Сланцавыя камяні
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Сцяна з металалому
 block.scrap-wall-large.name = Вялікая сцяна з металалому
 block.scrap-wall-huge.name = Велізарная сцяна з металалому
@@ -890,13 +979,17 @@ block.craters.name = Кратэры
 block.sand-water.name = Пясок з вадой
 block.darksand-water.name = Тёмный пясок з вадой
 block.char.name = Выпаленая зямля
-block.holostone.name = Галаграфічны камень
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Заснежаны лёд
-block.rocks.name = Камяні
-block.icerocks.name = Ледзяныя камяні
-block.snowrocks.name = Снежныя камяні
-block.dunerocks.name = Цёмныя пясчаныя камяні
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Сасна
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Мёртвае белае дрэва
 block.white-tree.name = Белае дрэва
 block.spore-cluster.name = Навала спрэчка
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Цёмная панэль 4
 block.dark-panel-5.name = Цёмная панэль 5
 block.dark-panel-6.name = Цёмная панэль 6
 block.dark-metal.name = Цёмны метал
-block.ignarock.name = Абпечаны камень
+block.basalt.name = Basalt
 block.hotrock.name = Гарачы камень
 block.magmarock.name = Магмавы камень
-block.cliffs.name = Скалы
 block.copper-wall.name = Медная сцяна
 block.copper-wall-large.name = Вялікая медная сцяна
 block.titanium-wall.name = Тытанавая сцяна
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Залішнi шлюз
 block.silicon-smelter.name = Крэмнявы плавільны завод
 block.phase-weaver.name = Фазавы ткач
 block.pulverizer.name = Здрабняльнік
-block.cryofluidmixer.name = Мешалка крыягеннай вадкасці
+block.cryofluid-mixer.name = Мешалка крыягеннай вадкасці
 block.melter.name = Плавільня
 block.incinerator.name = Мусарасжыгатель
 block.spore-press.name = Споравы прэс
@@ -964,7 +1056,7 @@ block.diode.name = Дыёд
 block.battery.name = Акумулятар
 block.battery-large.name = Вялікі акумулятар
 block.combustion-generator.name = Генератар ўнутранага згарання
-block.turbine-generator.name = Паравы генератар
+block.steam-generator.name = Паравы генератар
 block.differential-generator.name = Дыферэнцыяльны генератар
 block.impact-reactor.name = Імпульсны рэактар
 block.mechanical-drill.name = Механічны бур
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Мяшалка выбуховай сумесі
 block.solar-panel.name = Сонечная панэль
 block.solar-panel-large.name = Вялікая сонечная панэль
 block.oil-extractor.name = Нафтавая вышка
-block.command-center.name = Камандны цэнтр
-block.draug-factory.name = Завод здабываючых Дронаў «Драугр»
-block.spirit-factory.name = Завод рамонтных Дронаў «Дух»
-block.phantom-factory.name = Завод будаўнічых Дронаў «Фантом»
-block.wraith-factory.name = Завод знішчальнікаў «Прывід»
-block.ghoul-factory.name = Завод бамбавікоў «Гуль»
-block.dagger-factory.name = Завод мяхоў «Кінжал»
-block.crawler-factory.name = Завод гусенічных ботаў «Камікадзэ»
-block.titan-factory.name = Завод мяхоў «Тытан»
-block.fortress-factory.name = Завод мяхоў «Крэпасць»
-block.revenant-factory.name = Завод крэйсераў «Мсціўца»
 block.repair-point.name = Рамонтны пункт
 block.pulse-conduit.name = Імпульсны трубаправод
 block.plated-conduit.name = Умацаваны трубаправод
@@ -1036,6 +1117,29 @@ block.meltdown.name = Іспепяліцель
 block.container.name = Кантэйнер
 block.launch-pad.name = Пускавая пляцоўка
 block.launch-pad-large.name = Вялікая пускавая пляцоўка
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = Сіняя
 team.crux.name = Чырвоная
 team.sharded.name = Аскепакавая
@@ -1043,21 +1147,7 @@ team.orange.name = Аранжавая
 team.derelict.name = Пакінутая
 team.green.name = Зелёная
 team.purple.name = Фіялетавая
-unit.spirit.name = Рамонтны робат «Дух»
-unit.draug.name = Здабываўнiчы робат «Драугр»
-unit.phantom.name = Будаўнічы робат «Фантом»
-unit.dagger.name = Кінжал
-unit.crawler.name = Камікадзэ
-unit.titan.name = Тытан
-unit.ghoul.name = Гуль
-unit.wraith.name = Прывід
-unit.fortress.name = Крэпасць
-unit.revenant.name = Мсціўца
-unit.eruptor.name = Вывяргальнік
-unit.chaos-array.name = Масіў хаосу
-unit.eradicator.name = Выкараняльнік
-unit.lich.name = Ліч
-unit.reaper.name = Жнец
+
 tutorial.next = [lightgray]<Націсніце для працягу>
 tutorial.intro = Вы пачалі[scarlet] навучанне па Mindustry.[]\nВыкарыстоўвайце кнопкі[accent] [[WASD][] для перамяшчэння.\n[accent]Пакруціце кола мышы[] для набліжэння або аддалення камеры.\nПачнiце з [accent] здабычы медзі[]. Наблізьцеся да яе, затым націсніце на медную жылу каля Вашага ядра, каб зрабіць гэта.\n[accent] {0}/{1} медзі
 tutorial.intro.mobile = Вы пачалі[scarlet] навучанне па Mindustry.[]\nПравядзiце па экране, каб рухацца. \n[accent]зведзены або развядзіце 2 пальца[] для змены маштабу. \nПачнiце з [accent] здабычы медзі[]. Наблізьцеся да яе, затым націсніце на медную жылу каля Вашага ядра, каб зрабіць гэта.\n [accent]{0}/{1} медзі
@@ -1100,17 +1190,7 @@ liquid.water.description = Самая карысная вадкасць. Звы
 liquid.slag.description = разнастайныя розныя тыпы расплаўленага металу, змешаныя разам. Можа быць падзелены на складнікі яго мінералы або распылён на варожых баявыя адзінкі ў якасці зброі.
 liquid.oil.description = Вадкасць, якая выкарыстоўваецца ў вытворчасці сучасных матэрыялаў. Можа быць пераўтвораная ў вугаль для выкарыстання ў якасці паліва або распыленая і падпаленыя як зброя.
 liquid.cryofluid.description = Інэртная, неедкая вадкасць, створаная з вады і тытана. Валодае надзвычай высокай цеплаёмістасцю. Шырока выкарыстоўваецца ў якасці астуджальнай вадкасці.
-unit.draug.description = Прымітыўны здабываючы робат. Танны ў вытворчасці. Выдаткоўванай. Аўтаматычна здабывае медзь і свінец ў непасрэднай блізкасці. Пастаўляе здабытыя рэсурсы ў бліжэйшы ядро.
-unit.spirit.description = Мадыфікаваны «Драугр», прызначаны для рамонту замест здабычы рэсурсаў. Аўтаматычна рамантуе любыя пашкоджаныя блокі ў вобласці.
-unit.phantom.description = Прасунуты робат. Ідзе за карыстальнікамі. Дапамагае ў будаўніцтве блокаў.
-unit.dagger.description = Самы асноўны наземны мех. Танны ў вытворчасці. Вельмі моцны пры выкарыстанні натоўпамі.
-unit.crawler.description = Наземная адзінка, якая складаецца з зрэзанай рамы з прымацаваны зверху магутнай выбухоўкай. Не асоба трывалая. Выбухае пры кантакце з ворагамі.
-unit.titan.description = Прасунуты, браніраваны наземны юніт. Атакуе як наземныя, так і паветраныя мэты. Абсталяваны двума мініяцюрнымі агнямётамі класа «Обжигатель».
-unit.fortress.description = Цяжкі артылерыйскі мех. Абсталяваны двума мадыфікаванымі гарматамі тыпу «Град» для штурму далёкіх аб'ектаў і падраздзяленняў суперніка.
-unit.eruptor.description = Цяжкі мех, прызначаны для разбурэння будынкаў. Выстрэльвае струмень дзындры па варожых ўмацаванняў, плавіць іх і падпальвае лятучыя рэчывы.
-unit.wraith.description = Хуткі перахопнік. Накіраваны на генератары энергіі.
-unit.ghoul.description = Цяжкі дывановы бамбавік. Пранікае праз варожыя структуры, нацэльваючыся на крытычную інфраструктуру.
-unit.revenant.description = Цяжкая лятаючая сістэма рэактыўнага залпавага агню.
+
 block.message.description = Захоўвае паведамленне. Выкарыстоўваецца для сувязі паміж саюзьнікамі.
 block.graphite-press.description = Сціскае кавалкі вугалю ў чыстыя лісты графіту.
 block.multi-press.description = Абноўленая версія графітавага прэса. Выкарыстоўвае ваду і энергію для хуткай і эфектыўнай апрацоўкі вугалю.
@@ -1119,7 +1199,7 @@ block.kiln.description = выплавляемым пясок і свінец ў
 block.plastanium-compressor.description = Вырабляе пластан з нафты ды тытана.
 block.phase-weaver.description = Сінтэзуе фазавую тканіна з радыеактыўнага торыя і пяску. Патрабуецца вялікая колькасць энергіі для працы.
 block.alloy-smelter.description = Аб'ядноўвае тытан, свінец, крэмній і медзь для вытворчасці кінэтычнага сплаву.
-block.cryofluidmixer.description = змешваюцца ваду і дробны тытанавы парашок у криогеннную вадкасць. Неад'емная частка пры выкарыстання ториевого рэактара
+block.cryofluid-mixer.description = змешваюцца ваду і дробны тытанавы парашок у криогеннную вадкасць. Неад'емная частка пры выкарыстання ториевого рэактара
 block.blast-mixer.description = расціскаюць і змешвае навалы спрэчка з пиротитом для атрымання выбуховага рэчыва.
 block.pyratite-mixer.description = Змешвае вугаль, свінец і пясок у гаручы піратыт
 block.melter.description = Плавіць металалом ў шлак для далейшай апрацоўкі або выкарыстання ў турэлях «Хваля».
@@ -1185,7 +1265,7 @@ block.battery.description = Назапашвае энергію як буфер
 block.battery-large.description = Захоўвае значна больш энергіі, чым звычайны акумулятар.
 block.combustion-generator.description = вырабленай энергіі шляхам спальвання лёгкаўзгаральных матэрыялаў, такіх як вугаль.
 block.thermal-generator.description = Генеруе энергію, калі знаходзіцца ў гарачых месцах.
-block.turbine-generator.description = Удасканалены генератар згарання. Больш эфектыўны, але дадаткова патрабуе ваду для выпрацоўкі пары.
+block.steam-generator.description = Удасканалены генератар згарання. Больш эфектыўны, але дадаткова патрабуе ваду для выпрацоўкі пары.
 block.differential-generator.description = Генеруе вялікая колькасць энергіі. Выкарыстоўвае розніцу тэмператур паміж крыягеннай вадкасцю і падпаленым пиротитом.
 block.rtg-generator.description = Просты, надзейны генератар. Выкарыстоўвае цяпло распадаюцца радыеактыўных злучэнняў для вытворчасці энергіі з нізкай хуткасцю.
 block.solar-panel.description = Забяспечвае невялікая колькасць энергіі ад сонца.
@@ -1221,15 +1301,5 @@ block.ripple.description = Вельмі магутная артылерыйск
 block.cyclone.description = Вялікая турэль, якая можа весці агонь па паветраных і наземных мэтах. Страляе разрыўнымі снарадамі па бліжэйшых ворагам.
 block.spectre.description = Масіўная двуствольное гармата. Страляе буйнымі бранябойнымі кулямі па паветраных і наземных мэтах.
 block.meltdown.description = Масіўная лазерная гармата. Зараджае і страляе пастаянным лазерным прамянём ў бліжэйшых ворагаў. Патрабуецца астуджальная вадкасць для працы.
-block.command-center.description = Камандуе перасоўваннямі баявых адзінак па ўсёй карце. \nУказывает падраздзяленням [accent] збірацца[] вакол каманднага цэнтра, [accent] атакаваць[] варожае ядро ​​або [accent] адступаць[] да ядра/фабрыцы. Калі варожае ядро ​​адсутнічае, адзінкі будуць патруляваць пры камандзе [accent] атакі[].
-block.draug-factory.description = Вырабляе здабываюць Дронов «Драугр».
-block.spirit-factory.description = Вырабляе Дронов «Дух», якія рамантуюць пабудовы.
-block.phantom-factory.description = Вырабляе палепшаных Дронов, якія дапамагаюць у будаўніцтве.
-block.wraith-factory.description = Вырабляе хуткія і лётаюць баявыя адзінкі.
-block.ghoul-factory.description = Вырабляе цяжкія дывановыя бамбавікі.
-block.revenant-factory.description = Вырабляе цяжкія якія лётаюць баявыя адзінкі, узброеныя ракетамі.
-block.dagger-factory.description = Вырабляе асноўныя наземныя баявыя адзінкі.
-block.crawler-factory.description = Вырабляе хуткія саморазрушающиеся баявыя адзінкі.
-block.titan-factory.description = Вырабляе прасунутыя браняваныя баявыя адзінкі.
-block.fortress-factory.description = Вырабляе цяжкія артылерыйскія баявыя адзінкі.
 block.repair-point.description = Бесперапынна лечыць бліжэйшую пашкоджаную баявую адзінку або мех у сваім радыусе.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 138425f612..e0c66ff624 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Stránka na itch.io s odkazy na stažení hry
 link.google-play.description = Obchod Google Play
 link.f-droid.description = Katalog F-Droid
 link.wiki.description = Oficiální Wiki Mindustry
-link.feathub.description = Navrhni něco nového do hry!
+link.suggestions.description = Suggest new features
 linkfail = Nepodařilo se otevřít odkaz!\nAdresa URL byla zkopírována do schránky.
 screenshot = Snímek obrazovky uložen {0}
 screenshot.invalid = Mapa je moc velká, nemusí být dost paměti pro získání snímku obrazovky.
@@ -20,6 +20,8 @@ gameover = Konec hry
 gameover.pvp = Vyhrál tým [accent]{0}[]!
 highscore = [accent]Nový rekord!
 copied = Zkopírováno.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = Tato část hry ještě není připravena
 
 load.sound = Zvuky
 load.map = Mapy
@@ -63,8 +65,7 @@ stat.delivered = Materiálu vysláno:
 stat.playtime = Odehraný čas: [accent]{0}[]
 stat.rank = Celková známka: [accent]{0}[]
 
-launcheditems = [accent]Získané předměty[]
-launchinfo = [unlaunched]Je třeba vyslat zpět Tvé jádro, abys získal věci vyznačené modře.[]
+globalitems = [accent]Celkové položky[]
 map.delete = Jsi si jistý, že chceš smazat mapu "[accent]{0}[]"?
 level.highscore = Nejvyšší skóre: [accent]{0}[]
 level.select = Výběr úrovně
@@ -106,6 +107,7 @@ mods.guide = Průvodce modifikacemi
 mods.report = Nahlásit závadu
 mods.openfolder = Otevřít složku s modifikacemi
 mods.reload = Znovu načíst
+mods.reloadexit = Hra bude nyní ukončena, aby si znovu načetla modifikace.
 mod.display = [gray]Modifikace:[][orange] {0}[]
 mod.enabled = [lightgray]Povoleno[]
 mod.disabled = [scarlet]Zakázáno[]
@@ -113,6 +115,7 @@ mod.disable = Zakázat
 mod.content = Obsah:
 mod.delete.error = Nebylo možnost smazat modifikaci. Soubor může být používán.
 mod.requiresversion = [scarlet]Minimální požadovaná verze hry: [accent]{0}[]
+mod.outdated = [scarlet]Nekompatibilní s V6 (chybí minGameVersion: 105)
 mod.missingdependencies = [scarlet]Chybějící závislosti: {0}[]
 mod.erroredcontent = [scarlet]V obsahu jsou chyby[]
 mod.errors = Při načítání obsahu hry se vyskytly problémy.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Je vyžadováno znovuspuštění hry.
 mod.import = Importovat modifikaci
 mod.import.file = Importovat soubor
 mod.import.github = Import modifikace z GitHubu
+mod.jarwarn = [scarlet]JAR modifikace jsou z podstaty nebezpečné.[]Ujisti se, že je importuješ z důvěryhodného zdroje!
 mod.item.remove = Tato položka je součástí [accent]'{0}'[] modifikace. Pokud ji chcete odstranit, odinstalujte tuto modifikaci.
 mod.remove.confirm = Tato modifikace bude odstraněna.
 mod.author = [lightgray]Autor:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Tvoje zařízení nepodporuje skripty. Musíš zakázat ty
 about.button = O hře
 name = Jméno:
 noname = Nejdřív si vyber [accent]jméno ve hře[].
+planetmap = Planetární mapa
+launchcore = Vyslat jádro
 filename = Název souboru:
 unlocked = Byl odemmknut nový blok!
 completed = [accent]Dokončeno[]
@@ -142,6 +148,7 @@ techtree = Technologie
 research.list = [lightgray]Výzkum:[]
 research = Výzkum
 researched = Dokončen výzkum technologie: [lightgray]{0}[].
+research.progress = {0}% dokončeno
 players = Hráčů: {0}
 players.single = Hráč: {0}
 players.search = hledat
@@ -196,8 +203,8 @@ server.admins.none = Žádní správci nebyli nalezeni.
 server.add = Přidat server
 server.delete = Jsi si jistý, že chceš smazat tento server?
 server.edit = Upravit server
-server.outdated = [crimson]Zastaralá verze serveru![]
-server.outdated.client = [crimson]Zastaralá verze klienta![]
+server.outdated = [scarlet]Zastaralá verze serveru![]
+server.outdated.client = [scarlet]Zastaralá verze klienta![]
 server.version = [gray]Verze: {0} {1}[]
 server.custombuild = [accent]Upravená verze hry[]
 confirmban = Jsi si jistý, že chceš zakázat hráče "{0}[white]"?[]
@@ -219,7 +226,7 @@ connecting.data = [accent]Načítám data ze serveru...[]
 server.port = Port:
 server.addressinuse = Adresu již někdo používá!
 server.invalidport = Neplatné číslo portu!
-server.error = [crimson]Chyba při hostování serveru.[]
+server.error = [scarlet]Chyba při hostování serveru.[]
 save.new = Nové uložení hry
 save.overwrite = Jsi si jistý, že chceš přepsat\ntuto pozici pro uložení hry?
 overwrite = Přepsat
@@ -229,8 +236,8 @@ save.delete.confirm = Jsi si jistý, že chceš smazat toto uložení hry?
 save.delete = Smazat
 save.export = Exportovat uložení hry
 save.import.invalid = [accent]Toto uložení není v pořádku![]
-save.import.fail = [crimson]Nepodařilo se importovat uložení hry: [accent]{0}[]
-save.export.fail = [crimson]Nepodařilo se exportovat uložení hry: [accent]{0}[]
+save.import.fail = [scarlet]Nepodařilo se importovat uložení hry: [accent]{0}[]
+save.export.fail = [scarlet]Nepodařilo se exportovat uložení hry: [accent]{0}[]
 save.import = Importovat uložení hry
 save.newslot = Uložit hru:
 save.rename = Přejmenovat
@@ -330,7 +337,7 @@ waves.waves = vln(y)
 waves.perspawn = za zrození
 waves.shields = štítů/vlnu
 waves.to = do
-waves.boss = Strážce
+waves.guardian = Guardian
 waves.preview = Náhled
 waves.edit = Upravit....
 waves.copy = Uložit do schránky
@@ -338,6 +345,11 @@ waves.load = Načíst ze schránky
 waves.invalid = Neplatné vlny ve schránce.
 waves.copied = Vlny byly zkopírovány.
 waves.none = Žádní nepřátelé nebyli definováni.\nVlny s prázdným rozložením budou automaticky upraveny na výchozí rozložení.
+
+wavemode.counts = počty
+wavemode.totals = součty
+wavemode.health = zdraví
+
 editor.default = [lightgray]<Výchozí>[]
 details = Podrobnosti...
 edit = Upravit...
@@ -377,7 +389,7 @@ editor.exportimage = Exportovat obrázek terénu
 editor.exportimage.description = Exportovat obrázek mapy do souboru
 editor.loadimage = Importovat terén
 editor.saveimage = Exportovat terén
-editor.unsaved = [scarlet]Máš neuložené změny![]\nPřesto chceš odejít z editoru? Změny budou ztraceny.
+editor.unsaved = Opravdu chceš odejít z editoru?\n[scarlet]Neuložené změny budou ztraceny.[]
 editor.resizemap = Změnit velikost mapy
 editor.mapname = Jméno mapy:
 editor.overwrite = [accent]Varování!\nToto přepíše již existující mapu.[]
@@ -457,10 +469,12 @@ locked = Zamčeno
 complete = [lightgray]Dokončeno:
 requirement.wave = Dosáhni vlny {0} na mapě {1}
 requirement.core = Znič nepřátelské jádro na mapě {0}
-requirement.unlock = Odemknuto {0}
+requirement.research = Vynalezeno {0}
+requirement.capture = Polapeno {0}
 resume = Zpět do mapy:\n[lightgray]{0}[]
 bestwave = [lightgray]Nejvyšší vlna: {0}
-launch = Vyslat do této mapy Tvé jádro
+launch = < VYSLAT >
+launch.text = Vyslat
 launch.title = Vyslání bylo úspěšné
 launch.next = [lightgray]další možnost bude až ve vlně {0}[]
 launch.unable2 = [scarlet]Není možno se vyslat.[]
@@ -468,13 +482,14 @@ launch.confirm = Toto vyšle veškeré suroviny ve Tvém jádře zpět.\nJiž se
 launch.skip.confirm = Jestli teď zůstaneš, budeš moci odejít až po několika dalších vlnách.
 uncover = Odkrýt mapu
 configure = Přizpůsobit vybavení
+loadout = Načtení
+resources = Zdroje 
 bannedblocks = Zakázané bloky
 addall = Přidat vše
-configure.locked = [lightgray]{0},\naby sis mohl přizpůsobit vybavení pro mapu.[]
+launch.destination = Destination: {0}
 configure.invalid = Hodnota musí být číslo mezi 0 a {0}.
 zone.unlocked = [lightgray]Mapa {0} byla odemknuta.[]
 zone.requirement.complete = Bylo dosaženo vlny {0},\nčímž byla splněna podmínka pro mapu {1}.
-zone.config.unlocked = Odemknuto přizpůsobení vybavení pro mapu:[lightgray]\n{0}[]
 zone.resources = [lightgray]Byly detekovány tyto suroviny:[]
 zone.objective = [lightgray]Úkol: [][accent]{0}[]
 zone.objective.survival = Přežij
@@ -482,7 +497,7 @@ zone.objective.attack = Znič nepřátelské jádro
 add = Přidat...
 boss.health = Životy Strážce
 
-connectfail = [crimson]Nepovedlo se připojení k serveru:\n\n[accent]{0}[]
+connectfail = [scarlet]Nepovedlo se připojení k serveru:\n\n[accent]{0}[]
 error.unreachable = Server je nedostupný.\nJe IP adresa napsaná správně (XXX.XXX.XXX.XXX)?
 error.invalidaddress = Neplatná IP adresa.
 error.timedout = Čas pro spojení se serverem vypršel!\nUjisti se, že IP adresa je napsaná správně. Zkus také zjistit, zda má hostitel správně nastavené přesměrování portů.
@@ -493,7 +508,20 @@ error.io = Vstupně/výstupní (I/O) chyba sítě.
 error.any = Ueznámá chyba sítě.
 error.bloom = Chyba inicializace filtru Bloom.\nTvé zařízení ho nejspíš nepodporuje.
 
-#NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway
+weather.rain.name = Déšť
+weather.snow.name = Sníh
+weather.sandstorm.name = Písečná ouře
+weather.sporestorm.name = Spórová bouře
+
+sectors.unexplored = [lightgray]Neprozkoumáno
+sectors.resources = Zdroje:
+sectors.production = Výroba:
+sectors.stored = Uskladněno:
+sectors.resume = Pokračovat
+sectors.launch = Vyslat
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
 sector.groundZero.name = Základní tábor
 sector.craters.name = Krátery
 sector.frozenForest.name = Zamrzlý les
@@ -506,10 +534,6 @@ sector.tarFields.name = Dehtová pole
 sector.saltFlats.name = Solné nížiny
 sector.fungalPass.name = Plísňový průsmyk
 
-#unused
-sector.impact0078.name = Zóna dopadu 0078
-sector.crags.name = Skalní útesy
-
 sector.groundZero.description = Optimální místo, kde znovu začít. Nízký výskyt nepřátel. Několik málo surovin.\nPosbírej co nejvíce olova a mědi.\nBěž dál.
 sector.frozenForest.description = Dokonce až sem, blízko hor, se  dokázaly spóry rozrůst. Mráz je však nemůže zadržet navěky.\n\nPusť se do práce za pomocí energie. Stav spalovací generátory. Nauč se, jak používat opravovací věže.
 sector.saltFlats.description = Na okraji pouště leží Solné nížiny. V této lokaci se nachází jen několik málo surovin.\n\nNepřítel zde vybudoval zásobovací komplex. Znič jádro v jeho základně. Nenechej kámen na kameni.
@@ -534,6 +558,8 @@ settings.graphics = Grafika
 settings.cleardata = Vymazat data hry...
 settings.clear.confirm = Jsi si jistý, že chceš vymazat Tvá data ve hře?\nTento krok je nevratný!
 settings.clearall.confirm = [scarlet]Varování![]\nToto vyresetuje všechna Tvá data ve hře, včetně uložení hry, map, odemknutého postupu v kampani a nastavení ovládání.\nJakmile stiskneš "OK", všechna data se vymažou a hra se automaticky ukončí.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Pozastaveno >[]
 clear = Vyčistit
 banned = [scarlet]Zakázán[]
@@ -541,7 +567,7 @@ unplaceable.sectorcaptured = [scarlet]Vyžaduje polapený sektor[]
 yes = Ano
 no = Ne
 info.title = Informace
-error.title = [crimson]Objevila se chyba[]
+error.title = [scarlet]Objevila se chyba[]
 error.crashtitle = Objevila se chyba
 unit.nobuild = [scarlet]Jednotka nemůže stavět
 blocks.input = Vstup
@@ -559,8 +585,11 @@ blocks.itemsmoved = Rychlost pohybu
 blocks.launchtime = Čas mezi vysláním
 blocks.shootrange = Dostřel
 blocks.size = Velikost
+blocks.displaysize = Velikost zobrazovače
 blocks.liquidcapacity = Kapacita kapalin
 blocks.powerrange = Rozsah energie
+blocks.linkrange = Dosah napojení
+blocks.instructions = Instrukce
 blocks.powerconnections = Nejvyšší počet spojení
 blocks.poweruse = Spotřeba energie
 blocks.powerdamage = Energie na jednotku poškození
@@ -576,13 +605,18 @@ blocks.boosteffect = Účinek posílení
 blocks.maxunits = Nejvýše aktivních jednotek
 blocks.health = Životy
 blocks.buildtime = Čas stavby
+blocks.maxconsecutive = Nejvýše po sobě
 blocks.buildcost = Cena stavby
 blocks.inaccuracy = Nepřesnost
 blocks.shots = Střely
 blocks.reload = Střel za 1s
 blocks.ammo = Střelivo
+blocks.shieldhealth = Zdraví štítu
+blocks.cooldowntime = Čas na zchladnutí
 
 bar.drilltierreq = Je vyžadován lepší vrt
+bar.noresources = Chybějí zdroje
+bar.corereq = Je vyžadováno základní jádro
 bar.drillspeed = Rychlost vrtu: {0}/s
 bar.pumpspeed = Rychlost pumpy: {0}/s
 bar.efficiency = Účinnost: {0}%
@@ -592,7 +626,8 @@ bar.poweramount = Energie celkem: {0}
 bar.poweroutput = Výstup energie: {0}
 bar.items = Předměty: {0}
 bar.capacity = Kapacita: {0}
-bar.units = Jednotky: {0}/{1}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[jednotka je vypnuta]
 bar.liquid = Chlazení
 bar.heat = Teplo
 bar.power = Energie
@@ -620,12 +655,16 @@ unit.liquidunits = jednotek kapalin
 unit.powerunits = jednotek energie
 unit.degrees = úhly
 unit.seconds = sekundy
+unit.minutes = minuty
 unit.persecond = /s
+unit.perminute = /min
 unit.timesspeed = x větší rychlost
 unit.percent = %
+unit.shieldhealth = zdraví štítu
 unit.items = předměty
-unit.thousands = t
-unit.millions = m
+unit.thousands = tis
+unit.millions = mio
+unit.billions = mld
 category.general = Všeobecné
 category.power = Energie
 category.liquids = Kapaliny
@@ -640,6 +679,7 @@ setting.linear.name = Lineární filtrování
 setting.hints.name = Rady a tipy
 setting.flow.name = Zobrazit rychlost toku zdroje [scarlet](experimentální)[]
 setting.buildautopause.name = Automaticky pozastavit stavění
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animované tekutiny
 setting.animatedshields.name = Animované štíty
 setting.antialias.name = Použít antialias [lightgray](vyžaduje restart)[]
@@ -664,7 +704,6 @@ setting.effects.name = Zobrazit efekty
 setting.destroyedblocks.name = Zobrazit zničené bloky
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Hledat cestu při umisťování pásu
-setting.coreselect.name = Povolit jádra v šablonách
 setting.sensitivity.name = Citlivost ovladače
 setting.saveinterval.name = Interval automatického ukládání
 setting.seconds = {0} sekund
@@ -678,6 +717,7 @@ setting.blockselectkeys.name = Ukázat klávesy při práci s blokem
 setting.vsync.name = Vertikální synchronizace
 setting.pixelate.name = Rozpixlovat
 setting.minimap.name = Ukázat mapičku
+setting.coreitems.name = Ukázat položky jádra (WIP)
 setting.position.name = Ukázat pozici hráče
 setting.musicvol.name = Hlasitost hudby
 setting.atmosphere.name = Ukázat atmosféru planety
@@ -703,9 +743,11 @@ keybinds.mobile = [scarlet]Většina kláves nefunguje v mobilní verzi hry. Je
 category.general.name = Všeobecné
 category.view.name = Pohled
 category.multiplayer.name = Hra více hráčů
+category.blocks.name = Výběr bloků
 command.attack = Útok
 command.rally = Shromáždění
 command.retreat = Ústup
+command.idle = Nečinný
 placement.blockselectkeys = \n[lightgray]Klávesa:[] [{0},
 keybind.respawn.name = Znovuzrození
 keybind.control.name = Ovládací jednotka
@@ -718,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Pohyb vodorovně
 keybind.move_y.name = Pohyb svisle
 keybind.mouse_move.name = Následovat myš
-keybind.dash.name = Zrychlení
+keybind.pan.name = Následovat kameru
+keybind.boost.name = Posílení
 keybind.schematic_select.name = Vybrat oblast
 keybind.schematic_menu.name = Nabídka šablon
 keybind.schematic_flip_x.name = Překlopit šablona podle svislé osy
@@ -745,6 +788,9 @@ keybind.diagonal_placement.name = Umisťovat úhlopříčně
 keybind.pick.name = Vybrat blok
 keybind.break_block.name = Rozbít blok
 keybind.deselect.name = Odznačit
+keybind.pickupCargo.name = Vyzvednout náklad
+keybind.dropCargo.name = Položit náklad
+keybind.command.name = Velet
 keybind.shoot.name = Střílet
 keybind.zoom.name = Přiblížení
 keybind.menu.name = Hlavní nabídka
@@ -779,6 +825,7 @@ rules.reactorexplosions = Výbuch reaktoru
 rules.wavetimer = Časovač vln
 rules.waves = Vlny
 rules.attack = Režim útoku
+rules.buildai = Umělá inteligence staví
 rules.enemyCheat = Neomezeně surovin pro umělou inteligenci
 rules.blockhealthmultiplier = Násobek zdraví bloků
 rules.blockdamagemultiplier = Násobek poškození bloků
@@ -800,8 +847,12 @@ rules.title.unit = Jednotky
 rules.title.experimental = Experimentální
 rules.title.environment = Environmentální
 rules.lighting = Světlo
+rules.fire = Výstřel
+rules.explosions = Výbušné poškození bloku/jednotky
 rules.ambientlight = Světlo prostředí
-rules.solarpowermultiplier = Násobek sluneční energie
+rules.weather = Počasí
+rules.weather.frequency = Četnost:
+rules.weather.duration = Trvání:
 
 content.item.name = Předměty
 content.liquid.name = Kapaliny
@@ -827,10 +878,11 @@ liquid.water.name = Voda
 liquid.slag.name = Roztavený kov
 liquid.oil.name = Nafta
 liquid.cryofluid.name = Chladící kapalina
-item.corestorable = [lightgray]Úložné místo v jídře: {0}[]
+
 item.explosiveness = [lightgray]Výbušnost: {0}%[]
 item.flammability = [lightgray]Zápalnost: {0}%[]
 item.radioactivity = [lightgray]Radioaktivita: {0}%[]
+
 unit.health = [lightgray]Životy: {0}[]
 unit.speed = [lightgray]Rychlost: {0}[]
 unit.weapon = [lightgray]Zbraň: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Rychlost těžení: {0}%
 unit.minepower = [lightgray]Těžební síla: {0}
 unit.ability = [lightgray]Schopnost: {0}
 unit.buildspeed = [lightgray]Rychlost stavění: {0}%
+
 liquid.heatcapacity = [lightgray]Teplotní kapacita: {0}[]
 liquid.viscosity = [lightgray]Viskozita: {0}[]
 liquid.temperature = [lightgray]Teplota: {0}[]
 
-block.cliff.name = Cliff
+unit.dagger.name = Dýka
+unit.mace.name = Palcát
+unit.fortress.name = Pevnost
+unit.nova.name = Nova
+unit.pulsar.name = Pulzar
+unit.quasar.name = Kvasar
+unit.crawler.name = Slídil
+unit.atrax.name = Atrax
+unit.spiroct.name = Spirokt
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Záře
+unit.horizon.name = Horizont
+unit.zenith.name = Zenit
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Zatmění
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alfa
+unit.beta.name = Beta
+unit.gamma.name = Gama
+unit.scepter.name = Žezlo
+unit.reign.name = Panovník
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Zásobovací místo
+block.parallax.name = Paralaxa
+block.cliff.name = Útes
 block.sand-boulder.name = Pískovec
 block.grass.name = Tráva
 block.slag.name = Slag
 block.salt.name = Sůl
-block.saltrocks.name = Solný kámen
+block.salt-wall.name = Solné skály
 block.pebbles.name = Oblázky
 block.tendrils.name = Úponky
-block.sandrocks.name = Písečný kámen
+block.sand-wall.name = Písečné skály
 block.spore-pine.name = Spórová borovice
-block.sporerocks.name = Spórové kamení
-block.rock.name = Kámen
-block.snowrock.name = Sněhový kámen
+block.spore-wall.name = Spórové skály
+block.boulder.name = Kámen
+block.snow-boulder.name = Sněhový kámen
 block.snow-pine.name = Sněžná borovice
 block.shale.name = Břidlice
 block.shale-boulder.name = Břidličný balvan
 block.moss.name = Mech
 block.shrubs.name = Křoví
 block.spore-moss.name = Spórový mech
-block.shalerocks.name = Břidlicové kamení
+block.shale-wall.name = Břidlicové skály
 block.scrap-wall.name = Rozpadlá zeď
 block.scrap-wall-large.name = Velká rozpadlá zeď
 block.scrap-wall-huge.name = Obří rozpadlá zeď
@@ -889,14 +978,18 @@ block.snow.name = Sníh
 block.craters.name = Krátery
 block.sand-water.name = Voda s pískem
 block.darksand-water.name = Voda s černým pískem
-block.char.name = Char
-block.holostone.name = Blok kamene
+block.char.name = Dřevěné uhlí
+block.dacite.name = Dacit
+block.dacite-wall.name = Stěna dacitu
 block.ice-snow.name = Zasněžený led
-block.rocks.name = Skály
-block.icerocks.name = Ledové skály
-block.snowrocks.name = Sněhové skály
-block.dunerocks.name = Písečné duny
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ledové skály
+block.snow-wall.name = Sněhové skály
+block.dune-wall.name = Písečné duny
 block.pine.name = Borovice
+block.dirt.name = Hlína
+block.dirt-wall.name = Kopec hlíny
+block.mud.name = Bláto
 block.white-tree-dead.name = Bílá souška
 block.white-tree.name = Bílý strom
 block.spore-cluster.name = Shluk spór
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Tmavá deska 4
 block.dark-panel-5.name = Tmavá deska 5
 block.dark-panel-6.name = Tmavá deska 6
 block.dark-metal.name = Tmavý kov
-block.ignarock.name = Třaskavec
+block.basalt.name = Čedič
 block.hotrock.name = Horký kámen
 block.magmarock.name = Magmatický kámen
-block.cliffs.name = Útesy
 block.copper-wall.name = Měděná zeď
 block.copper-wall-large.name = Velká měděná zeď
 block.titanium-wall.name = Titanová zeď
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Brána s podtokem
 block.silicon-smelter.name = Křemíková huť
 block.phase-weaver.name = Tkalcovna pro fázovou tkaninu
 block.pulverizer.name = Rozmělňovač
-block.cryofluidmixer.name = Míchačka na chladící kapalinu
+block.cryofluid-mixer.name = Míchačka na chladící kapalinu
 block.melter.name = Tavírna
 block.incinerator.name = Spalovna
 block.spore-press.name = Lis na spóry
@@ -964,7 +1056,7 @@ block.diode.name = Bateriová dioda
 block.battery.name = Baterie
 block.battery-large.name = Velká baterie
 block.combustion-generator.name = Spalovací generátor
-block.turbine-generator.name = Turbínový generátor
+block.steam-generator.name = Turbínový generátor
 block.differential-generator.name = Rozdílový Generator
 block.impact-reactor.name = Rázový reaktor
 block.mechanical-drill.name = Mechanický vrt
@@ -994,7 +1086,6 @@ block.blast-mixer.name = Míchačka na výbušninu
 block.solar-panel.name = Solární panel
 block.solar-panel-large.name = Velký solární panel
 block.oil-extractor.name = Vrt na naftu
-block.command-center.name = Řídící středisko
 block.repair-point.name = Opravovací bod
 block.pulse-conduit.name = Pulzní potrubí
 block.plated-conduit.name = Plátované potrubí
@@ -1027,18 +1118,28 @@ block.container.name = Kontejnér
 block.launch-pad.name = Vysílací plošina
 block.launch-pad-large.name = Velká vysílací plošina
 block.segment.name = Úsek
+block.command-center.name = Velín
 block.ground-factory.name = Pozemní továrna
 block.air-factory.name = Letecká továrna
 block.naval-factory.name = Námořní továrna
 block.additive-reconstructor.name = Přídavný přestavbovač
 block.multiplicative-reconstructor.name = Násobný přestavbovač
 block.exponential-reconstructor.name = Exponenciální přestavbovač
-block.tetrative-reconstructor.name = Umocňující přestavbovač
-block.mass-conveyor.name = Hromadný dopravník
+block.tetrative-reconstructor.name = Mocninný přestavbovač
+block.payload-conveyor.name = Dopravník nákladu
 block.payload-router.name = Směřovač nákladu
 block.disassembler.name = Rozebírač
-block.silicon-crucible.name = Křemíková nádoba
-block.large-overdrive-projector.name = Velký urychlující projektor 
+block.silicon-crucible.name = Tavicí tyglík pro křemík
+block.overdrive-dome.name = Velká urychlující kupole 
+
+block.switch.name = Přepínač
+block.micro-processor.name = Mikroprocesor
+block.logic-processor.name = Logický procesor
+block.hyper-processor.name = Hyperprocesor
+block.logic-display.name = Zobrazovač logiky
+block.large-logic-display.name = Velký zobrazovač logiky
+block.memory-cell.name = Paměťová buňka
+
 team.blue.name = modrý
 team.crux.name = červený
 team.sharded.name = oranžový
@@ -1046,21 +1147,7 @@ team.orange.name = oranžový
 team.derelict.name = opuštěný
 team.green.name = zelený
 team.purple.name = fialový
-unit.spirit.name = Opravovací dron Spirit
-unit.draug.name = Těžící dron Dragoun
-unit.phantom.name = Stavící drom Fantóm
-unit.dagger.name = Mech Dýka
-unit.crawler.name = Mech Slídil
-unit.titan.name = Mech Titán
-unit.ghoul.name = Bombardér Ghúl
-unit.wraith.name = Stíhačka Přízrak
-unit.fortress.name = Mech Pevnost
-unit.revenant.name = Stíhačka Mstitel
-unit.eruptor.name = Lávovec
-unit.chaos-array.name = Čirý chaos
-unit.eradicator.name = Likvidátor
-unit.lich.name = Kostěj nesmrtelný
-unit.reaper.name = Rozparovač
+
 tutorial.next = [lightgray]<Klikni pro pokračování>
 tutorial.intro = Vítej ve [scarlet]výuce Mindustry[]. Zde se dozvíš základy hraní.\nPoznámka: výuka předpokládá [accent]výchozí klávesy[] v nastavení, pokud jsi je změnil, bude třeba to vzít v potaz.\nPoužij [accent][[WASD][] pro pohyb a [accent]kolečko myši[] pro přibližování a oddalování.\nZačni [accent]těžením mědi[]. Přibliž se k měděné žíle u Tvého jádra a klikni na ni pro zahájení těžby.\n\n[accent]{0}/{1} mědi[]
 tutorial.intro.mobile = Vítej ve [scarlet]výuce Mindustry[].\nPohybuj se táhnutím prstem do strany.\nPřibližuj a oddaluj mapu [accent]2 prsty[].\nZačni [accent] těžením mědi[]. Přibliž se k měděné žíle u Tvého jádra a ťupni na ni pro zahájení těžby.\n\n[accent]{0}/{1} mědi[]
@@ -1103,17 +1190,7 @@ liquid.water.description = Nejužitečnější kapalina. Hojně využívaná jak
 liquid.slag.description = Různé různé druhy roztaveného kovu smíchané dohromady. Lze je rozdělit na jednotlivé minerály, nebo se tato slitina dá použít jako munice při střílení na nepřátelské jednotky.
 liquid.oil.description = Kapalina použitá při pokročilé výrobě materiálů. Může být přeměněna na uhlí, nebo při rozprášení a zapálení použita jako zbraň.
 liquid.cryofluid.description = Netečná, nereznoucí kapalina, vytvořená z vody a titanu. Má extrémně vysokou tepelnou kapacitu. Hojně se používá jako chladicí kapalina.
-unit.draug.description = Jednoduchý těžící dron. Levný a postradatelný. Automaticky těží měď a olovo ve své blízkosti. Natěžené suroviny donese do nejbližšího jádra.
-unit.spirit.description = Modifikovaný dron Dragoun, upravený pro opravu staveb, namísto těžení. Automaticky opravuje poškozené bloky v oblasti svého působení.
-unit.phantom.description = Pokročilý dron. Následuje uživatele. Pomáhá při stavění. Znovu staví zničené bloky.
-unit.dagger.description = Základní pozemní jednotka. Levná výroba. Zdrcující ve velkém houfu.
-unit.crawler.description = Pozemní jednotka sestávající z oholené železné kostry s přilepenými výbušninami. Vydrží málo a exploduje při kontaktu s nepřáteli.
-unit.titan.description = Vyspělá obrněná pozemní jednotka. Útočí jak na pozemní, tak vzdušné nepřátelské cíle. Je vybavena dvěma změnšenými plamenomety třídy Palivec.
-unit.fortress.description = Těžký dělostřelecký mech. Je vybaven dvěma upravenými kanóny typu Kroupomet pro útok dalekého dosahu proti nepřátelským jednotkám a stavbám.
-unit.eruptor.description = Těžký mech navržený na ničení budov. Pálí proudy rozžhaveného kovu na nepřátelská opevnění. Taví a zapaluje vše v cestě.
-unit.wraith.description = Rychlá stíhačka pro bleskové útoky. Cílí na generátory energie.
-unit.ghoul.description = Těžký bombardér pro kobercový nálet. Trhá nepřátelské struktury, cílí na kritickou infrastrukturu.
-unit.revenant.description = Těžký vznášející se mrak raket.
+
 block.message.description = Ukládá zprávu. Používá se pro komunikaci mezi spojenci.
 block.graphite-press.description = Přeměňuje neforemné kusy uhlí do ušlechtilých výlisků grafitu.
 block.multi-press.description = Vylepšená verze lisu na grafit. Využívá vodu a energii k rychlejšímu a efektivnějšímu zpracování uhlí.
@@ -1122,7 +1199,7 @@ block.kiln.description = Taví písek a olovo na směs známou jako metasklo. Vy
 block.plastanium-compressor.description = Produkuje plastanu z titanu a nafty.
 block.phase-weaver.description = Produkuje fázovou tkaninu z radioaktivního thoria a písku. Spotřebuje k tomu výrazné množství energie.
 block.alloy-smelter.description = Produkuje rázovou slitinu z titanu, olova, křemíku a mědi.
-block.cryofluidmixer.description = Míchá vodu a jemný titanová prášek do chladící kapaliny, nezbytné například pro thoriový reaktor.
+block.cryofluid-mixer.description = Míchá vodu a jemný titanová prášek do chladící kapaliny, nezbytné například pro thoriový reaktor.
 block.blast-mixer.description = Drtí a míchá shluky spór s pyratitem, čímž vzniká výbušnina.
 block.pyratite-mixer.description = Míchá uhlí, olovo a písek do vysoce hořlavého pyratitu.
 block.melter.description = Taví šrot do roztaveného kovu pro další zpracování, nebo pro munici do střílny Vlna.
@@ -1158,7 +1235,7 @@ block.force-projector.description = Vytvoří okolo sebe šestihrané silové po
 block.shock-mine.description = Působí poškození nepřátelským jednotkám při sešlápnutí. Takřka neviditelné pro nepřátele (a i v nabídce bloků :) ).
 block.conveyor.description = Základní blok pro přepravu předmětů. Unáší předměty kupředu a automaticky plní vhodná úložiště (budovy, kontejnery, jádro), které po cestě potká. Lze jej otáčet dle potřeby.
 block.titanium-conveyor.description = Pokročilý blok pro přepravu předmětů. Přenáší předměty rychleji, než základní dopravník.
-block.plastanium-conveyor.description = Přesouvá položky v dávkích.\nPřijímá položky zezadu, a vykládá je do tří směrů vepředu.
+block.plastanium-conveyor.description = Přesouvá položky v dávkích.\nPřijímá položky zezadu, a vykládá je do tří směrů vepředu.\nPro špičkový průchod vyžaduje několik nakládacích a vykládacích míst.
 block.junction.description = Chová se jako most pro dva křížící se pásy dopravníků. Užitečný při situaci, kdy dva rozdílné dopravníky dopravují dva rozdílné materiály přes jedno pole.
 block.bridge-conveyor.description = Pokročilý blok pro přepravu předmětů. Dovoluje transport předmětů až přes tři pole, a to přes jakýkoliv terén nebo budovu.
 block.phase-conveyor.description = Pokročilý blok pro přepravu předmětů. Využívá energii k teleportaci předmětů na vzdálenost několika dlaždic mezi jiným propojeným fázovým dopravníkem.
@@ -1188,7 +1265,7 @@ block.battery.description = Ukládá energii v případě nadbytku v síti a pos
 block.battery-large.description = Ukládá více energie, než základní baterie.
 block.combustion-generator.description = Generuje energii spalováním hořlaných materiálů, jako je například uhlí.
 block.thermal-generator.description = Pokud je umístěn na teplotně aktivní místo (jako je magmatický kámen), dokáže z tepla generovat energii.
-block.turbine-generator.description = Pokročilý spalovací generátor. Efektivnější, ale vyžaduje dodatečný přísun vody pro produkci páry.
+block.steam-generator.description = Pokročilý spalovací generátor. Efektivnější, ale vyžaduje dodatečný přísun vody pro produkci páry.
 block.differential-generator.description = Generuje velké množství energie. Využívá teplotního rozdílu mezi chladící kapalinou a hořícím pyratitem.
 block.rtg-generator.description = Radioizotopní termoenergetický generátor (RTG) je jednoduchý, spolehlivý generátor. Využívá tepla z rozpadu radioaktivních složek ke generování menších dávek energie.
 block.solar-panel.description = Základní solární panel pro generování malého množství energie ze Slunce.
@@ -1224,6 +1301,5 @@ block.ripple.description = Extrémně silná dělostřelecká střílna. Pálí
 block.cyclone.description = Velká protiletecká a protipozemní střílna. Pálí explodující dávky na nepřítele v okolí.
 block.spectre.description = Velká střílna s kanónem s dvěma hlavněmi. Střílí velké náboje, které pronikají brněním jak pozemních, tak vzdušných nepřátelských cílů.
 block.meltdown.description = Masivní laserový kanón. Nabije se a pak pálí nepřetržitý laserový paprsek na nepřátele v okolí. Vyžaduje ke své funkci chlazení.
-block.command-center.description = Vydává příkazy spojeneckým jednotkám na mapě.\nInstruuje jednotky k útoku na nepřátelské jádro, návratu do jádra nebo továrny a ke shromáždění se. Pokud se na mapě nepřátelské jádro nenachází, jednotky budou v útočném režimu držet hlídku.
 block.repair-point.description = Nepřetržitě léčí nejbližší poškozenou jednotku v poli své působnosti.
-
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 7f67c2e5c9..0e9d2ce889 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io side med PC downloads
 link.google-play.description = Google Play store
 link.f-droid.description = F-Droid katalog
 link.wiki.description = Det officielle Mindustry wiki
-link.feathub.description = Foreslå nye ændringer
+link.suggestions.description = Foreslå nye ændringer
 linkfail = Kunne ikke åbne link!\n Linkets URL er kopieret til din udklipsholder.
 screenshot = Screenshot gemt i {0}
 screenshot.invalid = Banen er for stor, der er ikke nok hukommelse til screenshot.
@@ -20,6 +20,8 @@ gameover = Game Over
 gameover.pvp = [accent] {0}[] hold har vundet!
 highscore = [accent]Ny highscore!
 copied = kopieret.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Lyd
 load.map = Bane
@@ -40,6 +42,7 @@ schematic = Skabelon
 schematic.add = Gem skabelon...
 schematics = Skabeloner
 schematic.replace = En skabelon med det navn eksistere allerede. Vil du erstatte den?
+schematic.exists = A schematic by that name already exists.
 schematic.import = Importer skabelon...
 schematic.exportfile = Exporter Fil
 schematic.importfile = Importer Fil
@@ -62,13 +65,11 @@ stat.delivered = Ressourcer afsendt:
 stat.playtime = Spilletid:[accent] {0}
 stat.rank = Endelig Rang: [accent]{0}
 
-launcheditems = [accent]Afsendte genstande
-launchinfo = [unlaunched][[LAUNCH] din kerne for at modtage genstandene vist i blå.
+globalitems = [accent]Global Items
 map.delete = Er du sikker på at du vil slette banen"[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
 level.select = Vælg bane
 level.mode = Spiltilstand:
-showagain = Vis ikke igen
 coreattack = < Kerne er under angreb!! >
 nearpoint = [[ [scarlet]FORLAD INVASIONSZONE OMGÅENDE[] ]\n Fare for udslettelse
 database = Kerne database
@@ -105,12 +106,16 @@ mods.none = [LIGHT_GRAY]Ingen mods fundet!
 mods.guide = Modding guide
 mods.report = Reportér fejl
 mods.openfolder = Åben mod mappe
+mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktiveret
 mod.disabled = [scarlet]Deaktiveret
 mod.disable = Deaktiver
+mod.content = Content:
 mod.delete.error = Kan ikke slette mod. Filer er muligvis i brug.
 mod.requiresversion = [scarlet]Behøver minimal spil version: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Mangler afhængigheder: {0}
 mod.erroredcontent = [scarlet]Indholds fejl
 mod.errors = Fejl ved afhentning af indhold.
@@ -120,18 +125,22 @@ mod.enable = Aktiver
 mod.requiresrestart = Spillet vil nu lukke for at tilføje mod ændringerne
 mod.reloadrequired = [scarlet]Genindlæsning påkrævet
 mod.import = Importer Mod
+mod.import.file = Import File
 mod.import.github = Importer GitHub Mod
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Denne genstand er tilføjet af [accent] '{0}'[] mod. Afinstaller mod for at fjerne den.
 mod.remove.confirm = Dette mod vil blive slettet.
 mod.author = [LIGHT_GRAY]Forfatter:[] {0}
 mod.missing = Dette spil benytter mods som ikke er tilgængelige. Er du sikker på at du vil hente det? Dette kan medfører fejl i spillet\n[lightgray]Mods:\n{0}
 mod.preview.missing = Før du offentliggøre dette mod i workshoppen, skal du tilføje et billede.\nPlacer billedet i moddets mappe under navnet [accent] preview.png[] og forsøg igen.
 mod.folder.missing = Kun mods i mappe-form kan offentliggøres til workshoppen.\nFor at konverter etvært mod til en mappe, udpak .zip-filen i en mappe and slet den herefter, genstart efterfølgende dit spil eller genindlæs dine mods.
-mod.scripts.unsupported = Din enhed understøtter ikke mod scripts. Nogle mods vil ikke fungere korrekt.
+mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
 
 about.button = Om
 name = Navn:
 noname = Vælg et[accent] spiller navn[] først.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Fil navn:
 unlocked = Nyt indhold tilgængeligt!
 completed = [accent]Færdiggjort
@@ -139,8 +148,11 @@ techtree = Teknologi træ
 research.list = [lightgray]Forskning:
 research = Udforsk
 researched = [lightgray]{0} Udforsket.
+research.progress = {0}% complete
 players = {0} spillere
 players.single = {0} spiller
+players.search = search
+players.notfound = [gray]no players found
 server.closing = [accent]Lukker server...
 server.kicked.kick = Du er blevet kicked fra serveren!
 server.kicked.whitelist = Du er ikke whitelisted her.
@@ -159,7 +171,7 @@ server.kicked.customClient = Denne server understøtter ikke brugerdefineret ver
 server.kicked.gameover = Game over!
 server.kicked.serverRestarting = Server genstarter.
 server.versions = Din version:[accent] {0}[]\nServer version:[accent] {1}[]
-host.info = [accent]Afhold[] knappen starter en server på port [scarlet]6567[]. \Enhver på samme [lightgray]wifi elle lokalt netværk[] burde kunne se din server i deres server liste.\n\n[accent]Port forwarding[]er påkrævet. Hvis du ønsker at spillere fra hele verden skal kunne forbinde med IP\n\n[lightgray]Note: Hvis nogen har problemer med at forbinde til din LAN server, sørg for at you har tilladt Mindustry adgang til dit lokale netværk i dine firewall indstillinger.
+host.info = [accent]Afhold[] knappen starter en server på port [scarlet]6567[]. Enhver på samme [lightgray]wifi elle lokalt netværk[] burde kunne se din server i deres server liste.\n\n[accent]Port forwarding[]er påkrævet. Hvis du ønsker at spillere fra hele verden skal kunne forbinde med IP\n\n[lightgray]Note: Hvis nogen har problemer med at forbinde til din LAN server, sørg for at you har tilladt Mindustry adgang til dit lokale netværk i dine firewall indstillinger.
 join.info = Her kan du forbinde til en [accent]server IP[], eller finde [accent]lokal netværk[] servers.\nBåde LAN og WAN multiplayer understøttes.\n\n[lightgray]Note: Der er ingen automatisk global server liste; Hvis du ønsker at forbinde til nogen med IP, skal du spørge værten om serverens IP.
 hostserver = Afhold Multiplayer Spil
 invitefriends = Inviter venner
@@ -205,9 +217,8 @@ joingame.title = Deltag i spil
 joingame.ip = Addresse:
 disconnect = Afbryd forbindelse
 disconnect.error = Forbindelses fejl.
-disconnect.closed =  Forbindelse afbrudt.
+disconnect.closed = Forbindelse afbrudt.
 disconnect.timeout = Maksimal ventetid overskredet.
-#MesterArz
 disconnect.data = Failed to load world data!
 cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connecting...
@@ -220,7 +231,6 @@ save.new = New Save
 save.overwrite = Are you sure you want to overwrite\nthis save slot?
 overwrite = Overwrite
 save.none = No saves found!
-saveload = Saving...
 savefail = Failed to save game!
 save.delete.confirm = Are you sure you want to delete this save?
 save.delete = Delete
@@ -263,13 +273,12 @@ data.openfolder = Open Data Folder
 data.exported = Data exported.
 data.invalid = This isn't valid game data.
 data.import.confirm = Importing external data will overwrite[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
-classic.export = Export Classic Data
-classic.export.text = [accent]Mindustry[] has just had a major update.\nClassic (v3.5 build 40) save or map data has been detected. Would you like to export these saves to your phone's home folder, for use in the Mindustry Classic app?
 quit.confirm = Are you sure you want to quit?
 quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Loading...
 reloading = [accent]Reloading Mods...
 saving = [accent]Saving...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
@@ -326,8 +335,9 @@ waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
 waves.perspawn = per spawn
+waves.shields = shields/wave
 waves.to = to
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
 waves.copy = Copy to Clipboard
@@ -335,6 +345,11 @@ waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
@@ -400,6 +415,8 @@ toolmode.drawteams.description = Draw teams instead of blocks.
 filters.empty = [lightgray]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
+filter.enemyspawn = Enemy Spawn Select
+filter.corespawn = Core Select
 filter.median = Median
 filter.oremedian = Ore Median
 filter.blend = Blend
@@ -419,6 +436,7 @@ filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
 filter.option.angle = Angle
+filter.option.amount = Amount
 filter.option.block = Block
 filter.option.floor = Floor
 filter.option.flooronto = Target Floor
@@ -451,10 +469,12 @@ locked = Locked
 complete = [lightgray]Complete:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
-requirement.unlock = Unlock {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Resume Zone:\n[lightgray]{0}
 bestwave = [lightgray]Best Wave: {0}
 launch = < LAUNCH >
+launch.text = Launch
 launch.title = Launch Successful
 launch.next = [lightgray]next opportunity at wave {0}
 launch.unable2 = [scarlet]Unable to LAUNCH.[]
@@ -462,13 +482,14 @@ launch.confirm = This will launch all resources in your core.\nYou will not be a
 launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = Add All
-configure.locked = [lightgray]Unlock configuring loadout: {0}.
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Requirement for {0} completed:[lightgray]\n{1}
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = [lightgray]Resources Detected:
 zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
@@ -487,35 +508,43 @@ error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
-zone.groundZero.name = Ground Zero
-zone.desertWastes.name = Desert Wastes
-zone.craters.name = The Craters
-zone.frozenForest.name = Frozen Forest
-zone.ruinousShores.name = Ruinous Shores
-zone.stainedMountains.name = Stained Mountains
-zone.desolateRift.name = Desolate Rift
-zone.nuclearComplex.name = Nuclear Production Complex
-zone.overgrowth.name = Overgrowth
-zone.tarFields.name = Tar Fields
-zone.saltFlats.name = Salt Flats
-zone.impact0078.name = Impact 0078
-zone.crags.name = Crags
-zone.fungalPass.name = Fungal Pass
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
-zone.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
-zone.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
-zone.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
-zone.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
-zone.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
-zone.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
-zone.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
-zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
-zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
-zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Language
 settings.data = Game Data
@@ -529,14 +558,18 @@ settings.graphics = Graphics
 settings.cleardata = Clear Game Data...
 settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone!
 settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Paused >
 clear = Clear
 banned = [scarlet]Banned
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Yes
 no = No
 info.title = Info
 error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
+unit.nobuild = [scarlet]Unit can't build
 blocks.input = Input
 blocks.output = Output
 blocks.booster = Booster
@@ -552,8 +585,11 @@ blocks.itemsmoved = Move Speed
 blocks.launchtime = Time Between Launches
 blocks.shootrange = Range
 blocks.size = Size
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Liquid Capacity
 blocks.powerrange = Power Range
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
@@ -569,13 +605,18 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
 blocks.ammo = Ammo
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Better Drill Required
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
@@ -585,11 +626,12 @@ bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
 bar.progress = Build Progress
-bar.spawned = Units: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -613,12 +655,16 @@ unit.liquidunits = liquid units
 unit.powerunits = power units
 unit.degrees = degrees
 unit.seconds = seconds
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x speed
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = items
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = General
 category.power = Power
 category.liquids = Liquids
@@ -631,10 +677,13 @@ setting.shadows.name = Shadows
 setting.blockreplace.name = Automatic Block Suggestions
 setting.linear.name = Linear Filtering
 setting.hints.name = Hints
+setting.flow.name = Display Resource Flow Rate
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animated Water
 setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
+setting.playerindicators.name = Player Indicators
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
@@ -653,8 +702,8 @@ setting.difficulty.name = Difficulty:
 setting.screenshake.name = Screen Shake
 setting.effects.name = Display Effects
 setting.destroyedblocks.name = Display Destroyed Blocks
+setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Save Interval
 setting.seconds = {0} seconds
@@ -663,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
 setting.fps.name = Show FPS & Ping
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate
 setting.minimap.name = Show Minimap
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Music Volume
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
@@ -691,19 +743,25 @@ keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only
 category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
+category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Clear Building
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.toggle_power_lines.name = Toggle Power Lasers
+keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Move X
 keybind.move_y.name = Move Y
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Dash
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -730,6 +788,9 @@ keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Shoot
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -764,38 +825,39 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
+rules.buildai = AI Building
 rules.enemyCheat = Infinite AI (Red Team) Resources
-rules.unitdrops = Unit Drops
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Player Health Multiplier
-rules.playerdamagemultiplier = Player Damage Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
-rules.respawntime = Respawn Time:[lightgray] (sec)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
+rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves Wait for Enemies
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
-rules.respawns = Max respawns per wave
-rules.limitedRespawns = Limit Respawns
+rules.unitammo = Units Require Ammo
 rules.title.waves = Waves
-rules.title.respawns = Respawns
 rules.title.resourcesbuilding = Resources & Building
-rules.title.player = Players
 rules.title.enemy = Enemies
 rules.title.unit = Units
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
 content.block.name = Blocks
-content.mech.name = Mechs
 item.copper.name = Copper
 item.lead.name = Lead
 item.coal.name = Coal
@@ -816,62 +878,80 @@ liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
-mech.alpha-mech.name = Alpha
-mech.alpha-mech.weapon = Heavy Repeater
-mech.alpha-mech.ability = Regeneration
-mech.delta-mech.name = Delta
-mech.delta-mech.weapon = Arc Generator
-mech.delta-mech.ability = Discharge
-mech.tau-mech.name = Tau
-mech.tau-mech.weapon = Restruct Laser
-mech.tau-mech.ability = Repair Burst
-mech.omega-mech.name = Omega
-mech.omega-mech.weapon = Swarm Missiles
-mech.omega-mech.ability = Armored Configuration
-mech.dart-ship.name = Dart
-mech.dart-ship.weapon = Repeater
-mech.javelin-ship.name = Javelin
-mech.javelin-ship.weapon = Burst Missiles
-mech.javelin-ship.ability = Discharge Booster
-mech.trident-ship.name = Trident
-mech.trident-ship.weapon = Bomb Bay
-mech.glaive-ship.name = Glaive
-mech.glaive-ship.weapon = Flame Repeater
-item.corestorable = [lightgray]Storable in Core: {0}
+
 item.explosiveness = [lightgray]Explosiveness: {0}%
 item.flammability = [lightgray]Flammability: {0}%
 item.radioactivity = [lightgray]Radioactivity: {0}%
+
 unit.health = [lightgray]Health: {0}
 unit.speed = [lightgray]Speed: {0}
-mech.weapon = [lightgray]Weapon: {0}
-mech.health = [lightgray]Health: {0}
-mech.itemcapacity = [lightgray]Item Capacity: {0}
-mech.minespeed = [lightgray]Mining Speed: {0}%
-mech.minepower = [lightgray]Mining Power: {0}
-mech.ability = [lightgray]Ability: {0}
-mech.buildspeed = [lightgray]Building Speed: {0}%
+unit.weapon = [lightgray]Weapon: {0}
+unit.itemcapacity = [lightgray]Item Capacity: {0}
+unit.minespeed = [lightgray]Mining Speed: {0}%
+unit.minepower = [lightgray]Mining Power: {0}
+unit.ability = [lightgray]Ability: {0}
+unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viscosity: {0}
 liquid.temperature = [lightgray]Temperature: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
+block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
 block.grass.name = Grass
+block.slag.name = Slag
 block.salt.name = Salt
-block.saltrocks.name = Salt Rocks
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pebbles
 block.tendrils.name = Tendrils
-block.sandrocks.name = Sand Rocks
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spore Pine
-block.sporerocks.name = Spore Rocks
-block.rock.name = Rock
-block.snowrock.name = Snow Rock
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
 block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
-block.shalerocks.name = Shale Rocks
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -899,13 +979,17 @@ block.craters.name = Craters
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ice Snow
-block.rocks.name = Rocks
-block.icerocks.name = Ice rocks
-block.snowrocks.name = Snow Rocks
-block.dunerocks.name = Dune Rocks
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pine
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
@@ -921,10 +1005,9 @@ block.dark-panel-4.name = Dark Panel 4
 block.dark-panel-5.name = Dark Panel 5
 block.dark-panel-6.name = Dark Panel 6
 block.dark-metal.name = Dark Metal
-block.ignarock.name = Igna Rock
+block.basalt.name = Basalt
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
-block.cliffs.name = Cliffs
 block.copper-wall.name = Copper Wall
 block.copper-wall-large.name = Large Copper Wall
 block.titanium-wall.name = Titanium Wall
@@ -944,6 +1027,7 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.plastanium-conveyor.name = Plastanium Conveyor
 block.armored-conveyor.name = Armored Conveyor
 block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyor belts.
 block.junction.name = Junction
@@ -959,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Pulverizer
-block.cryofluidmixer.name = Cryofluid Mixer
+block.cryofluid-mixer.name = Cryofluid Mixer
 block.melter.name = Melter
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
@@ -972,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Steam Generator
+block.steam-generator.name = Steam Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -980,13 +1064,6 @@ block.pneumatic-drill.name = Pneumatic Drill
 block.laser-drill.name = Laser Drill
 block.water-extractor.name = Water Extractor
 block.cultivator.name = Cultivator
-block.dart-mech-pad.name = Alpha Mech Pad
-block.delta-mech-pad.name = Delta Mech Pad
-block.javelin-ship-pad.name = Javelin Ship Pad
-block.trident-ship-pad.name = Trident Ship Pad
-block.glaive-ship-pad.name = Glaive Ship Pad
-block.omega-mech-pad.name = Omega Mech Pad
-block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = Conduit
 block.mechanical-pump.name = Mechanical Pump
 block.item-source.name = Item Source
@@ -1009,17 +1086,6 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
-block.command-center.name = Command Center
-block.draug-factory.name = Draug Miner Drone Factory
-block.spirit-factory.name = Spirit Repair Drone Factory
-block.phantom-factory.name = Phantom Builder Drone Factory
-block.wraith-factory.name = Wraith Fighter Factory
-block.ghoul-factory.name = Ghoul Bomber Factory
-block.dagger-factory.name = Dagger Mech Factory
-block.crawler-factory.name = Crawler Mech Factory
-block.titan-factory.name = Titan Mech Factory
-block.fortress-factory.name = Fortress Mech Factory
-block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Repair Point
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
@@ -1051,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = blue
 team.crux.name = red
 team.sharded.name = orange
@@ -1058,21 +1147,7 @@ team.orange.name = orange
 team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
-unit.spirit.name = Spirit Repair Drone
-unit.draug.name = Draug Miner Drone
-unit.phantom.name = Phantom Builder Drone
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
-unit.wraith.name = Wraith Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse[accent] [[WASD][] to move.\n[accent]Scroll[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1115,25 +1190,7 @@ liquid.water.description = The most useful liquid. Commonly used for cooling mac
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = A liquid used in advanced material production. Can be converted into coal as fuel, or sprayed and set on fire as a weapon.
 liquid.cryofluid.description = An inert, non-corrosive liquid created from water and titanium. Has extremely high heat capacity. Extensively used as coolant.
-mech.alpha-mech.description = The standard control mech. Based on a Dagger unit, with upgraded armor and building capabilities. Has more damage output than a Dart ship.
-mech.delta-mech.description = A fast, lightly-armored mech made for hit-and-run attacks. Does little damage against structures, but can kill large groups of enemy units very quickly with its arc lightning weapons.
-mech.tau-mech.description = The support mech. Heals allied blocks by shooting at them. Can heal allies in a radius with its repair ability.
-mech.omega-mech.description = A bulky and well-armored mech, made for front-line assaults. Its armor can block up to 90% of incoming damage.
-mech.dart-ship.description = The standard control ship. Fast mining speed. Reasonably fast and light, but has little offensive capability.
-mech.javelin-ship.description = A hit-and-run strike ship. While initially slow, it can accelerate to great speeds and fly by enemy outposts, dealing large amounts of damage with its lightning and missiles.
-mech.trident-ship.description = A heavy bomber, built for construction and destroying enemy fortifications. Reasonably well armored.
-mech.glaive-ship.description = A large, well-armored gunship. Equipped with an incendiary repeater. Highly maneuverable.
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
-unit.spirit.description = A modified draug drone, designed for repair instead of mining. Automatically fixes any damaged blocks in the area.
-unit.phantom.description = An advanced drone unit. Follows users. Assists in block construction.
-unit.dagger.description = The most basic ground mech. Cheap to produce. Overwhelming when used in swarms.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
-unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets. Equipped with two miniature Scorch-class flamethrowers.
-unit.fortress.description = A heavy artillery mech. Equipped with two modified Hail-type cannons for long-range assault on enemy structures and units.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
-unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critical infrastructure.
-unit.revenant.description = A heavy, hovering missile array.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
@@ -1142,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function.
 block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy.
-block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
+block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
 block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets.
@@ -1178,6 +1235,7 @@ block.force-projector.description = Creates a hexagonal force field around itsel
 block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
 block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into blocks. Rotatable.
 block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
+block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.
 block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
@@ -1207,7 +1265,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.
@@ -1243,22 +1301,5 @@ block.ripple.description = An extremely powerful artillery turret. Shoots cluste
 block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produces Spirit structural repair drones.
-block.phantom-factory.description = Produces advanced construction drones.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
-block.ghoul-factory.description = Produces heavy carpet bombers.
-block.revenant-factory.description = Produces heavy missile-based units.
-block.dagger-factory.description = Produces basic ground units.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produces advanced, armored ground units.
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
-block.dart-mech-pad.description = Provides transformation into a basic attack mech.\nUse by tapping while standing on it.
-block.delta-mech-pad.description = Provides transformation into a lightly armored hit-and-run attack mech.\nUse by tapping while standing on it.
-block.tau-mech-pad.description = Provides transformation into an advanced support mech.\nUse by tapping while standing on it.
-block.omega-mech-pad.description = Provides transformation into a heavily-armored missile mech.\nUse by tapping while standing on it.
-block.javelin-ship-pad.description = Provides transformation into a quick, lightly-armored interceptor.\nUse by tapping while standing on it.
-block.trident-ship-pad.description = Provides transformation into a heavy support bomber.\nUse by tapping while standing on it.
-block.glaive-ship-pad.description = Provides transformation into a large, well-armored gunship.\nUse by tapping while standing on it.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 9f24ba236b..67311e3451 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io-Seite mit Downloads und der Web-Version des S
 link.google-play.description = Google Play Store-Seite
 link.f-droid.description = F-Droid-Seite
 link.wiki.description = Offizelles Mindustry-Wiki
-link.feathub.description = Neue Ideen einbringen
+link.suggestions.description = Neue Ideen einbringen
 linkfail = Fehler beim Öffnen des Links!\nDie URL wurde in die Zwischenablage kopiert.
 screenshot = Screenshot gespeichert unter {0}
 screenshot.invalid = Karte zu groß! Eventuell nicht ausreichend Arbeitsspeicher für Screenshot.
@@ -20,6 +20,8 @@ gameover = Der Kern wurde zerstört.
 gameover.pvp = Das[accent] {0}[] Team ist siegreich!
 highscore = [accent]Neuer Highscore!
 copied = Kopiert.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Audio
 load.map = Karten
@@ -63,8 +65,7 @@ stat.delivered = Übertragene Ressourcen:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Finaler Rang:[accent] {0}
 
-launcheditems = [accent]Abgefeuerte Items
-launchinfo = [unlaunched][[LAUNCH] deine Basis um blau markierte Items zu erhalten.
+globalitems = [accent]Global Items
 map.delete = Bist du sicher, dass du die Karte "[accent]{0}[]" löschen möchtest?
 level.highscore = Highscore: [accent]{0}
 level.select = Level-Auswahl
@@ -106,6 +107,7 @@ mods.guide = Modding-Anleitung
 mods.report = Problem melden
 mods.openfolder = Mod-Verzeichnis öffnen
 mods.reload = Neu laden
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktiviert
 mod.disabled = [scarlet]Deaktiviert
@@ -113,6 +115,7 @@ mod.disable = Deaktivieren
 mod.content = Content:
 mod.delete.error = Unfähig Mod zu löschen. Datei könnte in Benutzung sein.
 mod.requiresversion = [scarlet]Benötigt mindestens Version:[accent] {0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Fehlende Abhängigkeiten: {0}
 mod.erroredcontent = [scarlet]Inhalt-Fehler
 mod.errors = Beim Laden von Inhalt sind Fehler aufgetreten.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Neuladen benötigt
 mod.import = Mod importieren
 mod.import.file = Import File
 mod.import.github = GitHub-Mod importieren
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = Dieser Mod wird gelöscht.
 mod.author = [lightgray]Autor:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Ihr Gerät unterstüzt keine Mods mit Scripts. Du musst di
 about.button = Info
 name = Name:
 noname = Wähle zunächst einen[accent] Spielernamen[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Dateiname:
 unlocked = Neuer Inhalt freigeschaltet!
 completed = [accent]Abgeschlossen
@@ -142,6 +148,7 @@ techtree = Forschung
 research.list = [lightgray]Forschung:
 research = Erforschen
 researched = [lightgray]{0} erforscht.
+research.progress = {0}% complete
 players = {0} Spieler online
 players.single = {0} Spieler online
 players.search = search
@@ -224,7 +231,6 @@ save.new = Neuer Spielstand
 save.overwrite = Möchtest du diesen Spielstand wirklich überschreiben?
 overwrite = Überschreiben
 save.none = Keine Spielstände gefunden!
-saveload = [accent]Speichern...
 savefail = Fehler beim Speichern des Spiels!
 save.delete.confirm = Möchtest du diesen Spielstand wirklich löschen?
 save.delete = Löschen
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Weißt du, was du tust?\nDu kannst das Tutorial unter[ac
 loading = [accent]Wird geladen...
 reloading = [accent]Lade Mods neu...
 saving = [accent]Speichere...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] um den Plan zu leeren
 selectschematic = [accent][[{0}][] zum Auswählen+Kopieren
 pausebuilding = [accent][[{0}][] um das Bauen zu pausieren
@@ -328,8 +335,9 @@ waves.never = <nie>
 waves.every = alle
 waves.waves = Welle(n)
 waves.perspawn = per Spawn
+waves.shields = shields/wave
 waves.to = bis
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Vorschau
 waves.edit = Bearbeiten...
 waves.copy = Aus der Zwischenablage kopieren
@@ -337,6 +345,11 @@ waves.load = Aus der Zwischenablage laden
 waves.invalid = Ungültige Wellen in der Zwischenablage.
 waves.copied = Wellen kopiert.
 waves.none = Keine Gegner definiert.\nInfo: Leere Wellenentwürfe werden automatisch mit dem Standard-Entwurf ersetzt.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Standard>
 details = Details
 edit = Bearbeiten
@@ -456,10 +469,12 @@ locked = Gesperrt
 complete = [lightgray]Abschließen:
 requirement.wave = Erreiche Welle {0} in {1}
 requirement.core = Zerstöre den feindlichen Kern in {0}
-requirement.unlock = Schalte {0} frei
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Zu Zone zurückkehren:\n[lightgray]{0}
 bestwave = [lightgray]Beste Welle: {0}
 launch = Starten
+launch.text = Launch
 launch.title = Start erfolgreich
 launch.next = [lightgray]Nächste Möglichkeit bei Welle {0}
 launch.unable2 = [scarlet]START nicht möglich.[]
@@ -467,13 +482,14 @@ launch.confirm = Dies wird alle Ressourcen in deinen Kern übertragen.\nDu kanns
 launch.skip.confirm = Wenn du die Wartezeit überspringst, kannst du den Kern bis zu einer späteren Welle nicht mehr starten.
 uncover = Freischalten
 configure = Startitems festlegen
+loadout = Loadout
+resources = Resources 
 bannedblocks = Gesperrte Blöcke
 addall = Alle hinzufügen
-configure.locked = [lightgray]Festlegen von Startitems freischalten: {0}.
+launch.destination = Destination: {0}
 configure.invalid = Anzahl muss eine Zahl zwischen 0 und {0} sein.
 zone.unlocked = [lightgray]{0} freigeschaltet.
 zone.requirement.complete = Welle {0} erreicht:\n{1} Anforderungen der Zone erfüllt.
-zone.config.unlocked = Konfiguration:[lightgray]\n{0}
 zone.resources = Ressourcen entdeckt:
 zone.objective = [lightgray]Ziel: [accent]{0}
 zone.objective.survival = Überlebe
@@ -492,35 +508,43 @@ error.io = Netzwerk-I/O-Fehler.
 error.any = Unbekannter Netzwerkfehler.
 error.bloom = Bloom konnte nicht initialisiert werden.\nEs kann sein, dass dein Gerät es nicht unterstützt.
 
-zone.groundZero.name = Ground Zero
-zone.desertWastes.name = Schrottwüste
-zone.craters.name = Krater
-zone.frozenForest.name = Gefrorener Wald
-zone.ruinousShores.name = Verfallene Ufer
-zone.stainedMountains.name = Gefleckte Berge
-zone.desolateRift.name = Trostloser Riss
-zone.nuclearComplex.name = Kernkraftwerk
-zone.overgrowth.name = Überwucherung
-zone.tarFields.name = Teerfelder
-zone.saltFlats.name = Salzebenen
-zone.impact0078.name = Einschlagspunkt 0078
-zone.crags.name = Die Klippen
-zone.fungalPass.name = Sporenpass
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Der optimale Ort, um neu anzufangen. Niedrige Bedrohung durch Gegner. Wenige Ressourcen.\nSammle so viel Kupfer und Blei wie möglich.\nMach weiter!
-zone.frozenForest.description = Sogar hier, näher an den Bergen, haben sich die Sporen verbreitet. Die kalten Temperaturen können sie nicht für immer im Schach halten.\n\nStarte das Wagnis in Strom. Baue Verbrennungsgeneratoren. Lerne Reparateure zu benutzen.
-zone.desertWastes.description = Diese Abfälle sind riesig, unberechenbar, und durchzogen von verfallenen Sektorstrukturen.\nKohle ist in dieser Region vorhanden. Verbrenne es für Strom, oder synthetisiere Graphit.\n\n[lightgray]Dieser Landeort kann nicht garantiert werden.
-zone.saltFlats.description = Am Rande der Wüste liegen die Salzebenen. In dieser Gegend sind Ressourcen nur spärlich vorhanden.\n\nDer Feind hat hier einen Ressourcenspeicherkomplex errichtet. Zerstöre ihren Kern. Lass nichts stehen.
-zone.craters.description = Wasser hat sich in diesem Krater angesammelt, ein Relikt von den alten Kriegen. Gewinne dieses Gebiet zurück. Sammle Sand. Schmelze Metaglass. Pumpe Wasser, um Geschütztürme und Bohrer zu kühlen.
-zone.ruinousShores.description = Vorbei an der Wüste liegt die Küste. An diesem Ort befand sich einst eine Küstenverteidigungsanlage, davon ist aber nicht mehr viel übrig. Lediglich einfache Verteidigungsstrukturen sind unversehrt, alles andere ist nur noch Schrott.\nSetze die Ausbreitung nach außen fort. Wiederentdecke die Technologie.
-zone.stainedMountains.description = Weiter im Landesinneren liegen die Berge, sie sind noch nicht von Sporen befleckt.\nExtrahiere das reichlich vorhandene Titan in diesem Bereich und erlerne es zu benutzen.\n\nDie feindliche Präsenz ist größer hier. Gib ihnen nicht die Zeit, ihre stärksten Einheiten zu schicken.
-zone.overgrowth.description = Dieser Bereich ist verwachsen, näher an der Quelle der Sporen.\nDer Feind hat hier einen Außenposten errichtet. Baue Dagger-Einheiten und zerstöre ihn. Gewinne zurück, was verloren gegangen ist.
-zone.tarFields.description = Der Rand einer Ölförderzone, zwischen Bergen und Wüste. Eine der wenigen Plätze mit nutzbaren Teer-Reserven.\nObwohl es aufgegeben wurde, befinden sich in diesem Gebiet gefährliche feindliche Kräfte. Unterschätze sie nicht.\n\n[lightgray]Wenn möglich, erforsche Technologien zur Ölverarbeitung.
-zone.desolateRift.description = Eine extrem gefährliche Zone. Reichlich Ressourcen, aber wenig Platz. Hohe Gefahr von Zerstörung. Verlasse es so schnell wie möglich. Lass dich nicht von den großen Abständen zwischen feindlichen Angriffen täuschen.
-zone.nuclearComplex.description = Eine ehemalige Anlage zur Herstellung und Verarbeitung von Thorium, die in Trümmern liegt.\n[lightgray]Erforsche das Thorium und seine vielen Verwendungsmöglichkeiten.\n\nDer Feind ist hier in großer Zahl präsent und sucht ständig nach Angreifern.
-zone.fungalPass.description = Ein Übergangsgebiet zwischen hohen Bergen und niedrigeren, sporenverseuchten Landschaften. Ein kleiner feindlicher Außenposten wurde hier entdeckt.\nZerstöre ihn.\nNutze Dagger und Crawler-Einheiten. Zerstöre die zwei Kerne.
-zone.impact0078.description = <Beschreibung hier einfügen>
-zone.crags.description = <Beschreibung hier einfügen>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Sprache
 settings.data = Spieldaten
@@ -534,9 +558,12 @@ settings.graphics = Grafik
 settings.cleardata = Spieldaten zurücksetzen...
 settings.clear.confirm = Bist du sicher, dass du die Spieldaten zurücksetzen willst?\n Diese Aktion kann nicht rückgängig gemacht werden!
 settings.clearall.confirm = [scarlet]WARNUNG![]\nDas wird jegliche Spieldaten zurücksetzen, inklusive Speicherstände, Karten, Freischaltungen und Tastenbelegungen.\n Sobald du 'OK' drückst, wird alles zurückgesetzt und das Spiel schließt sich automatisch.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Pausiert >
 clear = Leeren
 banned = [scarlet]Verbannt
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Ja
 no = Nein
 info.title = Info
@@ -558,8 +585,11 @@ blocks.itemsmoved = Bewegungsgeschwindigkeit
 blocks.launchtime = Zeit zwischen Starts
 blocks.shootrange = Reichweite
 blocks.size = Größe
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Flüssigkeitskapazität
 blocks.powerrange = Stromreichweite
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Maximale Stromverbindungen
 blocks.poweruse = Stromverbrauch
 blocks.powerdamage = Stromverbrauch/Schadenspunkt
@@ -575,13 +605,18 @@ blocks.boosteffect = Verstärkungseffekt
 blocks.maxunits = Max. aktive Einheiten
 blocks.health = Lebenspunkte
 blocks.buildtime = Baudauer
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Baukosten
 blocks.inaccuracy = Ungenauigkeit
 blocks.shots = Schüsse
 blocks.reload = Schüsse/Sekunde
 blocks.ammo = Munition
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Besserer Bohrer Benötigt
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Bohrgeschwindigkeit: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Effizienz: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Strom: {0}
 bar.poweroutput = Stromgenerierung: {0}
 bar.items = Items: {0}
 bar.capacity = Kapazität: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Flüssigkeit
 bar.heat = Hitze
 bar.power = Strom
 bar.progress = Baufortschritt
-bar.spawned = Einheiten: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -619,12 +655,16 @@ unit.liquidunits = Flüssigkeitseinheiten
 unit.powerunits = Stromeinheiten
 unit.degrees = Grad
 unit.seconds = Sekunden
+unit.minutes = mins
 unit.persecond = /sek
+unit.perminute = /min
 unit.timesspeed = x Geschwindigkeit
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = Materialeinheiten
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Allgemeines
 category.power = Strom
 category.liquids = Flüssigkeiten
@@ -639,6 +679,7 @@ setting.linear.name = Lineare Filterung
 setting.hints.name = Tipps
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Bauen automatisch pausieren
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animiertes Wasser
 setting.animatedshields.name = Animierte Schilde
 setting.antialias.name = Antialias[lightgray] (Neustart erforderlich)[]
@@ -663,7 +704,6 @@ setting.effects.name = Effekte anzeigen
 setting.destroyedblocks.name = Zerstörte Blöcke anzeigen
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Automatische Wegfindung beim Bau von Förderbändern
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Controller-Empfindlichkeit
 setting.saveinterval.name = Autosave-Häufigkeit
 setting.seconds = {0} Sekunden
@@ -672,12 +712,15 @@ setting.milliseconds = {0} Millisekunden
 setting.fullscreen.name = Vollbild
 setting.borderlesswindow.name = Randloses Fenster [lightgray](Neustart vielleicht erforderlich)
 setting.fps.name = FPS zeigen
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Block Shortcuts anzeigen
 setting.vsync.name = VSync
 setting.pixelate.name = Verpixeln [lightgray](Könnte die Leistung beeinträchtigen)
 setting.minimap.name = Zeige die Minimap
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Spieler-Position anzeigen
 setting.musicvol.name = Musiklautstärke
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Ambient-Lautstärke
 setting.mutemusic.name = Musik stummschalten
 setting.sfxvol.name = Audioeffekt-Lautstärke
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Die meisten Tastenzuweisungen hier funktionieren auf
 category.general.name = Allgemein
 category.view.name = Ansicht
 category.multiplayer.name = Mehrspieler
+category.blocks.name = Block Select
 command.attack = Angreifen
 command.rally = Patrouillieren
 command.retreat = Rückzug
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Taste: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Bauplan löschen
 keybind.press = Drücke eine Taste...
 keybind.press.axis = Drücke eine Taste oder bewege eine Achse...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = X-Achse
 keybind.move_y.name = Y-Achse
 keybind.mouse_move.name = Der Maus folgen
-keybind.dash.name = Sprinten
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Bereich auswählen
 keybind.schematic_menu.name = Entwurfsmenü
 keybind.schematic_flip_x.name = Entwurf umdrehen X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Diagonal platzieren
 keybind.pick.name = Block auswählen
 keybind.break_block.name = Block zerstören
 keybind.deselect.name = Auswahl aufheben
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Schießen
 keybind.zoom.name = Zoomen
 keybind.menu.name = Menü
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reaktor-Explosionen
 rules.wavetimer = Wellen-Timer
 rules.waves = Wellen
 rules.attack = Angriff-Modus
+rules.buildai = AI Building
 rules.enemyCheat = Unbegrenzte Ressourcen für die KI (Rotes Team)
-rules.unitdrops = Einheiten-Abwürfe
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Baugeschwindigkeit-Einheit Multiplikator 
 rules.unithealthmultiplier = Lebenspunkte-Einheit Multiplikator
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Spieler-Lebenspunkte Multiplikator
-rules.playerdamagemultiplier = Spieler-Schaden Multiplikator
 rules.unitdamagemultiplier = Schaden-Einheit Multiplikator
 rules.enemycorebuildradius = Bauverbot Radius druch feindlichen Kern:[lightgray] (Kacheln)
-rules.respawntime = Respawn-Zeit:[lightgray] (Sek)
 rules.wavespacing = Wellen-Abstand:[lightgray] (Sek)
 rules.buildcostmultiplier = Bau-Kosten Multiplikator
 rules.buildspeedmultiplier = Bau-Schnelligkeit Multiplikator
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Warten bis Welle endet
 rules.dropzoneradius = Drop-Zonen-Radius:[lightgray] (Kacheln)
-rules.respawns = Max. Wiederbelebungen pro Welle
-rules.limitedRespawns = Wiederbelebungslimit
+rules.unitammo = Units Require Ammo
 rules.title.waves = Wellen
-rules.title.respawns = Wiederbelebungen
 rules.title.resourcesbuilding = Ressourcen & Gebäude
-rules.title.player = Spieler
 rules.title.enemy = Gegner
 rules.title.unit = Einheiten
 rules.title.experimental = Experimentell
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Materialien
 content.liquid.name = Flüssigkeiten
@@ -827,10 +878,11 @@ liquid.water.name = Wasser
 liquid.slag.name = Schlacke
 liquid.oil.name = Öl
 liquid.cryofluid.name = Kryoflüssigkeit
-item.corestorable = [lightgray]Im Kern speicherbar: {0}
+
 item.explosiveness = [lightgray]Explosivität: {0}
 item.flammability = [lightgray]Entflammbarkeit: {0}
 item.radioactivity = [lightgray]Radioaktivität: {0}
+
 unit.health = [lightgray]Lebenskraft: {0}
 unit.speed = [lightgray]Geschwindigkeit: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Wärmekapazität: {0}
 liquid.viscosity = [lightgray]Viskosität: {0}
 liquid.temperature = [lightgray]Temperatur: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sandbrocken
 block.grass.name = Gras
 block.slag.name = Slag
 block.salt.name = Salz
-block.saltrocks.name = Salzgestein
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Geröll
 block.tendrils.name = Ranken
-block.sandrocks.name = Sandstein
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Sporenkiefer
-block.sporerocks.name = Sporengestein
-block.rock.name = Gestein
-block.snowrock.name = Schnee-Gestein
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Schnee-Kiefer
 block.shale.name = Schiefer
 block.shale-boulder.name = Schiefergeröll
 block.moss.name = Moos
 block.shrubs.name = Gestrüpp
 block.spore-moss.name = Moossporen
-block.shalerocks.name = Schiefer-Gestein
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Schrottmauer
 block.scrap-wall-large.name = Große Schrottmauer
 block.scrap-wall-huge.name = Riesige Schrottmauer
@@ -890,13 +979,17 @@ block.craters.name = Krater
 block.sand-water.name = Sandiges Wasser
 block.darksand-water.name = Dunkles sandiges Wasser
 block.char.name = Holzkohle
-block.holostone.name = Holo-Stein
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Eisschnee
-block.rocks.name = Felsen
-block.icerocks.name = Eis-Felsen
-block.snowrocks.name = Schnee-Felsen
-block.dunerocks.name = Dünen-Felsen
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Kiefer
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Weißer Baum (tot)
 block.white-tree.name = Weißer Baum
 block.spore-cluster.name = Sporen-Cluster
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Dunkles Panel 4
 block.dark-panel-5.name = Dunkles Panel 5
 block.dark-panel-6.name = Dunkles Panel 6
 block.dark-metal.name = Dunkles Metall
-block.ignarock.name = Igna-Felsen
+block.basalt.name = Basalt
 block.hotrock.name = Heißer Felsen
 block.magmarock.name = Magma-Felsen
-block.cliffs.name = Klippen
 block.copper-wall.name = Kupfermauer
 block.copper-wall-large.name = Große Kupfermauer
 block.titanium-wall.name = Titanmauer
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Unterlauftor
 block.silicon-smelter.name = Silizium-Schmelzer
 block.phase-weaver.name = Phasenweber
 block.pulverizer.name = Pulverisierer
-block.cryofluidmixer.name = Kryoflüssigkeitsmixer
+block.cryofluid-mixer.name = Kryoflüssigkeitsmixer
 block.melter.name = Schmelzer
 block.incinerator.name = Verbrennungsanlage
 block.spore-press.name = Sporenpresse
@@ -964,7 +1056,7 @@ block.diode.name = Batterie-Diode
 block.battery.name = Batterie
 block.battery-large.name = Große Batterie
 block.combustion-generator.name = Verbrennungsgenerator
-block.turbine-generator.name = Turbinengenerator
+block.steam-generator.name = Turbinengenerator
 block.differential-generator.name = Differentialgenerator
 block.impact-reactor.name = Schlaggenerator
 block.mechanical-drill.name = Mechanischer Bohrer
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Sprengmixer
 block.solar-panel.name = Solarpanel
 block.solar-panel-large.name = Großes Solarpanel
 block.oil-extractor.name = Öl-Extraktor
-block.command-center.name = Kommandozentrale
-block.draug-factory.name = Draug-Miner-Dronenfabrik
-block.spirit-factory.name = Spirit-Drohnenfabrik
-block.phantom-factory.name = Phantom-Drohnenfabrik
-block.wraith-factory.name = Wraith-Fighter-Fabrik
-block.ghoul-factory.name = Ghoul-Bomber-Fabrik
-block.dagger-factory.name = Dagger-Mech-Fabrik
-block.crawler-factory.name = Crawler-Mech-Fabrik
-block.titan-factory.name = Titan-Mech-Fabrik
-block.fortress-factory.name = Fortress-Mech-Fabrik
-block.revenant-factory.name = Revenant-Fighter-Fabrik
 block.repair-point.name = Reparaturpunkt
 block.pulse-conduit.name = Impulskanal
 block.plated-conduit.name = Gepanzerter Kanal
@@ -1036,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Container
 block.launch-pad.name = Launchpad
 block.launch-pad-large.name = Großes Launchpad
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = Blau
 team.crux.name = Rot
 team.sharded.name = Orange
@@ -1043,21 +1147,7 @@ team.orange.name = Orange
 team.derelict.name = Derelict
 team.green.name = Grün
 team.purple.name = Lila
-unit.spirit.name = Spirit-Drohne
-unit.draug.name = Draug-Miner-Drone
-unit.phantom.name = Phantom-Drohne
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul-Bomber
-unit.wraith.name = Wraith-Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tippen um fortzufahren>
 tutorial.intro = Du befindest dich im[scarlet] Mindustry-Tutorial.[]\nBeginne, indem du[accent] Kupfer abbaust[]. Tippe dazu auf ein Kupfervorkommen in der Nähe deiner Basis.\n\n[accent]{0}/{1} Kupfer
 tutorial.intro.mobile = Du befindest dich im [scarlet]Mindustry Tutorial.[]\nWische über den Bildschirm, um dich zu bewegen.\n[accent]Benutze zwei Finger[] um heran- und hinauszuzoomen.\nBeginne, indem du [accent]Kupfer abbaust[]. Bewege dich zu einem Kupfervorkommen und tippe anschließend darauf.\n\n[accent]{0}/{1} Kupfer
@@ -1100,17 +1190,7 @@ liquid.water.description = Wird üblicherweise zum Kühlen von Maschinen und zur
 liquid.slag.description = Ein Gemisch aus verschiedenen Arten von Metall, welche miteinander vermischt wurden. Kann in seine Bestandteile getrennt oder als Waffe auf feindliche Einheiten gesprüht werden.
 liquid.oil.description = Kann verbrannt, zum Explodieren gebracht, oder zur Kühlung verwendet werden.
 liquid.cryofluid.description = Die Flüssigkeit, die Dinge am effizientesten herunterkühlen kann.
-unit.draug.description = Eine primitive Bergbaudrohne. Günstig herzustellen. Entbehrlich. Baut automatisch Kupfer und Blei in der Nähe ab. Bringt abgebaute Ressourcen zum nächstgelegenen Kern.
-unit.spirit.description = Die anfängliche Drohne. Sie baut gewöhnlich in der Basis Erz ab, sammelt Materialien und repariert Blöcke.
-unit.phantom.description = Eine fortgeschrittene Drohne. Baut automatisch Erz ab, sammelt Materialien und repariert Blöcke. Deutlich effizienter als die Standard-Drohne.
-unit.dagger.description = Eine Standard-Bodeneinheit. Nützlich in Schwärmen.
-unit.crawler.description = Eine Bodeneinheit, die aus einem abgespeckten Rahmen mit hochexplosiven Sprengstoffen besteht. Nicht besonders haltbar. Explodiert bei Kontakt mit Gegnern.
-unit.titan.description = Eine fortgeschrittene gepanzerte Bodeneinheit. Greift sowohl Boden- als auch Luftziele an.
-unit.fortress.description = Eine schwere Artillerie-Bodeneinheit.
-unit.eruptor.description = Ein schwerer Mech, der Strukturen abbaut. Feuert einen Schlackenstrom auf feindliche Befestigungen ab, welcher flüchtige Stoffe in Brand steckt.
-unit.wraith.description = Eine schneller Abfangjäger.
-unit.ghoul.description = Ein schwerer Flächenbomber.
-unit.revenant.description = Eine schwere, schwebende Raketengruppe.
+
 block.message.description = Speichert eine Nachricht. Wird genutzt, um mit Verbündeten zu kommunizieren.
 block.graphite-press.description = Komprimiert Kohlestücke zu reinen Graphitplatten.
 block.multi-press.description = Eine aktualisierte Version der Graphitpresse. Setzt Wasser und Strom ein, um Kohle schnell und effizient zu verarbeiten.
@@ -1119,7 +1199,7 @@ block.kiln.description = Schmelzt Sand und Blei zu Metaglass. Erfordert kleine M
 block.plastanium-compressor.description = Produziert Plastanium aus Öl und Titan.
 block.phase-weaver.description = Produziert Phasengewebe aus radioaktivem Thorium und großen Mengen an Sand.
 block.alloy-smelter.description = Verarbeitet Titan, Blei, Silizium und Kupfer zu einer Stromstoßlegierung.
-block.cryofluidmixer.description = Verarbeitet Wasser mit Titan zu einer Kryoflüssigkeit, die viel effizienter kühlt.
+block.cryofluid-mixer.description = Verarbeitet Wasser mit Titan zu einer Kryoflüssigkeit, die viel effizienter kühlt.
 block.blast-mixer.description = Verwendet Sporen, um Pyratit in eine weniger enzündliche aber explosive Mischung umzuwandeln.
 block.pyratite-mixer.description = Vermischt Kohle, Blei und Sand zu hochentzündlichem Pyratit.
 block.melter.description = Erhitzt Schrott auf extrem hohe Temperaturen, um Lava zu erhalten.
@@ -1185,7 +1265,7 @@ block.battery.description = Speichert Strom, solange ein Überschuss besteht, un
 block.battery-large.description = Speichert sehr viel mehr Strom als eine normale Batterie.
 block.combustion-generator.description = Generiert Strom, indem Öl oder entzündliche Materialien verbrannt werden.
 block.thermal-generator.description = Erzeugt große Mengen Strom aus Lava.
-block.turbine-generator.description = Effizienter als ein Verbrennungsgenerator, benötigt jedoch zusätzlich Wasser.
+block.steam-generator.description = Effizienter als ein Verbrennungsgenerator, benötigt jedoch zusätzlich Wasser.
 block.differential-generator.description = Erzeugt große Mengen an Energie. Nutzt den Temperaturunterschied zwischen Kryofluid und brennendem Pyratit.
 block.rtg-generator.description = Ein Radioisotopengenerator, der keine Kühlung benötigt, aber weniger Strom als ein Thorium-Reaktor liefert.
 block.solar-panel.description = Erzeugt kleine Mengen an Strom aus Sonnenenergie.
@@ -1221,15 +1301,5 @@ block.ripple.description = Ein großer Artillerie-Geschützturm, der mehrere Sch
 block.cyclone.description = Ein großer Schnellfeuer-Geschützturm.
 block.spectre.description = Ein großer Geschützturm, der zwei starke Schüsse gleichzeitig abfeuert.
 block.meltdown.description = Ein großer Geschützturm, der starke Strahlen mit großer Reichweite abfeuert.
-block.command-center.description = Erteilt allen verbündeten Einheiten auf der Karte Bewegungsbefehle. \nBringt Einheiten zum Patrouillieren, Angreifen eines feindlichen Kerns oder Rückzug zur Fabrik/ zum Kern. Wenn es keinen feindlichen Kern gibt, patrouillieren die Einheiten bei einem Angriffsbefehl.
-block.draug-factory.description = Produziert Draug-Mining-Drohnen.
-block.spirit-factory.description = Produziert leichte Drohnen, die Erz abbauen und Blöcke reparieren können.
-block.phantom-factory.description = Produziert erweiterte Drohnen, die deutlich effizienter sind als Spirit-Drohnen.
-block.wraith-factory.description = Produziert schnelle Abfangjäger.
-block.ghoul-factory.description = Produziert schwere Flächenbomber.
-block.revenant-factory.description = Produziert schwere Raketen-basierte Flugeinheiten.
-block.dagger-factory.description = Produziert Standard-Bodeneinheiten.
-block.crawler-factory.description = Produziert schnelle, selbstzerstörende Schwarmeinheiten.
-block.titan-factory.description = Produziert fortgeschrittene, gepanzerte Bodeneinheiten.
-block.fortress-factory.description = Produziert schwere Artillerie-Bodeneinheiten.
 block.repair-point.description = Heilt durchgehend die nächste befreundete, beschädigte Einheit in der Umgebung.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 9c42701b32..8c538a6974 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io es la página donde podes descargar las versi
 link.google-play.description = Ficha en la Google Play Store
 link.f-droid.description = Página de F-Droid del juego
 link.wiki.description = Wiki oficial de Mindustry
-link.feathub.description = Sugerir nuevas funciones
+link.suggestions.description = Sugerir nuevas funciones
 linkfail = ¡Error al abrir el enlace!\nLa URL ha sido copiada a su portapapeles.
 screenshot = Captura de pantalla guardada en {0}
 screenshot.invalid = Mapa demasiado grande, no hay suficiente memoria para la captura de pantalla.
@@ -20,6 +20,8 @@ gameover = Tu núcleo ha sido destruido.
 gameover.pvp = ¡El equipo[accent] {0}[] ha ganado!
 highscore = [accent]¡Nueva mejor puntuación!
 copied = Copiado.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Sonidos
 load.map = Mapas
@@ -63,8 +65,7 @@ stat.delivered = Recursos Lanzados:
 stat.playtime = Tiempo jugado:[accent] {0}
 stat.rank = Rango final: [accent]{0}
 
-launcheditems = [accent]Recursos Lanzados
-launchinfo = [unlaunched][[LAUNCH] tu núcleo core obtenga los objetos indicados en azul.
+globalitems = [accent]Global Items
 map.delete = ¿Estás seguro que quieres borrar el mapa "[accent]{0}[]"?
 level.highscore = Puntuación más alta: [accent]{0}
 level.select = Selección de nivel
@@ -106,6 +107,7 @@ mods.guide = Guia de Modding
 mods.report = Reportar Error
 mods.openfolder = Abrir carpeta de mods
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Activado
 mod.disabled = [scarlet]Desactivado
@@ -113,6 +115,7 @@ mod.disable = Desactivar
 mod.content = Content:
 mod.delete.error = Fallo al elminar el mod. Quizás el archivo esta en uso.
 mod.requiresversion = [scarlet]Requiere mínima versión del juego: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Dependencias faltantes: {0}
 mod.erroredcontent = [scarlet]Errores de contenido
 mod.errors = Ocurrieron fallos al cargar el contenido.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Se requiere actualizar
 mod.import = Importar mod
 mod.import.file = Import File
 mod.import.github = Importar Mod de Github
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Este objeto es parte del[accent] '{0}'[] mod. Para eliminarlo, desinstala ese mod.
 mod.remove.confirm = Este mod va a ser eliminado.\n¿Quieres continuar?
 mod.author = [lightgray]Autor:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Tu dispositivo no soporta los mods con scripts. Debes desh
 about.button = Acerca de
 name = Nombre:
 noname = Elige un[accent] nombre de jugador[] primero.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Nombre del archivo:
 unlocked = ¡Nuevo Bloque Desbloqueado!
 completed = [accent]Completado
@@ -142,6 +148,7 @@ techtree = Árbol de Tecnologías
 research.list = [lightgray]investigación:
 research = Investigación
 researched = [lightgray]{0} investigado.
+research.progress = {0}% complete
 players = {0} jugadores online
 players.single = {0} jugador online
 players.search = buscar
@@ -224,7 +231,6 @@ save.new = Nuevo Punto de Guardado
 save.overwrite = ¿Estás seguro de querer sobrescribir\neste punto de guardado?
 overwrite = Sobrescribir
 save.none = ¡No se ha encontrado ningún punto de guardado!
-saveload = [accent]Guardando...
 savefail = ¡No se ha podido guardar la partida!
 save.delete.confirm = ¿Estás seguro de querer borrar este punto de guardado?
 save.delete = Borrar
@@ -272,7 +278,7 @@ quit.confirm.tutorial = ¿Estás seguro de que sabes qué estas haciendo?\nSe pu
 loading = [accent]Cargando...
 reloading = [accent]Recargando mods...
 saving = [accent]Guardando...
-respwan = [accent][[{0}][] para reaparecer en núcleo
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] para limpiar el plan
 selectschematic = [accent][[{0}][] para seleccionar+copiar
 pausebuilding = [accent][[{0}][] para pausar la construcción
@@ -339,6 +345,11 @@ waves.load = Cargar del Portapapeles
 waves.invalid = Oleadas inválidaas en el portapapeles.
 waves.copied = Oleadas copiadas.
 waves.none = No hay enemigos definidos.\nNótese que las listas de oleadas vacías se sustituirán por la lista por defecto.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Por defecto>
 details = Detalles...
 edit = Editar...
@@ -458,10 +469,12 @@ locked = Bloqueado
 complete = [lightgray]Completado:
 requirement.wave = Alcanzar la oleada {0} en {1}
 requirement.core = Destruir el núcleo enemigo en {0}
-requirement.unlock = Desbloquear {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Continuar Zona:\n[lightgray]{0}
 bestwave = [lightgray]Récord: {0}
 launch = Lanzar
+launch.text = Launch
 launch.title = Lanzamiento Exitoso
 launch.next = [lightgray]próxima oportunidad en la oleada {0}
 launch.unable2 = [scarlet]No se puede LANZAR.[]
@@ -469,13 +482,14 @@ launch.confirm = Esto lanzará todos los recursos al núcleo.\nNo podrás volver
 launch.skip.confirm = Si saltas la oleada ahora, no podrás lanzar recursos hasta unas oleadas después.
 uncover = Descubrir
 configure = Configurar carga inicial
+loadout = Loadout
+resources = Resources 
 bannedblocks = Bloques prohibidos
 addall = Añadir todo
-configure.locked = [lightgray]Para configurar la carga inicial: {0}.
+launch.destination = Destination: {0}
 configure.invalid = La cantidad debe estar entre 0 y {0}.
 zone.unlocked = [lightgray]{0} desbloqueado.
 zone.requirement.complete = Oleada {0} alcanzada:\nrequerimientos de la zona {1} cumplidos.
-zone.config.unlocked = Carga desbloqueada:[lightgray]\n{0}
 zone.resources = Recursos Detectados:
 zone.objective = [lightgray]Objetivo: [accent]{0}
 zone.objective.survival = Sobrevivir
@@ -494,35 +508,43 @@ error.io = Error I/O de conexión.
 error.any = Error de red desconocido.
 error.bloom = Error al cargar el bloom.\nPuede que tu dispositivo no soporte esta característica.
 
-zone.groundZero.name = Terreno Cero
-zone.desertWastes.name = Ruinas del Desierto
-zone.craters.name = Los Cráteres
-zone.frozenForest.name = Bosque Congelado
-zone.ruinousShores.name = Costas Ruinosas
-zone.stainedMountains.name = Montañas Manchadas
-zone.desolateRift.name = Grieta Desolada
-zone.nuclearComplex.name = Complejo de Producción Nuclear
-zone.overgrowth.name = Crecimiento Excesivo
-zone.tarFields.name = Campos de Alquitrán
-zone.saltFlats.name = Salinas
-zone.impact0078.name = Impacto 0078
-zone.crags.name = Riscos
-zone.fungalPass.name = Pasillo de hongos
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = La zona óptima para empezar una vez más. Riesgo bajo de los enemigos. Pocos recursos.\nConsigue tanto plomo y cobre como puedas.\nSigue avanzando.
-zone.frozenForest.description = Incluso aquí, cerca de las montañas, las esporas se han expandido. Las temperaturas gélidas no pueden contenerlas para siempre.\n\nEmpieza a investigar sobre energía. Cnstruye generadores de combustión. Aprende a usar reparadores.
-zone.desertWastes.description = Estas ruinas son vastas, impredecibles y entrecruzadas con sectores de estructuras abandonadas.\nHay carbñon presente en la región. Quémalo para energía, o sintetiza grafito.\n\n[lightgray]La zona de aparición no puede ser garantizada.
-zone.saltFlats.description = A las afueras del desierto se encuentran las Salinas. Pocos recursos pueden ser encontrados en esta ubicación.\n\nEl enemigo ha erigido un complejo de almacén de recursos aquí. Erradica su núcleo. No dejes nada.
-zone.craters.description = Se ha acumulado agua en este cráter, reliquia de las guerraas antiguas. Reconquista la zona. Obtén arena. Funde metacristal. Bombea agua para refrigerar torres y taladros.
-zone.ruinousShores.description = Después de las ruinas viene la costa. Una vez este lugar hospedaba a una defensa de cosa. No queda mucho de ella. Solo las estructuras defensivas más básicas se han mantenido intactas, tolo lo demás ha sido reducido a chatarra. Continúa la expansión hacia fuera. Redescubre la tecnología.
-zone.stainedMountains.description = Más hacia dentro están las montañas, todavía sin esporas. Extrae el abundante titanio en esta zona. Aprende cómo usarlo.\n\nLa presencia de enemigos es mayor aquí. No les dejes tiempo a que envíen sus unidades más fuertes.
-zone.overgrowth.description = Este área está cubierta, más cerca de la fuente de esporas.\nEl enemigo ha establecido un puesto aquí. Construye unidades daga. Destrúyelo. Reconquista lo que se perdió.
-zone.tarFields.description = Las afueras de una zona de producción de petróleo, entre las montañas y el desierto. Una de las pocas zonas con reservas utilizables de alquitrán natural.\nAunque abandonada, esta zona tiene esta zona tiene algunas fuerzas enemigas peligrosas. No las subestimes.\n\n[lightgray]Investiga tecnología de procesamiento de petróleo si es posible.
-zone.desolateRift.description = Una zona extremadamente peligrosa. Tiene muchos recursos pero poco espacio. Riesgo alto de destrucción. Abandona lo antes posible. No te dejes engañar por la gran separación de tiempo entre oleadas enemigas.
-zone.nuclearComplex.description = Una antigua facilidad para la producción y el procesamiento del torio reducido a ruinas.\n[lightgray]Investiga el torio y sus diversos usos.\n\nEl enemigo está presente en números grandes, constantemente buscando atacantes.
-zone.fungalPass.description = Una zona transitoria entre alta montaña y zonas más bajas con esporas. Una base enemiga pequeña de reconocimiento se ubica aquí.\nDestrúyela.nUsa Dagas y Orugas. Destruye los dos núcleos.
-zone.impact0078.description = <insertar descripción aquí>
-zone.crags.description = <insertar descripción aquí>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Idioma
 settings.data = Datos del Juego
@@ -536,9 +558,12 @@ settings.graphics = Gráficos
 settings.cleardata = Limpiar Datos del Juego...
 settings.clear.confirm = ¿Estas seguro de querer limpiar estos datos?\n¡Esta acción no puede deshacerse!
 settings.clearall.confirm = [scarlet]ADVERTENCIA![]\nEsto va a eliminar todos tus datos, incluyendo guardados, mapas, desbloqueos y atajos de teclado.\nUna vez presiones 'ok', el juego va a borrrar todos tus datos y saldrá del juego automáticamente.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent] < Pausado >
 clear = Limpiar
 banned = [scarlet]Baneado
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Sí
 no = No
 info.title = [accent]Información
@@ -560,8 +585,11 @@ blocks.itemsmoved = Velocidad de movimiento
 blocks.launchtime = Tiempo entre lanzamientos
 blocks.shootrange = Rango de Disparo
 blocks.size = Tamaño
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Capacidad de Líquidos
 blocks.powerrange = Rango de Energía
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Conexiones maximas
 blocks.poweruse = Consumo de Energía
 blocks.powerdamage = Energía/Daño
@@ -577,13 +605,18 @@ blocks.boosteffect = Efecto del Potenciador
 blocks.maxunits = Máximo de Unidades Activas
 blocks.health = Vida
 blocks.buildtime = Tiempo de construcción
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Coste de construcción
 blocks.inaccuracy = Imprecisión
 blocks.shots = Disparos
 blocks.reload = Recarga
 blocks.ammo = Munición
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Se requiere un mejor taladro.
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Velocidad del Taladro: {0}/s
 bar.pumpspeed = Velocidad de bombeado: {0}/s
 bar.efficiency = Eficiencia: {0}%
@@ -593,7 +626,8 @@ bar.poweramount = Energía: {0}
 bar.poweroutput = Salida de Energía: {0}
 bar.items = Objetos: {0}
 bar.capacity = Capacidad: {0}
-bar.units = Unidades: {0}/{1}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Líquido
 bar.heat = Calor
 bar.power = Energía
@@ -621,12 +655,16 @@ unit.liquidunits = unidades de líquido
 unit.powerunits = unidades de energía
 unit.degrees = grados
 unit.seconds = segundos
+unit.minutes = mins
 unit.persecond = /seg
+unit.perminute = /min
 unit.timesspeed = x velocidad
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = objetos
 unit.thousands = k
 unit.millions = M
+unit.billions = b
 category.general = General
 category.power = Energía
 category.liquids = Líquidos
@@ -641,6 +679,7 @@ setting.linear.name = Filtrado Lineal
 setting.hints.name = Pistas
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-pausar construcción
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Agua Animada
 setting.animatedshields.name = Escudos Animados
 setting.antialias.name = Antialias[lightgray] (necesita reiniciar)[]
@@ -665,7 +704,6 @@ setting.effects.name = Mostrar Efectos
 setting.destroyedblocks.name = Mostrar bloques destruidos
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Colocación del transportador en búsqueda de caminos
-setting.coreselect.name = Permitir núcleos esquemáticos
 setting.sensitivity.name = Sensibilidad del Control
 setting.saveinterval.name = Intervalo del Autoguardado
 setting.seconds = {0} Segundos
@@ -674,12 +712,15 @@ setting.milliseconds = {0} milisegundos
 setting.fullscreen.name = Pantalla Completa
 setting.borderlesswindow.name = Ventana sin Bordes[lightgray] (podría requerir un reinicio)
 setting.fps.name = Mostrar FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Mostrar teclas de selección de bloque
 setting.vsync.name = Vsync (Limita los fps a los Hz de tu pantalla)
 setting.pixelate.name = Pixelar [lightgray](podría reducir el rendimiento)
 setting.minimap.name = Mostrar Minimapa
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Mostrar posición del jugador.
 setting.musicvol.name = Volumen de la Música
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Volumen del Ambiente
 setting.mutemusic.name = Silenciar Musica
 setting.sfxvol.name = Volumen de los efectos de sonido
@@ -702,10 +743,14 @@ keybinds.mobile = [scarlet]Los accesos del teclado aquí mostrados no estan disp
 category.general.name = General
 category.view.name = Visión
 category.multiplayer.name = Multijugador
+category.blocks.name = Block Select
 command.attack = Atacar
 command.rally = Patrullar
 command.retreat = Retirarse
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Eliminar construcción
 keybind.press = Presiona una tecla...
 keybind.press.axis = Pulsa un eje o botón...
@@ -715,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Mover x
 keybind.move_y.name = Mover y
 keybind.mouse_move.name = Seguír al ratón
-keybind.dash.name = Correr
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Seleccionar región
 keybind.schematic_menu.name = Menu de esquématicos
 keybind.schematic_flip_x.name = Girar esquemático desde X
@@ -742,6 +788,9 @@ keybind.diagonal_placement.name = Construcción Diagonal
 keybind.pick.name = Elegir bloque
 keybind.break_block.name = Destruir Bloque
 keybind.deselect.name = Deseleccionar
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Disparar
 keybind.zoom.name = Zoom
 keybind.menu.name = Menú
@@ -776,34 +825,34 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Temportzador de Oleadas
 rules.waves = Oleadas
 rules.attack = Modo  de Ataque
+rules.buildai = AI Building
 rules.enemyCheat = Recursos infinitos de la IA
-rules.unitdrops = REcursos de las Unidades
+rules.blockhealthmultiplier = Multiplicador de salud de bloque
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Multiplicador de velocidad de creación de unidades
 rules.unithealthmultiplier = Multiplicador de la vida de las unidades
-rules.blockhealthmultiplier = Multiplicador de salud de bloque
-rules.playerhealthmultiplier = Multiplicador de la vida del jugador
-rules.playerdamagemultiplier = Multiplicador del daño del jugador
 rules.unitdamagemultiplier = Multiplicador del daño de unidades
 rules.enemycorebuildradius = Radio de No-Construcción del Núcleo Enemigo:[lightgray] (casillas)
-rules.respawntime = Tiempo de reaparición:[lightgray] (seg)
 rules.wavespacing = Tiempo entre oleadas:[lightgray] (seg)
 rules.buildcostmultiplier = Multiplicador de coste de construcción
 rules.buildspeedmultiplier = Multiplicador de velocidad de construcción
 rules.deconstructrefundmultiplier = Multiplicador de Devolución de Desconstrucción
 rules.waitForWaveToEnd = Las oleadas esperan a los enemigos
 rules.dropzoneradius = Radio de zona de caída:[lightgray] (casillas)
-rules.respawns = Reapariciones máximas por oleada
-rules.limitedRespawns = Límite de reapariciones
+rules.unitammo = Units Require Ammo
 rules.title.waves = Oleadas
-rules.title.respawns = Reapariciones
 rules.title.resourcesbuilding = Recursos y Construcción
-rules.title.player = Jugadores
 rules.title.enemy = Enemigos
 rules.title.unit = Unidades
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Iluminación
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Iluminación ambiental
-rules.solarpowermultiplier = Multiplicador de Potencia de Panel Solar
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Objetos
 content.liquid.name = Líquidos
@@ -829,10 +878,11 @@ liquid.water.name = Agua
 liquid.slag.name = Fundido
 liquid.oil.name = Petróleo
 liquid.cryofluid.name = Criogénico
-item.corestorable = [lightgray]Guardable en el núcleo: {0}
+
 item.explosiveness = [lightgray]Explosividad: {0}
 item.flammability = [lightgray]Inflamabilidad: {0}
 item.radioactivity = [lightgray]Radioactividad: {0}
+
 unit.health = [lightgray]Vida: {0}
 unit.speed = [lightgray]Velocidad: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -841,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidad Térmica: {0}
 liquid.viscosity = [lightgray]Viscosidad: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
 
+unit.dagger.name = Daga
+unit.mace.name = Mace
+unit.fortress.name = Fortaleza
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Oruga
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Piedra de Arena
 block.grass.name = Hierba
 block.slag.name = Slag
 block.salt.name = Sal
-block.saltrocks.name = Rocas de Sal
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Guijarros
 block.tendrils.name = Zarcillos
-block.sandrocks.name = Rocas de arena
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Pino de esporas
-block.sporerocks.name = Rocas de espora
-block.rock.name = Roca
-block.snowrock.name = Roca de nieve
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Pino de nieve
 block.shale.name = Pizarra
 block.shale-boulder.name = Piedra de Pizarra
 block.moss.name = Musgo
 block.shrubs.name = Arbustos
 block.spore-moss.name = Musgo de esporas
-block.shalerocks.name = Rocas de Pizarra
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Muro de Chatarra
 block.scrap-wall-large.name = Muro de Chatarra grande
 block.scrap-wall-huge.name = Muro de Chatarra muy grande
@@ -892,13 +979,17 @@ block.craters.name = Cráteres
 block.sand-water.name = Agua con Arena
 block.darksand-water.name = Agua con Arena Oscura
 block.char.name = Carbonizado
-block.holostone.name = Piedra hologramatica
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Hielo Nieve
-block.rocks.name = Rocas
-block.icerocks.name = Rocas de hielo
-block.snowrocks.name = Rocas de nieve
-block.dunerocks.name = Dune Rocks
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pino
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Árbol Blanco Muerto
 block.white-tree.name = Árbol Blanco
 block.spore-cluster.name = Concentración de Esporas
@@ -914,10 +1005,9 @@ block.dark-panel-4.name = Panel Oscuro 4
 block.dark-panel-5.name = Panel Oscuro 5
 block.dark-panel-6.name = Panel Oscuro 6
 block.dark-metal.name = Metal Oscuro
-block.ignarock.name = Roca Ignea
+block.basalt.name = Basalt
 block.hotrock.name = Roca Caliente
 block.magmarock.name = Roca de Magma
-block.cliffs.name = Acantilados
 block.copper-wall.name = Muro de Cobre
 block.copper-wall-large.name = Muro de Cobre grande
 block.titanium-wall.name = Muro de Titanio
@@ -939,6 +1029,7 @@ block.conveyor.name = Cinta Transportadora
 block.titanium-conveyor.name = Cinta Transportadora de Titanio
 block.plastanium-conveyor.name = Cinta Transportadora de Titanio
 block.armored-conveyor.name = Cinta Transportadora Acorazada
+block.armored-conveyor.description = Mueve items a la misma veolcidad que una cinta de titanio, pero tiene mas defensa. No acepta entradas por los lados a menos que sean lineas transportadoras.
 block.junction.name = Cruce
 block.router.name = Enrutador
 block.distributor.name = Distribuidor
@@ -952,7 +1043,7 @@ block.underflow-gate.name = Compuerta de Subdesbordamiento
 block.silicon-smelter.name = Horno para Silicio
 block.phase-weaver.name = Tejedor de Fase
 block.pulverizer.name = Pulverizador
-block.cryofluidmixer.name = Mezclador de Criogénicos
+block.cryofluid-mixer.name = Mezclador de Criogénicos
 block.melter.name = Fundidor
 block.incinerator.name = Incinerador
 block.spore-press.name = Prensa de Esporas
@@ -965,7 +1056,7 @@ block.diode.name = Diodo de batería
 block.battery.name = Batería
 block.battery-large.name = Batería Grande
 block.combustion-generator.name = Generador de Combustión
-block.turbine-generator.name = Turbina
+block.steam-generator.name = Turbina
 block.differential-generator.name = Generador Diferencial
 block.impact-reactor.name = Reactor de Impacto
 block.mechanical-drill.name = Taladro mecánico
@@ -995,17 +1086,6 @@ block.blast-mixer.name = Mezclador de Explosivos
 block.solar-panel.name = Panel Solar
 block.solar-panel-large.name = Panel Solar Grande
 block.oil-extractor.name = Extractor de Petróleo
-block.command-center.name = Centro de Comando
-block.draug-factory.name = Fábrica de Drones Mineros Primitivos
-block.spirit-factory.name = Fábrica de Drones Espíritu
-block.phantom-factory.name = Fábrica de Drones Fantasmales
-block.wraith-factory.name = Fábrica de Peleador Infernal
-block.ghoul-factory.name = Fábrica de Bombardero Fantasmal
-block.dagger-factory.name = Fábrica de Mecanoide Daga
-block.crawler-factory.name = Fábrica de Mecanoide Oruga
-block.titan-factory.name = Fábrica de Mecanoide Titán
-block.fortress-factory.name = Fábrica de Mecanoide Fortress
-block.revenant-factory.name = Fábrica de Peleador Revenante
 block.repair-point.name = Punto de Reparación
 block.pulse-conduit.name = Conducto de Pulso
 block.plated-conduit.name = Conducto Chapado
@@ -1037,6 +1117,29 @@ block.meltdown.name = Fusión de Reactor
 block.container.name = Contenedor
 block.launch-pad.name = Pad de Lanzamiento
 block.launch-pad-large.name = Pad de Lanzamiento Grande
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = Azul
 team.crux.name = rojo
 team.sharded.name = naranja
@@ -1044,21 +1147,7 @@ team.orange.name = Naranja
 team.derelict.name = derelict
 team.green.name = Verde
 team.purple.name = Púrpura
-unit.spirit.name = Dron Espíritu
-unit.draug.name = Dron Minero Primitivo
-unit.phantom.name = Dron Fantasmal
-unit.dagger.name = Daga
-unit.crawler.name = Oruga
-unit.titan.name = Titán
-unit.ghoul.name = Bombardero Fantasmal
-unit.wraith.name = Peleador Infernal
-unit.fortress.name = Fortaleza
-unit.revenant.name = Revenante
-unit.eruptor.name = Erupcionador
-unit.chaos-array.name = Matriz del caos
-unit.eradicator.name = Erradicador
-unit.lich.name = Exánime
-unit.reaper.name = Segador
+
 tutorial.next = [lightgray]<Toca para continuar>
 tutorial.intro = Has entrado en el[scarlet]Tutorial de Mindustry.[]\nComienza[accent]minando cobre[]. Toca en una veta de cobre cercana al núcleo para hacer esto.\n\n[accent]{0}/{1} cobre
 tutorial.intro.mobile = Has entrado en el[scarlet] Tutorial de Mindustry.[]\nArrastra la pantalla para moverte.\n[accent]Pellizca con 2 dedos [] para alejar y acercar la vista.\nComienza por[accent] minar cobre[]. Muevete cerca de el, luego toca una veta de mineral de cobre cerca de su núcleo para hacer esto.\n\n[accent]{0}/{1} cobre
@@ -1101,17 +1190,7 @@ liquid.water.description = Usada comúnmente para enfriar máquinas y para proce
 liquid.slag.description = Diferentes tipos de metales fundidos mezclados. Puede ser separado en sus minerales constituyentes, o expulsado a unidades enemigas como arma.
 liquid.oil.description = Puede ser quemado, explotado o como un enfriador.
 liquid.cryofluid.description = El líquido más eficiente pra enfriar las cosas.
-unit.draug.description = Un dron minero primitivo. Barato de producir. Reciclable. Mina cobre y plomo cercanos automáticamente. Transporta los recursos minados al núcleo más cercano.
-unit.spirit.description = Un dron minero primitivo modificado, diseñado para reparar en vez de minar. Repara automáticamente cualquier bloque dañado en la zona.
-unit.phantom.description = Un dron avanzado. Mina automáticamente minerales, recoge objetos y repra bloques. Bastante más efectivo que un dron normal.
-unit.dagger.description = Una unidad terrestre. Útil con enjambres.
-unit.crawler.description = Una unidad terrestre que consiste en un marco desmontado con una gran cantidad de explosivos en la parte superior. No es muy duradero. Explota en contacto enemigo.
-unit.titan.description = Una unidad terrestre blindada avanzada. Ataca objetivos aéreos y terrestres.
-unit.fortress.description = Una unidad terrestre pesada de artillería.
-unit.eruptor.description = Un mecanoide pesado diseñado para destruir estructuras. Dispara un líquido a las fortificaciones enemigas, fundiéndolas y quemando materiales volátiles.
-unit.wraith.description = Una unidad interceptora rápida.
-unit.ghoul.description = Una unidad bombardera pesada. Usa compuesto explosivo o pirotita como munición.
-unit.revenant.description = Una unidad aérea pesada equipada con misiles.
+
 block.message.description = Almacena un mensaje. Puedes usarlo para comunicarte con aliados o dejar recordatorios.
 block.graphite-press.description = Comprime carbón en piezas de grafito puro.
 block.multi-press.description = Una versión mejorada de la prensa de grafito. Utiliza agua y energía para procesar carbón rápida y eficientemente.
@@ -1120,7 +1199,7 @@ block.kiln.description = Funde arena y plomo en metacristal. Requiere cantidades
 block.plastanium-compressor.description = Produce plastanio con aceite y titanio.
 block.phase-weaver.description = Produce tejido de fase del torio radioactivo y altas cantidades de arena.
 block.alloy-smelter.description = Produce aleación eléctrica con titanio, plomo, silicio y cobre.
-block.cryofluidmixer.description = Combina agua y titanio en líquido criogénico, que es mucho más eficiente para enfriar.
+block.cryofluid-mixer.description = Combina agua y titanio en líquido criogénico, que es mucho más eficiente para enfriar.
 block.blast-mixer.description = Usa aceite para transformar pirotita en un objeto menos inflamable pero más explosivo: el compuesto explosivo.
 block.pyratite-mixer.description = Mezcla carbón, plomo y arena en pirotita altamente inflamable.
 block.melter.description = Calienta piedra a temperaturas muy altas para obtener lava.
@@ -1157,7 +1236,6 @@ block.shock-mine.description = Daña enemigos que pisan a mina. Casi invisible a
 block.conveyor.description = Bloque de transporte básico. Mueve objetos hacia adelante y los deposita automáticamente en torres o fábricas. Rotable.
 block.titanium-conveyor.description = Bloque de transporte avanzado. Mueve objetos más rápido que los transportadores estándar.
 block.plastanium-conveyor.description = Mueve ítems por lotes.\nAcepta ítems por detrás, y los descarga en tres direcciones hacia el frente, como un enrutador.
-block.armored-conveyor.description = Mueve items a la misma veolcidad que una cinta de titanio, pero tiene mas defensa. No acepta entradas por los lados a menos que sean lineas transportadoras.
 block.junction.description = Actúa como puente para dos transportadores que se cruzan. Útil en situaciones con dos diferentes transportadores transportando diferentes materiales a diferentes lugares.
 block.bridge-conveyor.description = Bloque avanzado de transporte. Puede transportar objetos por encima hasta 3 casillas de cualquier terreno o construcción.
 block.phase-conveyor.description = Bloque de transporte avanzado. Usa energía para transportar objetos a otro transportador de fase conectado a través de varias casillas.
@@ -1187,7 +1265,7 @@ block.battery.description = Guarda energía cuando hay abundancia y proporciona
 block.battery-large.description = Almacena mucha más energía que una batería normal.
 block.combustion-generator.description = Genera energía quemando aceite o materiales inflamables.
 block.thermal-generator.description = Genera una gran cantidad de energía con la lava.
-block.turbine-generator.description = Más eficiente que un generador de combustión, pero requiere agua adicional.
+block.steam-generator.description = Más eficiente que un generador de combustión, pero requiere agua adicional.
 block.differential-generator.description = Genera grandes cantidades de energía. Utiliza la diferencia de temperatura entre el fluído criogenico y la quema de piratita.
 block.rtg-generator.description = Un generador radioisótropo termoeléctrico que no necesita enfriamiento, pero proporciona menos energía que un reactor de torio.
 block.solar-panel.description = Proporciona una pequeña cantidad de energía procedente del sol.
@@ -1223,15 +1301,5 @@ block.ripple.description = Una extramadamente poderosa torre. Dispara conjuntos
 block.cyclone.description = Una torre grande anti-aérea y anti-terrestre. Dispara conjuntos explosivos de Flak a enemigos cercanos.
 block.spectre.description = Un cañon masivo de dos barriles. Dispara balas perforantes a objetivos de aire y tierra.
 block.meltdown.description = Un cañon láser masivo. Carga y dispara un rayo láser constante a enemigos cercanos. Requiere enfriamiento para operar.
-block.command-center.description = Emite comandos de movimiento a las unidades aliadas en el mapa.\nHace que las unidades patrullen, ataquen un núcleo enemigo o se retiren al núcleo / fábrica. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produce drones mineros primitivos.
-block.spirit-factory.description = Produce drones ligeros que reparan bloques.
-block.phantom-factory.description = Produce drones avanzados de construcción.
-block.wraith-factory.description = Produce unidades aéreas rápidas e interceptoras.
-block.ghoul-factory.description = Produce unidades bombarderas pesadas.
-block.revenant-factory.description = Produce unidades aéreas lanzamisiles pesadas.
-block.dagger-factory.description = Produce unidades terrestres básicas.
-block.crawler-factory.description = Produce unidades rápidas terrestres explosivas.
-block.titan-factory.description = Produce unidades terrestres avanzadas con armadura.
-block.fortress-factory.description = Produce unidades terrestres de artillería pesada.
 block.repair-point.description = Repara la unidad dañada más cercana a su alrededor.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index c002a01a5f..d5ac8cfb74 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Kõik PC-platvormide versioonid
 link.google-play.description = Androidi versioon Google Play poes
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Mängu ametlik viki
-link.feathub.description = Suggest new features
+link.suggestions.description = Suggest new features
 linkfail = Lingi avamine ebaõnnestus!\nVeebiaadress kopeeriti.
 screenshot = Kuvatõmmis salvestati: {0}
 screenshot.invalid = Maailm on liiga suur: kuvatõmmise salvestamiseks ei pruugi olla piisavalt mälu.
@@ -20,6 +20,8 @@ gameover = Mäng läbi!
 gameover.pvp = Võistkond[accent] {0}[] võitis!
 highscore = [accent]Uus rekord!
 copied = Copied.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Helid
 load.map = Maailmad
@@ -63,8 +65,7 @@ stat.delivered = Kaasavõetud ressursid:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Hinne:[accent] {0}
 
-launcheditems = [accent]Kaasavõetud ressursid
-launchinfo = [unlaunched][[LAUNCH] your core to obtain the items indicated in blue.
+globalitems = [accent]Global Items
 map.delete = Kas oled kindel, et soovid kustutada\nmaailma "[accent]{0}[]"?
 level.highscore = Rekord: [accent]{0}
 level.select = Taseme valimine
@@ -106,6 +107,7 @@ mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Mod Folder
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
@@ -113,6 +115,7 @@ 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.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
 mod.import.file = Import File
 mod.import.github = Import GitHub Mod
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = This mod will be deleted.
 mod.author = [lightgray]Author:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Info
 name = Nimi:
 noname = Valige kõigepealt [accent]nimi[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Failinimi:
 unlocked = Uus sisu!
 completed = [accent]Olemas
@@ -142,6 +148,7 @@ techtree = Uurimispuu
 research.list = [lightgray]Vajalikud uuringud:
 research = Uuri
 researched = [lightgray]{0} uuritud.
+research.progress = {0}% complete
 players = {0} mängijat
 players.single = {0} mängija
 players.search = search
@@ -224,7 +231,6 @@ save.new = Uus salvestis
 save.overwrite = Oled kindel, et soovid selle salvestise asendada?
 overwrite = Asenda
 save.none = Salvestisi ei leitud!
-saveload = [accent]Salvestamine...
 savefail = Salvestamine ebaõnnestus!
 save.delete.confirm = Oled kindel, et soovid selle salvestise kustutada?
 save.delete = Kustuta
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Oled kindel, et soovid õpetuse lõpetada?\nÕpetust saa
 loading = [accent]Laadimine...
 reloading = [accent]Reloading Mods...
 saving = [accent]Salvestamine...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
@@ -328,8 +335,9 @@ waves.never = --
 waves.every = iga
 waves.waves = laine järel
 waves.perspawn = laine kohta
+waves.shields = shields/wave
 waves.to = kuni
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Eelvaade
 waves.edit = Muuda...
 waves.copy = Kopeeri puhvrisse
@@ -337,6 +345,11 @@ waves.load = Lae puhvrist
 waves.invalid = Puhvrist laeti vigane lahingulainete informatsioon.
 waves.copied = Lahingulainete informatsioon kopeeriti puhvrisse.
 waves.none = Vaenlased on täpsustamata.\n[accent]Märkus: Tühjad lahingulained asendatakse automaatselt[]\n[accent]vaikimisi lahingulainetega.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Vaikimisi>
 details = Üksikasjad...
 edit = Muuda...
@@ -456,10 +469,12 @@ locked = Lukus
 complete = [lightgray]Eesmärgid:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
-requirement.unlock = Unlock {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Jätka piirkonnas:\n[lightgray]{0}
 bestwave = [lightgray]Parim lahingulaine: {0}
 launch = < LENDUTÕUS >
+launch.text = Launch
 launch.title = Lendutõus
 launch.next = [lightgray]Järgmine võimalus on {0}. laine järel
 launch.unable2 = [scarlet]Ei saa LENDU TÕUSTA.[]
@@ -467,13 +482,14 @@ launch.confirm = Lendu tõusmisel võetakse kaasa\nkõik tuumikus olevad ressurs
 launch.skip.confirm = Kui jätad praegu lendu tõusmata, siis saad seda teha alles hilisemate lahingulainete järel.
 uncover = Ava
 configure = Muuda varustust
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = Add All
-configure.locked = [lightgray]Varustuse muutmine avaneb\n {0}. lahingulaine järel.
+launch.destination = Destination: {0}
 configure.invalid = Arv peab olema 0 ja {0} vahel.
 zone.unlocked = [lightgray]{0} avatud.
 zone.requirement.complete = Jõudsid lahingulaineni {0}:\nPiirkonna "{1}" nõuded täidetud.
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = Ressursid:
 zone.objective = [lightgray]Eesmärk: [accent]{0}
 zone.objective.survival = Ellujäämine
@@ -492,35 +508,43 @@ error.io = Võrgu sisend-väljundi viga.
 error.any = Teadmata viga võrgus.
 error.bloom = Bloom-efekti lähtestamine ebaõnnestus.\nSinu seade ei pruugi seda efekti toetada.
 
-zone.groundZero.name = Nullpunkt
-zone.desertWastes.name = Kõrbestunud tühermaa
-zone.craters.name = Kraatrid
-zone.frozenForest.name = Jäätunud mets
-zone.ruinousShores.name = Rüüstatud kaldad
-zone.stainedMountains.name = Rikutud mägismaa
-zone.desolateRift.name = Mahajäetud rift
-zone.nuclearComplex.name = Tuumajõujaam
-zone.overgrowth.name = Kinnikasvanud võsa
-zone.tarFields.name = Tõrvaväljad
-zone.saltFlats.name = Soolaväljad
-zone.impact0078.name = Kokkupõrge 0078
-zone.crags.name = Kaljurünkad
-zone.fungalPass.name = Seenekuru
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Optimaalne asukoht alustamiseks.\nMadal ohutase. Vähesel määral ressursse.\nKogu kokku nii palju vaske ja pliid kui võimalik.
-zone.frozenForest.description = Spoorid on levinud isegi mägede lähedale. Jäised temperatuurid ei suuda neid igavesti eemal hoida.\n\nAlusta esimeste katsetustega energia tootmises. Ehita põlemisgeneraatoreid.\nÕpi oma ehitisi parandama.
-zone.desertWastes.description = Need tühermaad on üüratud ja ettearvamatud. Siin-seal leidub mahajäetud ja räsitud tööstushooneid.\n\nSelles piirkonnas leidub sütt. Töötle seda grafiidiks või põleta energia saamiseks.\n\n[lightgray]Maandumispaik ei ole kindlaks määratud.
-zone.saltFlats.description = Kõrbe äärealadel laiuvad soolaväljad. Sellel alal leidub üksikuid ressursse.\n\nVaenlased on ehitanud siia ressursside hoidla. Hävita nende tuumik. Tee kõik maatasa.
-zone.craters.description = Kunagiste sõdade käigus tekkinud kraatrisse on nüüdseks kogunenud vesi. Taasta see piirkond. Kogu liiva. Sulata see metaklaasiks. Kahurite ja puuride jahutamiseks pumpa vett.
-zone.ruinousShores.description = Peale tühermaad algab rannajoon. Kunagi asus siin rannakaitsekompleks. Sellest ei ole palju alles. Kõigest põhilisemad kaitseehitised on jäänud puutumata. Teistest hoonetest on alles vaid varemed.\nJätka kaugemale arenemist. Taasavasta tehnoloogiaid.
-zone.stainedMountains.description = Kaugemal sisemaal laiuvad mäed, mis on veel spooridest puutumata.\nKaevanda selles piirkonnas külluslikult leiduvat titaani. Õpi seda kasutama.\n\nVaenlasi on siin üpris palju. Ära anna neile aega oma tugevaimate väeüksuste teele saatmiseks.
-zone.overgrowth.description = See ala on võsastunud ja asub spooride allika lähedal.\nVaenlased on siin eelpostil. Hävita see. Ehita kalevite väeüksuseid. Taasta see, mis läks kunagi kaduma.
-zone.tarFields.description = Mägede ja kõrbe vahel asuvad naftatootmistsooni äärealad. Üks väheseid tõrvavarude piirkondi.\nEhkki see koht on mahajäetud, leidub selle läheduses ohtlikke vaenlasi. Ära alahinda neid.\n\n[lightgray]Võimaluse korral uuri nafta töötlemise tehnoloogiaid.
-zone.desolateRift.description = Äärmiselt ohtlik piirkond. Külluslikult ressursse, kuid vähe ruumi. Suur hävinemisoht. Lahku võimalikult kiiresti. Vaenlaste rünnakute vaheline pikk aeg on petlik!
-zone.nuclearComplex.description = Endine tooriumi tootmise ja töötlemise rajatis, millest on nüüdseks alles vaid varemed.\n[lightgray]Uuri tooriumit ja selle laialdaseid kasutusvõimalusi.\n\nVaenlaseid on siin palju ning nad jälgivad pidevalt sissetungijaid.
-zone.fungalPass.description = Üleminekuala kõrgete mägede ja madalamate, spooridega ülekülvatud maade vahel. Siin asub väike vaenlaste luurebaas.\nHävita see.\nKasuta soldatite ja plahvatajate väeüksuseid. Hävita kaks vaenlaste tuumikut.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Keel
 settings.data = Mänguandmed
@@ -534,9 +558,12 @@ settings.graphics = Graafika
 settings.cleardata = Kustuta mänguandmed...
 settings.clear.confirm = Oled kindel, et soovid olemasolevad\nsätted kustutada?\n[accent]Seda ei saa tagasi võtta!
 settings.clearall.confirm = [scarlet]HOIATUS![]\nKustutatakse kõik andmed, sealhulgas salvestised, maailmad, kampaania saavutused\nja juhtnuppude sätted.\n[accent]Vajutades nupule "OK", kustutatakse\nkõik andmed ja seejärel mäng sulgub.[]
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Paus >
 clear = Clear
 banned = [scarlet]Banned
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Jah
 no = Ei
 info.title = Info
@@ -558,8 +585,11 @@ blocks.itemsmoved = Transportimise kiirus
 blocks.launchtime = Aeg lendutõusude vahel
 blocks.shootrange = Ulatus
 blocks.size = Suurus
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Vedelike mahutavus
 blocks.powerrange = Energia ulatus
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Energiatarve
 blocks.powerdamage = Energiatarve hävituspunkti kohta
@@ -575,13 +605,18 @@ blocks.boosteffect = Kiirendaja mõju
 blocks.maxunits = Maks. aktiivseid väeüksuseid
 blocks.health = Elud
 blocks.buildtime = Ehitamise aeg
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Ehitamise maksumus
 blocks.inaccuracy = Ebatäpsus
 blocks.shots = Laske
 blocks.reload = Lasku/s
 blocks.ammo = Laskemoon
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Nõuab paremat puuri
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Puurimise kiirus: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Kasutegur: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Laeng: {0}
 bar.poweroutput = Tootlus: {0}
 bar.items = Ressursse: {0}
 bar.capacity = Mahutavus: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Vedelik
 bar.heat = Kuumus
 bar.power = Energia
 bar.progress = Edenemine
-bar.spawned = Väeüksuseid: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -619,12 +655,16 @@ unit.liquidunits = vedelikuühikut
 unit.powerunits = energiaühikut
 unit.degrees = kraadi
 unit.seconds = s
+unit.minutes = mins
 unit.persecond = /s
+unit.perminute = /min
 unit.timesspeed = x kiirus
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = ressursiühikut
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Üldinfo
 category.power = Energia
 category.liquids = Vedelikud
@@ -639,6 +679,7 @@ setting.linear.name = Lineaarne tekstuurivastendus
 setting.hints.name = Hints
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animeeritud vesi
 setting.animatedshields.name = Animeeritud kilbid
 setting.antialias.name = Sakitõrje[lightgray] (vajab mängu taaskäivitamist)[]
@@ -663,7 +704,6 @@ setting.effects.name = Näita visuaalefekte
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Kontrolleri tundlikkus
 setting.saveinterval.name = Salvestamise intervall
 setting.seconds = {0} sekundit
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Täisekraan
 setting.borderlesswindow.name = Äärteta ekraan[lightgray] (võib vajada mängu taaskäivitamist)
 setting.fps.name = Näita kaadrite arvu sekundis
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = Vertikaalne sünkroonimine
 setting.pixelate.name = Piksel-efekt[lightgray] (lülitab animatsioonid välja)
 setting.minimap.name = Näita kaarti
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Muusika helitugevus
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Taustahelide tugevus
 setting.mutemusic.name = Vaigista muusika
 setting.sfxvol.name = Heliefektide tugevus
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Enamik kuvatud juhtnuppudest ei ole kasutusel mobiils
 category.general.name = Mäng
 category.view.name = Kaamera ja kasutajaliides
 category.multiplayer.name = Mitmikmäng
+category.blocks.name = Block Select
 command.attack = Ründa
 command.rally = Patrulli
 command.retreat = Põgene
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Clear Building
 keybind.press = Vajuta klahvi...
 keybind.press.axis = Liiguta juhtkangi või vajuta klahvi...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Liigu X-teljel
 keybind.move_y.name = Liigu Y-teljel
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Söösta
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Diagonaalne paigutamine
 keybind.pick.name = Vali blokk
 keybind.break_block.name = Hävita blokk
 keybind.deselect.name = Tühista valik
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Tulista
 keybind.zoom.name = Muuda suumi
 keybind.menu.name = Menüü
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Kasuta taimerit
 rules.waves = Kasuta lahingulaineid
 rules.attack = Mänguviis "Rünnak"
+rules.buildai = AI Building
 rules.enemyCheat = [scarlet]Vaenlastel[] on lõputult ressursse
-rules.unitdrops = Väeüksuste heitmine lubatud
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Väeüksuste tootmiskiiruse kordaja
 rules.unithealthmultiplier = Väeüksuste elude kordaja
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Mängija elude kordaja
-rules.playerdamagemultiplier = Mängija hävitusvõime kordaja
 rules.unitdamagemultiplier = Väeüksuste hävitusvõime kordaja
 rules.enemycorebuildradius = Vaenlaste tuumiku ehitistevaba ala raadius:[lightgray] (ühik)
-rules.respawntime = Elluärkamise aeg:[lightgray] (sekund)
 rules.wavespacing = Aeg lainete vahel:[lightgray] (sekund)
 rules.buildcostmultiplier = Ehitamise maksumuse kordaja
 rules.buildspeedmultiplier = Ehitamise kiiruse kordaja
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Järgmine laine ootab eelmise laine lõpuni
 rules.dropzoneradius = Maandumisala raadius:[lightgray] (ühik)
-rules.respawns = Maks. arv elluärkamisi laine kohta
-rules.limitedRespawns = Piira elluärkamisi
+rules.unitammo = Units Require Ammo
 rules.title.waves = Lahingulained
-rules.title.respawns = Elluärkamised
 rules.title.resourcesbuilding = Ressursid ja ehitamine
-rules.title.player = Mängijad
 rules.title.enemy = Vaenlased
 rules.title.unit = Väeüksused
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Ressursid
 content.liquid.name = Vedelikud
@@ -827,10 +878,11 @@ liquid.water.name = Vesi
 liquid.slag.name = Räbu
 liquid.oil.name = Nafta
 liquid.cryofluid.name = Krüovedelik
-item.corestorable = [lightgray]Storable in Core: {0}
+
 item.explosiveness = [lightgray]Plahvatusohtlikkus: {0}%
 item.flammability = [lightgray]Tuleohtlikkus: {0}%
 item.radioactivity = [lightgray]Radioaktiivsus: {0}%
+
 unit.health = [lightgray]Elud: {0}
 unit.speed = [lightgray]Kiirus: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Soojusmahtuvus: {0}
 liquid.viscosity = [lightgray]Viskoossus: {0}
 liquid.temperature = [lightgray]Temperatuur: {0}
 
+unit.dagger.name = Soldat
+unit.mace.name = Mace
+unit.fortress.name = Koljat
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Plahvataja
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Liivakamakas
 block.grass.name = Rohi
 block.slag.name = Slag
 block.salt.name = Sool
-block.saltrocks.name = Kristallsool
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Kruus
 block.tendrils.name = Kombitsad
-block.sandrocks.name = Liivakivid
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spoorine puu
-block.sporerocks.name = Spoorkivid
-block.rock.name = Kivikamakas
-block.snowrock.name = Lumine kivikamakas
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Lumine puu
 block.shale.name = Savikilt
 block.shale-boulder.name = Kivikamakas
 block.moss.name = Sammal
 block.shrubs.name = Põõsad
 block.spore-moss.name = Spoorsammal
-block.shalerocks.name = Savikildad
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Vanametallist sein
 block.scrap-wall-large.name = Suur vanametallist sein
 block.scrap-wall-huge.name = Tohutu vanametallist sein
@@ -890,13 +979,17 @@ block.craters.name = Kraatrid
 block.sand-water.name = Vesi liival
 block.darksand-water.name = Vesi tumedal liival
 block.char.name = Puusüsi
-block.holostone.name = Helendav kivi
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Jäine lumi
-block.rocks.name = Kivid
-block.icerocks.name = Jäised kivid
-block.snowrocks.name = Lumised kivid
-block.dunerocks.name = Luitekivid
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Puu
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Surnud valgepuu
 block.white-tree.name = Valgepuu
 block.spore-cluster.name = Spoorikobarad
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Tume paneel 4
 block.dark-panel-5.name = Tume paneel 5
 block.dark-panel-6.name = Tume paneel 6
 block.dark-metal.name = Tume metall
-block.ignarock.name = Tardkivim
+block.basalt.name = Basalt
 block.hotrock.name = Kuumad kivid
 block.magmarock.name = Magmakivim
-block.cliffs.name = Rahnud
 block.copper-wall.name = Vasksein
 block.copper-wall-large.name = Suur vasksein
 block.titanium-wall.name = Titaansein
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Ränisulatusahi
 block.phase-weaver.name = Faaskangakuduja
 block.pulverizer.name = Metallijahvataja
-block.cryofluidmixer.name = Krüosegisti
+block.cryofluid-mixer.name = Krüosegisti
 block.melter.name = Metallisulataja
 block.incinerator.name = Tuhastusahi
 block.spore-press.name = Spooripress
@@ -964,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Aku
 block.battery-large.name = Suur aku
 block.combustion-generator.name = Põlemisgeneraator
-block.turbine-generator.name = Aurugeneraator
+block.steam-generator.name = Aurugeneraator
 block.differential-generator.name = Diferentseeriv generaator
 block.impact-reactor.name = Impulssreaktor
 block.mechanical-drill.name = Harilik puur
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Lõhkeainete segisti
 block.solar-panel.name = Päikesepaneel
 block.solar-panel-large.name = Suur päikesepaneel
 block.oil-extractor.name = Naftapuur
-block.command-center.name = Juhtimiskeskus
-block.draug-factory.name = Kaevandusdroonide tehas
-block.spirit-factory.name = Parandusdroonide tehas
-block.phantom-factory.name = Ehitusdroonide tehas
-block.wraith-factory.name = Hävitajate tehas
-block.ghoul-factory.name = Pommitajate tehas
-block.dagger-factory.name = Soldatite tehas
-block.crawler-factory.name = Plahvatajate tehas
-block.titan-factory.name = Kalevite tehas
-block.fortress-factory.name = Koljatite tehas
-block.revenant-factory.name = Ülestõusnute tehas
 block.repair-point.name = Parandusjaam
 block.pulse-conduit.name = Titaantoru
 block.plated-conduit.name = Plated Conduit
@@ -1036,6 +1117,29 @@ block.meltdown.name = Valguskiir
 block.container.name = Hoidla
 block.launch-pad.name = Stardiplatvorm
 block.launch-pad-large.name = Suur stardiplatvorm
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = sinine
 team.crux.name = punane
 team.sharded.name = killustunud
@@ -1043,21 +1147,7 @@ team.orange.name = oranž
 team.derelict.name = unustatud
 team.green.name = roheline
 team.purple.name = lilla
-unit.spirit.name = Parandusdroon
-unit.draug.name = Kaevandusdroon
-unit.phantom.name = Ehitusdroon
-unit.dagger.name = Soldat
-unit.crawler.name = Plahvataja
-unit.titan.name = Kalev
-unit.ghoul.name = Pommitaja
-unit.wraith.name = Hävitaja
-unit.fortress.name = Koljat
-unit.revenant.name = Ülestõusnu
-unit.eruptor.name = Tulesülgaja
-unit.chaos-array.name = Peninukk
-unit.eradicator.name = Luupainaja
-unit.lich.name = Tulihänd
-unit.reaper.name = Vanapagan
+
 tutorial.next = [lightgray]<Jätkamiseks vajuta siia>
 tutorial.intro = Alustasid[accent] Mindustry mänguõpetusega[].\n[accent]Tuumikust[] väljub sinu [accent]lendmehhaan Ahti[]. Alusta[accent] vase kaevandamisest[]. Selleks liigu tuumiku lähedal asuva vasemaagi juurde ja vajuta sellele.\n\n[accent]{0}/{1} vaske kaevandatud
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1100,17 +1190,7 @@ liquid.water.description = Kõige kasulikum vedelik, mida kasutatakse masinate j
 liquid.slag.description = Erinevate sulametallide segu. Võimalik eraldada koostisesse kuuluvateks mineraalideks või kasutada relvana, pihustades seda vaenlase väeüksustele.
 liquid.oil.description = Keerukate materjalide tootmisel kasutatav vedelik. Võimalik muundada söeks või kasutada relvana, pihustades seda vaenlase väeüksustele.
 liquid.cryofluid.description = Inertne mittesöövitav vedelik, mis saadakse veest ja titaanist. Suure soojusmahtuvusega. Kasutatakse masinate jahutamiseks.
-unit.draug.description = Algeline droon, mis on mõeldud kaevandamiseks. Odav toota, kuid kulukas ülal pidada. Kaevandab automaatselt vaske ja pliid ning transpordib ressursse lähimasse tuumikusse.
-unit.spirit.description = Modifitseeritud kaevandusdroon, mis on mõeldud ehitiste automaatseks parandamiseks.
-unit.phantom.description = Täiustatud droon, mis järgneb oma liitlastele ja abistab konstruktsioonide ehitamisel.
-unit.dagger.description = Kõige elementaarsem maapealne väeüksus, mida on odav toota. Suured parved käivad vaenlastele üle jõu.
-unit.crawler.description = Maapealne väeüksus, mis koosneb lihtsast kerest, millele on kinnitatud lõhkeained. Pole eriti vastupidav. Plahvatab kokkupuutel vaenlasega.
-unit.titan.description = Täiustatud ja soomustatud maapealne väeüksus. Ründab nii maapealseid kui ka õhus olevaid sihtmärke. Varustatud kahe miniatuurse leegiheitjaga.
-unit.fortress.description = Tugev maapealne väeüksus, mis on relvastatud kahe modifitseeritud kauglaskuriga. Need võimaldavad hõlpsasti rünnata kaugel asuvaid vaenlasi ja nende väeüksusi.
-unit.eruptor.description = Tugev maapealne väeüksus, mis on loodud konstruktsioonide hävitamiseks. Pritsib vaenlase ehitisi kuuma räbuga, mis sulatab need ning süütab ümbritsevad lenduvad osakesed.
-unit.wraith.description = Kiiresti lendav väeüksus, mis sihib generaatoreid.
-unit.ghoul.description = Tugev ja lendav lauspommitav väeüksus. Sööstab vaenlaste ja nende ehitiste kohal, sihtides infrastruktuuri kõige olulisemaid osi.
-unit.revenant.description = Vastupidav ja lendav väeüksus raketimassiiviga.
+
 block.message.description = Hoiab endas liitlastele olulist sõnumit.
 block.graphite-press.description = Surub söekamakaid õhukesteks grafiidilehtedeks.
 block.multi-press.description = Grafiidipressi täiustatud versioon, mis kasutab vett ja energiat kiiremaks ja tõhusamaks töötlemiseks.
@@ -1119,7 +1199,7 @@ block.kiln.description = Sulatab liiva ja plii metaklaasiks. Väike energiatarve
 block.plastanium-compressor.description = Toodab naftast ja titaanist plastiumit.
 block.phase-weaver.description = Sünteesib faaskangast radioaktiivsest tooriumist ja liivast. Tohutu energiatarve.
 block.alloy-smelter.description = Kombineerib titaaniumi, plii, räni ja vase voogsulamiks.
-block.cryofluidmixer.description = Toodab krüovedelikku, segades kokku vee ja peene titaanpulbri. Hädavajalik tooriumreaktori toimimiseks.
+block.cryofluid-mixer.description = Toodab krüovedelikku, segades kokku vee ja peene titaanpulbri. Hädavajalik tooriumreaktori toimimiseks.
 block.blast-mixer.description = Purustab spoorikobaraid ja segab neid püratiidiga, et toota lõhkeainet.
 block.pyratite-mixer.description = Segab söe, plii ja liiva tuleohtlikuks püratiidiks.
 block.melter.description = Sulatab vanametalli räbuks, mida saab kas edasi töödelda või kasutada pritskahurites.
@@ -1185,7 +1265,7 @@ block.battery.description = Salvestab energiat puhvrina positiivse energiabilans
 block.battery-large.description = Salvestab rohkem energiat kui tavaline aku.
 block.combustion-generator.description = Toodab energiat süttivate materjalide, näiteks söe, põletamisel.
 block.thermal-generator.description = Toodab energiat kuumades piirkondades.
-block.turbine-generator.description = Täiustatud põlemisgeneraator. Tõhusam kui põlemisgeneraator, kuid vajab auru tootmiseks lisanduvat vett.
+block.steam-generator.description = Täiustatud põlemisgeneraator. Tõhusam kui põlemisgeneraator, kuid vajab auru tootmiseks lisanduvat vett.
 block.differential-generator.description = Tekitab suurel hulgal energiat. Kasutab ära krüovedeliku ja põleva püratiidi temperatuuride erinevust.
 block.rtg-generator.description = Töökindel generaator, mis kasutab radioaktiivsete ühendite lagunemisel eralduvat soojust, et toota sellest aeglasel kiirusel energiat.
 block.solar-panel.description = Toodab vähesel määral energiat päikesekiirgusest.
@@ -1221,15 +1301,5 @@ block.ripple.description = Äärmiselt võimas kahur, mis tulistab mürske kobar
 block.cyclone.description = Suur lendavate ja maapealsete väeüksuste vastane kahur, mis tulistab plahvatavaid mürske.
 block.spectre.description = Massiivne kaheraudne kahur, mis tulistab soomuskatteid läbistavaid mürske nii lendavate kui ka maapealsete väeüksuste pihta.
 block.meltdown.description = Massiivne laserkahur, mis tekitab püsiva energiakiire. Vajab töötamiseks jahutusvedelikku.
-block.command-center.description = Jagab liitlaste väeüksustele käske. Kohustab väeüksusi vaenlase tuumikut ründama, põgenema või patrullima. Kui vaenlaste tuumikut ei ole, siis vaikimisi antakse väeüksustele käsk oodata vaenlaste väeüksuste lähenemist ja rünnata.
-block.draug-factory.description = Toodab kaevandusdroone. Kaevandusdroonid on mõeldud baasressursside automaatseks kaevandamiseks.
-block.spirit-factory.description = Toodab parandusdroone. Parandusdroonid on mõeldud ehitiste automaatseks parandamiseks.
-block.phantom-factory.description = Toodab ehitusdroone. Ehitusdroonid järgnevad oma liitlastele ja abistavad konstruktsioonide ehitamisel.
-block.wraith-factory.description = Toodab hävitajate väeüksuseid. Hävitajad on kiiresti lendavad väeüksused.
-block.ghoul-factory.description = Toodab pommitajate väeüksuseid. Pommitajad on tugevad ja lendavad lauspommitavad väeüksused.
-block.revenant-factory.description = Toodab ülestõusnute väeüksuseid. Ülestõusnud on vastupidavad ja lendavad väeüksused raketimassiiviga.
-block.dagger-factory.description = Toodab soldatite väeüksuseid. Soldatid on kõige elementaarsemad maapealsed väeüksused.
-block.crawler-factory.description = Toodab plahvatajate väeüksuseid. Plahvatajad on maapealsed väeüksused, mis koosnevad lihtsast kerest, millele on kinnitatud lõhkeained.
-block.titan-factory.description = Toodab kalevite väeüksuseid. Kalevid on maapealsed väeüksused, mis on relvastatud kahe miniatuurse leegiheitjaga.
-block.fortress-factory.description = Toodab koljatite väeüksuseid. Koljatid on tugevad maapealsed väeüksused, mis on relvastatud kahe modifitseeritud kauglaskuriga.
 block.repair-point.description = Parandab kõige lähemal asuvat liitlaste väeüksust.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index d2bf23c503..5ef1a41b71 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -12,7 +12,7 @@ link.itch.io.description = PC deskargen itch.io orria
 link.google-play.description = Google Play dendako sarrera
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Mindustry wiki ofiziala
-link.feathub.description = Suggest new features
+link.suggestions.description = Suggest new features
 linkfail = Huts egin du esteka irekitzean!\nURL-a zure arbelera kopiatu da.
 screenshot = Pantaila-argazkia {0} helbidean gorde da
 screenshot.invalid = Mapa handiegia, baliteke pantaila-argazkirako memoria nahiko ez egotea.
@@ -20,6 +20,8 @@ gameover = Partida amaitu da
 gameover.pvp = [accent] {0}[] taldeak irabazi du!
 highscore = [accent]Marka berria!
 copied = Kopiatuta.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Soinuak
 load.map = Mapak
@@ -63,8 +65,7 @@ stat.delivered = Egotzitako baliabideak:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Azken graduazioa: [accent]{0}
 
-launcheditems = [accent]Egotzitako baliabideak
-launchinfo = [unlaunched][[EGOTZI] zure muina urdinez adierazitako baliabideak eskuratzeko.
+globalitems = [accent]Global Items
 map.delete = Ziur al zaude "[accent]{0}[]" mapa ezabatu nahi duzula?
 level.highscore = Marka: [accent]{0}
 level.select = Maila hautaketa
@@ -106,6 +107,7 @@ mods.guide = Mod-ak sortzeko gida
 mods.report = Eman akatsaren berri
 mods.openfolder = Ireki Mod-en karpeta
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Gaituta
 mod.disabled = [scarlet]Desgaituta
@@ -113,6 +115,7 @@ mod.disable = Desgaitu
 mod.content = Content:
 mod.delete.error = Ezin izan da mod-a ezabatu. Agian fitxategia erabilia izaten ari da.
 mod.requiresversion = [scarlet]Requires min game version: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Falta diren menpekotasunak: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Birkargatu behar da
 mod.import = Importatu Mod-a
 mod.import.file = Import File
 mod.import.github = Inportatu GitHub Mod-a
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = Mod hau ezabatuko da.
 mod.author = [lightgray]Egilea:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Honi buruz
 name = Izena:
 noname = Hautatu[accent] jokalari-izena[] aurretik.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Fitxategi-izena:
 unlocked = Eduki berria desblokeatuta!
 completed = [accent]Ikertua
@@ -142,6 +148,7 @@ techtree = Teknologia zuhaitza
 research.list = [lightgray]Ikertu:
 research = Ikertu
 researched = [lightgray]{0} ikertuta.
+research.progress = {0}% complete
 players = {0} jokalari konektatuta
 players.single = Jokalari {0} konektatuta
 players.search = search
@@ -224,7 +231,6 @@ save.new = Gordetako partida berria
 save.overwrite = Ziur gordetzeko tarte hau gainidatzi nahi duzula?
 overwrite = Gainidatzi
 save.none = Ez da gordetako partidarik aurkitu!
-saveload = Gordetzen...
 savefail = Huts egin du partida gordetzean!
 save.delete.confirm = Ziur gordetako partida hau ezabatu nahi duzula?
 save.delete = Ezabatu
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Ziur al zaude irten nahi duzula?\nTutoriala berriro hasi
 loading = [accent]Kargatzen...
 reloading = [accent]Mod-ak birkargatzen...
 saving = [accent]Gordetzen...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] plan bat ezabatzeko
 selectschematic = [accent][[{0}][] hautatu+kopiatzeko
 pausebuilding = [accent][[{0}][] eraikiketa eteteko
@@ -328,8 +335,9 @@ waves.never = <beti>
 waves.every = maiztasuna
 waves.waves = bolada
 waves.perspawn = sorrerako
+waves.shields = shields/wave
 waves.to = -
-waves.boss = Nagusia
+waves.guardian = Guardian
 waves.preview = Aurrebista
 waves.edit = Editatu...
 waves.copy = Kopiatu arbelera
@@ -337,6 +345,11 @@ waves.load = Kargatu arbeletik
 waves.invalid = Bolada baliogabeak arbelean.
 waves.copied = Boladak kopiatuta.
 waves.none = Ez da etsairik zehaztu.\nKontuan izan bolada hutsak lehenetsitako diseinuarekin ordeztuko direla.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Lehenetsia>
 details = Xehetasunak...
 edit = Editatu...
@@ -456,10 +469,12 @@ locked = Blokeatuta
 complete = [lightgray]Helmena:
 requirement.wave = Iritsi {0} boladara {1}
 requirement.core = Suntsitu etsaiaren muina {0}
-requirement.unlock = Desblokeatu {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Berrekin:\n[lightgray]{0}
 bestwave = [lightgray]Bolada onena: {0}
 launch = < EGOTZI >
+launch.text = Launch
 launch.title = Ongi egotzi da
 launch.next = [lightgray]hurrengo aukera\n {0}. boladan
 launch.unable2 = [scarlet]Ezin da EGOTZI.[]
@@ -467,13 +482,14 @@ launch.confirm = Honek zure muinean dauden baliabide guztiak egotziko ditu.\nEzi
 launch.skip.confirm = Orain ez eginez gero, geroagoko beste bolada batera itxaron beharko duzu.
 uncover = Estalgabetu
 configure = Konfiguratu zuzkidura
+loadout = Loadout
+resources = Resources 
 bannedblocks = Debekatutako blokeak
 addall = Gehitu denak
-configure.locked = [lightgray]Zuzkiduraren konfigurazioa desblokeatzeko: {0} bolada.
+launch.destination = Destination: {0}
 configure.invalid = Kopurua 0 eta {0} bitarteko zenbaki bat izan behar da.
 zone.unlocked = [lightgray]{0} desblokeatuta.
 zone.requirement.complete = {0}. boladara iritsia:\n{1} Eremuaren betebeharra beteta.
-zone.config.unlocked = Deskarga desblokeatuta:[lightgray]\n{0}
 zone.resources = [lightgray]Antzemandako baliabideak:
 zone.objective = [lightgray]Helburua: [accent]{0}
 zone.objective.survival = Biziraupena
@@ -492,35 +508,43 @@ error.io = Sareko irteera/sarrera errorea.
 error.any = Sareko errore ezezaguna.
 error.bloom = Ezin izan da distira hasieratu.\nAgian zure gailuak ez du onartzen.
 
-zone.groundZero.name = Zero eremua
-zone.desertWastes.name = Basamortuak
-zone.craters.name = Kraterrak
-zone.frozenForest.name = Oihan izoztua
-zone.ruinousShores.name = Hondamenaren itsasertza
-zone.stainedMountains.name = Kutsatutako mendiak
-zone.desolateRift.name = Arraila ospela
-zone.nuclearComplex.name = Konplexu nuklearra
-zone.overgrowth.name = Gehiegizko hazkundea
-zone.tarFields.name = Mundrun larreak
-zone.saltFlats.name = Gatz zelaiak
-zone.impact0078.name = 0078 talka
-zone.crags.name = Harkaitzak
-zone.fungalPass.name = Onddo mendatea
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Berriro hasteko kokaleku egokiena.\nBaliabide gutxi daude baina etsaien mehatxua ere txikia da.\nEskuratu ahal beste berun eta kobre.\nSegi aurrera.
-zone.frozenForest.description = Hemen ere, mendietatik hurbil, esporak sakabanatu dira. Tenperatura hotzek ez dituzte betirako geldiaraziko.\n\nHasi energia eskuratzeko abentura. Eraiki errekuntza sorgailuak. Ikasi konpontzaileak erabiltzen.
-zone.desertWastes.description = Basamortu hauen zabalak dira, ezustekoak, eta abandonaturiko sektore estrukturekin marratuak.\nBadago ikatza eskualde honetan. Erre energiarako, edo grafitoa sintetizatzeko.\n\n[lightgray]Ezin da lurreratze tokia bermatu.
-zone.saltFlats.description = Basamortuaren ertza gatz lautadetan datza. Baliabide gutxi aurkitu daitezke hemen.\n\nEtsaiak baliabideen biltegi konplexu bat eraiki du hemen. Suntsitu beraien muina. Ez utzi ezer zutunik.
-zone.craters.description = Ura pilatu da krater honetan, gerra zaharren oroigarri bat. Zureganatu eremu hau. Bildu hondarra. Galdatu metabeira. Ponpatu ura dorreak eta zulagailuak hozteko.
-zone.ruinousShores.description = Basamortuetatik haratago, itsasertza dago. Aspaldi, kostaldearen defentsarako konplexu bat zegoen hemen. Ez da askorik geratzen. Defentsarako estrukturak oinarrizkoenak besterik ez dira geratu dira salbu, beste guztia txatarrara txikitua dago.\nJarraitu kanporako zabalkundea. Berraurkitu teknologia.
-zone.stainedMountains.description = Barnealderantz mendiak daude, esporek oraindik kutsatu gabeak.\nErauzi titanio ugari eremu honetatik. Ikasi nola erabili.\n\nHemen etsaiaren presentzia handiagoa da. Ez eman bere unitate sendoenak bidaltzeko denborarik.
-zone.overgrowth.description = Eremu honetan gehiegizko hazkundea dago, esporen sorlekutik hurbilago.\nEtsaiak base aitzindari bat ezarri du hemen. Eraiki titaniozko unitateak eta suntsitu ezazu. Berreskuratu galdu zena.
-zone.tarFields.description = Olioa ekoizteko eremu baten kanpoaldea, mendiak eta basamortuen artean. Mundrun erreserba erabilgarriak dituen eremu bakarrenetako bat.\nAbandonatuta badago ere, inguru honetatik hurbil indar etsai arriskutsuak daude. Ez itzazu gutxietsi.\n\n[lightgray]Ikertu olio prozesaketarako teknologia ahal izanez gero.
-zone.desolateRift.description = Oso inguru arriskutsua. Baliabide ugari, baina toki gutxi. Suntsitua izateko arrisku handia. Irten ahal bezain laster. Ez zaitzala engainatu etsaien erasoen arteko tarte luzea.
-zone.nuclearComplex.description = Torioa ekoiztu eta prozesatzeko instalazio ohiak, hondakinetara txikitua.\n[lightgray]Ikertu torioa eta bere erabilera anitzak.\n\nEtsai ugari daude inguruan, etengabe miatzen erasotzaileen bila.
-zone.fungalPass.description = Mendi garaiak eta esporez jositako behe lautaden arteko transizio eremua. Etsaien araketa-base txiki bat dago hemen.\nSuntsitu ezazu.\nErabili Daga eta Ibilkari unitateak. Akabatu bi muinak.
-zone.impact0078.description = <jarri deskripzioa hemen>
-zone.crags.description = <jarri deskripzioa hemen>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Hizkuntza
 settings.data = Jolasaren datuak
@@ -534,9 +558,12 @@ settings.graphics = Grafikoak
 settings.cleardata = Garbitu jolasaren datuak...
 settings.clear.confirm = Ziur datu hauek garbitu nahi dituzula?\nEgindakoa ezin da desegin!
 settings.clearall.confirm = [scarlet]ABISUA![]\nHonek datu guztiak garbituko ditu, gordetako partidak, mapak, desblokeatutakoak, eta teklen konfigurazioak barne.\nBehin 'Ados' sakatzen duzula jolasak datuk guztiak ezabatuko ditu eta automatikoki irten.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Pausatuta >
 clear = Garbitu
 banned = [scarlet]Debekatuta
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Bai
 no = Ez
 info.title = Informazioa
@@ -558,8 +585,11 @@ blocks.itemsmoved = Garraio-abiadura
 blocks.launchtime = Egozketen arteko denbora
 blocks.shootrange = Irismena
 blocks.size = Neurria
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Likido-edukiera
 blocks.powerrange = Energia irismena
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Gehieneko konexioak
 blocks.poweruse = Energia-erabilera
 blocks.powerdamage = Energia/Kaltea
@@ -575,13 +605,18 @@ blocks.boosteffect = Indartze-efektua
 blocks.maxunits = Gehieneko unitate aktiboak
 blocks.health = Osasuna
 blocks.buildtime = Eraikitze-denbora
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Eraikitze-kostua
 blocks.inaccuracy = Zehazgabetasuna
 blocks.shots = Tiroak
 blocks.reload = Tiroak/segundoko
 blocks.ammo = Munizioa
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Zulagailu hobea behar da
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Ustiatze-abiadura: {0}/s
 bar.pumpspeed = Ponpatze abiadura: {0}/s
 bar.efficiency = Eraginkortasuna: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Energia: {0}
 bar.poweroutput = Energia irteera: {0}
 bar.items = Elementuak: {0}
 bar.capacity = Edukiera: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Likidoa
 bar.heat = Beroa
 bar.power = Energia
 bar.progress = Eraikitze egoera
-bar.spawned = Unitateak: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -619,12 +655,16 @@ unit.liquidunits = likido unitate
 unit.powerunits = energia unitate
 unit.degrees = grado
 unit.seconds = segundo
+unit.minutes = mins
 unit.persecond = /seg
+unit.perminute = /min
 unit.timesspeed = x abiadura
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = elementu
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Orokorra
 category.power = Energia
 category.liquids = Likidoak
@@ -639,6 +679,7 @@ setting.linear.name = Iragazte lineala
 setting.hints.name = Pistak
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animatutako ura
 setting.animatedshields.name = Animatutako ezkutuak
 setting.antialias.name = Antialias[lightgray] (berrabiarazi behar da)[]
@@ -663,7 +704,6 @@ setting.effects.name = Bistaratze-efektuak
 setting.destroyedblocks.name = Erakutsi suntsitutako blokeak
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Garraio-zintak kokatzeko bide-bilaketa
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Kontrolagailuaren sentikortasuna
 setting.saveinterval.name = Gordetzeko tartea
 setting.seconds = {0} segundo
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Pantaila osoa
 setting.borderlesswindow.name = Ertzik gabeko leihoa[lightgray] (berrabiaraztea behar lezake)
 setting.fps.name = Erakutsi FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelatu[lightgray] (animazioak desgaitzen ditu)
 setting.minimap.name = Erakutsi mapatxoa
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Erakutsi jokalariaren kokalekua
 setting.musicvol.name = Musikaren bolumena
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Giroaren bolumena
 setting.mutemusic.name = Isilarazi musika
 setting.sfxvol.name = Efektuen bolumena
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Tekla konfigurazio gehienak ez dabiltza mugikorrean.
 category.general.name = Orokorra
 category.view.name = Bistaratzea
 category.multiplayer.name = Hainbat jokalari
+category.blocks.name = Block Select
 command.attack = Eraso
 command.rally = Batu
 command.retreat = Erretreta
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Garrbitu eraikina
 keybind.press = Sakatu tekla bat...
 keybind.press.axis = Sakatu ardatza edo tekla...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Mugitu x
 keybind.move_y.name = Mugitu y
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Arrapalada
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Hautatu eskualdea
 keybind.schematic_menu.name = Eskema menua
 keybind.schematic_flip_x.name = Itzulbiratu X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Kokatze diagonala
 keybind.pick.name = Jaso blokea
 keybind.break_block.name = Apurtu blokea
 keybind.deselect.name = Deshautatu
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Tirokatu
 keybind.zoom.name = Zoom
 keybind.menu.name = Menua
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Boladen denboragailua
 rules.waves = Boladak
 rules.attack = Eraso modua
+rules.buildai = AI Building
 rules.enemyCheat = IA-k (talde gorriak) baliabide amaigabeak ditu
-rules.unitdrops = Unitate-sorrerak
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unitateen sorrerarako abiadura-biderkatzailea
 rules.unithealthmultiplier = Unitateen osasun-biderkatzailea
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Jokalariaren osasun-biderkatzailea
-rules.playerdamagemultiplier = Jokalariaren kalte-biderkatzailea
 rules.unitdamagemultiplier = Unitateen kalte-biderkatzailea
 rules.enemycorebuildradius = Etsaien muinaren ez-eraikitze erradioa:[lightgray] (lauzak)
-rules.respawntime = Birsortze denbora:[lightgray] (seg)
 rules.wavespacing = Boladen tartea:[lightgray] (seg)
 rules.buildcostmultiplier = Eraikitze kostu-biderkatzailea
 rules.buildspeedmultiplier = Eraikitze abiadura-biderkatzailea
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Atzeratu bolada etsairik geratzen bada
 rules.dropzoneradius = Erruntze puntuaren erradioa:[lightgray] (lauzak)
-rules.respawns = Gehieneko birsortzeak boladako
-rules.limitedRespawns = Mugatu birsortzeak
+rules.unitammo = Units Require Ammo
 rules.title.waves = Boladak
-rules.title.respawns = Birsortzeak
 rules.title.resourcesbuilding = Baliabideak eta eraikuntza
-rules.title.player = Jokalariak
 rules.title.enemy = Etsaiak
 rules.title.unit = Unitateak
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Solidoak
 content.liquid.name = Likidoak
@@ -827,10 +878,11 @@ liquid.water.name = Ura
 liquid.slag.name = Zepa
 liquid.oil.name = Olioa
 liquid.cryofluid.name = Krio-isurkaria
-item.corestorable = [lightgray]Storable in Core: {0}
+
 item.explosiveness = [lightgray]Lehergarritasuna: {0}%
 item.flammability = [lightgray]Sukoitasuna: {0}%
 item.radioactivity = [lightgray]Erradioaktibitatea: {0}%
+
 unit.health = [lightgray]Osasuna: {0}
 unit.speed = [lightgray]Abiadura: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Bero edukiera: {0}
 liquid.viscosity = [lightgray]Likatasuna: {0}
 liquid.temperature = [lightgray]Tenperatura: {0}
 
+unit.dagger.name = Daga
+unit.mace.name = Mace
+unit.fortress.name = Gotorleku
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Ibilkaria
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Hondar harkaitza
 block.grass.name = Belarra
 block.slag.name = Slag
 block.salt.name = Gatza
-block.saltrocks.name = Gatz harkaitzak
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Harribilak
 block.tendrils.name = Kiribilak
-block.sandrocks.name = Hondar arrokak
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Espora pinua
-block.sporerocks.name = Espora arrokak
-block.rock.name = Arroka
-block.snowrock.name = Elur arroka
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Elur pinua
 block.shale.name = Shalea
 block.shale-boulder.name = Shale harkaitza
 block.moss.name = Goroldioa
 block.shrubs.name = Zuhaixkak
 block.spore-moss.name = Espora goroldioa
-block.shalerocks.name = Espora arrokak
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Txatarrezko horma
 block.scrap-wall-large.name = Txatarrezko horma handia
 block.scrap-wall-huge.name = Txatarrezko horma itzela
@@ -890,13 +979,17 @@ block.craters.name = Kraterrak
 block.sand-water.name = Hondar ura
 block.darksand-water.name = Hondar ilun ura
 block.char.name = Kokea
-block.holostone.name = Holo harria
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Izotz elurra
-block.rocks.name = Harkaitzak
-block.icerocks.name = Izotz harkaitzak
-block.snowrocks.name = Elur harkaitzak
-block.dunerocks.name = Duna arrokak
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pinua
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Zuhaitz zuri hila
 block.white-tree.name = Zuhaitz zuria
 block.spore-cluster.name = Espora mordoa
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Panel iluna 4
 block.dark-panel-5.name = Panel iluna 5
 block.dark-panel-6.name = Panel iluna 6
 block.dark-metal.name = Metal iluna
-block.ignarock.name = Igna arroka
+block.basalt.name = Basalt
 block.hotrock.name = Arroka beroa
 block.magmarock.name = Magma arroka
-block.cliffs.name = Amildegiak
 block.copper-wall.name = Kobrezko horma
 block.copper-wall-large.name = Kobrezko horma handia
 block.titanium-wall.name = Titaniozko horma
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silizio galdategia
 block.phase-weaver.name = Fase ehulea
 block.pulverizer.name = Birringailua
-block.cryofluidmixer.name = Krio-isurkari nahasgailua
+block.cryofluid-mixer.name = Krio-isurkari nahasgailua
 block.melter.name = Urtzailea
 block.incinerator.name = Erraustegia
 block.spore-press.name = Espora prentsa
@@ -964,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Bateria
 block.battery-large.name = Bateria handia
 block.combustion-generator.name = Errekuntza sorgailua
-block.turbine-generator.name = Lurrin sorgailua
+block.steam-generator.name = Lurrin sorgailua
 block.differential-generator.name = Sorgailu diferentziala
 block.impact-reactor.name = Talkazko erreaktorea
 block.mechanical-drill.name = Zulagailu mekanikoa
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Lehergai nahasgailua
 block.solar-panel.name = Panel fotovoltaikoa
 block.solar-panel-large.name = Panel fotovoltaiko handia
 block.oil-extractor.name = Olio erauzgailua
-block.command-center.name = Agindu zentroa
-block.draug-factory.name = Daratulu dron zulagailu faktoria
-block.spirit-factory.name = Arima dron konpontzaile faktoria
-block.phantom-factory.name = Itzala dron eraikitzaile faktoria
-block.wraith-factory.name = Iratxo ehiza-hegazkin faktoria
-block.ghoul-factory.name = Hilotz-jale bonbaketari faktoria
-block.dagger-factory.name = Daga meka faktoria
-block.crawler-factory.name = Ibilkari meka faktoria
-block.titan-factory.name = Zentoi meka faktoria
-block.fortress-factory.name = Gotorleku meka faktoria
-block.revenant-factory.name = Mamu ehiza-hegazkin faktoria
 block.repair-point.name = Konponketa puntua
 block.pulse-conduit.name = Pultsu hodia
 block.plated-conduit.name = Plated Conduit
@@ -1036,6 +1117,29 @@ block.meltdown.name = Nukleofusio
 block.container.name = Edukiontzia
 block.launch-pad.name = Egozketa-plataforma
 block.launch-pad-large.name = Egozketa-plataforma handia
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = urdina
 team.crux.name = gorria
 team.sharded.name = laranja
@@ -1043,21 +1147,7 @@ team.orange.name = laranja
 team.derelict.name = abandonatua
 team.green.name = berdea
 team.purple.name = morea
-unit.spirit.name = Arima dron konpontzailea
-unit.draug.name = Daratulu dron zulagailua
-unit.phantom.name = Itzala dron eraikitzailea
-unit.dagger.name = Daga
-unit.crawler.name = Ibilkaria
-unit.titan.name = Zentoia
-unit.ghoul.name = Hilotz-jale bonbaketaria
-unit.wraith.name = Iratxo ehiza-hegazkina
-unit.fortress.name = Gotorleku
-unit.revenant.name = Mamu
-unit.eruptor.name = Sumendi
-unit.chaos-array.name = Kaos 
-unit.eradicator.name = Ezerezle
-unit.lich.name = Litxe
-unit.reaper.name = Segalaria
+
 tutorial.next = [lightgray]<Sakatu jarraitzeko>
 tutorial.intro = Hau [scarlet]Mindustry tutoriala[] da.\nHasi [accent]kobrea ustiatzen[]. Horretarako, sakatu zure muinetik hurbil dagoen kobre-mea bat.\n\n[accent]{0}/{1} kobre
 tutorial.intro.mobile = [scarlet] Mindustry Tutorialean[] sartu zara\nPasatu hatza mugitzeko.\n[accent]Egin atximurkada bi hatzekin [] zooma hurbildu edo urruntzeko.\nHasi[accent] kobrea ustiatuz[]. Hurbildu kobrera, gero sakatu zure muinetik hurbil dagoen kobre mea bat.\n\n[accent]{0}/{1} kobre
@@ -1100,17 +1190,7 @@ liquid.water.description = Likido erabilgarriena. Makinen hozgarri gisa eta hond
 liquid.slag.description = Urtutako mineral desberdinen batura. Bere jatorrizko mineraletara banatu daiteke, edo munizio gisa etsaiei ihinztatu.
 liquid.oil.description = Material aurreratuen ekoizpenean erabilitako likidoa. Ikatz bihurtu daiteke erregai gisa erabiltzeko, edo arma gisa ihinztatu eta su emanda.
 liquid.cryofluid.description = Ur eta titanioz egindako likido bizigabe eta ez korrosiboa. Beroa xurgatzeko gaitasun handia du. Hozgarri gisa maiz erabilia.
-unit.draug.description = Dron zulagailu traketsa. Ekoizteko merkea. Erabili eta bota daitekeena. Inguruko kobrea eta beruna automatikoki ustiatzen du. Erauzitako baliabideak muin hurbilenera daramatza.
-unit.spirit.description = Moldatutako daratulu dron bat, mehatzako ordez konponketak egiteko diseinatua. Inguruko kaltetutako blokeak konpontzen ditu automatikoki.
-unit.phantom.description = Dron unitate aurreratu bat. Erabiltzaile jarraitzen du. Eraikuntzan laguntzen du.
-unit.dagger.description = Lurreko meka oinarrizkoena. Ekoizteko merkea. Samaldatan erabilia eutsi ezinezkoa.
-unit.crawler.description = Gainean lehergailuak daramatzan armazoi biluzi batez osatutako lurreko unitatea. Ez du askorik irauten. Etsaiekin talka egitean eztanda egiten du.
-unit.titan.description = Blindatutako lurreko unitate aurreratua. Lurreko zein aireko xedeak erasotzen ditu. Kiskalgarri klaseko bi su-isurle daramatza.
-unit.fortress.description = Kanoiteria meka astuna. Moldatutako Txingor motako bi kanoi daramatza etsaiaren azpiegitura eta unitateen irismen luzeko erasoetarako.
-unit.eruptor.description = Estrukturak behera botatzeko diseinatutako meka astuna. Zepa jario bat tirokatzen du etsaiaren babesetara, hauek urtuz eta lurrinkorrak sutan jarriz.
-unit.wraith.description = Jo eta iheseko unitate harrapari azkarra. Energia sorgailuak ditu xede.
-unit.ghoul.description = Azal bonbaketari astuna. Etsaiaren estrukturak urratzen ditu, azpiegitura kritikoa xede duela.
-unit.revenant.description = Misil planeatzailedun tramankulu astuna.
+
 block.message.description = Mezu bat gordetzen du. Aliatuen arteko komunikaziorako erabilia.
 block.graphite-press.description = Ikatz puskak zanpatzen ditu grafito hutsezko xaflak sortuz.
 block.multi-press.description = Grafito prentsaren bertsio hobetu bat. Ura eta energia behar ditu ikatza azkar eta eraginkorki prozesatzeko.
@@ -1119,7 +1199,7 @@ block.kiln.description = Hondarra eta beruna galdatzen ditu metabeira izeneko ko
 block.plastanium-compressor.description = Plastanioa ekoizten du olioa eta titanioa erabiliz.
 block.phase-weaver.description = Fasezko ehuna sintetizatzen du torio erradioaktiboa eta hondarra erabiliz. Energia kopurua handia behar du jarduteko.
 block.alloy-smelter.description = Titanioa, beruna, silizioa eta kobrea konbinatzen ditu tirain aleazioa ekoizteko.
-block.cryofluidmixer.description = Ura eta titanio hauts fina nahasten ditu krio-isurkia ekoizteko. Toriozko erreaktorea erabiltzeko ezinbestekoa.
+block.cryofluid-mixer.description = Ura eta titanio hauts fina nahasten ditu krio-isurkia ekoizteko. Toriozko erreaktorea erabiltzeko ezinbestekoa.
 block.blast-mixer.description = Espora sortak eta piratita txikitu eta nahasten ditu lehergai konposatua ekoizteko.
 block.pyratite-mixer.description = Ikatza, beruna, eta hondarra nahasten ditu oso sukoia den piratita sortuz.
 block.melter.description = Metala zepara urtzen du, prozesatzen jarraitzeko edo olatu dorreetan erabiltzeko.
@@ -1185,7 +1265,7 @@ block.battery.description = Energia biltegiratu dezake gehiegi dagoenean tarteka
 block.battery-large.description = Bateria arrunt batek baino energia gehiago biltegiratu dezake.
 block.combustion-generator.description = Energia sortzen du gai erregarriak errez, esaterako ikatza.
 block.thermal-generator.description = Energia sortzen du toki beroetan jarrita.
-block.turbine-generator.description = Errekuntza sorgailu aurreratu bat. Eraginkorragoa. baina ur gehiago behar du lurrina sortzeko.
+block.steam-generator.description = Errekuntza sorgailu aurreratu bat. Eraginkorragoa. baina ur gehiago behar du lurrina sortzeko.
 block.differential-generator.description = Energia kopuru handia sortzen du. Krio-isurkaria eta piratita goriaren arteko tenperatura diferentzia erabiltzen du.
 block.rtg-generator.description = Sorgailu sinple eta fidagarria. Konposatu erradioaktiboen hirotzearen beroa erabiltzen du geldiro energia sortzeko.
 block.solar-panel.description = Eguzkiaren energia kopuru txiki bat ematen du.
@@ -1221,15 +1301,5 @@ block.ripple.description = Kanoiteria dorre izugarri indartsua. Obus sortak jaur
 block.cyclone.description = Aire zein lurreko defentsarako dorre handia. Torpedo lehergarrien sortak jaurtitzen dizkie inguruko unitateei.
 block.spectre.description = Kanoi bikoitz erraldoia. Blindajea zulatu dezaketen bala handiak tirokatzen ditu aireko zein lurreko xedeei.
 block.meltdown.description = Laser kanoi erraldoia. Etengabeko laser izpi bat kargatu eta jauritzen die inguruko etsaiei. Hozgarria behar du jarduteko.
-block.command-center.description = Mugimendu aginduak ematen dizkie mapa osoko unitate aliatuei.\nUnitateei patruilatzea, etsaien muin bat erasotzea edo bere muin edo faktoriara atzera egitea agintzen die. Etsairik ez badago, unitateek lehenetsita patruilatu egingo dute eraso agindupean badaude.
-block.draug-factory.description = Daratulu dron zulagailuak ekoizten ditu.
-block.spirit-factory.description = Arima konponketarako dron estrukturalak ekoizten ditu.
-block.phantom-factory.description = Eraikuntza dron aurreratuak ekoizten ditu.
-block.wraith-factory.description = Jo eta iheseko unitate harrapari azkarrak ekoizten ditu.
-block.ghoul-factory.description = Azal bonbaketari astunak ekoizten ditu.
-block.revenant-factory.description = Misilezko unitate astunak ekoizten ditu.
-block.dagger-factory.description = Lurreko oinarrizko unitateak ekoizten ditu.
-block.crawler-factory.description = Ibilkari unitate auto-suntsitzaileak ekoizten ditu.
-block.titan-factory.description = Lurreko unitate blindatu aurreratuak ekoizten ditu.
-block.fortress-factory.description = Lurreko kanoiteria unitate astunak ekoizten ditu.
 block.repair-point.description = Etengabe konpontzen du inguruko kaltetutako unitate hurbilena.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 9609baca29..ae351b8764 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io -sivu tietokoneversion latausten kanssa
 link.google-play.description = Google Play Kauppa -sivu
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Virallinen Mindustry wiki
-link.feathub.description = Ehdota uusia ominaisuuksia
+link.suggestions.description = Ehdota uusia ominaisuuksia
 linkfail = Linkin avaaminen epäonnistui!\nOsoite on kopioitu leikepöydällesi.
 screenshot = Kuvankaappaus tallennettu sijaintiin {0}
 screenshot.invalid = Kartta liian laaja, kuvankaappaukselle ei mahdollisesti ole tarpeeksi tilaa.
@@ -20,6 +20,8 @@ gameover = Peli ohi
 gameover.pvp = [accent] {0}[] joukkue voittaa!
 highscore = [accent]Uusi ennätys!
 copied = Kopioitu.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Ääniä
 load.map = Karttoja
@@ -63,8 +65,7 @@ stat.delivered = Resursseja laukaistu:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Lopullinen arvosana: [accent]{0}
 
-launcheditems = [accent]Laukaistut tavarat
-launchinfo = [unlaunched][[LAUKAISE] ytimesi saadaksesi sinisellä merkityt tavarat.
+globalitems = [accent]Global Items
 map.delete = Oletko varma että haluat poistaa kartan "[accent]{0}[]"?
 level.highscore = Ennätys: [accent]{0}
 level.select = Tason valinta
@@ -106,6 +107,7 @@ mods.guide = Modaamisopas
 mods.report = Raportoi ohjelmistovirhe
 mods.openfolder = Avaa modikansio
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Käytössä
 mod.disabled = [scarlet]Pois käytöstä
@@ -113,6 +115,7 @@ mod.disable = Poista käytössä
 mod.content = Sisältö:
 mod.delete.error = Modia ei pystytty poistamaan. Tiedosto voi olla käytössä.
 mod.requiresversion = [scarlet]Tarvitsee vähintään pelin version: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Tarvitsee nämä modit: {0}
 mod.erroredcontent = [scarlet]Sisältövirheet
 mod.errors = Virheitä on tapahtunut pelin ladatessa.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Vaatii Uudelleenkäynnistystä
 mod.import = Tuo modi
 mod.import.file = Tuo tiedosto
 mod.import.github = Tuo GitHub Modi
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Tämä esine on osa[accent] '{0}'[] modia. Poistaaksesi sen, sinun tulee poistaa tuon modin vasennus
 mod.remove.confirm = Tämä modi poistetaan.
 mod.author = [lightgray]Tekijä:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Laitteesi ei tue modeja skripteillä. Sinun on sammutettav
 about.button = Tietoa
 name = Nimi:
 noname = Valitse ensin[accent] pelaajanimi[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Tiedostonimi:
 unlocked = Uutta sisältöä avattu!
 completed = [accent]Suoritettu
@@ -142,6 +148,7 @@ techtree = Tekniikkapuu
 research.list = [lightgray]Tutki:
 research = Tutki
 researched = [lightgray]{0} tutkittu.
+research.progress = {0}% complete
 players = {0} pelaajaa paikalla
 players.single = {0} pelaaja paikalla
 players.search = etsiä
@@ -224,7 +231,6 @@ save.new = Uusi tallennus
 save.overwrite = Haluatko varmasti korvata \ntämän tallennuspaikan??
 overwrite = Korvata
 save.none = Tallennuksia ei löytynyt!
-saveload = Tallennetaan...
 savefail = Pelin tallentaminen epäonnistui!
 save.delete.confirm = Oletko varma että haluat poistaa tämän tallennuksen?
 save.delete = Poista
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial c
 loading = [accent]Ladataan...
 reloading = [accent]Ladataan Modeja...
 saving = [accent]Tallennetaan...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
@@ -328,8 +335,9 @@ waves.never = <ei koskaan>
 waves.every = jokainen
 waves.waves = tasot
 waves.perspawn = per syntymispiste
+waves.shields = shields/wave
 waves.to = jotta
-waves.boss = Pomo
+waves.guardian = Guardian
 waves.preview = Esikatselu
 waves.edit = Muokkaa...
 waves.copy = Kopioi leikepöydälle
@@ -337,6 +345,11 @@ waves.load = Lataa leikepöydältä
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Tasot kopioitu.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Default>
 details = Yksityiskohdat...
 edit = Muokkaa...
@@ -456,10 +469,12 @@ locked = Lukittu
 complete = [lightgray]Reach:
 requirement.wave = Pääse Tasolle {0} kartassa {1}
 requirement.core = Tuhoa vihollisen ydin kartassa {0}
-requirement.unlock = Avaa {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Resume Zone:\n[lightgray]{0}
 bestwave = [lightgray]Paras taso: {0}
 launch = < LAUKAISE >
+launch.text = Launch
 launch.title = Onnistunut laukaisu
 launch.next = [lightgray]seuraava mahdollisuus tasolla {0}
 launch.unable2 = [scarlet]Unable to LAUNCH.[]
@@ -467,13 +482,14 @@ launch.confirm = Tämä laukaisee kaikki resurssit ytimestäsi.\nEt voi enää p
 launch.skip.confirm = Jos ohitat nyt, voit laukaista vasta myöhemmillä tasoilla.
 uncover = Paljasta
 configure = Configure Loadout
+loadout = Loadout
+resources = Resources 
 bannedblocks = Kielletyt Palikat
 addall = Lisää kaikki
-configure.locked = [lightgray]Unlock configuring loadout: Wave {0}.
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = [lightgray]Resoursseja havaittu:
 zone.objective = [lightgray]Objectiivi: [accent]{0}
 zone.objective.survival = Selviydy
@@ -492,35 +508,43 @@ error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
-zone.groundZero.name = Nollapiste
-zone.desertWastes.name = Karu autiomaa
-zone.craters.name = Kraatterit
-zone.frozenForest.name = Jäätynyt metsä
-zone.ruinousShores.name = Tuhoisa ranta
-zone.stainedMountains.name = Tahravuoret
-zone.desolateRift.name = Autio syvänne
-zone.nuclearComplex.name = Ydinvoimakompleksi
-zone.overgrowth.name = Liikakasvu
-zone.tarFields.name = Tervakentät
-zone.saltFlats.name = Suolatasangot
-zone.impact0078.name = Törmäys 0078
-zone.crags.name = Kalliot
-zone.fungalPass.name = Sienilaakso
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Suotuisa alue aloittaa peli. Matala vaarataso. Vähän resoursseja.\nKerää mahdollisimman paljon kuparia ja lyijyä.\nJatka eteenpäin.
-zone.frozenForest.description = Jopa täällä, lähellä vuoria, asustaa itiöitä. Mutta ne eivöt voi elää ikuisesti jäätävässä ilmastossa.\n\nAloita matkasi energiaan. Rakenna polttogeneraattoreita. Opettele korjaajien käyttö.
-zone.desertWastes.description = Valtavia määriä jätteitä ränsityneiden rakennuksien seassa.\nVoit löytää hiiltä. Polta se energiaksi, tai tiivistä siitä grafiittia.\n\n[lightgray]Laskeutumiskohta on epävarma.
-zone.saltFlats.description = Aavikoiden reunoilla on suolainen tasanne. Vain vähän resoursse on saatavilla.\n\nVihollinen on rakentanut resurssi hankinnan. Hävitä vihollisen ydin. Älä jätä mitään jäljelle.
-zone.craters.description = Vettä on kertynyt tähän kraatteriin vanhojen sotien jäänteinä. Ota alue itsellesi. Kerää hiekkaa. Sulata metallilasia. Pumppaa vettä jäähdyttääksesi kaivausporia ja tykkejä.
-zone.ruinousShores.description = Jätteiden takaa, löydät rantaviivan. Kerran täma paikka asutti sotilasjoukkoja. Paljoa jäljella ei ole. Vain perus puolustus rekenteet ovat vahingoittumattomia, kaakki muu on romua.\nJatka laajentamista eteenpäin. Tutki teknologiaa.
-zone.stainedMountains.description = Alankoa vuroien sisämaassa, löydät paljon itiöelämää.\nOta talteen runsas titaani jota täältä löytyy. Opi käyttämään sitä.\n\nVihollinen on läasnäoleva. Älä anna heille liikaa aikaa lähettää heidän vahvimpia aseitaan.
-zone.overgrowth.description = Tämä alue on ylikasvanut, lähempänä itiöiden pesäkettä.\nVihollinen on muodostanut etuvartion. Rakenna titaani yksikköjä. Tuhoa vihollinen. Hanki se alue joka joskus on menetetty.
-zone.tarFields.description = Öljytuotannon laitamia, vuorien ja aavikkojen välissä. Yksi ainoista paikosta joissa on tervalähde.\nLöydät vaarallisia vihollis joukkoja täältä hylätystä paikasta. Älä aliarvio niitä.\n\n[lightgray]Tutki öljyprosessointi mekanismeja jos mahdollista.
-zone.desolateRift.description = Extremaalisen vaarallinen alue. Runsaasti resursseja, mutta vain vähän tilaa. Korke riski eliminaatiolle. Lähde mahdollisimman nopeasti. Älä tule huijatuksi pitkien taukojen vihollisten hyökkäyksien vällillä.
-zone.nuclearComplex.description = Entinen laitos tehty toriumin tuotantoa ja prosessointia varten, nykyään vain rauniota.\n[lightgray]Tutki toriumin monia hyödyllisiä käyttötarkoituksia.\n\nVihollinen on läsnä isoin joukkoin kokoajan partioimassa tunkeilijoilta.
-zone.fungalPass.description = Siirtymis alue korkeiden ja matalien vuorien välillä, itiöiden peitossa. Pieni vihollis tiedustelu tukikohta on täällä. Tuhoa se.\nKäytä Dagger- ja Crawler yksikköjä. Tuhoa kaksi vihollisydintä.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Kieli
 settings.data = Peli Data
@@ -534,9 +558,12 @@ settings.graphics = Grafiikat
 settings.cleardata = Tyhjennä Pelin Data...
 settings.clear.confirm = Oletko varma että haluat tyhjentää pelin datan?\nMitä on tehty ei voi peruuttaa!
 settings.clearall.confirm = [scarlet]WARNING![]\nTämä poistaa kaiken datan, mukaanlukien kesken olevat pelit, kartat, avatut asiat ja kontrolliasetukset.\nKun painat 'ok' kaikki datasi poistetaan ja peli suljetaan.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Pysäytetty >
 clear = Tyhjä
 banned = [scarlet]Kielletty
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Kyllä
 no = Ei
 info.title = Informaatio
@@ -558,8 +585,11 @@ blocks.itemsmoved = Liikkumisnopeus
 blocks.launchtime = Aika laukaisujen välillä
 blocks.shootrange = Kantama
 blocks.size = Koko
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Nestekapasiteetti
 blocks.powerrange = Energiakantama
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Maksimimäärä yhdistyksiä
 blocks.poweruse = Energian käyttö
 blocks.powerdamage = Energia/Vahinko
@@ -575,13 +605,18 @@ blocks.boosteffect = Tehostamisem vaikutus
 blocks.maxunits = Maksimimäärä yksikköjä
 blocks.health = Elämäpisteet
 blocks.buildtime = Rakentamisaika
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Rakentamishinta
 blocks.inaccuracy = Epätarkkuus
 blocks.shots = Ammusta
 blocks.reload = Ammusta/sekunnissa
 blocks.ammo = Ammus
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Parempi pora vaadittu
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Poran nopeus: {0}/s
 bar.pumpspeed = Pumpun nopeus: {0}/s
 bar.efficiency = Tehokkuus: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Energia: {0}
 bar.poweroutput = Energiantuotto: {0}
 bar.items = Tavaroita: {0}
 bar.capacity = Kapasiteetti: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Neste
 bar.heat = Lämpö
 bar.power = Energia
 bar.progress = Rakennuksen edistys
-bar.spawned = Yksikköjä: {0}/{1}
 bar.input = Sisääntulo
 bar.output = Ulostulo
 
@@ -619,12 +655,16 @@ unit.liquidunits = nesteyksikköä
 unit.powerunits = energiayksikköä
 unit.degrees = astetta
 unit.seconds = sekunttia
+unit.minutes = mins
 unit.persecond = /s
+unit.perminute = /min
 unit.timesspeed = x nopeus
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = esinettä
 unit.thousands = t
 unit.millions = mil
+unit.billions = b
 category.general = Yleinen
 category.power = Energia
 category.liquids = Neste
@@ -639,6 +679,7 @@ setting.linear.name = Lineaarinen suodatus
 setting.hints.name = Vihjeet
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Automaattisest Pysäytä Rakentaessa
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animoitu vesi
 setting.animatedshields.name = Animoidut kilvet
 setting.antialias.name = Antialiaasi[lightgray] (vaatii uudelleenkäynnistyksen)[]
@@ -663,7 +704,6 @@ setting.effects.name = Naytön Efektit
 setting.destroyedblocks.name = Näytä tuhoutuneet palikat
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Ohjauksen herkkyys
 setting.saveinterval.name = Tallennuksen Aikaväli
 setting.seconds = {0} Sekunttia
@@ -672,12 +712,15 @@ setting.milliseconds = {0} millisekunttia
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Borderless Window[lightgray] (vaatii uudelleenkäynnistyksen)
 setting.fps.name = Näytä FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Näytä palikan valintaohjaimet
 setting.vsync.name = VSync
 setting.pixelate.name = Pixeloi[lightgray] (poistaa animaation käytöstä)
 setting.minimap.name = Näytä pienoiskartta
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Näytä pelaajan sijainti
 setting.musicvol.name = Musiikin äänenvoimakkuus
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Taustaäänet
 setting.mutemusic.name = Mykistä musiikki
 setting.sfxvol.name = SFX-voimakkuus
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only
 category.general.name = General
 category.view.name = View
 category.multiplayer.name = Moninpeli
+category.blocks.name = Block Select
 command.attack = Hyökkäys
 command.rally = Kokoontuminen
 command.retreat = Perääntyminen
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Clear Building
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Dash
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Valitse alue
 keybind.schematic_menu.name = Kaavio Valikko
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Shoot
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reaktorien räjähtäminen
 rules.wavetimer = Tasojen aikaraja
 rules.waves = Tasot
 rules.attack = Hyökkäystila
+rules.buildai = AI Building
 rules.enemyCheat = Infinite AI (Red Team) Resources
-rules.unitdrops = Unit Drops
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Pelaajan elämäpisteiden kerroin
-rules.playerdamagemultiplier = Pelaajan vahingon kerroin
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
-rules.respawntime = Respawn Time:[lightgray] (sec)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves wait for enemies
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
-rules.respawns = Max respawns per wave
-rules.limitedRespawns = Limit Respawns
+rules.unitammo = Units Require Ammo
 rules.title.waves = Waves
-rules.title.respawns = Respawns
 rules.title.resourcesbuilding = Resources & Building
-rules.title.player = Players
 rules.title.enemy = Enemies
 rules.title.unit = Units
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Tavarat
 content.liquid.name = Nesteet
@@ -827,10 +878,11 @@ liquid.water.name = Vesi
 liquid.slag.name = Kuona
 liquid.oil.name = Öljy
 liquid.cryofluid.name = Kryoneste
-item.corestorable = [lightgray]Säilöttävissä ytimeen: {0}
+
 item.explosiveness = [lightgray]Räjädysmäisyys: {0}%
 item.flammability = [lightgray]Syttyvyys: {0}%
 item.radioactivity = [lightgray]Radioaktiivisuus: {0}%
+
 unit.health = [lightgray]Elämäpisteet: {0}
 unit.speed = [lightgray]Nopeus: {0}
 unit.weapon = [lightgray]Ammuksia: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Lämpökapasiteetti: {0}
 liquid.viscosity = [lightgray]Tahmeus: {0}
 liquid.temperature = [lightgray]Lämpö: {0}
 
+unit.dagger.name = Tikari
+unit.mace.name = Mace
+unit.fortress.name = Linnoitus
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Indeksointirobotti
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Vuoren
 block.sand-boulder.name = Hiekkalohkare
 block.grass.name = Ruoho
 block.slag.name = Kuono
 block.salt.name = Suolapitoisuus
-block.saltrocks.name = Suolakivi
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pikkukivi
 block.tendrils.name = Tendrils
-block.sandrocks.name = Hiekkakivet
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spore Pine
-block.sporerocks.name = Spore Rocks
-block.rock.name = Mukulakivi
-block.snowrock.name = Lumi kivi
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Lumimänny
 block.shale.name = Liuske
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Sammal
 block.shrubs.name = Pensaikko
 block.spore-moss.name = Itiösammal
-block.shalerocks.name = Liuskekivet
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Romuseinä
 block.scrap-wall-large.name = Suuri romuseinä
 block.scrap-wall-huge.name = Valtava romuseinä
@@ -890,13 +979,17 @@ block.craters.name = Kraatterit
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ice Snow
-block.rocks.name = Rocks
-block.icerocks.name = Jääkivet
-block.snowrocks.name = Snow Rocks
-block.dunerocks.name = Dune Rocks
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Mänty
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Valkoinen kuollut puu
 block.white-tree.name = Valkoinen puu
 block.spore-cluster.name = Spore Cluster
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Tumma paneeli 4
 block.dark-panel-5.name = Tumma paneeli 5
 block.dark-panel-6.name = Tumma paneeli 6
 block.dark-metal.name = Tumma metalli
-block.ignarock.name = Igna Rock
+block.basalt.name = Basalt
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
-block.cliffs.name = Kallio
 block.copper-wall.name = Kupariseinä
 block.copper-wall-large.name = Suuri kupariseinä
 block.titanium-wall.name = Titaaniseinä
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Pulverizer
-block.cryofluidmixer.name = Cryofluid Mixer
+block.cryofluid-mixer.name = Cryofluid Mixer
 block.melter.name = Melter
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
@@ -964,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Akku
 block.battery-large.name = Suuri akku
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Höyrygeneraattori
+block.steam-generator.name = Höyrygeneraattori
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Törmäysreaktori
 block.mechanical-drill.name = Mechanical Drill
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Aurinkopaneeli
 block.solar-panel-large.name = Suuri aurinkopaneeli
 block.oil-extractor.name = Oil Extractor
-block.command-center.name = Command Center
-block.draug-factory.name = Draug Miner Drone Factory
-block.spirit-factory.name = Spirit Repair Drone Factory
-block.phantom-factory.name = Phantom Builder Drone Factory
-block.wraith-factory.name = Wraith Fighter Factory
-block.ghoul-factory.name = Ghoul Bomber Factory
-block.dagger-factory.name = Dagger Mech Factory
-block.crawler-factory.name = Crawler Mech Factory
-block.titan-factory.name = Titan Mech Factory
-block.fortress-factory.name = Fortress Mech Factory
-block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Repair Point
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
@@ -1036,6 +1117,29 @@ block.meltdown.name = Sulamispiste
 block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = sininen
 team.crux.name = punainen
 team.sharded.name = orange
@@ -1043,21 +1147,7 @@ team.orange.name = oranssi
 team.derelict.name = derelict
 team.green.name = vihreä
 team.purple.name = violetti
-unit.spirit.name = Henki-korjausdrooni
-unit.draug.name = Kummitus-louhintadrooni
-unit.phantom.name = Aave-rakennusdrooni
-unit.dagger.name = Tikari
-unit.crawler.name = Indeksointirobotti
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul-pommittaja
-unit.wraith.name = Haamu-taistelija
-unit.fortress.name = Linnoitus
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1100,17 +1190,7 @@ liquid.water.description = The most useful liquid. Commonly used for cooling mac
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = A liquid used in advanced material production. Can be converted into coal as fuel, or sprayed and set on fire as a weapon.
 liquid.cryofluid.description = An inert, non-corrosive liquid created from water and titanium. Has extremely high heat capacity. Extensively used as coolant.
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
-unit.spirit.description = A modified draug drone, designed for repair instead of mining. Automatically fixes any damaged blocks in the area.
-unit.phantom.description = An advanced drone unit. Follows users. Assists in block construction.
-unit.dagger.description = The most basic ground mech. Cheap to produce. Overwhelming when used in swarms.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
-unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets. Equipped with two miniature Scorch-class flamethrowers.
-unit.fortress.description = A heavy artillery mech. Equipped with two modified Hail-type cannons for long-range assault on enemy structures and units.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
-unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critical infrastructure.
-unit.revenant.description = A heavy, hovering missile array.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
@@ -1119,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function.
 block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy.
-block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
+block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
 block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets.
@@ -1185,7 +1265,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.
@@ -1221,15 +1301,5 @@ block.ripple.description = An extremely powerful artillery turret. Shoots cluste
 block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produces Spirit structural repair drones.
-block.phantom-factory.description = Produces advanced construction drones.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
-block.ghoul-factory.description = Produces heavy carpet bombers.
-block.revenant-factory.description = Produces heavy missile-based units.
-block.dagger-factory.description = Produces basic ground units.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produces advanced, armored ground units.
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
new file mode 100644
index 0000000000..86c3c0737a
--- /dev/null
+++ b/core/assets/bundles/bundle_fil.properties
@@ -0,0 +1,1305 @@
+credits.text = Created by [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits = Credits
+contributors = Mga Tagasalin at Contributor
+discord = Sumali sa Mindustry Discord!
+link.discord.description = Ang opisyal na Mindustry Discord chatroom.
+link.reddit.description = Ang Mindustry subreddit
+link.github.description = Game source code
+link.changelog.description = Listahan ng mga pagbabagong ginawa
+link.dev-builds.description = Unstable development builds
+link.trello.description = Opisyal Trello board para sa mga nakalatag na features
+link.itch.io.description = itch.io page na may PC download
+link.google-play.description = Google Play store listing
+link.f-droid.description = F-Droid catalogue listing
+link.wiki.description = Opsiyal Mindustry wiki
+link.suggestions.description = Magmungkahi ng bagong feature
+linkfail = 'Di mabuksan ang link!\nKinopya na sa 'yong clipboard ang URL.
+screenshot = Ini-adya na ang screenshot sa {0}
+screenshot.invalid = Masiyadong malaki ang mapa; maaaring kulang ang memory para sa screenshot.
+gameover = Tapos Na Ang Laro
+gameover.pvp = Ang[accent] {0}[] team ay nanalo!
+highscore = [accent]Panibagong mataas na Iskor!
+copied = Kinopya.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
+
+load.sound = Mga Tunog
+load.map = Mga Mapa
+load.image = Mga Litrato
+load.content = Nilalaman
+load.system = System
+load.mod = Mga Mod
+load.scripts = Mga Iskrip
+
+be.update = Mayroong baong Bleeding Edge build na makukuha:
+be.update.confirm = I-download at i-restart?
+be.updating = I-na-update...
+be.ignore = Huwag Pansinin
+be.noupdates = Walang nahanap na update.
+be.check = Tignan kung may mga update.
+
+schematic = Schematic
+schematic.add = I-adya ang Schematic...
+schematics = Mga Schematic
+schematic.replace = Ang schematic sa parehong pangalan ay mayroon na. Gusto mo bang palitan?
+schematic.exists = Ang schematic sa parehong pangalan ay mayroon na.
+schematic.import = I-angkat ang Schematic...
+schematic.exportfile = Mag-export ng File
+schematic.importfile = Mag-angkat ng File
+schematic.browseworkshop = Maghanap sa Workshop
+schematic.copy = Kopyahin sa Clipboard
+schematic.copy.import = I-angkat mula sa Clipboard
+schematic.shareworkshop = Ibahagi sa Workshop
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Baligtarin ang Schematic
+schematic.saved = Na-i-adya na ang schematic.
+schematic.delete.confirm = Ang schematic na'to ay tuluyang mawawala.
+schematic.rename = Palitan Ang Pangalan ng Schematic
+schematic.info = {0}x{1}, {2} blocks
+
+stat.wave = Wave na Nalagpasan:[accent] {0}
+stat.enemiesDestroyed = Tinalong Kalaban:[accent] {0}
+stat.built = Gusaling Itinayo:[accent] {0}
+stat.destroyed = Gusaling Nawasak:[accent] {0}
+stat.deconstructed = Gusaling Binuwag/Tinanggal:[accent] {0}
+stat.delivered = Mga Yaman na Nahanap:
+stat.playtime = Tagal na Nilaro:[accent] {0}
+stat.rank = Pinal na Ranggo: [accent]{0}
+
+globalitems = [accent]Mga Pangkalahatang Bagay
+map.delete = Sigurado ka bang buburahin ang mapang "[accent]{0}[]"?
+level.highscore = Pinakamataas na Iskor: [accent]{0}
+level.select = Mamili ng Lebel
+level.mode = Paraan ng Paglalaro:
+coreattack = < Ang core ay inaatake! >
+nearpoint = [[ [scarlet]UMALIS KAAGAD SA DROP POINT[] ]\nmalapit ka nang mamatay
+database = Database ng Core
+savegame = I-adya ang Laro
+loadgame = Load Game
+joingame = Sumali sa Laro
+customgame = Kustom na Laro
+newgame = Bagong Laro
+none = <wala>
+minimap = Minimap
+position = Posisyon
+close = Isara
+website = Website
+quit = Umalis
+save.quit = I-adya & Umalis
+maps = Mga Mapa
+maps.browse = Maghanap ng mga Mapa
+continue = Magpatuloy
+maps.none = [lightgray]Walang mapang nahanap!
+invalid = Hindi Wasto
+pickcolor = Pumili ng Kulay
+preparingconfig = Inihahanda ang Config
+preparingcontent = Inihahanda ang mga Nilalaman
+uploadingcontent = Ini-a-upload ang Nilalaman
+uploadingpreviewfile = Ini-a-upload ang Preview File
+committingchanges = Gumagawa ng mga Pagbabago
+done = Tapos Na
+feature.unsupported = Hindi suportado ng 'yong device ang feature na'to.
+
+mods.alphainfo = Tandaan mo na ang mga mod ay nasa 'alpha', at[scarlet] maaaring may depekto pa ang mga 'to[].\nI-ulat ang kahit anong depektong matutuklasan mo sa Mindustry GitHub o Discord.
+mods.alpha = [accent](Alpha)
+mods = Mga Mod
+mods.none = [lightgray]Walang mga mod na nahanap!
+mods.guide = Gabay para sa Paggawa ng Mod
+mods.report = Mag-ulat ng Depekto
+mods.openfolder = Buksan ang Folder
+mods.reload = I-reload
+mods.reloadexit = Ang laro ay isasara, para mag-reload ng mga mod.
+mod.display = [gray]Mod:[orange] {0}
+mod.enabled = [lightgray]Gumagana
+mod.disabled = [scarlet]Hindi Gumagana
+mod.disable = 'Wag Paganahin
+mod.content = Nilalaman:
+mod.delete.error = 'Di matanggal ang mod. Maaaring ginagamit pa 'to.
+mod.requiresversion = [scarlet]Kinakailangan ang minimum bersyon ng laro: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
+mod.missingdependencies = [scarlet]Nawawalang mga Dependency: {0}
+mod.erroredcontent = [scarlet]Mga Error sa Nilalaman
+mod.errors = May mga error na naitala habang ni-lo-load ang nilalaman.
+mod.noerrorplay = [scarlet]May mga mod kang may error.[] Maaaring 'wag munang paganahin ang mga apektadong mod o 'di kaya'y ayusin ang mga error bago maglaro.
+mod.nowdisabled = [scarlet]Ang mod na '{0}' ay ma kulang na mga dependency:[accent] {1}\n[lightgray]Ang mga ito'y kinakailangang i-download muna.\nAng mod na'to ay kusang 'di papaganahin.
+mod.enable = Paganahin
+mod.requiresrestart = Ang laro'y magsasaro upang mai-apply ang mga pagbabago sa mod.
+mod.reloadrequired = [scarlet]Kinakalingang I-restart
+mod.import = I-angkat ang Mod
+mod.import.file = I-angkat ang File
+mod.import.github = Mag-angkat mula sa GitHub
+mod.jarwarn = [scarlet]Ang mga mod na gawa sa JAR ay likas na 'di ligtas laruin.[]\nSiguraduhin mong mapapagkatiwalaan ang 'yong pinagkunan nito!
+mod.item.remove = Ang bagay na'to ay parte ng mod na [accent] '{0}'[]. Kung nais mong tanggalin, i-uninstall mo ang mod.
+mod.remove.confirm = Ang mod na'to ay mabubura.
+mod.author = [lightgray]May-akda:[] {0}
+mod.missing = Ang larong 'to ay may nilalaman na mod na in-update kamakailan o binura mo na. Maaaring ma-corrput ang larong 'to. Sigurado ka bang gusto mong i-load 'to?\n[lightgray]Mga Mod:\n{0}
+mod.preview.missing = Bago mong ilathala ang mod sa workshop, dapat maglagay ka nang image preview.\nMaglagay ka ng litratong nagngangalang[accent] preview.png[] sa folder ng mod at subukan mo muli.
+mod.folder.missing = Tanging mga mod lang nasa loob ng folder ay maaaring ma-ilathala sa workshop.\nTo convert any mod into a folder, simply unzip its file into a folder and delete the old zip, then restart your game or reload your mods.
+mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
+
+about.button = About
+name = Name:
+noname = Pick a[accent] player name[] first.
+planetmap = Planet Map
+launchcore = Launch Core
+filename = File Name:
+unlocked = New content unlocked!
+completed = [accent]Completed
+techtree = Tech Tree
+research.list = [lightgray]Research:
+research = Research
+researched = [lightgray]{0} researched.
+research.progress = {0}% complete
+players = {0} players
+players.single = {0} player
+players.search = search
+players.notfound = [gray]no players found
+server.closing = [accent]Closing server...
+server.kicked.kick = You have been kicked from the server!
+server.kicked.whitelist = You are not whitelisted here.
+server.kicked.serverClose = Server closed.
+server.kicked.vote = You have been vote-kicked. Goodbye.
+server.kicked.clientOutdated = Outdated client! Update your game!
+server.kicked.serverOutdated = Outdated server! Ask the host to update!
+server.kicked.banned = You are banned on this server.
+server.kicked.typeMismatch = This server is not compatible with your build type.
+server.kicked.playerLimit = This server is full. Wait for an empty slot.
+server.kicked.recentKick = You have been kicked recently.\nWait before connecting again.
+server.kicked.nameInUse = There is someone with that name\nalready on this server.
+server.kicked.nameEmpty = Your chosen name is invalid.
+server.kicked.idInUse = You are already on this server! Connecting with two accounts is not permitted.
+server.kicked.customClient = This server does not support custom builds. Download an official version.
+server.kicked.gameover = Game over!
+server.kicked.serverRestarting = The server is restarting.
+server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[]
+host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [lightgray]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[lightgray]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. Note that public networks sometimes do not allow server discovery.
+join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] or [accent]global[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]If you want to connect to someone by IP, you would need to ask the host for their IP, which can be found by googling "my ip" from their device.
+hostserver = Host Multiplayer Game
+invitefriends = Invite Friends
+hostserver.mobile = Host\nGame
+host = Host
+hosting = [accent]Opening server...
+hosts.refresh = Refresh
+hosts.discovering = Discovering LAN games
+hosts.discovering.any = Discovering games
+server.refreshing = Refreshing server
+hosts.none = [lightgray]No local games found!
+host.invalid = [scarlet]Can't connect to host.
+
+servers.local = Local Servers
+servers.remote = Remote Servers
+servers.global = Community Servers
+
+trace = Trace Player
+trace.playername = Player name: [accent]{0}
+trace.ip = IP: [accent]{0}
+trace.id = Unique ID: [accent]{0}
+trace.mobile = Mobile Client: [accent]{0}
+trace.modclient = Custom Client: [accent]{0}
+invalidid = Invalid client ID! Submit a bug report.
+server.bans = Bans
+server.bans.none = No banned players found!
+server.admins = Admins
+server.admins.none = No admins found!
+server.add = Add Server
+server.delete = Are you sure you want to delete this server?
+server.edit = Edit Server
+server.outdated = [scarlet]Outdated Server![]
+server.outdated.client = [scarlet]Outdated Client![]
+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]"?
+joingame.title = Join Game
+joingame.ip = Address:
+disconnect = Disconnected.
+disconnect.error = Connection error.
+disconnect.closed = Connection closed.
+disconnect.timeout = Timed out.
+disconnect.data = Failed to load world data!
+cantconnect = Unable to join game ([accent]{0}[]).
+connecting = [accent]Connecting...
+connecting.data = [accent]Loading world data...
+server.port = Port:
+server.addressinuse = Address already in use!
+server.invalidport = Invalid port number!
+server.error = [scarlet]Error hosting server.
+save.new = New Save
+save.overwrite = Are you sure you want to overwrite\nthis save slot?
+overwrite = Overwrite
+save.none = No saves found!
+savefail = Failed to save game!
+save.delete.confirm = Are you sure you want to delete this save?
+save.delete = Delete
+save.export = Export Save
+save.import.invalid = [accent]This save is invalid!
+save.import.fail = [scarlet]Failed to import save: [accent]{0}
+save.export.fail = [scarlet]Failed to export save: [accent]{0}
+save.import = Import Save
+save.newslot = Save name:
+save.rename = Rename
+save.rename.text = New name:
+selectslot = Select a save.
+slot = [accent]Slot {0}
+editmessage = Edit Message
+save.corrupted = Save file corrupted or invalid!
+empty = <empty>
+on = On
+off = Off
+save.autosave = Autosave: {0}
+save.map = Map: {0}
+save.wave = Wave {0}
+save.mode = Gamemode: {0}
+save.date = Last Saved: {0}
+save.playtime = Playtime: {0}
+warning = Warning.
+confirm = Confirm
+delete = Delete
+view.workshop = View In Workshop
+workshop.listing = Edit Workshop Listing
+ok = OK
+open = Open
+customize = Customize Rules
+cancel = Cancel
+openlink = Open Link
+copylink = Copy Link
+back = Back
+data.export = Export Data
+data.import = Import Data
+data.openfolder = Open Data Folder
+data.exported = Data exported.
+data.invalid = This isn't valid game data.
+data.import.confirm = Importing external data will overwrite[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
+quit.confirm = Are you sure you want to quit?
+quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
+loading = [accent]Loading...
+reloading = [accent]Reloading Mods...
+saving = [accent]Saving...
+respawn = [accent][[{0}][] to respawn in core
+cancelbuilding = [accent][[{0}][] to clear plan
+selectschematic = [accent][[{0}][] to select+copy
+pausebuilding = [accent][[{0}][] to pause building
+resumebuilding = [scarlet][[{0}][] to resume building
+wave = [accent]Wave {0}
+wave.waiting = [lightgray]Wave in {0}
+wave.waveInProgress = [lightgray]Wave in progress
+waiting = [lightgray]Waiting...
+waiting.players = Waiting for players...
+wave.enemies = [lightgray]{0} Enemies Remaining
+wave.enemy = [lightgray]{0} Enemy Remaining
+loadimage = Load Image
+saveimage = Save Image
+unknown = Unknown
+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[accent] orange[] 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[scarlet] red[] 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}
+map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
+workshop.menu = Select what you would like to do with this item.
+workshop.info = Item Info
+changelog = Changelog (optional):
+eula = Steam EULA
+missing = This item has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked.
+publishing = [accent]Publishing...
+publish.confirm = Are you sure you want to publish this?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your items will not show up!
+publish.error = Error publishing item: {0}
+steam.error = Failed to initialize Steam services.\nError: {0}
+
+editor.brush = Brush
+editor.openin = Open In Editor
+editor.oregen = Ore Generation
+editor.oregen.info = Ore Generation:
+editor.mapinfo = Map Info
+editor.author = Author:
+editor.description = Description:
+editor.nodescription = A map must have a description of at least 4 characters before being published.
+editor.waves = Waves:
+editor.rules = Rules:
+editor.generation = Generation:
+editor.ingame = Edit In-Game
+editor.publish.workshop = Publish On Workshop
+editor.newmap = New Map
+workshop = Workshop
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.shields = shields/wave
+waves.to = to
+waves.guardian = Guardian
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
+waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
+editor.default = [lightgray]<Default>
+details = Details...
+edit = Edit...
+editor.name = Name:
+editor.spawn = Spawn Unit
+editor.removeunit = Remove Unit
+editor.teams = Teams
+editor.errorload = Error loading file.
+editor.errorsave = Error saving file.
+editor.errorimage = That's an image, not a map.\n\nIf you want to import a 3.5/build 40 map, use the 'Import Legacy Map' button in the editor.
+editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported.
+editor.errornot = This is not a map file.
+editor.errorheader = This map file is either not valid or corrupt.
+editor.errorname = Map has no name defined. Are you trying to load a save file?
+editor.update = Update
+editor.randomize = Randomize
+editor.apply = Apply
+editor.generate = Generate
+editor.resize = Resize
+editor.loadmap = Load Map
+editor.savemap = Save Map
+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.
+editor.import.exists = [scarlet]Unable to import:[] a built-in map named '{0}' already exists!
+editor.import = Import...
+editor.importmap = Import Map
+editor.importmap.description = Import an already existing map
+editor.importfile = Import File
+editor.importfile.description = Import an external map file
+editor.importimage = Import Image File
+editor.importimage.description = Import an external map image file
+editor.export = Export...
+editor.exportfile = Export File
+editor.exportfile.description = Export a map file
+editor.exportimage = Export Terrain Image
+editor.exportimage.description = Export an image file containing only basic terrain
+editor.loadimage = Import Terrain
+editor.saveimage = Export Terrain
+editor.unsaved = [scarlet]You have unsaved changes![]\nAre you sure you want to exit?
+editor.resizemap = Resize Map
+editor.mapname = Map Name:
+editor.overwrite = [accent]Warning!\nThis overwrites an existing map.
+editor.overwrite.confirm = [scarlet]Warning![] A map with this name already exists. Are you sure you want to overwrite it?\n"[accent]{0}[]"
+editor.exists = A map with this name already exists.
+editor.selectmap = Select a map to load:
+
+toolmode.replace = Replace
+toolmode.replace.description = Draws only on solid blocks.
+toolmode.replaceall = Replace All
+toolmode.replaceall.description = Replace all blocks in map.
+toolmode.orthogonal = Orthogonal
+toolmode.orthogonal.description = Draws only orthogonal lines.
+toolmode.square = Square
+toolmode.square.description = Square brush.
+toolmode.eraseores = Erase Ores
+toolmode.eraseores.description = Erase only ores.
+toolmode.fillteams = Fill Teams
+toolmode.fillteams.description = Fill teams instead of blocks.
+toolmode.drawteams = Draw Teams
+toolmode.drawteams.description = Draw teams instead of blocks.
+
+filters.empty = [lightgray]No filters! Add one with the button below.
+filter.distort = Distort
+filter.noise = Noise
+filter.enemyspawn = Enemy Spawn Select
+filter.corespawn = Core Select
+filter.median = Median
+filter.oremedian = Ore Median
+filter.blend = Blend
+filter.defaultores = Default Ores
+filter.ore = Ore
+filter.rivernoise = River Noise
+filter.mirror = Mirror
+filter.clear = Clear
+filter.option.ignore = Ignore
+filter.scatter = Scatter
+filter.terrain = Terrain
+filter.option.scale = Scale
+filter.option.chance = Chance
+filter.option.mag = Magnitude
+filter.option.threshold = Threshold
+filter.option.circle-scale = Circle Scale
+filter.option.octaves = Octaves
+filter.option.falloff = Falloff
+filter.option.angle = Angle
+filter.option.amount = Amount
+filter.option.block = Block
+filter.option.floor = Floor
+filter.option.flooronto = Target Floor
+filter.option.wall = Wall
+filter.option.ore = Ore
+filter.option.floor2 = Secondary Floor
+filter.option.threshold2 = Secondary Threshold
+filter.option.radius = Radius
+filter.option.percentile = Percentile
+
+width = Width:
+height = Height:
+menu = Menu
+play = Play
+campaign = Campaign
+load = Load
+save = Save
+fps = FPS: {0}
+ping = Ping: {0}ms
+language.restart = Please restart your game for the language settings to take effect.
+settings = Settings
+tutorial = Tutorial
+tutorial.retake = Re-Take Tutorial
+editor = Editor
+mapeditor = Map Editor
+
+abandon = Abandon
+abandon.text = This zone and all its resources will be lost to the enemy.
+locked = Locked
+complete = [lightgray]Complete:
+requirement.wave = Reach Wave {0} in {1}
+requirement.core = Destroy Enemy Core in {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
+resume = Resume Zone:\n[lightgray]{0}
+bestwave = [lightgray]Best Wave: {0}
+launch = < LAUNCH >
+launch.text = Launch
+launch.title = Launch Successful
+launch.next = [lightgray]next opportunity at wave {0}
+launch.unable2 = [scarlet]Unable to LAUNCH.[]
+launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
+uncover = Uncover
+configure = Configure Loadout
+loadout = Loadout
+resources = Resources
+bannedblocks = Banned Blocks
+addall = Add All
+launch.destination = Destination: {0}
+configure.invalid = Amount must be a number between 0 and {0}.
+zone.unlocked = [lightgray]{0} unlocked.
+zone.requirement.complete = Requirement for {0} completed:[lightgray]\n{1}
+zone.resources = [lightgray]Resources Detected:
+zone.objective = [lightgray]Objective: [accent]{0}
+zone.objective.survival = Survive
+zone.objective.attack = Destroy Enemy Core
+add = Add...
+boss.health = Boss Health
+
+connectfail = [scarlet]Connection error:\n\n[accent]{0}
+error.unreachable = Server unreachable.\nIs the address spelled correctly?
+error.invalidaddress = Invalid address.
+error.timedout = Timed out!\nMake sure the host has port forwarding set up, and that the address is correct!
+error.mismatch = Packet error:\npossible client/server version mismatch.\nMake sure you and the host have the latest version of Mindustry!
+error.alreadyconnected = Already connected.
+error.mapnotfound = Map file not found!
+error.io = Network I/O error.
+error.any = Unknown network error.
+error.bloom = Failed to initialize bloom.\nYour device may not support it.
+
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
+
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
+
+settings.language = Language
+settings.data = Game Data
+settings.reset = Reset to Defaults
+settings.rebind = Rebind
+settings.resetKey = Reset
+settings.controls = Controls
+settings.game = Game
+settings.sound = Sound
+settings.graphics = Graphics
+settings.cleardata = Clear Game Data...
+settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone!
+settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
+paused = [accent]< Paused >
+clear = Clear
+banned = [scarlet]Banned
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
+yes = Yes
+no = No
+info.title = Info
+error.title = [scarlet]An error has occured
+error.crashtitle = An error has occured
+unit.nobuild = [scarlet]Unit can't build
+blocks.input = Input
+blocks.output = Output
+blocks.booster = Booster
+blocks.tiles = Required Tiles
+blocks.affinities = Affinities
+block.unknown = [lightgray]???
+blocks.powercapacity = Power Capacity
+blocks.powershot = Power/Shot
+blocks.damage = Damage
+blocks.targetsair = Targets Air
+blocks.targetsground = Targets Ground
+blocks.itemsmoved = Move Speed
+blocks.launchtime = Time Between Launches
+blocks.shootrange = Range
+blocks.size = Size
+blocks.displaysize = Display Size
+blocks.liquidcapacity = Liquid Capacity
+blocks.powerrange = Power Range
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
+blocks.powerconnections = Max Connections
+blocks.poweruse = Power Use
+blocks.powerdamage = Power/Damage
+blocks.itemcapacity = Item Capacity
+blocks.basepowergeneration = Base Power Generation
+blocks.productiontime = Production Time
+blocks.repairtime = Block Full Repair Time
+blocks.speedincrease = Speed Increase
+blocks.range = Range
+blocks.drilltier = Drillables
+blocks.drillspeed = Base Drill Speed
+blocks.boosteffect = Boost Effect
+blocks.maxunits = Max Active Units
+blocks.health = Health
+blocks.buildtime = Build Time
+blocks.maxconsecutive = Max Consecutive
+blocks.buildcost = Build Cost
+blocks.inaccuracy = Inaccuracy
+blocks.shots = Shots
+blocks.reload = Shots/Second
+blocks.ammo = Ammo
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
+
+bar.drilltierreq = Better Drill Required
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
+bar.drillspeed = Drill Speed: {0}/s
+bar.pumpspeed = Pump Speed: {0}/s
+bar.efficiency = Efficiency: {0}%
+bar.powerbalance = Power: {0}/s
+bar.powerstored = Stored: {0}/{1}
+bar.poweramount = Power: {0}
+bar.poweroutput = Power Output: {0}
+bar.items = Items: {0}
+bar.capacity = Capacity: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
+bar.liquid = Liquid
+bar.heat = Heat
+bar.power = Power
+bar.progress = Build Progress
+bar.input = Input
+bar.output = Output
+
+bullet.damage = [stat]{0}[lightgray] damage
+bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
+bullet.incendiary = [stat]incendiary
+bullet.homing = [stat]homing
+bullet.shock = [stat]shock
+bullet.frag = [stat]frag
+bullet.knockback = [stat]{0}[lightgray] knockback
+bullet.freezing = [stat]freezing
+bullet.tarred = [stat]tarred
+bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
+bullet.reload = [stat]{0}[lightgray]x fire rate
+
+unit.blocks = blocks
+unit.powersecond = power units/second
+unit.liquidsecond = liquid units/second
+unit.itemssecond = items/second
+unit.liquidunits = liquid units
+unit.powerunits = power units
+unit.degrees = degrees
+unit.seconds = seconds
+unit.minutes = mins
+unit.persecond = /sec
+unit.perminute = /min
+unit.timesspeed = x speed
+unit.percent = %
+unit.shieldhealth = shield health
+unit.items = items
+unit.thousands = k
+unit.millions = mil
+unit.billions = b
+category.general = General
+category.power = Power
+category.liquids = Liquids
+category.items = Items
+category.crafting = Input/Output
+category.shooting = Shooting
+category.optional = Optional Enhancements
+setting.landscape.name = Lock Landscape
+setting.shadows.name = Shadows
+setting.blockreplace.name = Automatic Block Suggestions
+setting.linear.name = Linear Filtering
+setting.hints.name = Hints
+setting.flow.name = Display Resource Flow Rate
+setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
+setting.animatedwater.name = Animated Fluids
+setting.animatedshields.name = Animated Shields
+setting.antialias.name = Antialias[lightgray] (requires restart)[]
+setting.playerindicators.name = Player Indicators
+setting.indicators.name = Enemy Indicators
+setting.autotarget.name = Auto-Target
+setting.keyboard.name = Mouse+Keyboard Controls
+setting.touchscreen.name = Touchscreen Controls
+setting.fpscap.name = Max FPS
+setting.fpscap.none = None
+setting.fpscap.text = {0} FPS
+setting.uiscale.name = UI Scaling[lightgray] (restart required)[]
+setting.swapdiagonal.name = Always Diagonal Placement
+setting.difficulty.training = Training
+setting.difficulty.easy = Easy
+setting.difficulty.normal = Normal
+setting.difficulty.hard = Hard
+setting.difficulty.insane = Insane
+setting.difficulty.name = Difficulty:
+setting.screenshake.name = Screen Shake
+setting.effects.name = Display Effects
+setting.destroyedblocks.name = Display Destroyed Blocks
+setting.blockstatus.name = Display Block Status
+setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
+setting.sensitivity.name = Controller Sensitivity
+setting.saveinterval.name = Save Interval
+setting.seconds = {0} seconds
+setting.blockselecttimeout.name = Block Select Timeout
+setting.milliseconds = {0} milliseconds
+setting.fullscreen.name = Fullscreen
+setting.borderlesswindow.name = Borderless Window[lightgray] (restart may be required)
+setting.fps.name = Show FPS & Ping
+setting.smoothcamera.name = Smooth Camera
+setting.blockselectkeys.name = Show Block Select Keys
+setting.vsync.name = VSync
+setting.pixelate.name = Pixelate
+setting.minimap.name = Show Minimap
+setting.coreitems.name = Display Core Items (WIP)
+setting.position.name = Show Player Position
+setting.musicvol.name = Music Volume
+setting.atmosphere.name = Show Planet Atmosphere
+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.playerlimit.name = Player Limit
+setting.chatopacity.name = Chat Opacity
+setting.lasersopacity.name = Power Laser Opacity
+setting.bridgeopacity.name = Bridge Opacity
+setting.playerchat.name = Display Player Bubble Chat
+public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
+public.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
+setting.bloom.name = Bloom
+keybind.title = Rebind Keys
+keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only basic movement is supported.
+category.general.name = General
+category.view.name = View
+category.multiplayer.name = Multiplayer
+category.blocks.name = Block Select
+command.attack = Attack
+command.rally = Rally
+command.retreat = Retreat
+command.idle = Idle
+placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
+keybind.clear_building.name = Clear Building
+keybind.press = Press a key...
+keybind.press.axis = Press an axis or key...
+keybind.screenshot.name = Map Screenshot
+keybind.toggle_power_lines.name = Toggle Power Lasers
+keybind.toggle_block_status.name = Toggle Block Statuses
+keybind.move_x.name = Move X
+keybind.move_y.name = Move Y
+keybind.mouse_move.name = Follow Mouse
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
+keybind.schematic_select.name = Select Region
+keybind.schematic_menu.name = Schematic Menu
+keybind.schematic_flip_x.name = Flip Schematic X
+keybind.schematic_flip_y.name = Flip Schematic Y
+keybind.category_prev.name = Previous Category
+keybind.category_next.name = Next Category
+keybind.block_select_left.name = Block Select Left
+keybind.block_select_right.name = Block Select Right
+keybind.block_select_up.name = Block Select Up
+keybind.block_select_down.name = Block Select Down
+keybind.block_select_01.name = Category/Block Select 1
+keybind.block_select_02.name = Category/Block Select 2
+keybind.block_select_03.name = Category/Block Select 3
+keybind.block_select_04.name = Category/Block Select 4
+keybind.block_select_05.name = Category/Block Select 5
+keybind.block_select_06.name = Category/Block Select 6
+keybind.block_select_07.name = Category/Block Select 7
+keybind.block_select_08.name = Category/Block Select 8
+keybind.block_select_09.name = Category/Block Select 9
+keybind.block_select_10.name = Category/Block Select 10
+keybind.fullscreen.name = Toggle Fullscreen
+keybind.select.name = Select/Shoot
+keybind.diagonal_placement.name = Diagonal Placement
+keybind.pick.name = Pick Block
+keybind.break_block.name = Break Block
+keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
+keybind.shoot.name = Shoot
+keybind.zoom.name = Zoom
+keybind.menu.name = Menu
+keybind.pause.name = Pause
+keybind.pause_building.name = Pause/Resume Building
+keybind.minimap.name = Minimap
+keybind.chat.name = Chat
+keybind.player_list.name = Player List
+keybind.console.name = Console
+keybind.rotate.name = Rotate
+keybind.rotateplaced.name = Rotate Existing (Hold)
+keybind.toggle_menus.name = Toggle Menus
+keybind.chat_history_prev.name = Chat History Prev
+keybind.chat_history_next.name = Chat History Next
+keybind.chat_scroll.name = Chat Scroll
+keybind.drop_unit.name = Drop Unit
+keybind.zoom_minimap.name = Zoom Minimap
+mode.help.title = Description of modes
+mode.survival.name = Survival
+mode.survival.description = The normal mode. Limited resources and automatic incoming waves.\n[gray]Requires enemy spawns in the map to play.
+mode.sandbox.name = Sandbox
+mode.sandbox.description = Infinite resources and no timer for waves.
+mode.editor.name = Editor
+mode.pvp.name = PvP
+mode.pvp.description = Fight against other players locally.\n[gray]Requires at least 2 differently-colored cores in the map to play.
+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.infiniteresources = Infinite Resources
+rules.reactorexplosions = Reactor Explosions
+rules.wavetimer = Wave Timer
+rules.waves = Waves
+rules.attack = Attack Mode
+rules.buildai = AI Building
+rules.enemyCheat = Infinite AI (Red Team) Resources
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
+rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
+rules.unithealthmultiplier = Unit Health Multiplier
+rules.unitdamagemultiplier = Unit Damage Multiplier
+rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
+rules.wavespacing = Wave Spacing:[lightgray] (sec)
+rules.buildcostmultiplier = Build Cost Multiplier
+rules.buildspeedmultiplier = Build Speed Multiplier
+rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
+rules.waitForWaveToEnd = Waves Wait for Enemies
+rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
+rules.unitammo = Units Require Ammo
+rules.title.waves = Waves
+rules.title.resourcesbuilding = Resources & Building
+rules.title.enemy = Enemies
+rules.title.unit = Units
+rules.title.experimental = Experimental
+rules.title.environment = Environment
+rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
+rules.ambientlight = Ambient Light
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
+
+content.item.name = Items
+content.liquid.name = Liquids
+content.unit.name = Units
+content.block.name = Blocks
+item.copper.name = Copper
+item.lead.name = Lead
+item.coal.name = Coal
+item.graphite.name = Graphite
+item.titanium.name = Titanium
+item.thorium.name = Thorium
+item.silicon.name = Silicon
+item.plastanium.name = Plastanium
+item.phase-fabric.name = Phase Fabric
+item.surge-alloy.name = Surge Alloy
+item.spore-pod.name = Spore Pod
+item.sand.name = Sand
+item.blast-compound.name = Blast Compound
+item.pyratite.name = Pyratite
+item.metaglass.name = Metaglass
+item.scrap.name = Scrap
+liquid.water.name = Water
+liquid.slag.name = Slag
+liquid.oil.name = Oil
+liquid.cryofluid.name = Cryofluid
+
+item.explosiveness = [lightgray]Explosiveness: {0}%
+item.flammability = [lightgray]Flammability: {0}%
+item.radioactivity = [lightgray]Radioactivity: {0}%
+
+unit.health = [lightgray]Health: {0}
+unit.speed = [lightgray]Speed: {0}
+unit.weapon = [lightgray]Weapon: {0}
+unit.itemcapacity = [lightgray]Item Capacity: {0}
+unit.minespeed = [lightgray]Mining Speed: {0}%
+unit.minepower = [lightgray]Mining Power: {0}
+unit.ability = [lightgray]Ability: {0}
+unit.buildspeed = [lightgray]Building Speed: {0}%
+
+liquid.heatcapacity = [lightgray]Heat Capacity: {0}
+liquid.viscosity = [lightgray]Viscosity: {0}
+liquid.temperature = [lightgray]Temperature: {0}
+
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
+block.cliff.name = Cliff
+block.sand-boulder.name = Sand Boulder
+block.grass.name = Grass
+block.slag.name = Slag
+block.salt.name = Salt
+block.salt-wall.name = Salt Wall
+block.pebbles.name = Pebbles
+block.tendrils.name = Tendrils
+block.sand-wall.name = Sand Wall
+block.spore-pine.name = Spore Pine
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
+block.snow-pine.name = Snow Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.shrubs.name = Shrubs
+block.spore-moss.name = Spore Moss
+block.shale-wall.name = Shale Wall
+block.scrap-wall.name = Scrap Wall
+block.scrap-wall-large.name = Large Scrap Wall
+block.scrap-wall-huge.name = Huge Scrap Wall
+block.scrap-wall-gigantic.name = Gigantic Scrap Wall
+block.thruster.name = Thruster
+block.kiln.name = Kiln
+block.graphite-press.name = Graphite Press
+block.multi-press.name = Multi-Press
+block.constructing = {0} [lightgray](Constructing)
+block.spawn.name = Enemy Spawn
+block.core-shard.name = Core: Shard
+block.core-foundation.name = Core: Foundation
+block.core-nucleus.name = Core: Nucleus
+block.deepwater.name = Deep Water
+block.water.name = Water
+block.tainted-water.name = Tainted Water
+block.darksand-tainted-water.name = Dark Sand Tainted Water
+block.tar.name = Tar
+block.stone.name = Stone
+block.sand.name = Sand
+block.darksand.name = Dark Sand
+block.ice.name = Ice
+block.snow.name = Snow
+block.craters.name = Craters
+block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
+block.char.name = Char
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
+block.ice-snow.name = Ice Snow
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
+block.pine.name = Pine
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
+block.white-tree-dead.name = White Tree Dead
+block.white-tree.name = White Tree
+block.spore-cluster.name = Spore Cluster
+block.metal-floor.name = Metal Floor 1
+block.metal-floor-2.name = Metal Floor 2
+block.metal-floor-3.name = Metal Floor 3
+block.metal-floor-5.name = Metal Floor 4
+block.metal-floor-damaged.name = Metal Floor Damaged
+block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-6.name = Dark Panel 6
+block.dark-metal.name = Dark Metal
+block.basalt.name = Basalt
+block.hotrock.name = Hot Rock
+block.magmarock.name = Magma Rock
+block.copper-wall.name = Copper Wall
+block.copper-wall-large.name = Large Copper Wall
+block.titanium-wall.name = Titanium Wall
+block.titanium-wall-large.name = Large Titanium Wall
+block.plastanium-wall.name = Plastanium Wall
+block.plastanium-wall-large.name = Large Plastanium Wall
+block.phase-wall.name = Phase Wall
+block.phase-wall-large.name = Large Phase Wall
+block.thorium-wall.name = Thorium Wall
+block.thorium-wall-large.name = Large Thorium Wall
+block.door.name = Door
+block.door-large.name = Large Door
+block.duo.name = Duo
+block.scorch.name = Scorch
+block.scatter.name = Scatter
+block.hail.name = Hail
+block.lancer.name = Lancer
+block.conveyor.name = Conveyor
+block.titanium-conveyor.name = Titanium Conveyor
+block.plastanium-conveyor.name = Plastanium Conveyor
+block.armored-conveyor.name = Armored Conveyor
+block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyor belts.
+block.junction.name = Junction
+block.router.name = Router
+block.distributor.name = Distributor
+block.sorter.name = Sorter
+block.inverted-sorter.name = Inverted Sorter
+block.message.name = Message
+block.illuminator.name = Illuminator
+block.illuminator.description = A small, compact, configurable light source. Requires power to function.
+block.overflow-gate.name = Overflow Gate
+block.underflow-gate.name = Underflow Gate
+block.silicon-smelter.name = Silicon Smelter
+block.phase-weaver.name = Phase Weaver
+block.pulverizer.name = Pulverizer
+block.cryofluid-mixer.name = Cryofluid Mixer
+block.melter.name = Melter
+block.incinerator.name = Incinerator
+block.spore-press.name = Spore Press
+block.separator.name = Separator
+block.coal-centrifuge.name = Coal Centrifuge
+block.power-node.name = Power Node
+block.power-node-large.name = Large Power Node
+block.surge-tower.name = Surge Tower
+block.diode.name = Battery Diode
+block.battery.name = Battery
+block.battery-large.name = Large Battery
+block.combustion-generator.name = Combustion Generator
+block.steam-generator.name = Steam Generator
+block.differential-generator.name = Differential Generator
+block.impact-reactor.name = Impact Reactor
+block.mechanical-drill.name = Mechanical Drill
+block.pneumatic-drill.name = Pneumatic Drill
+block.laser-drill.name = Laser Drill
+block.water-extractor.name = Water Extractor
+block.cultivator.name = Cultivator
+block.conduit.name = Conduit
+block.mechanical-pump.name = Mechanical Pump
+block.item-source.name = Item Source
+block.item-void.name = Item Void
+block.liquid-source.name = Liquid Source
+block.liquid-void.name = Liquid Void
+block.power-void.name = Power Void
+block.power-source.name = Power Infinite
+block.unloader.name = Unloader
+block.vault.name = Vault
+block.wave.name = Wave
+block.swarmer.name = Swarmer
+block.salvo.name = Salvo
+block.ripple.name = Ripple
+block.phase-conveyor.name = Phase Conveyor
+block.bridge-conveyor.name = Bridge Conveyor
+block.plastanium-compressor.name = Plastanium Compressor
+block.pyratite-mixer.name = Pyratite Mixer
+block.blast-mixer.name = Blast Mixer
+block.solar-panel.name = Solar Panel
+block.solar-panel-large.name = Large Solar Panel
+block.oil-extractor.name = Oil Extractor
+block.repair-point.name = Repair Point
+block.pulse-conduit.name = Pulse Conduit
+block.plated-conduit.name = Plated Conduit
+block.phase-conduit.name = Phase Conduit
+block.liquid-router.name = Liquid Router
+block.liquid-tank.name = Liquid Tank
+block.liquid-junction.name = Liquid Junction
+block.bridge-conduit.name = Bridge Conduit
+block.rotary-pump.name = Rotary Pump
+block.thorium-reactor.name = Thorium Reactor
+block.mass-driver.name = Mass Driver
+block.blast-drill.name = Airblast Drill
+block.thermal-pump.name = Thermal Pump
+block.thermal-generator.name = Thermal Generator
+block.alloy-smelter.name = Alloy Smelter
+block.mender.name = Mender
+block.mend-projector.name = Mend Projector
+block.surge-wall.name = Surge Wall
+block.surge-wall-large.name = Large Surge Wall
+block.cyclone.name = Cyclone
+block.fuse.name = Fuse
+block.shock-mine.name = Shock Mine
+block.overdrive-projector.name = Overdrive Projector
+block.force-projector.name = Force Projector
+block.arc.name = Arc
+block.rtg-generator.name = RTG Generator
+block.spectre.name = Spectre
+block.meltdown.name = Meltdown
+block.container.name = Container
+block.launch-pad.name = Launch Pad
+block.launch-pad-large.name = Large Launch Pad
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
+team.blue.name = blue
+team.crux.name = red
+team.sharded.name = orange
+team.orange.name = orange
+team.derelict.name = derelict
+team.green.name = green
+team.purple.name = purple
+
+tutorial.next = [lightgray]<Tap to continue>
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse[accent] [[WASD][] to move.\n[accent]Scroll[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
+tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
+tutorial.drill = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\nYou can also select the drill by tapping [accent][[2][] then [accent][[1][] quickly, regardless of which tab is open.\n[accent]Right-click[] to stop building.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[]
+tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\nUse the scrollwheel to rotate blocks before placing them.\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core.
+tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core.
+tutorial.turret = Once an item enters your core, it can be used for building.\nKeep in mind that not all items can be used for building.\nItems that are not used for building, such as[accent] coal[] or[accent] scrap[], cannot be put into the core.\nDefensive structures must be built to repel the[lightgray] enemy[].\nBuild a[accent] duo turret[] near your base.
+tutorial.drillturret = Duo turrets require[accent] copper ammo[] to shoot.\nPlace a drill near the turret.\nLead conveyors into the turret to supply it with copper.\n\n[accent]Ammo delivered: 0/1
+tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause.
+tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause.
+tutorial.unpause = Now press space again to unpause.
+tutorial.unpause.mobile = Now press it again to unpause.
+tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection.
+tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[]
+tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[]
+tutorial.waves = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves.[accent] Click[] to shoot.\nBuild more turrets and drills. Mine more copper.
+tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
+tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese obtained resources can then be used to research new technology.\n\n[accent]Press the launch button.
+
+item.copper.description = The most basic structural material. Used extensively in all types of blocks.
+item.lead.description = A basic starter material. Used extensively in electronics and liquid transportation blocks.
+item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
+item.graphite.description = Mineralized carbon, used for ammunition and electrical components.
+item.sand.description = A common material that is used extensively in smelting, both in alloying and as a flux.
+item.coal.description = Fossilized plant matter, formed long before the seeding event. Used extensively for fuel and resource production.
+item.titanium.description = A rare super-light metal used extensively in liquid transportation, drills and aircraft.
+item.thorium.description = A dense, radioactive metal used as structural support and nuclear fuel.
+item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
+item.silicon.description = An extremely useful semiconductor. Applications in solar panels, complex electronics and homing turret ammunition.
+item.plastanium.description = A light, ductile material used in advanced aircraft and fragmentation ammunition.
+item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
+item.surge-alloy.description = An advanced alloy with unique electrical properties.
+item.spore-pod.description = A pod of synthetic spores, synthesized from atmospheric concentrations for industrial purposes. Used for conversion into oil, explosives and fuel.
+item.blast-compound.description = An unstable compound used in bombs and explosives. Synthesized from spore pods and other volatile substances. Use as fuel is not advised.
+item.pyratite.description = An extremely flammable substance used in incendiary weapons.
+liquid.water.description = The most useful liquid. Commonly used for cooling machines and waste processing.
+liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
+liquid.oil.description = A liquid used in advanced material production. Can be converted into coal as fuel, or sprayed and set on fire as a weapon.
+liquid.cryofluid.description = An inert, non-corrosive liquid created from water and titanium. Has extremely high heat capacity. Extensively used as coolant.
+
+block.message.description = Stores a message. Used for communication between allies.
+block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
+block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
+block.silicon-smelter.description = Reduces sand with pure coal. Produces silicon.
+block.kiln.description = Smelts sand and lead into the compound known as metaglass. Requires small amounts of power to run.
+block.plastanium-compressor.description = Produces plastanium from oil and titanium.
+block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function.
+block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy.
+block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
+block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound.
+block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
+block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets.
+block.separator.description = Separates slag into its mineral components. Outputs the cooled result.
+block.spore-press.description = Compresses spore pods under extreme pressure to synthesize oil.
+block.pulverizer.description = Crushes scrap into fine sand.
+block.coal-centrifuge.description = Solidifes oil into chunks of coal.
+block.incinerator.description = Vaporizes any excess item or liquid it receives.
+block.power-void.description = Voids all power inputted into it. Sandbox only.
+block.power-source.description = Infinitely outputs power. Sandbox only.
+block.item-source.description = Infinitely outputs items. Sandbox only.
+block.item-void.description = Destroys any items. Sandbox only.
+block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
+block.liquid-void.description = Removes any liquids. Sandbox only.
+block.copper-wall.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.
+block.copper-wall-large.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.\nSpans multiple tiles.
+block.titanium-wall.description = A moderately strong defensive block.\nProvides moderate protection from enemies.
+block.titanium-wall-large.description = A moderately strong defensive block.\nProvides moderate protection from enemies.\nSpans multiple tiles.
+block.plastanium-wall.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections.
+block.plastanium-wall-large.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections.\nSpans multiple tiles.
+block.thorium-wall.description = A strong defensive block.\nDecent protection from enemies.
+block.thorium-wall-large.description = A strong defensive block.\nDecent protection from enemies.\nSpans multiple tiles.
+block.phase-wall.description = A wall coated with special phase-based reflective compound. Deflects most bullets upon impact.
+block.phase-wall-large.description = A wall coated with special phase-based reflective compound. Deflects most bullets upon impact.\nSpans multiple tiles.
+block.surge-wall.description = An extremely durable defensive block.\nBuilds up charge on bullet contact, releasing it randomly.
+block.surge-wall-large.description = An extremely durable defensive block.\nBuilds up charge on bullet contact, releasing it randomly.\nSpans multiple tiles.
+block.door.description = A small door. Can be opened or closed by tapping.
+block.door-large.description = A large door. Can be opened and closed by tapping.\nSpans multiple tiles.
+block.mender.description = Periodically repairs blocks in its vicinity. Keeps defenses repaired in-between waves.\nOptionally uses silicon to boost range and efficiency.
+block.mend-projector.description = An upgraded version of the Mender. Repairs blocks in its vicinity.\nOptionally uses phase fabric to boost range and efficiency.
+block.overdrive-projector.description = Increases the speed of nearby buildings.\nOptionally uses phase fabric to boost range and efficiency.
+block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage.\nOverheats if too much damage is sustained. Optionally uses coolant to prevent overheating. Phase fabric can be used to increase shield size.
+block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
+block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into blocks. Rotatable.
+block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
+block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.
+block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
+block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
+block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
+block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
+block.inverted-sorter.description = Processes items like a standard sorter, but outputs selected items to the sides instead.
+block.router.description = Accepts items, then outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.\n\n[scarlet]Never use next to production inputs, as they will get clogged by output.[]
+block.distributor.description = An advanced router. Splits items to up to 7 other directions equally.
+block.overflow-gate.description = Only outputs to the left and right if the front path is blocked.
+block.underflow-gate.description = The opposite of an overflow gate. Outputs to the front if the left and right paths are blocked.
+block.mass-driver.description = The ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range. Requires power to operate.
+block.mechanical-pump.description = A cheap pump with slow output, but no power consumption.
+block.rotary-pump.description = An advanced pump. Pumps more liquid, but requires power.
+block.thermal-pump.description = The ultimate pump.
+block.conduit.description = Basic liquid transport block. Moves liquids forward. Used in conjunction with pumps and other conduits.
+block.pulse-conduit.description = An advanced liquid transport block. Transports liquids faster and stores more than standard conduits.
+block.plated-conduit.description = Moves liquids at the same rate as pulse conduits, but possesses more armor. Does not accept fluids from the sides by anything other than conduits.\nLeaks less.
+block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. Useful for splitting the liquids from one source to multiple targets.
+block.liquid-tank.description = Stores a large amount of liquids. Use for creating buffers in situations with non-constant demand of materials or as a safeguard for cooling vital blocks.
+block.liquid-junction.description = Acts as a bridge for two crossing conduits. Useful in situations with two different conduits carrying different liquids to different locations.
+block.bridge-conduit.description = Advanced liquid transport block. Allows transporting liquids over up to 3 tiles of any terrain or building.
+block.phase-conduit.description = Advanced liquid transport block. Uses power to teleport liquids to a connected phase conduit over several tiles.
+block.power-node.description = Transmits power to connected nodes. The node will receive power from or supply power to any adjacent blocks.
+block.power-node-large.description = An advanced power node with greater range.
+block.surge-tower.description = An extremely long-range power node with fewer available connections.
+block.diode.description = Battery power can flow through this block in only one direction, but only if the other side has less power stored.
+block.battery.description = Stores power as a buffer in times of surplus energy. Outputs power in times of deficit.
+block.battery-large.description = Stores much more power than a regular battery.
+block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
+block.thermal-generator.description = Generates power when placed in hot locations.
+block.steam-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
+block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
+block.solar-panel.description = Provides a small amount of power from the sun.
+block.solar-panel-large.description = A significantly more efficient version of the standard solar panel.
+block.thorium-reactor.description = Generates significant amounts of power from thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. Power output depends on fullness, with base power generated at full capacity.
+block.impact-reactor.description = An advanced generator, capable of creating massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
+block.mechanical-drill.description = A cheap drill. When placed on appropriate tiles, outputs items at a slow pace indefinitely. Only capable of mining basic resources.
+block.pneumatic-drill.description = An improved drill, capable of mining titanium. Mines at a faster pace than a mechanical drill.
+block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Capable of mining thorium.
+block.blast-drill.description = The ultimate drill. Requires large amounts of power.
+block.water-extractor.description = Extracts groundwater. Used in locations with no surface water available.
+block.cultivator.description = Cultivates tiny concentrations of spores in the atmosphere into industry-ready pods.
+block.oil-extractor.description = Uses large amounts of power, sand and water to drill for oil.
+block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen.
+block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
+block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
+block.vault.description = Stores a large amount of items of each type. An unloader block can be used to retrieve items from the vault.
+block.container.description = Stores a small amount of items of each type. An unloader block can be used to retrieve items from the container.
+block.unloader.description = Unloads items from any nearby non-transportation block. The type of item to be unloaded can be changed by tapping.
+block.launch-pad.description = Launches batches of items without any need for a core launch.
+block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
+block.duo.description = A small, cheap turret. Useful against ground units.
+block.scatter.description = An essential anti-air turret. Sprays clumps of lead, scrap or metaglass flak at enemy units.
+block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
+block.hail.description = A small, long-range artillery turret.
+block.wave.description = A medium-sized turret. Shoots streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.lancer.description = A medium-sized anti-ground laser turret. Charges and fires powerful beams of energy.
+block.arc.description = A small close-range electric turret. Fires arcs of electricity at enemies.
+block.swarmer.description = A medium-sized missile turret. Attacks both air and ground enemies. Fires homing missiles.
+block.salvo.description = A larger, more advanced version of the Duo turret. Fires quick salvos of bullets at the enemy.
+block.fuse.description = A large, close-range shrapnel turret. Fires three piercing blasts at nearby enemies.
+block.ripple.description = An extremely powerful artillery turret. Shoots clusters of shells at enemies over long distances.
+block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
+block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
+block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
+block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index c8b102004f..e7749d7347 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Page itch.io avec lien de téléchargement pour PC
 link.google-play.description = Google Play Store
 link.f-droid.description = Catalogue F-Droid
 link.wiki.description = Le wiki officiel de Mindustry
-link.feathub.description = Suggérer de nouvelles fonctionnalités
+link.suggestions.description = Suggérer de nouvelles fonctionnalités
 linkfail = Erreur lors de l'ouverture du lien !\nL'URL a été copiée dans votre presse-papier.
 screenshot = Capture d'écran sauvegardée à {0}
 screenshot.invalid = La carte est trop large, il n'y a potentiellement pas assez de mémoire pour la capture d'écran.
@@ -20,6 +20,8 @@ gameover = Game over
 gameover.pvp = L'équipe [accent] {0}[] a gagné !
 highscore = [accent]Nouveau meilleur score!
 copied = Copié.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Sons
 load.map = Cartes
@@ -63,8 +65,7 @@ stat.delivered = Ressources transférées:
 stat.playtime = Temps de jeu:[accent] {0}
 stat.rank = Rang Final: [accent]{0}
 
-launcheditems = [accent]Ressources transférées
-launchinfo = [unlaunched][[LANCER] votre noyau pour obtenir les objets indiqués en bleu.
+globalitems = [accent]Global Items
 map.delete = Êtes-vous certain(e) de vouloir supprimer la carte "[accent]{0}[]"?
 level.highscore = Meilleur score: [accent]{0}
 level.select = Sélection du niveau
@@ -106,6 +107,7 @@ mods.guide = Guide de Modding
 mods.report = Signaler un Bug
 mods.openfolder = Ouvrir le dossier des mods
 mods.reload = Rafraichir
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Activé
 mod.disabled = [scarlet]Désactivé
@@ -113,6 +115,7 @@ mod.disable = Désactiver
 mod.content = Contenu:
 mod.delete.error = Impossible de supprimer le mod. Le fichier est probablement en cours d'utilisation.
 mod.requiresversion = [scarlet]Version du jeu requise : [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Dépendances manquantes: {0}
 mod.erroredcontent = [scarlet]Erreurs de contenu
 mod.errors = Des erreurs se sont produites lors du chargement du contenu.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Rechargement requis
 mod.import = Importer un mod
 mod.import.file = Importer un fichier
 mod.import.github = Importer un mod GitHub
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Cet objet fait partie du mod[accent] '{0}'[]. Pour le supprimer, désinstallez le mod en question.
 mod.remove.confirm = Ce mod sera supprimé.
 mod.author = [lightgray]Auteur:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Votre appareil ne supporte pas les mods avec des scripts.
 about.button = À propos
 name = Nom:
 noname = Commencez par choisir un[accent] nom de joueur[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Nom du fichier:
 unlocked = Nouveau bloc débloqué!
 completed = [accent]Complété
@@ -142,6 +148,7 @@ techtree = Arbre technologique
 research.list = [lightgray]Recherche:
 research = Rechercher
 researched = [lightgray]{0} recherché(e).
+research.progress = {0}% complete
 players = {0} joueurs en ligne
 players.single = {0} joueur en ligne
 players.search = Recherche
@@ -338,6 +345,11 @@ waves.load = Coller depuis le presse-papiers
 waves.invalid = Vagues invalides dans le presse-papiers.
 waves.copied = Vagues copiées
 waves.none = Aucun ennemi défini.\nNotez que les vagues vides seront automatiquement remplacées par une vague générée par défaut.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<par défaut>
 details = Détails...
 edit = Modifier...
@@ -457,10 +469,12 @@ locked = Verrouillé
 complete = [lightgray]Compléter:
 requirement.wave = Vague {0} dans {1}
 requirement.core = Détruire le Noyau ennemi dans {0}
-requirement.unlock = Débloque {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Reprendre la partie:\n[lightgray]{0}
 bestwave = [lightgray]Meilleur: {0}
 launch = < LANCEMENT >
+launch.text = Launch
 launch.title = Lancement Réussi
 launch.next = [lightgray]prochaine opportunité à la vague {0}
 launch.unable2 = [scarlet]LANCEMENT impossible.[]
@@ -468,13 +482,14 @@ launch.confirm = Cela va transférer toutes les ressources de votre noyau.\nVous
 launch.skip.confirm = Si vous passez à la vague suivante, vous ne pourrez pas effectuer le lancement avant les prochaines vagues.
 uncover = Découvrir
 configure = Modifier les ressources à emporter
+loadout = Loadout
+resources = Resources 
 bannedblocks = Blocs Bannis
 addall = Ajouter TOUS
-configure.locked = [lightgray]Débloquer la configuration des ressources à emporter: {0}.
+launch.destination = Destination: {0}
 configure.invalid = Le montant doit être un nombre compris entre 0 et {0}.
 zone.unlocked = [lightgray]{0} débloquée.
 zone.requirement.complete = Exigences pour {0} complétées:[lightgray]\n{1}
-zone.config.unlocked = Configuration des ressources à emporter débloquée:[lightgray]\n{0}
 zone.resources = [lightgray]Ressources détectées:
 zone.objective = [lightgray]Objectif: [accent]{0}
 zone.objective.survival = Survivre
@@ -493,35 +508,43 @@ error.io = Erreur de Réseau (I/O)
 error.any = Erreur réseau inconnue
 error.bloom = Échec de l'initialisation du flou lumineux.\nVotre appareil peut ne pas le supporter.
 
-zone.groundZero.name = Première Bataille
-zone.desertWastes.name = Désert Sauvage
-zone.craters.name = Cratères
-zone.frozenForest.name = Forêt Glaciale
-zone.ruinousShores.name = Rives en Ruine
-zone.stainedMountains.name = Montagnes Tachetées
-zone.desolateRift.name = Ravin Abandonné
-zone.nuclearComplex.name = Complexe Nucléaire
-zone.overgrowth.name = Friche Végétale
-zone.tarFields.name = Champs de Pétrole
-zone.saltFlats.name = Marais Salants
-zone.impact0078.name = Impact 0078
-zone.crags.name = Rochers
-zone.fungalPass.name = Passe Fongique
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = L'emplacement optimal pour débuter. Faible menace ennemie. Peu de ressources. \nRecueillez autant de plomb et de cuivre que possible.\nRien d'autre à signaler.
-zone.frozenForest.description = Même ici, plus près des montagnes, les spores se sont propagées. Les températures glaciales ne pourront pas les contenir pour toujours.\n\nFamiliarisez vous avec l'Énergie. Construisez des générateurs à combustion. Apprenez à utiliser les réparateurs.
-zone.desertWastes.description = Cette étendue désertique est immense, imprévisible. On y croise des structures abandonnées.\nLe charbon est présent dans la région. Brûlez-le pour générer de l'Énergie ou synthétisez-le en graphite.\n\n[lightgray]Ce lieu d'atterrisage est imprévisible.
-zone.saltFlats.description = Aux abords du désert se trouvent les Marais Salants. Peu de ressources peuvent être trouvées à cet endroit.\n\nL'ennemi y a érigé un stockage de ressources. Éradiquez leur présence.
-zone.craters.description = L'eau s'est accumulée dans ce cratère, vestige des guerres anciennes. Récupérez la zone. Recueillez du sable pour le transformer en verre trempé. Pompez de l'eau pour refroidir les tourelles et les foreuses.
-zone.ruinousShores.description = Passé les contrées désertiques, c'est le rivage. Auparavant, cet endroit a abrité un réseau de défense côtière. Il n'en reste pas grand chose. Seules les structures de défense les plus élémentaires sont restées indemnes, tout le reste ayant été réduit à néant.\nÉtendez vous. Redécouvrez la technologie.
-zone.stainedMountains.description = A l'intérieur des terres se trouvent des montagnes, épargnées par les spores. Extrayez le titane qui abonde dans cette région. Apprenez à vous en servir. La menace ennemie se fait plus présente ici. Ne leur donnez pas le temps de rallier leurs puissantes unités.
-zone.overgrowth.description = Cette zone est envahie par la végétation, et proche de la source des spores.\nL’ennemi a établi une base ici. Construisez des unités Titan pour le détruire. Reprenez ce qui a été perdu.
-zone.tarFields.description = La périphérie d'une zone de puits pétroliers, entre montagnes et désert. Une des rares zones disposant de réserves de pétrole utilisables. Bien qu'abandonnée, cette zone compte des forces ennemies dangereuses à proximité. Ne les sous-estimez pas.\n\n[lightgray]Si possible, recherchez les technologies de traitement du pétrole.
-zone.desolateRift.description = Une zone extrêmement dangereuse. Ressources abondantes, mais peu d'espace. Fort risque de destruction. Repartez le plus vite possible. Ne vous laissez pas berner par l'espacement des vagues ennemies...
-zone.nuclearComplex.description = Une ancienne installation de production et traitement de thorium réduite en ruines.\n[lightgray]Faites des recherches sur le thorium et ses nombreuses utilisations.\n\nL'ennemi est présent ici en grand nombre, constamment à l'affût.
-zone.fungalPass.description = Une zone de transition entre les hautes montagnes et les basses régions infestées de spores. Une petite base de reconnaissance ennemie s'y trouve.\nDétruisez-la.\nUtilisez les unités Poignards et Rampeurs. Détruisez les deux noyaux.
-zone.impact0078.description = <insérer une description ici>
-zone.crags.description = <insérer une description ici>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Langue
 settings.data = Données du Jeu
@@ -535,6 +558,8 @@ settings.graphics = Graphismes
 settings.cleardata = Effacer les données du jeu...
 settings.clear.confirm = Êtes-vous sûr d'effacer ces données ?\nAucun retour en arrière n'est possible!
 settings.clearall.confirm = [scarlet]ATTENTION![]\nCette action effacera toutes les données, y compris les sauvegardes, les cartes, la progression et la configuration des touches.\nUne fois que vous aurez pressé 'OK' le jeu effacera TOUTES les données et se fermera.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Pause >
 clear = Effacer
 banned = [scarlet]Bannis
@@ -560,8 +585,11 @@ blocks.itemsmoved = Vitesse de Déplacement
 blocks.launchtime = Temps entre chaque lancement
 blocks.shootrange = Portée de tir
 blocks.size = Taille
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Capacité liquide
 blocks.powerrange = Portée électrique
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Nombre maximal de connections
 blocks.poweruse = Énergie utilisée
 blocks.powerdamage = Dégâts d'énergie
@@ -577,13 +605,18 @@ blocks.boosteffect = Effet du Boost
 blocks.maxunits = Unités actives max
 blocks.health = Santé
 blocks.buildtime = Durée de construction
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Coût de construction
 blocks.inaccuracy = Imprécision
 blocks.shots = Tirs
 blocks.reload = Tirs/Seconde
 blocks.ammo = Munitions
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Meilleure Foreuse Requise
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Vitesse de Forage: {0}/s
 bar.pumpspeed = Vitesse de Pompage: {0}/s
 bar.efficiency = Efficacité: {0}%
@@ -593,11 +626,12 @@ bar.poweramount = Énergie: {0}
 bar.poweroutput = Énergie Produite: {0}
 bar.items = Objets: {0}
 bar.capacity = Capacité: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquide
 bar.heat = Chaleur
 bar.power = Énergie
 bar.progress = Progression de la construction
-bar.spawned = Unités: {0}/{1}
 bar.input = Entrée
 bar.output = Sortie
 
@@ -621,12 +655,16 @@ unit.liquidunits = unité de liquide
 unit.powerunits = unité d'énergie
 unit.degrees = degrés
 unit.seconds = secondes
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x vitesse
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = objets
 unit.thousands = k
 unit.millions = M
+unit.billions = b
 category.general = Général
 category.power = Énergie
 category.liquids = Liquides
@@ -641,6 +679,7 @@ setting.linear.name = Filtrage Linéaire
 setting.hints.name = Astuces
 setting.flow.name = Afficher le Débit des Ressources
 setting.buildautopause.name = Confirmation avant la construction
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Eau animée
 setting.animatedshields.name = Boucliers Animés
 setting.antialias.name = Anticrénelage[lightgray] (redémarrage du jeu nécessaire)[]
@@ -665,7 +704,6 @@ setting.effects.name = Afficher les Effets
 setting.destroyedblocks.name = Afficher les Blocs Détruits
 setting.blockstatus.name = Afficher le Statut des Blocs
 setting.conveyorpathfinding.name = Auto-placement Intelligent des Convoyeurs 
-setting.coreselect.name = Autoriser les schémas contenant des Noyaux
 setting.sensitivity.name = Sensibilité de la manette
 setting.saveinterval.name = Intervalle des Sauvegardes Automatiques
 setting.seconds = {0} secondes
@@ -679,6 +717,7 @@ setting.blockselectkeys.name = Afficher les Touches pour Sélectionner les Blocs
 setting.vsync.name = VSync
 setting.pixelate.name = Pixeliser[lightgray] (désactive les animations)
 setting.minimap.name = Afficher la Minimap
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Afficher la position du joueur
 setting.musicvol.name = Volume Musique
 setting.atmosphere.name = Son atmosphérique de la planète
@@ -704,9 +743,11 @@ keybinds.mobile = [scarlet]La plupart des raccourcis clavier ne sont pas fonctio
 category.general.name = Général
 category.view.name = Voir
 category.multiplayer.name = Multijoueur
+category.blocks.name = Block Select
 command.attack = Attaque
 command.rally = Rassembler
 command.retreat = Retraite
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Touche: [{0},
 keybind.respawn.name = Réapparaitre
 keybind.control.name = Controler une Unité
@@ -719,6 +760,7 @@ keybind.toggle_block_status.name = Montrer/Cacher les Status des Blocs
 keybind.move_x.name = Mouvement X
 keybind.move_y.name = Mouvement Y
 keybind.mouse_move.name = Suivre la Souris
+keybind.pan.name = Pan View
 keybind.boost.name = Boost
 keybind.schematic_select.name = Sélectionner une Région
 keybind.schematic_menu.name = Menu des schémas
@@ -746,6 +788,9 @@ keybind.diagonal_placement.name = Placement en diagonale
 keybind.pick.name = Choisir un bloc
 keybind.break_block.name = Supprimer un bloc
 keybind.deselect.name = Désélectionner
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Tirer
 keybind.zoom.name = Zoomer
 keybind.menu.name = Menu
@@ -780,6 +825,7 @@ rules.reactorexplosions = Explosion des Réacteurs
 rules.wavetimer = Minuterie pour les vagues
 rules.waves = Vagues
 rules.attack = Mode « Attaque »
+rules.buildai = AI Building
 rules.enemyCheat = Ressources infinies pour l'IA (équipe rouge)
 rules.blockhealthmultiplier = Multiplicateur de Santé des Blocs
 rules.blockdamagemultiplier = Multiplicateur de Dégât des Blocs
@@ -801,8 +847,12 @@ rules.title.unit = Unités
 rules.title.experimental = Expérimental
 rules.title.environment = Environment
 rules.lighting = Éclairage
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Éclairage Ambiant
-rules.solarpowermultiplier = Multiplicateur d'Énergie Solaire
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Objets
 content.liquid.name = Liquides
@@ -828,10 +878,11 @@ liquid.water.name = Eau
 liquid.slag.name = Scories
 liquid.oil.name = Pétrole
 liquid.cryofluid.name = Liquide Cryogénique
-item.corestorable = [lightgray]Stockable dans le Noyau: {0}
+
 item.explosiveness = [lightgray]Explosivité: {0}
 item.flammability = [lightgray]Inflammabilité: {0}
 item.radioactivity = [lightgray]Radioactivité: {0}
+
 unit.health = [lightgray]Santé: {0}
 unit.speed = [lightgray]Vitesse: {0}
 unit.weapon = [lightgray]Arme: {0}
@@ -840,30 +891,67 @@ unit.minespeed = [lightgray]Vitesse de Minage: {0}%
 unit.minepower = [lightgray]Puissance de Minage: {0}
 unit.ability = [lightgray]Abilité: {0}
 unit.buildspeed = [lightgray]Vitesse de Construction: {0}%
+
 liquid.heatcapacity = [lightgray]Capacité Thermique: {0}
 liquid.viscosity = [lightgray]Viscosité: {0}
 liquid.temperature = [lightgray]Température: {0}
 
+unit.dagger.name = Poignard
+unit.mace.name = Mace
+unit.fortress.name = Forteresse
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Rampeur
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Falaise
 block.sand-boulder.name = Bloc de Sable
 block.grass.name = Herbe
 block.slag.name = Scories
 block.salt.name = Sel
-block.saltrocks.name = Roches de sel
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Cailloux
 block.tendrils.name = Vrilles
-block.sandrocks.name = Roches de sable
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Pin Sporeux
-block.sporerocks.name = Roche Sporeuse
-block.rock.name = Roche
-block.snowrock.name = Roches enneigées
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Pin enneigé
 block.shale.name = Schiste
 block.shale-boulder.name = Blocs de Schiste
 block.moss.name = Mousse
 block.shrubs.name = Arbustes
 block.spore-moss.name = Mousse Sporeuse
-block.shalerocks.name = Rochers de Schiste Argileux
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Mur de Ferraille
 block.scrap-wall-large.name = Grand Mur de Ferraille
 block.scrap-wall-huge.name = Énorme Mur de Ferraille
@@ -891,13 +979,17 @@ block.craters.name = Cratères
 block.sand-water.name = Eau avec fond de Sable
 block.darksand-water.name = Eau avec fond de Sable Sombre
 block.char.name = Cendre
-block.holostone.name = Pierre Holographique
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Neige et Glace
-block.rocks.name = Rochers
-block.icerocks.name = Rochers de Glace
-block.snowrocks.name = Rochers de Neige
-block.dunerocks.name = Rochers de Sable
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pin
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Arbre Blanc Mort
 block.white-tree.name = Arbre Blanc
 block.spore-cluster.name = Grappe de Spores
@@ -913,10 +1005,9 @@ block.dark-panel-4.name = Panneau Sombre 4
 block.dark-panel-5.name = Panneau Sombre 5
 block.dark-panel-6.name = Panneau Sombre 6
 block.dark-metal.name = Métal Sombre
-block.ignarock.name = Roches Ignées
+block.basalt.name = Basalt
 block.hotrock.name = Roches Chaudes
 block.magmarock.name = Roches Magmatiques
-block.cliffs.name = Falaises
 block.copper-wall.name = Mur de Cuivre
 block.copper-wall-large.name = Grand Mur de Cuivre
 block.titanium-wall.name = Mur de Titane
@@ -952,7 +1043,7 @@ block.underflow-gate.name = Barrière de Refoulement
 block.silicon-smelter.name = Fonderie de Silicium
 block.phase-weaver.name = Tisseur à Phase
 block.pulverizer.name = Pulvérisateur
-block.cryofluidmixer.name = Refroidisseur
+block.cryofluid-mixer.name = Refroidisseur
 block.melter.name = Four à Fusion
 block.incinerator.name = Incinérateur
 block.spore-press.name = Presse à Spore
@@ -965,7 +1056,7 @@ block.diode.name = Diode
 block.battery.name = Batterie
 block.battery-large.name = Grande Batterie
 block.combustion-generator.name = Générateur à Combustion
-block.turbine-generator.name = Générateur à Turbine
+block.steam-generator.name = Générateur à Turbine
 block.differential-generator.name = Générateur Différentiel
 block.impact-reactor.name = Réacteur à Impact
 block.mechanical-drill.name = Foreuse Mécanique
@@ -995,7 +1086,6 @@ block.blast-mixer.name = Mixeur à Explosion
 block.solar-panel.name = Panneau Solaire
 block.solar-panel-large.name = Grand Panneau Solaire
 block.oil-extractor.name = Extracteur de Pétrole
-block.command-center.name = Centre de Commandement
 block.repair-point.name = Point de Réparation
 block.pulse-conduit.name = Conduit à Impulsion
 block.plated-conduit.name = Conduit Plaqué
@@ -1028,6 +1118,7 @@ block.container.name = Conteneur
 block.launch-pad.name = Plateforme de Lancement
 block.launch-pad-large.name = Grande Plateforme de Lancement
 block.segment.name = Diviseur 
+block.command-center.name = Command Center
 block.ground-factory.name = Usine d'Unité Terrestre
 block.air-factory.name = Usine d'Unité Aérienne
 block.naval-factory.name = Usine d'Unité Navale
@@ -1035,11 +1126,20 @@ block.additive-reconstructor.name = Reconstructeur Additif
 block.multiplicative-reconstructor.name = Reconstructeur Multiplicatif
 block.exponential-reconstructor.name = Reconstructeur Exponentiel
 block.tetrative-reconstructor.name = Reconstructeur Tétratif
-block.mass-conveyor.name = Convoyeur de Masse
+block.payload-conveyor.name = Convoyeur de Masse
 block.payload-router.name = Routeur de Charge Utile
-block.disasembler.name = Désassembleur
+block.disassembler.name = Disassembler
 block.silicon-crucible.name = Creuset de Silicium
-block.large-overdrive-projector = Grand Projecteur Surmultiplicateur
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = bleu
 team.crux.name = rouge
 team.sharded.name = jaune
@@ -1047,21 +1147,7 @@ team.orange.name = orange
 team.derelict.name = abandonné
 team.green.name = vert
 team.purple.name = violet
-unit.spirit.name = Drone Réparateur Spirituel
-unit.draug.name = Drone Mineur Spirituel
-unit.phantom.name = Drone Constructeur Spirituel
-unit.dagger.name = Poignard
-unit.crawler.name = Rampeur
-unit.titan.name = Titan
-unit.ghoul.name = Goule Bombardier
-unit.wraith.name = Combattant Spectral
-unit.fortress.name = Forteresse
-unit.revenant.name = Revenant
-unit.eruptor.name = Érupteur
-unit.chaos-array.name = Soldat du chaos
-unit.eradicator.name = Éradicateur
-unit.lich.name = Liche
-unit.reaper.name = Faucheur
+
 tutorial.next = [lightgray]<Appuyez pour continuer>
 tutorial.intro = Bienvenue sur le [scarlet]Tutoriel de Mindustry![]\nUtilisez [accent][[ZQSD ou WASD][] pour vous déplacer.\nFaites [accent]rouler[] la molette de la souris pour zoomer et dézoomer.\nCommencez en minant du [accent]cuivre[]. Pour cela, allez près de votre noyau, puis faites un clic gauche sur un minerai de cuivre.\n\n[accent]{0}/{1} cuivre
 tutorial.intro.mobile = Bienvenue sur le [scarlet]Tutoriel de Mindustry![]\nBalayez l'écran pour vous déplacer.\n[accent] Pincez avec deux doigts [] pour zoomer et dézoomer.\nCommencez en[accent] minant du cuivre[]. Pour cela, allez près de votre noyau, puis appuyez sur un minerai de cuivre.\n\n[accent]{0}/{1} cuivre
@@ -1104,17 +1190,7 @@ liquid.water.description = Le liquide le plus utile. Couramment utilisé pour le
 liquid.slag.description = Différents types de métaux en fusion mélangés. Peut être séparé en ses minéraux constitutifs ou tout simplement pulvérisé sur les unités ennemies.
 liquid.oil.description = Un liquide utilisé dans la production de matériaux avancés. Peut être transformé en charbon ou pulvérisé sur les ennemis, puis enflammé.
 liquid.cryofluid.description = Un liquide inerte, non corrosif, créé à partir d’eau et de titane. Possède une capacité d'absorption de chaleur extrêmement élevée. Largement utilisé comme liquide de refroidissement.
-unit.draug.description = Un drone de minage primitif pas cher à produire. Sacrifiable. Mine automatiquement le cuivre et le plomb dans les environs. Fournit les ressources minées au noyau le plus proche.
-unit.spirit.description = Un drone de minage modifié, conçu pour réparer au lieu d’exploiter. Répare automatiquement tous les blocs endommagés dans la zone.
-unit.phantom.description = Un drone avancé qui vous suit et vous aide à construire. Reconstruit aussi les bâtiments détruits par les ennemis
-unit.dagger.description = L'unité terrestre de base. Coûte peu cher à produire. Implacable lorsqu'il est utilisé en essaim.
-unit.crawler.description = Une unité terrestre composée d’un cadre dépouillé sur lequel sont fixés des explosifs puissants. Pas particulièrement durable. Explose au contact des ennemis.
-unit.titan.description = Une unité terrestre avancée et blindée. Attaque les cibles aériennes et terrestres. Équipé de deux lance-flammes « Brûleur » miniatures.
-unit.fortress.description = Une unité d'artillerie lourde. Équipée de deux canons « Grêle » modifiés pour l'assaut à longue portée contre les structures et les unités ennemies.
-unit.eruptor.description = Une unité lourde conçue pour détruire les structures. Tire un flot de scories sur les fortifications ennemies, les faisant fondre et brûler. Enflamme également les liquides volatiles.
-unit.wraith.description = Une unité d'interception rapide et de harcèlement. Cible les générateurs d'énergie.
-unit.ghoul.description = Un bombardier lourd qui fend à travers les lignes ennemies et ciblant les infrastructures critiques.
-unit.revenant.description = Une plateforme aérienne lançant de puissants missiles.
+
 block.message.description = Enregistre un message. Utilisé pour la communication entre alliés.
 block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite pur.
 block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
@@ -1123,7 +1199,7 @@ block.kiln.description = Fait fondre le sable et le plomb en verre trempé. Néc
 block.plastanium-compressor.description = Produit du plastanium à partir de pétrole et de titane.
 block.phase-weaver.description = Produit du tissu phasé à partir de thoriums et de grandes quantités de sable. Nécessite une quantité massive d'énergie pour fonctionner.
 block.alloy-smelter.description = Produit un alliage superchargé à l'aide de titane, de plomb, de silicium et de cuivre.
-block.cryofluidmixer.description = Mélange de l’eau et de la fine poudre de titane pour former du liquide cryogénique. Indispensable lors de l'utilisation de réacteurs aux thoriums.
+block.cryofluid-mixer.description = Mélange de l’eau et de la fine poudre de titane pour former du liquide cryogénique. Indispensable lors de l'utilisation de réacteurs aux thoriums.
 block.blast-mixer.description = Écrase et mélange les amas de spores avec de la pyratite pour produire un mélange explosif.
 block.pyratite-mixer.description = Mélange le charbon, le plomb et le sable en pyratite hautement inflammable.
 block.melter.description = Fait fondre la ferraille en scories pour un traitement ultérieur ou une utilisation dans les tourelles « Onde ».
@@ -1189,7 +1265,7 @@ block.battery.description = Stocke le surplus d'énergie et le redistribue en ca
 block.battery-large.description = Stocke bien plus d'énergie qu'une batterie normale.
 block.combustion-generator.description = Génère de l'énergie en brûlant du charbon ou d'autres matériaux inflammables.
 block.thermal-generator.description = Génère une grande quantité d'énergie à partir de zones de chaleur.
-block.turbine-generator.description = Plus efficace qu'un générateur à combustion, mais requiert de l'eau.
+block.steam-generator.description = Plus efficace qu'un générateur à combustion, mais requiert de l'eau.
 block.differential-generator.description = Génère de grandes quantités d'énergie en utilisant la différence de température entre le liquide cryogénique et la pyratite brûlante.
 block.rtg-generator.description = Un générateur thermo-électrique à radioisotope qui ne demande pas de refroidissement mais produit moins d'énergie qu'un réacteur à Thorium.
 block.solar-panel.description = Génère une faible quantité d'énergie grâce aux rayons du soleil.
@@ -1225,16 +1301,5 @@ block.ripple.description = Une grande tourelle d'artillerie qui tire plusieurs s
 block.cyclone.description = Une grande tourelle qui tire rapidement des débris explosifs aux ennemis terrestres et aériens.
 block.spectre.description = Une tourelle massive à double cannon et qui tire de puissantes balles perce-blindages simultanément.
 block.meltdown.description = Une tourelle massive chargeant et tirant de puissants rayons lasers. Nécessite un liquide de refroidissement.
-block.command-center.description = Permet de donner des ordres aux unités alliées sur la carte.\nIndique aux unités de se rallier, d'attaquer un noyau ennemi ou de battre en retraite vers le noyau/l'usine. En l'absence de noyau adverse, les unités patrouilleront par défaut en fonction de l'ordre donné.
-block.draug-factory.description = Produit des drones mineurs.
-block.spirit-factory.description = Produit des drones qui réparent les bâtiments endommagés.
-block.phantom-factory.description = Produit des drones de construction avancés.
-block.wraith-factory.description = Produit des intercepteurs rapides qui harcèlent l'ennemi.
-block.ghoul-factory.description = Produit des bombardiers lourds.
-block.revenant-factory.description = Produit des unités aériennes lourdes tirant des missiles.
-block.dagger-factory.description = Produit des unités terrestres basiques.
-block.crawler-factory.description = Produit des unités terrestres kamikazes rapides.
-block.titan-factory.description = Produit des unités terrestres avancées et cuirassées.
-block.fortress-factory.description = Produit des unités terrestres d'artillerie lourde.
 block.repair-point.description = Soigne en permanence l'unité endommagée la plus proche à proximité.
 block.segment.description = Endommage et détruit les tirs ennemis. Cependant, les lasers ne peuvent pas être ciblés.
diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties
index fcf8f417fe..02fe5e58b1 100644
--- a/core/assets/bundles/bundle_fr_BE.properties
+++ b/core/assets/bundles/bundle_fr_BE.properties
@@ -3,7 +3,7 @@ credits = Crédits
 contributors = Traducteurs et contributeurs
 discord = Rejoignez le discord de Mindustry !
 link.discord.description = Le discord officiel de Mindustry
-link.reddit.description = The Mindustry subreddit
+link.reddit.description = Le subreddit de Mindustry
 link.github.description = Code source du jeu
 link.changelog.description = Liste des mises à jour
 link.dev-builds.description = Versions instables de développement
@@ -12,14 +12,16 @@ link.itch.io.description = Site itch.io avec les versions téléchargeables pour
 link.google-play.description = Page Google Play du jeu
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Wiki officiel de Mindustry
-link.feathub.description = Suggest new features
+link.suggestions.description = Suggérer des nouvelles fonctionallitées
 linkfail = L'ouverture du lien a échoué!\nL'URL a été copiée dans votre presse-papier.
 screenshot = Capture d'écran enregistrée sur {0}
 screenshot.invalid = Carte trop grande, potentiellement pas assez de mémoire pour la capture d'écran.
 gameover = Le base a été détruite.
 gameover.pvp = L'équipe[accent] {0}[] a gagnée !
 highscore = [accent]Nouveau meilleur score !
-copied = Copied.
+copied = Copié.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Son
 load.map = Maps
@@ -29,29 +31,29 @@ load.system = Système
 load.mod = Mods
 load.scripts = Scripts
 
-be.update = A new Bleeding Edge build is available:
-be.update.confirm = Download it and restart now?
-be.updating = Updating...
-be.ignore = Ignore
-be.noupdates = No updates found.
-be.check = Check for updates
+be.update = Une nouvelle version est disponible:
+be.update.confirm = Voulez vous la télécharger et recommencer maintenant ?
+be.updating = Entrain de mettre à jour...
+be.ignore = Ignorer
+be.noupdates = Aucune mise à jour n'as été trouvée.
+be.check = Chercher des mises à jour
 
-schematic = Schematic
-schematic.add = Save Schematic...
-schematics = 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...
-schematic.exportfile = Export File
-schematic.importfile = Import File
-schematic.browseworkshop = Browse Workshop
-schematic.copy = Copy to Clipboard
-schematic.copy.import = Import from Clipboard
-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 = Schéma
+schematic.add = Enregistrer Schéma...
+schematics = Schémas
+schematic.replace = Un schéma avec ce nom existe déjà. Voulez vous le remplacer ?
+schematic.exists = Un schéma avec ce nom existe déjà.
+schematic.import = Importer le Schéma...
+schematic.exportfile = Exporter Dossier
+schematic.importfile = Importer Dossier
+schematic.browseworkshop = Parcourir l'Atelier
+schematic.copy = Copier dans le presse-papier
+schematic.copy.import = Importer du presse-papier
+schematic.shareworkshop = Partager sur l'Atelier
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Retourner Schéma
+schematic.saved = Schéma enregistré.
+schematic.delete.confirm = Ce Schéma sera totalement éradiqué.
+schematic.rename = Renommer Schéma
 schematic.info = {0}x{1}, {2} blocks
 
 stat.wave = Vagues vaincues:[accent] {0}
@@ -60,17 +62,16 @@ stat.built = Bâtiments construits:[accent] {0}
 stat.destroyed = Bâtiments détruits:[accent] {0}
 stat.deconstructed = Bâtiments déconstruits:[accent] {0}
 stat.delivered = Ressources transférées:
-stat.playtime = Time Played:[accent] {0}
+stat.playtime = Temps Joué:[accent] {0}
 stat.rank = Rang Final: [accent]{0}
 
-launcheditems = [accent]Ressources transférées
-launchinfo = [unlaunched][[LAUNCH] your core to obtain the items indicated in blue.
+globalitems = [accent]Global Items
 map.delete = Êtes-vous sûr de vouloir supprimer cette carte ?"[accent]{0}[]"?
 level.highscore = Meilleur score: [accent]{0}
 level.select = Sélection de niveau
 level.mode = Mode de jeu:
-coreattack = <Le base subis une attaque>
-nearpoint = [[ [scarlet]QUITTEZ LE POINT D'APPARITION ENNEMI IMMÉDIATEMENT[] ]\nannihilation imminente
+coreattack = <La base subit une attaque>
+nearpoint = [[ [scarlet]QUITTEZ LE POINT D'APPARITION ENNEMI IMMÉDIATEMENT[] ]\nextermination imminente
 database = Base de données
 savegame = Sauvegarder la partie
 loadgame = Charger la partie
@@ -81,38 +82,40 @@ none = <Vide>
 minimap = Minimap
 position = Position
 close = Fermer
-website = Website
+website = Site Web
 quit = Quitter
 save.quit = Save & Quit
 maps = Cartes
-maps.browse = Browse Maps
-continue = Continue
+maps.browse = Feuilleter les maps
+continue = Continuer
 maps.none = [lightgray]Aucune carte trouvée!
-invalid = Invalid
-pickcolor = Pick Color
-preparingconfig = Preparing Config
-preparingcontent = Preparing Content
-uploadingcontent = Uploading Content
-uploadingpreviewfile = Uploading Preview File
-committingchanges = Comitting Changes
-done = Done
-feature.unsupported = Your device does not support this feature.
+invalid = Invalide
+pickcolor = Choisir Couleur
+preparingconfig = Préparation Configuration
+preparingcontent = Préparation Contenu
+uploadingcontent = Télécharger Contenu
+uploadingpreviewfile = Télécharger Aperçu de Dossier
+committingchanges = Commettre Changements
+done = Fini
+feature.unsupported = Votre appareil ne prend pas en charge cette fonctionnalité.
 
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
+mods.alphainfo = Tenez en compte que les mods sont en version alpha et [scarlet] qu'ils peuvent avoir des bugs[].\nVeuillez signaler tout les problèmes que vous encontrez sur le Github de Mindustry ou sur Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
-mods.none = [lightgray]No mods found!
-mods.guide = Modding Guide
-mods.report = Report Bug
-mods.openfolder = Open Mod Folder
-mods.reload = Reload
+mods.none = [lightgray]Aucun Mod trouvé !
+mods.guide = Guide de Modding
+mods.report = Signaler un Bug
+mods.openfolder = Ouvrir Dossier Mod
+mods.reload = Relancer
+mods.reloadexit = Le jeu va quitter pour relancer les mods.
 mod.display = [gray]Mod:[orange] {0}
-mod.enabled = [lightgray]Enabled
-mod.disabled = [scarlet]Disabled
-mod.disable = Disable
-mod.content = Content:
+mod.enabled = [lightgray]Activé
+mod.disabled = [scarlet]Désactivé
+mod.disable = Désactive
+mod.content = Contenu:
 mod.delete.error = Unable to delete mod. File may be in use.
 mod.requiresversion = [scarlet]Requires min game version: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
 mod.import.file = Import File
 mod.import.github = Import GitHub Mod
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = This mod will be deleted.
 mod.author = [lightgray]Author:[] {0}
@@ -135,13 +139,16 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = À propos
 name = Nom:
 noname = Choisissez d'abord [accent]un pseudo[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Nom du fichier:
 unlocked = Nouveau bloc debloqué!
 completed = [accent]Terminé
 techtree = Arbre technologique
 research.list = [lightgray]Recherche:
 research = Recherche
-researched = [lightgray]{0} recherchée.
+researched = [lightgray]{0} recherché.
+research.progress = {0}% complete
 players = {0} joueurs
 players.single = {0} joueur
 players.search = search
@@ -150,7 +157,7 @@ server.closing = [accent]Fermeture du serveur ...
 server.kicked.kick = Vous avez été expulsé du serveur !
 server.kicked.whitelist = You are not whitelisted here.
 server.kicked.serverClose = Serveur fermé.
-server.kicked.vote = You have been vote-kicked. Goodbye.
+server.kicked.vote = Vous avez été expulsé par vote. Au revoir.
 server.kicked.clientOutdated = Client dépassé! Mettez à jour votre jeu !
 server.kicked.serverOutdated = Serveur dépassé! Demandez à l'hôte de le mettre à jour !
 server.kicked.banned = Vous êtes banni de ce serveur.
@@ -162,37 +169,37 @@ server.kicked.nameEmpty = Votre nom doit contenir au moins une lettre ou un chif
 server.kicked.idInUse = Vous êtes déjà sur ce serveur ! Se connecter avec deux comptes n'est pas permis !
 server.kicked.customClient = Ce serveur ne supporte pas les versions personnalisées (Custom builds). Télécharger une version officielle.
 server.kicked.gameover = Vous avez perdu !
-server.kicked.serverRestarting = The server is restarting.
+server.kicked.serverRestarting = Le serveur est entrain de redémarrer.
 server.versions = Votre version:[accent] {0}[]\nVersion du serveur:[accent] {1}[]
 host.info = Le bouton [accent]héberger[] héberge un serveur sur les ports [scarlet]6567[] et [scarlet]6568.[]\nN'importe qui sur le même [lightgray]réseau wifi ou local[] devrait pouvoir voir votre serveur dans sa liste de serveurs.\n\nSi vous voulez que les gens puissent se connecter de n'importe où grâce à l'IP, [accent]rediriger les ports[] est requis.\n\n[lightgray]Note:Si quelqu'un éprouve des difficultés à se connecter à votre partie LAN, assurez-vous que vous avez autorisé Mindustry à accéder à votre réseau local dans les paramètres de votre pare-feu.
 join.info = Ici, vous pouvez entrer l' [accent]IP d'un serveur[] pour s'y connecter, ou découvrir les serveurs[accent]sur votre réseau local[] pour s'y connecter.\nLes parties multijoueur LAN et WAN sont toutes deux supportées.\n\n[lightgray]Note: Aucune liste globale des serveurs n'est génerée automatiquement: si vous voulez vous connecter à un serveur par IP, vous devrez demander l'IP à l'hébergeur.
 hostserver = Héberger un serveur
-invitefriends = Invite Friends
-hostserver.mobile = Héberger\nUne partie
+invitefriends = Inviter des amis
+hostserver.mobile = Héberger\nune partie
 host = Héberger
 hosting = [accent]Ouverture du serveur ...
 hosts.refresh = Actualiser
 hosts.discovering = Recherche de parties en LAN
-hosts.discovering.any = Discovering games
+hosts.discovering.any = Découverte des jeux
 server.refreshing = Actualisation du serveur
 hosts.none = [lightgray]Aucun jeu en LAN trouvé !
 host.invalid = [scarlet]Impossible de se\nconnecter à l'hôte.
 
-servers.local = Local Servers
-servers.remote = Remote Servers
-servers.global = Community Servers
+servers.local = Serveurs Locaux
+servers.remote = Serveurs Distants
+servers.global = Serveurs Communautaires
 
 trace = Suivre le joueur
 trace.playername = Nom du joueur: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID Unique: [accent]{0}
-trace.mobile = Mobile Client: [accent]{0}
+trace.mobile = Client Mobile: [accent]{0}
 trace.modclient = Client personnalisé: [accent]{0}
 invalidid = ID client invalide ! Soumettre un rapport de bug
-server.bans = Bannis
-server.bans.none = Aucun joueurs bannis trouvés !
+server.bans = Banni
+server.bans.none = Aucun joueur banni trouvé !
 server.admins = Administrateurs
-server.admins.none = Aucun administrateurs trouvé !
+server.admins.none = Aucun administrateur trouvé !
 server.add = Ajouter un serveur
 server.delete = Êtes-vous sûr de vouloir supprimer ce serveur ?
 server.edit = Modifier le serveur
@@ -201,19 +208,19 @@ server.outdated.client = [crimson]Client obsolète ![]
 server.version = [lightgray]Version: {0} {1}
 server.custombuild = [accent]Version personnalisée
 confirmban = Êtes-vous sûr de vouloir bannir ce joueur ?
-confirmkick = Êtes-vous sûr de vouloir expulser ce joueur?
-confirmvotekick = Are you sure you want to vote-kick this player?
+confirmkick = Êtes-vous sûr de vouloir expulser ce joueur ?
+confirmvotekick = Êtes-vous sûr de vouloir voter que ce joueur soit banni ?
 confirmunban = Êtes-vous sûr de vouloir annuler le ban de ce joueur ?
 confirmadmin = Êtes-vous sûr de vouloir faire de ce joueur un administrateur ?
 confirmunadmin = Êtes-vous sûr de vouloir supprimer le statut d'administrateur de ce joueur ?
 joingame.title = Rejoindre une partie
 joingame.ip = IP:
 disconnect = Déconnecté.
-disconnect.error = Connection error.
-disconnect.closed = Connection closed.
+disconnect.error = Un problème est survenu lors de la connection.
+disconnect.closed = Connection fermée.
 disconnect.timeout = Timed out.
 disconnect.data = Les données du monde n'ont pas pu être chargées !
-cantconnect = Unable to join game ([accent]{0}[]).
+cantconnect = Impossible de rejoindre le jeu ([accent]{0}[]).
 connecting = [accent]Connexion...
 connecting.data = [accent]Chargement des données du monde...
 server.port = Port:
@@ -221,10 +228,9 @@ server.addressinuse = Adresse déjà utilisée !
 server.invalidport = Numéro de port incorrect !
 server.error = [crimson]Erreur lors de l'hébergement du serveur: [accent]{0}
 save.new = Nouvelle sauvegarde
-save.overwrite = Êtes-vous sûr de vouloir\nécraser cette sauvegarde ?
-overwrite = Écraser
+save.overwrite = Êtes-vous sûr de vouloir\nrecouvrir cette sauvegarde ?
+overwrite = Recouvrir
 save.none = Aucune sauvegarde trouvée !
-saveload = [accent]Sauvegarde...
 savefail = Échec de la sauvegarde !
 save.delete.confirm = Êtes-vous sûr de supprimer cette sauvegarde ?
 save.delete = Supprimer
@@ -238,7 +244,7 @@ save.rename = Renommer
 save.rename.text = Nouveau nom:
 selectslot = Sélectionnez une sauvegarde.
 slot = [accent]Emplacement {0}
-editmessage = Edit Message
+editmessage = Modifier le Message
 save.corrupted = [accent]Fichier de sauvegarde corrompu ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]non[] un bug.
 empty = <vide>
 on = Allumer
@@ -265,13 +271,14 @@ data.export = Export Data
 data.import = Import Data
 data.openfolder = Open Data Folder
 data.exported = Data exported.
-data.invalid = This isn't valid game data.
+data.invalid = Ceci ne sont pas des données de jeu valide.
 data.import.confirm = Importing external data will erase[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
 quit.confirm = Êtes-vous sûr de vouloir quitter?
 quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Chargement...
 reloading = [accent]Reloading Mods...
 saving = [accent]Sauvegarde...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
@@ -328,8 +335,9 @@ waves.never = <jamais>
 waves.every = tous les
 waves.waves = vague(s)
 waves.perspawn = par apparition
+waves.shields = shields/wave
 waves.to = à
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Prévisualiser
 waves.edit = Modifier...
 waves.copy = Copier dans le Presse-papiers
@@ -337,6 +345,11 @@ waves.load = Coller depuis le Presse-papiers
 waves.invalid = Vagues invalides dans le Presse-papiers.
 waves.copied = Vagues copiées.
 waves.none = Aucun ennemi défini.\nNotez que les dispositions vides seront automatiquement remplacées par la dispositions par défaut.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Par défaut>
 details = Details...
 edit = Modifier...
@@ -456,10 +469,12 @@ locked = Verrouillé
 complete = [lightgray]Compléter:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
-requirement.unlock = Unlock {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Reprendre la partie en cours:\n[lightgray]{0}
 bestwave = [lightgray]Meilleur: {0}
 launch = Lancement
+launch.text = Launch
 launch.title = Lancement réussi
 launch.next = [lightgray]Prochaine opportunité à la vague {0}
 launch.unable2 = [scarlet]Unable to LAUNCH.[]
@@ -467,13 +482,14 @@ launch.confirm = Cela lancera toutes les ressources dans votre noyau.\nVous ne p
 launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Découvrir
 configure = Configurer le transfert des ressources.
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = Add All
-configure.locked = [lightgray]Atteigner la vague {0}\npour configurer le transfert des ressources.
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} Débloquée.
 zone.requirement.complete = Vague {0} atteinte:\n{1} Exigences de la zone complétées
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = Ressources détectées:
 zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
@@ -492,35 +508,43 @@ error.io = Network I/O error.
 error.any = Erreur réseau inconnue.
 error.bloom = Échec d'initialisation du flou lumineux.\nVotre appareil peut ne pas le supporter.
 
-zone.groundZero.name = Première Bataille
-zone.desertWastes.name = Déchets du désert
-zone.craters.name = Les Cratères
-zone.frozenForest.name = Forêt Glaciale
-zone.ruinousShores.name = Rives en Ruine
-zone.stainedMountains.name = Montagnes Tâchetées
-zone.desolateRift.name = Fissure abandonnée
-zone.nuclearComplex.name = Complexe nucléaire
-zone.overgrowth.name = Surcroissance
-zone.tarFields.name = Champs de goudron
-zone.saltFlats.name = Salière
-zone.impact0078.name = Impact 0078
-zone.crags.name = Crags
-zone.fungalPass.name = Fungal Pass
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = L'emplacement optimal pour recommencer. Faible menace ennemie. Peu de ressources.\nRassemblez autant de plomb et de cuivre que possible.\nAllons-y
-zone.frozenForest.description = Même ici, plus près des montagnes, les spores se sont propagées. Les températures glaciales ne peuvent pas les contenir pour toujours.\n\nCommencez l'aventure au pouvoir. Construire des générateurs de combustion. Apprenez à utiliser les réparations.
-zone.desertWastes.description = Ces déchets sont vastes, imprévisibles, et sillonné de structures du secteur désaffectés.\nLe charbon est présent dans la région. Brulez-le pour obtenir de l'énergie ou synthétisez du graphite.\n\n[lightgray]Ce lieu d'atterrissage ne peut être garanti.
-zone.saltFlats.description = Aux abords du désert se trouvent les marais salants. Peu de ressources peuvent être trouvées à cet endroit.\n\nL'ennemi a érigé un complexe de stockage de ressources ici. Éradiquer leur base. Ne laisser rien debout.
-zone.craters.description = L'eau s'est accumulée dans ce cratère, vestige des guerres anciennes. Récupérer la zone. Recueillir du sable. Créé du Métaverre. Pomper de l'eau pour refroidir les tourelles et les perceuses.
-zone.ruinousShores.description = Passé les déchets, c'est le rivage. Une fois, cet endroit a abrité un réseau de défense côtière. Il n'en reste pas beaucoup. Seules les structures de défense les plus élémentaires restent indemnes, tout le reste étant réduit à néant.\nContinuer l'expansion vers l'extérieur. Redécouvrez la technologie.
-zone.stainedMountains.description = Plus à l'intérieur des terres se trouvent les montagnes, non polluées par les spores.\nExtraire le titane abondant dans cette zone. Et apprennez comment l'utiliser.\n\nLa présence de l'ennemi est plus grande ici. Ne leur donnez pas le temps d'envoyer leurs unités les plus fortes.
-zone.overgrowth.description = Cette zone est envahie par la végétation, plus proche de la source des spores.\nL'ennemi a établi un avant-poste ici. Construire des unités de poignard. Detruis-le. Et repprennez ce qui a été perdu !
-zone.tarFields.description = La périphérie d'une zone de production de pétrole, entre les montagnes et le désert. Une des rares zones avec des réserves de goudron utilisables.\nBien qu'abandonnée, cette zone a des forces ennemies dangereuses à proximité. Ne les sous-estimez pas.\n\n[lightgray]Rechercher la technologie de traitement de pétrole si possible.
-zone.desolateRift.description = Une zone extrêmement dangereuse. Ressources abondantes, mais peu d'espace. Risque élevé de destruction. Pars le plus vite possible.\nNe vous laissez pas berner par le long espacement entre les attaques ennemies.
-zone.nuclearComplex.description = Une ancienne installation de production et de traitement de thorium, réduite à néant.\n[lightgray]Recherche sur le thorium et ses nombreuses utilisations.\n\nL'ennemi est présent ici en grand nombre, recherchant constamment des assaillants.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
-zone.impact0078.description = <insérer la description ici>
-zone.crags.description = <insérer la description ici>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Langage
 settings.data = Game Data
@@ -534,9 +558,12 @@ settings.graphics = Graphiques
 settings.cleardata = Effacer les données du jeu...
 settings.clear.confirm = Êtes-vous sûr d'effacer ces données ?\n[scarlet]Ceci est irréversible
 settings.clearall.confirm = [scarlet]ATTENTION![]\nCet action effacera toutes les données , incluant les sauvegarges, les cartes, les déblocages et la configuration des touches.\nUne fois que vous aurez pressé 'Ok' le jeu effacera toutes les données et se fermera.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = En pause
 clear = Clear
 banned = [scarlet]Banned
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Oui
 no = Non
 info.title = Info
@@ -558,8 +585,11 @@ blocks.itemsmoved = Vitesse de déplacement
 blocks.launchtime = Temps entre chaque lancement
 blocks.shootrange = Portée
 blocks.size = Taille
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Capacité en liquide
 blocks.powerrange = Distance de transmission
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Énergie utilisée
 blocks.powerdamage = Énergie/Dégâts
@@ -575,13 +605,18 @@ blocks.boosteffect = Effet boostant
 blocks.maxunits = Maximum d'unitée active
 blocks.health = Santé
 blocks.buildtime = Temps de construction
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Coût de construction
 blocks.inaccuracy = Précision
 blocks.shots = Tirs
 blocks.reload = Tirs/Seconde
 blocks.ammo = Munition
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Better Drill Required
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Vitesse de forage: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficacité: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Énergie: {0}
 bar.poweroutput = Énergie en sortie: {0}
 bar.items = Objets: {0}
 bar.capacity = Capacity: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquide
 bar.heat = Chaleur
 bar.power = Énergie
 bar.progress = Progression de la construction
-bar.spawned = Unités: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -619,12 +655,16 @@ unit.liquidunits = Unité de liquide
 unit.powerunits = Unité d'énergie
 unit.degrees = degrés
 unit.seconds = secondes
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x vitesse
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = Objets
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Général
 category.power = Énergie
 category.liquids = Liquides
@@ -639,6 +679,7 @@ setting.linear.name = Filtrage linéaire
 setting.hints.name = Hints
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Eau animée
 setting.animatedshields.name = Boucliers Animés
 setting.antialias.name = Antialias[lightgray] (demande le redémarrage de l'appareil)[]
@@ -663,7 +704,6 @@ setting.effects.name = Montrer les effets
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Contôle de la sensibilité
 setting.saveinterval.name = Intervalle des sauvegardes auto
 setting.seconds = {0} Secondes
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Plein écran
 setting.borderlesswindow.name = Fenêtre sans bordure[lightgray] (peut nécessiter un redémarrage)
 setting.fps.name = Afficher FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixélisé [lightgray](peut diminuer les performances)[]
 setting.minimap.name = Montrer la minimap
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Volume de la musique
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Couper la musique
 setting.sfxvol.name = Volume des SFX
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]La plupart des raccourcis clavier ne sont pas fonctio
 category.general.name = Général
 category.view.name = Voir
 category.multiplayer.name = Multijoueur
+category.blocks.name = Block Select
 command.attack = Attaquer
 command.rally = Rally
 command.retreat = Retraite
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Clear Building
 keybind.press = Appuyez sur une touche ...
 keybind.press.axis = Appuyez sur un axe ou une touche...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Mouvement X
 keybind.move_y.name = Mouvement Y
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Sprint
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Placement en diagonal
 keybind.pick.name = Choisir un bloc
 keybind.break_block.name = Supprimer un bloc
 keybind.deselect.name = Déselectionner
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Tirer
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Temps de vague
 rules.waves = Vague
 rules.attack = Mode attaque
+rules.buildai = AI Building
 rules.enemyCheat = Ressources infinies pour l'IA
-rules.unitdrops = Uniter Drops
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Multiplicateur de vitesse de création d'unités
 rules.unithealthmultiplier = Multiplicateur de la santé des unités
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Multiplicateur de la santé des joueurs
-rules.playerdamagemultiplier = Multiplicateur de dégât des joueurs
 rules.unitdamagemultiplier = Multiplicateur de dégât des unités
 rules.enemycorebuildradius = Rayon de non-construction autour de la base ennemi:[lightgray] (tuiles)
-rules.respawntime = Temps de réapparition:[lightgray] (sec)
 rules.wavespacing = Espacement des vagues:[lightgray] (sec)
 rules.buildcostmultiplier = Multiplicateur de coût de construction
 rules.buildspeedmultiplier = Multiplicateur de vitesse de construction
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Les vagues attendent les ennemis
 rules.dropzoneradius = Rayon de la zone de largage:[lightgray] (tuiles)
-rules.respawns = Max d'apparition par vague
-rules.limitedRespawns = Limite d'apparition
+rules.unitammo = Units Require Ammo
 rules.title.waves = Vagues
-rules.title.respawns = Apparition
 rules.title.resourcesbuilding = Ressources & Bâtiment
-rules.title.player = Joueurs
 rules.title.enemy = Ennemis
 rules.title.unit = Unités
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Objets
 content.liquid.name = Liquides
@@ -827,10 +878,11 @@ liquid.water.name = Eau
 liquid.slag.name = Scorie
 liquid.oil.name = Pétrole
 liquid.cryofluid.name = Liquide Cryogénique
-item.corestorable = [lightgray]Storable in Core: {0}
+
 item.explosiveness = [lightgray]Explosivité: {0}
 item.flammability = [lightgray]Inflammabilité: {0}
 item.radioactivity = [lightgray]Radioactivité: {0}
+
 unit.health = [lightgray]Santé: {0}
 unit.speed = [lightgray]Vitesse: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacité Thermique {0}
 liquid.viscosity = [lightgray]Viscosité: {0}
 liquid.temperature = [lightgray]Température: {0}
 
+unit.dagger.name = Poignard
+unit.mace.name = Mace
+unit.fortress.name = Forteresse
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Chenille
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sable rocheux
 block.grass.name = Herbe
 block.slag.name = Slag
 block.salt.name = Sel
-block.saltrocks.name = Roches de sel
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Cailloux
 block.tendrils.name = Vrilles
-block.sandrocks.name = Roche de sableuse
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Pin sporifère
-block.sporerocks.name = Roche sporifère
-block.rock.name = Roche
-block.snowrock.name = Roche enneigée
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
 block.shale.name = Schiste
 block.shale-boulder.name = Rocher de schiste
 block.moss.name = Mousse
 block.shrubs.name = Arbustes
 block.spore-moss.name = Mousse sporifère
-block.shalerocks.name = Roche de schiste
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Mur de ferraille
 block.scrap-wall-large.name = Grand mur de ferraille
 block.scrap-wall-huge.name = Enorme mur de ferraille
@@ -890,13 +979,17 @@ block.craters.name = Cratères
 block.sand-water.name = Eau (sable)
 block.darksand-water.name = Eau (sable noir)
 block.char.name = Carboniser
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Neige glacée
-block.rocks.name = Roche
-block.icerocks.name = Roches de glace
-block.snowrocks.name = Roches de neige
-block.dunerocks.name = Roches de sable
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pin
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Arbre blanc mort
 block.white-tree.name = Arbre blanc
 block.spore-cluster.name = Grappe de spores
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Panneau noir 4
 block.dark-panel-5.name = Panneau noir 5
 block.dark-panel-6.name = Panneau noir 6
 block.dark-metal.name = Métal noir
-block.ignarock.name = Roche d'igna
+block.basalt.name = Basalt
 block.hotrock.name = Roche chaude
 block.magmarock.name = Roche de magma
-block.cliffs.name = Falaises
 block.copper-wall.name = Mur de cuivre
 block.copper-wall-large.name = Grand mur de cuivre
 block.titanium-wall.name = Mur de titane
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Fonderie de silicium
 block.phase-weaver.name = Tisseur à phase
 block.pulverizer.name = Pulvérisateur
-block.cryofluidmixer.name = Refroidisseur
+block.cryofluid-mixer.name = Refroidisseur
 block.melter.name = Four à Fusion
 block.incinerator.name = Incinérateur
 block.spore-press.name = Spore presse
@@ -964,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Batterie
 block.battery-large.name = Batterie large
 block.combustion-generator.name = Générateur à combustion
-block.turbine-generator.name = Générateur à turbine
+block.steam-generator.name = Générateur à turbine
 block.differential-generator.name = Générateur différentiel
 block.impact-reactor.name = Réacteur à impact
 block.mechanical-drill.name = Foreuse mécanique
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Mixeur à explosion
 block.solar-panel.name = Panneau solaire
 block.solar-panel-large.name = Grand panneau solaire
 block.oil-extractor.name = Extracteur de pétrol
-block.command-center.name = Centre de commandement
-block.draug-factory.name = Usine de "Drones draug miner"
-block.spirit-factory.name = Usine de "Drones spirituels"
-block.phantom-factory.name = Usine de "Drones fantômes"
-block.wraith-factory.name = Usine de "Combattants spectraux"
-block.ghoul-factory.name = Usine de "Bombardiers goules"
-block.dagger-factory.name = Usine de "Poignards"
-block.crawler-factory.name = Usine de "Chenille"
-block.titan-factory.name = Usine de "Titans"
-block.fortress-factory.name = Usine de "Forteresse"
-block.revenant-factory.name = Usine de "Revenants"
 block.repair-point.name = Point de Réparation
 block.pulse-conduit.name = Conduit à Impulsion
 block.plated-conduit.name = Plated Conduit
@@ -1036,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Conteneur
 block.launch-pad.name = Rampe de lancement
 block.launch-pad-large.name = Grande rampe de lancement
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = Bleu
 team.crux.name = red
 team.sharded.name = orange
@@ -1043,21 +1147,7 @@ team.orange.name = Orange
 team.derelict.name = derelict
 team.green.name = Vert
 team.purple.name = Violet
-unit.spirit.name = Drone spirituel
-unit.draug.name = Drone draug miner
-unit.phantom.name = Drone Fantôme
-unit.dagger.name = Poignard
-unit.crawler.name = Chenille
-unit.titan.name = Titan
-unit.ghoul.name = Bombardier goule
-unit.wraith.name = Combattant spectral
-unit.fortress.name = Forteresse
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Appuyez pour continuer>
 tutorial.intro = Vous êtes entré dans le[scarlet] Tutoriel de Mindustry.[]\nCommencez par[accent] miner du cuivre[]. Appuyez ou cliquez sur une veine de minerai de cuivre près de votre base pour commencer à miner.\n\n[accent]{0}/{1} cuivre
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1100,17 +1190,7 @@ liquid.water.description = Couramment utilisé pour les machines de refroidissem
 liquid.slag.description = Différents types de métaux en fusion mélangés. Peut être séparé en ses minéraux constitutifs ou pulvérisé sur les unités ennemies comme une arme.
 liquid.oil.description = Peut être brûlé, explosé ou utilisé comme liquide de refroidissement.
 liquid.cryofluid.description = Le liquide de refroidissement le plus efficace.
-unit.draug.description = Un drone minier primitif. Pas cher à produire. Consommable. Extraction automatique de cuivre et de plomb dans les environs. Fournit les ressources minées à la base la plus proche.
-unit.spirit.description = L'unité de soutien de départ. Apparaît dans la base par défaut. Mine automatiquement les minerais, récupère les objets au sol et répare les blocs.
-unit.phantom.description = Une unité de soutien avancée. Mine automatiquement les minerais, récupère les objets au sol et répare les blocs. Bien plus efficace qu'un drone spirituel.
-unit.dagger.description = Une unité terrestre de base. Utile en essaims.
-unit.crawler.description = Unité au sol composée d’un cadre dépouillé sur lequel sont fixés des explosifs puissants. Pas particulièrement durable. Explose au contact des ennemis.
-unit.titan.description = Une unité terrestre cuirassée avancée. Utilise de l'alliage lourd pour munition. Attaque les unités aérinnes comme terrestres.
-unit.fortress.description = Une unité terrestre d'artillerie lourde.
-unit.eruptor.description = Un mech lourd conçu pour abattre des structures. Tire un flot de scories sur les fortifications ennemies, les fait fondre et met en feu les volatiles.
-unit.wraith.description = Une unité volante rapide harcelant les ennemis. Utilise du plomb comme munitions.
-unit.ghoul.description = Un bombardier lourd. Utilise de la pyratite ou des explosifs comme munitions.
-unit.revenant.description = Un arsenal de missiles lourd et planant.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresse des morceaux de charbon en feuilles de graphite.
 block.multi-press.description = Une version améliorée de la presse à graphite. Utilise de l'eau et de l'électricité pour traiter le charbon rapidement et efficacement.
@@ -1119,7 +1199,7 @@ block.kiln.description = Fait fondre le sable et le plomb en métaverre. Nécess
 block.plastanium-compressor.description = Produit du plastanium à partir de pétrole et de titane.
 block.phase-weaver.description = Produit un tissu de phase à partir de thorium radioactif et de grandes quantités de sable.
 block.alloy-smelter.description = Produit un alliage de surtension à partir de titane, plomb, silicium et cuivre.
-block.cryofluidmixer.description = L'eau et le titane combinés forment un fluide cryo beaucoup plus efficace pour le refroidissement.
+block.cryofluid-mixer.description = L'eau et le titane combinés forment un fluide cryo beaucoup plus efficace pour le refroidissement.
 block.blast-mixer.description = Utilise du pétrole pour transformer la pyratite en un composé explosif moins inflammable mais plus explosif.
 block.pyratite-mixer.description = Mélange le charbon, le plomb et le sable en pyratite hautement inflammable.
 block.melter.description = Chauffe la pierre à des températures très élevées pour obtenir de la lave.
@@ -1185,7 +1265,7 @@ block.battery.description = Stocke l’énergie chaque fois qu’il ya abondance
 block.battery-large.description = Stocke beaucoup plus d'énergie qu'une batterie ordinaire.
 block.combustion-generator.description = Génère de l'énergie en brûlant du pétrole ou des matériaux inflammables.
 block.thermal-generator.description = Génère une grande quantité d'énergie grâce à la lave.
-block.turbine-generator.description = Plus efficace qu'un générateur de combustion, mais nécessite de l'eau supplémentaire.
+block.steam-generator.description = Plus efficace qu'un générateur de combustion, mais nécessite de l'eau supplémentaire.
 block.differential-generator.description = Génère de grandes quantités d'énergie. Utilise la différence de température entre le cryofluide et la pyratite en combustion.
 block.rtg-generator.description = Générateur thermoélectrique à radio-isotopes ne nécessitant pas de refroidissement mais fournissant moins d'énergie qu'un réacteur à thorium.
 block.solar-panel.description = Fournit une petite quantité d'énergie grâce au soleil.
@@ -1221,15 +1301,5 @@ block.ripple.description = Une grande tourelle d'artillerie qui tire plusieurs c
 block.cyclone.description = Une grande tourelle à tir rapide.
 block.spectre.description = Une grande tourelle qui tire deux balles puissantes à la fois.
 block.meltdown.description = Une grande tourelle qui tire de puissants faisceaux à longue portée.
-block.command-center.description = Donne des ordres aux unités alliées sur la carte.\nPermet aux unités de patrouiller, d’attaquer un noyau ennemi ou de se retirer dans le noyau/l’usine. En l'absence de base ennemi, les unités patrouillent par défaut autour du centre de commandement.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produit des drones légers qui extraient du minerai et réparent des blocs.
-block.phantom-factory.description = Produit des drones avancés qui sont bien plus efficaces que les drones spirituels.
-block.wraith-factory.description = Produit des intercepteurs rapides qui harcèlent l'ennemi.
-block.ghoul-factory.description = Produit des bombardiers lourds.
-block.revenant-factory.description = Produit des unités terrestres lourdes avec des lasers.
-block.dagger-factory.description = Produit des unités terrestres basiques.
-block.crawler-factory.description = Produit des unités autodestructrices rapides.
-block.titan-factory.description = Produit des unités terrestres avancées et blindées.
-block.fortress-factory.description = Produit des unités terrestres d'artillerie lourde.
 block.repair-point.description = Soigne en permanence l'unité endommagée la plus proche à proximité.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 0777fd5e0e..b28d471cdd 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io oldal PC letöltésekkel
 link.google-play.description = Google Play áruház listázás
 link.f-droid.description = F-Droid katalógus listázás
 link.wiki.description = Hivatalos Mindustry wiki
-link.feathub.description = Új funkciók ajánlása
+link.suggestions.description = Új funkciók ajánlása
 linkfail = Nem sikerült megnyitni a linket!\nAz URL a vágólapra lett másolva.
 screenshot = Képernyőkép mentve ide: {0}
 screenshot.invalid = Túl nagy a térkép, nincsen elég memória a képernyőképhez.
@@ -20,6 +20,8 @@ gameover = Vége a játéknak
 gameover.pvp = A[accent] {0}[] csapat nyert!
 highscore = [accent]Új rekord!
 copied = Másolva.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Hangok
 load.map = Térképek
@@ -63,13 +65,11 @@ stat.delivered = Elindított erőforrások:
 stat.playtime = Játékidő:[accent] {0}
 stat.rank = Végső értékelés: [accent]{0}
 
-launcheditems = [accent]Elindított elemek
-launchinfo = [unlaunched][[INDÍTSD EL] a magot hogy megszerezd a kékkel jelölt erőforrásokat.
+globalitems = [accent]Global Items
 map.delete = Biztos, hogy törölni akarod a "[accent]{0}[]" térképet?
 level.highscore = Rekord: [accent]{0}
 level.select = Pálya választása
 level.mode = Játékmód:
-showagain = Ne mutassa legközelebb
 coreattack = < A mag támadás alatt van! >
 nearpoint = [[ [scarlet]AZONNAL HAGYD EL A LEDOBÁSI PONTOT[] ]\nveszélyes zóna
 database = Mag adatbázis
@@ -106,12 +106,16 @@ mods.none = [LIGHT_GRAY]Nincsen Mod!
 mods.guide = Mod készítési útmutató
 mods.report = Hiba bejelentése
 mods.openfolder = Mod mappa
+mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktív
 mod.disabled = [scarlet]Inaktív
 mod.disable = Letiltás
+mod.content = Content:
 mod.delete.error = Nem lehet törölni a Modot. Lehet, hogy egy másik folyamat használja.
 mod.requiresversion = [scarlet]Minimális játék verzió: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Hiányzó függőségek: {0}
 mod.erroredcontent = [scarlet]Tartalom hiba
 mod.errors = Hiba történt a tartalom betöltése közben.
@@ -121,18 +125,22 @@ mod.enable = Engedélyezés
 mod.requiresrestart = A játék kilép a módosítások alkalmazásához.
 mod.reloadrequired = [scarlet]Újratöltés szükséges
 mod.import = Mod importálása
+mod.import.file = Import File
 mod.import.github = GitHub Mod importálása
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Ez az elem része a [accent] '{0}'[] Modnak. A törléshez távolítsd el a Modot.
 mod.remove.confirm = Ez a Mod törölve lesz.
 mod.author = [LIGHT_GRAY]Készítő:[] {0}
 mod.missing = Ez a mentés nemrég törölt vagy frissített Modokat tartalmaz. Elképzelhető, hogy nem fog működni. Biztosan betöltöd?\n[lightgray]Modok:\n{0}
 mod.preview.missing = Mielőtt publikálod ezt a modot a workshopra, adj hozzá egy borítóképet.\nKészíts egy[accent] preview.png[] nevű képet a mod mappájába, majd próbáld újra.
 mod.folder.missing = Csak mappa formában lehet feltölteni a workshopra.\nHogy átalakítsd, csomagold ki a ZIP-et egy mappába és töröld le a régit, Majd indítsd újra a játékot vagy töltsd újra a modot.
-mod.scripts.unsupported = Az eszköz nem támogatja a Mod szkripteket. Néhány Mod nem fog működni.
+mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
 
 about.button = Közreműködők
 name = Név:
 noname = Válassz egy[accent] nevet[] előbb.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Fájl név:
 unlocked = Új tartalom kinyitva!
 completed = [accent]Kész
@@ -140,6 +148,7 @@ techtree = Tech Tree
 research.list = [lightgray]Fedezd fel:
 research = Felfedezés
 researched = [lightgray]{0} felfedezve.
+research.progress = {0}% complete
 players = {0} játékos
 players.single = {0} játékos
 players.search = keresés
@@ -166,7 +175,7 @@ host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \n
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] or [accent]global[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]If you want to connect to someone by IP, you would need to ask the host for their IP, which can be found by googling "my ip" from their device.
 hostserver = Másik játékos meghívása
 invitefriends = Barátok meghívása
-hostserver.mobile = Játékos\Meghívása
+hostserver.mobile = JátékosMeghívása
 host = meghívás
 hosting = [accent]Szerver megnyitása...
 hosts.refresh = Frissítés
@@ -222,7 +231,6 @@ save.new = Új mentés
 save.overwrite = Biztosan felülírod\nezt a mentést?
 overwrite = Felülírás
 save.none = Nem található mentés!
-saveload = Mentés...
 savefail = Nem sikerült menteni!
 save.delete.confirm = Biztosan törlöd ezt a mentést?
 save.delete = Törlés
@@ -265,13 +273,12 @@ data.openfolder = Adat mappa megnyitása
 data.exported = Adat exportálva.
 data.invalid = Érvénytelen adatok.
 data.import.confirm = Külső adat importálása felülírja[scarlet] minden[] jelenlegi állapotodat.\n[accent]Nem lehet visszavonni![]\n\nAmint kész az importálás, kilép a játék.
-classic.export = Classic adatok exportálása
-classic.export.text = A[accent] Mindustry[]-nak elkészült egy új változata.\nClassic (v3.5 build 40) adatok vannak az eszközön. Szeretnéd ezeket exportálni a Mindustry Classic-ba való használathoz?
 quit.confirm = Biztos kilépsz?
 quit.confirm.tutorial = Biztosan tudod, mit csinálsz?\nA bevezetőt megtalálod itt:[accent] Beállítások->Játék->Bevezető újrajátszása[]
 loading = [accent]Betöltés...
 reloading = [accent]Reloading Mods...
 saving = [accent]Saving...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
@@ -328,8 +335,9 @@ waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
 waves.perspawn = per spawn
+waves.shields = shields/wave
 waves.to = to
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
 waves.copy = Copy to Clipboard
@@ -337,6 +345,11 @@ waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
@@ -402,6 +415,8 @@ toolmode.drawteams.description = Draw teams instead of blocks.
 filters.empty = [lightgray]No filters! Add one with the button below.
 filter.distort = Distort
 filter.noise = Noise
+filter.enemyspawn = Enemy Spawn Select
+filter.corespawn = Core Select
 filter.median = Median
 filter.oremedian = Ore Median
 filter.blend = Blend
@@ -421,6 +436,7 @@ filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
 filter.option.angle = Angle
+filter.option.amount = Amount
 filter.option.block = Block
 filter.option.floor = Floor
 filter.option.flooronto = Target Floor
@@ -453,10 +469,12 @@ locked = Zárva
 complete = [lightgray]Complete:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
-requirement.unlock = Unlock {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Resume Zone:\n[lightgray]{0}
 bestwave = [lightgray]Best Wave: {0}
 launch = < INDÍTÁS >
+launch.text = Launch
 launch.title = Indítás sikeres
 launch.next = [lightgray]következő lehetőség a {0}. hullámnál
 launch.unable2 = [scarlet]Nem lehet ELINDÍTANI.[]
@@ -464,13 +482,14 @@ launch.confirm = This will launch all resources in your core.\nYou will not be a
 launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = Add All
-configure.locked = [lightgray]Unlock configuring loadout: {0}.
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Requirement for {0} completed:[lightgray]\n{1}
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = [lightgray]Resources Detected:
 zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
@@ -489,35 +508,43 @@ error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
-zone.groundZero.name = Ground Zero
-zone.desertWastes.name = Desert Wastes
-zone.craters.name = The Craters
-zone.frozenForest.name = Frozen Forest
-zone.ruinousShores.name = Ruinous Shores
-zone.stainedMountains.name = Stained Mountains
-zone.desolateRift.name = Desolate Rift
-zone.nuclearComplex.name = Nuclear Production Complex
-zone.overgrowth.name = Overgrowth
-zone.tarFields.name = Tar Fields
-zone.saltFlats.name = Salt Flats
-zone.impact0078.name = Impact 0078
-zone.crags.name = Crags
-zone.fungalPass.name = Fungal Pass
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
-zone.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
-zone.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
-zone.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
-zone.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
-zone.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
-zone.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
-zone.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
-zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
-zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
-zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Language
 settings.data = Game Data
@@ -531,14 +558,18 @@ settings.graphics = Graphics
 settings.cleardata = Clear Game Data...
 settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone!
 settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Paused >
 clear = Clear
 banned = [scarlet]Banned
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Yes
 no = No
 info.title = Info
 error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
+unit.nobuild = [scarlet]Unit can't build
 blocks.input = Input
 blocks.output = Output
 blocks.booster = Booster
@@ -554,8 +585,11 @@ blocks.itemsmoved = Move Speed
 blocks.launchtime = Time Between Launches
 blocks.shootrange = Range
 blocks.size = Size
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Liquid Capacity
 blocks.powerrange = Power Range
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
@@ -571,13 +605,18 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
 blocks.ammo = Ammo
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Better Drill Required
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
@@ -587,11 +626,12 @@ bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
 bar.progress = Build Progress
-bar.spawned = Units: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -615,12 +655,16 @@ unit.liquidunits = liquid units
 unit.powerunits = power units
 unit.degrees = degrees
 unit.seconds = seconds
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x speed
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = items
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = General
 category.power = Power
 category.liquids = Liquids
@@ -633,10 +677,13 @@ setting.shadows.name = Shadows
 setting.blockreplace.name = Automatic Block Suggestions
 setting.linear.name = Linear Filtering
 setting.hints.name = Hints
+setting.flow.name = Display Resource Flow Rate
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animated Water
 setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
+setting.playerindicators.name = Player Indicators
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.keyboard.name = Mouse+Keyboard Controls
@@ -655,8 +702,8 @@ setting.difficulty.name = Difficulty:
 setting.screenshake.name = Screen Shake
 setting.effects.name = Display Effects
 setting.destroyedblocks.name = Display Destroyed Blocks
+setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Save Interval
 setting.seconds = {0} seconds
@@ -665,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
 setting.fps.name = Show FPS & Ping
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate
 setting.minimap.name = Show Minimap
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Music Volume
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
@@ -693,19 +743,25 @@ keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only
 category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
+category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Clear Building
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.toggle_power_lines.name = Toggle Power Lasers
+keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Move X
 keybind.move_y.name = Move Y
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Dash
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -732,6 +788,9 @@ keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Shoot
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -766,40 +825,39 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
+rules.buildai = AI Building
 rules.enemyCheat = Infinite AI (Red Team) Resources
-rules.unitdrops = Unit Drops
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Player Health Multiplier
-rules.playerdamagemultiplier = Player Damage Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
-rules.respawntime = Respawn Time:[lightgray] (sec)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves Wait for Enemies
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
-rules.respawns = Max respawns per wave
-rules.limitedRespawns = Limit Respawns
+rules.unitammo = Units Require Ammo
 rules.title.waves = Waves
-rules.title.respawns = Respawns
 rules.title.resourcesbuilding = Resources & Building
-rules.title.player = Players
 rules.title.enemy = Enemies
 rules.title.unit = Units
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
 content.block.name = Blocks
-content.mech.name = Mechs
 item.copper.name = Copper
 item.lead.name = Lead
 item.coal.name = Coal
@@ -820,62 +878,80 @@ liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
-mech.alpha-mech.name = Alpha
-mech.alpha-mech.weapon = Heavy Repeater
-mech.alpha-mech.ability = Regeneration
-mech.delta-mech.name = Delta
-mech.delta-mech.weapon = Arc Generator
-mech.delta-mech.ability = Discharge
-mech.tau-mech.name = Tau
-mech.tau-mech.weapon = Restruct Laser
-mech.tau-mech.ability = Repair Burst
-mech.omega-mech.name = Omega
-mech.omega-mech.weapon = Swarm Missiles
-mech.omega-mech.ability = Armored Configuration
-mech.dart-ship.name = Dart
-mech.dart-ship.weapon = Repeater
-mech.javelin-ship.name = Javelin
-mech.javelin-ship.weapon = Burst Missiles
-mech.javelin-ship.ability = Discharge Booster
-mech.trident-ship.name = Trident
-mech.trident-ship.weapon = Bomb Bay
-mech.glaive-ship.name = Glaive
-mech.glaive-ship.weapon = Flame Repeater
-item.corestorable = [lightgray]Tárolható a Magban: {0}
+
 item.explosiveness = [lightgray]Robbanékonyság: {0}%
 item.flammability = [lightgray]Gyúlékonyság: {0}%
 item.radioactivity = [lightgray]Radioaktivitás: {0}%
+
 unit.health = [lightgray]Health: {0}
 unit.speed = [lightgray]Sebesség: {0}
-mech.weapon = [lightgray]Weapon: {0}
-mech.health = [lightgray]Health: {0}
-mech.itemcapacity = [lightgray]Kapacitás: {0}
-mech.minespeed = [lightgray]Bányászási sebesség: {0}%
-mech.minepower = [lightgray]Bányászási erő: {0}
-mech.ability = [lightgray]Képesség: {0}
-mech.buildspeed = [lightgray]Építési sebesség: {0}%
+unit.weapon = [lightgray]Weapon: {0}
+unit.itemcapacity = [lightgray]Item Capacity: {0}
+unit.minespeed = [lightgray]Mining Speed: {0}%
+unit.minepower = [lightgray]Mining Power: {0}
+unit.ability = [lightgray]Ability: {0}
+unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Hő hapacitás: {0}
 liquid.viscosity = [lightgray]Viszkozitás: {0}
 liquid.temperature = [lightgray]Hőmérséklet: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
+block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
 block.grass.name = Grass
+block.slag.name = Slag
 block.salt.name = Salt
-block.saltrocks.name = Salt Rocks
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pebbles
 block.tendrils.name = Tendrils
-block.sandrocks.name = Sand Rocks
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spore Pine
-block.sporerocks.name = Spore Rocks
-block.rock.name = Rock
-block.snowrock.name = Snow Rock
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
 block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
-block.shalerocks.name = Shale Rocks
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -903,13 +979,17 @@ block.craters.name = Craters
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ice Snow
-block.rocks.name = Rocks
-block.icerocks.name = Ice rocks
-block.snowrocks.name = Snow Rocks
-block.dunerocks.name = Dune Rocks
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pine
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
@@ -925,10 +1005,9 @@ block.dark-panel-4.name = Dark Panel 4
 block.dark-panel-5.name = Dark Panel 5
 block.dark-panel-6.name = Dark Panel 6
 block.dark-metal.name = Dark Metal
-block.ignarock.name = Igna Rock
+block.basalt.name = Basalt
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
-block.cliffs.name = Cliffs
 block.copper-wall.name = Copper Wall
 block.copper-wall-large.name = Large Copper Wall
 block.titanium-wall.name = Titanium Wall
@@ -948,6 +1027,7 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.plastanium-conveyor.name = Plastanium Conveyor
 block.armored-conveyor.name = Armored Conveyor
 block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyor belts.
 block.junction.name = Junction
@@ -963,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Pulverizer
-block.cryofluidmixer.name = Cryofluid Mixer
+block.cryofluid-mixer.name = Cryofluid Mixer
 block.melter.name = Melter
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
@@ -976,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Steam Generator
+block.steam-generator.name = Steam Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -984,13 +1064,6 @@ block.pneumatic-drill.name = Pneumatic Drill
 block.laser-drill.name = Laser Drill
 block.water-extractor.name = Water Extractor
 block.cultivator.name = Cultivator
-block.dart-mech-pad.name = Alpha Mech Pad
-block.delta-mech-pad.name = Delta Mech Pad
-block.javelin-ship-pad.name = Javelin Ship Pad
-block.trident-ship-pad.name = Trident Ship Pad
-block.glaive-ship-pad.name = Glaive Ship Pad
-block.omega-mech-pad.name = Omega Mech Pad
-block.tau-mech-pad.name = Tau Mech Pad
 block.conduit.name = Conduit
 block.mechanical-pump.name = Mechanical Pump
 block.item-source.name = Item Source
@@ -1013,17 +1086,6 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
-block.command-center.name = Command Center
-block.draug-factory.name = Draug Miner Drone Factory
-block.spirit-factory.name = Spirit Repair Drone Factory
-block.phantom-factory.name = Phantom Builder Drone Factory
-block.wraith-factory.name = Wraith Fighter Factory
-block.ghoul-factory.name = Ghoul Bomber Factory
-block.dagger-factory.name = Dagger Mech Factory
-block.crawler-factory.name = Crawler Mech Factory
-block.titan-factory.name = Titan Mech Factory
-block.fortress-factory.name = Fortress Mech Factory
-block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Repair Point
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
@@ -1055,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = blue
 team.crux.name = red
 team.sharded.name = orange
@@ -1062,21 +1147,7 @@ team.orange.name = orange
 team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
-unit.spirit.name = Spirit Repair Drone
-unit.draug.name = Draug Miner Drone
-unit.phantom.name = Phantom Builder Drone
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
-unit.wraith.name = Wraith Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse[accent] [[WASD][] to move.\n[accent]Scroll[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1119,25 +1190,7 @@ liquid.water.description = The most useful liquid. Commonly used for cooling mac
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = A liquid used in advanced material production. Can be converted into coal as fuel, or sprayed and set on fire as a weapon.
 liquid.cryofluid.description = An inert, non-corrosive liquid created from water and titanium. Has extremely high heat capacity. Extensively used as coolant.
-mech.alpha-mech.description = The standard control mech. Based on a Dagger unit, with upgraded armor and building capabilities. Has more damage output than a Dart ship.
-mech.delta-mech.description = A fast, lightly-armored mech made for hit-and-run attacks. Does little damage against structures, but can kill large groups of enemy units very quickly with its arc lightning weapons.
-mech.tau-mech.description = The support mech. Heals allied blocks by shooting at them. Can heal allies in a radius with its repair ability.
-mech.omega-mech.description = A bulky and well-armored mech, made for front-line assaults. Its armor can block up to 90% of incoming damage.
-mech.dart-ship.description = The standard control ship. Fast mining speed. Reasonably fast and light, but has little offensive capability.
-mech.javelin-ship.description = A hit-and-run strike ship. While initially slow, it can accelerate to great speeds and fly by enemy outposts, dealing large amounts of damage with its lightning and missiles.
-mech.trident-ship.description = A heavy bomber, built for construction and destroying enemy fortifications. Reasonably well armored.
-mech.glaive-ship.description = A large, well-armored gunship. Equipped with an incendiary repeater. Highly maneuverable.
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
-unit.spirit.description = A modified draug drone, designed for repair instead of mining. Automatically fixes any damaged blocks in the area.
-unit.phantom.description = An advanced drone unit. Follows users. Assists in block construction.
-unit.dagger.description = The most basic ground mech. Cheap to produce. Overwhelming when used in swarms.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
-unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets. Equipped with two miniature Scorch-class flamethrowers.
-unit.fortress.description = A heavy artillery mech. Equipped with two modified Hail-type cannons for long-range assault on enemy structures and units.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
-unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critical infrastructure.
-unit.revenant.description = A heavy, hovering missile array.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
@@ -1146,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function.
 block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy.
-block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
+block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
 block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets.
@@ -1182,6 +1235,7 @@ block.force-projector.description = Creates a hexagonal force field around itsel
 block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
 block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into blocks. Rotatable.
 block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
+block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.
 block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
@@ -1211,7 +1265,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.
@@ -1247,22 +1301,5 @@ block.ripple.description = An extremely powerful artillery turret. Shoots cluste
 block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produces Spirit structural repair drones.
-block.phantom-factory.description = Produces advanced construction drones.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
-block.ghoul-factory.description = Produces heavy carpet bombers.
-block.revenant-factory.description = Produces heavy missile-based units.
-block.dagger-factory.description = Produces basic ground units.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produces advanced, armored ground units.
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
-block.dart-mech-pad.description = Provides transformation into a basic attack mech.\nUse by tapping while standing on it.
-block.delta-mech-pad.description = Provides transformation into a lightly armored hit-and-run attack mech.\nUse by tapping while standing on it.
-block.tau-mech-pad.description = Provides transformation into an advanced support mech.\nUse by tapping while standing on it.
-block.omega-mech-pad.description = Provides transformation into a heavily-armored missile mech.\nUse by tapping while standing on it.
-block.javelin-ship-pad.description = Provides transformation into a quick, lightly-armored interceptor.\nUse by tapping while standing on it.
-block.trident-ship-pad.description = Provides transformation into a heavy support bomber.\nUse by tapping while standing on it.
-block.glaive-ship-pad.description = Provides transformation into a large, well-armored gunship.\nUse by tapping while standing on it.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties
index ad6c00f00b..32aabb9eb5 100644
--- a/core/assets/bundles/bundle_in_ID.properties
+++ b/core/assets/bundles/bundle_in_ID.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Halaman itch.io dengan unduhan PC dan versi situs jar
 link.google-play.description = Google Play Store
 link.f-droid.description = Daftar katalog F-Droid
 link.wiki.description = Wiki Mindustry resmi 
-link.feathub.description = Saran fitur baru
+link.suggestions.description = Saran fitur baru
 linkfail = Gagal membuka tautan!\nURL disalin ke papan ke papan klip.
 screenshot = Tangkapan layar disimpan di {0}
 screenshot.invalid = Peta terlalu besar, tidak cukup memori untuk menangkap layar.
@@ -20,6 +20,8 @@ gameover = Permainan Habis
 gameover.pvp = Tim[accent] {0}[] menang!
 highscore = [accent]Rekor Baru!
 copied = Tersalin.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Suara
 load.map = Peta
@@ -63,8 +65,7 @@ stat.delivered = Sumber Daya yang Diluncurkan:
 stat.playtime = Waktu Bermain:[accent] {0}
 stat.rank = Nilai Akhir: [accent]{0}
 
-launcheditems = [accent]Sumber Daya 
-launchinfo = [unlaunched][[LAUNCH] intimu untuk mendapatkan sumber daya yang ditandakan dengan warna biru
+globalitems = [accent]Global Items
 map.delete = Apakah Anda yakin ingin menghapus peta "[accent]{0}[]"?
 level.highscore = Nilai Tertinggi: [accent]{0}
 level.select = Pilih Level
@@ -98,21 +99,23 @@ committingchanges = Membuat Perubahan
 done = Selesai
 feature.unsupported = Perangkat Anda tidak mendukung fitur ini.
 
-mods.alphainfo = Perlu diingat bahwa mod masih dalam perkembangan, dan[scarlet] bisa mengalami kerusakan[].\nLapor isu atau masalah di Github atau Discord Mindustry.
+mods.alphainfo = Perlu diingat bahwa mod masih dalam perkembangan, dan[scarlet] bisa mengakibatkan kerusakan[].\nLapor isu atau masalah di Github atau Discord Mindustry.
 mods.alpha = [accent](Alpha)
 mods = Mod
 mods.none = [lightgray]Tidak ada mod yang ditemukan!
 mods.guide = Panduan Modding
 mods.report = Lapor Kesalahan
 mods.openfolder = Buka Folder Mod
-mods.reload = Reload
+mods.reload = mengulangi
+mods.reloadexit = game akan keluar, untuk mengulang mod.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktif
 mod.disabled = [scarlet]Nonaktif
 mod.disable = Aktif
-mod.content = Content:
+mod.content = konten:
 mod.delete.error = Tidak bisa menghapus mod. File mungkin sedang digunakan.
 mod.requiresversion = [scarlet]Versi game minimal yang dibutuhkan: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Ketergantungan hilang: {0}
 mod.erroredcontent = [scarlet]Konten Mengalami Kesalahan
 mod.errors = Kesalahan terjadi disaat memuat konten.
@@ -124,17 +127,20 @@ mod.reloadrequired = [scarlet]Dibutuhkan untuk memuat ulang
 mod.import = Impor Mod
 mod.import.file = Import File
 mod.import.github = Impor Mod GitHub
+mod.jarwarn = [scarlet]mod dari JAR sebenarnya tidak aman.[]\nPastikan anda mengimpor mod dari sumber terpercaya!
 mod.item.remove = Item ini merupakan bagian dari mod[accent] '{0}'[] mod. Untuk dihilangkan, hapus mod ini.
 mod.remove.confirm = Mod ini akan dihapus.
 mod.author = [lightgray]Pencipta:[] {0}
 mod.missing = Simpanan ini mengandung mod yang telah diperbarui atau sudah lama tidak dipasang. Kemungkinan akan terjadi perubahan. Apakah Anda yakin untuk memuatnya?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Sebelum menerbitkan mod di dalam workshop, kamu harus memberi foto pratinjau.\nBeri sebuah foto dinamakan[accent] preview.png[] ke dalam folder mod dan ulang kembali.
-mod.folder.missing = Hanya mod dengan format folder yang dapat diterbitkan di workshop.\nUntuk mengubah mod menjadi folder, unzip file mod tersebut dan bentuk sebuah folder, kemudian ulang game Anda atau mod Anda..
-mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
+mod.preview.missing = Sebelum memposting mod di workshop, kamu harus memberi foto pratinjau.\nBeri sebuah foto berformat[accent] preview.png[] ke dalam folder mod dan ulang kembali.
+mod.folder.missing = Hanya mod dengan format folder yang dapat diposting di workshop.\nUntuk mengubah mod menjadi folder, ekstrak file mod tersebut dan pastikan berbentuk sebuah folder, kemudian ulang game Anda atau mod Anda..
+mod.scripts.disable = perangkat anda tidak mendukung mod berformat skrip/JS. Anda harus menonaktifkan mod untuk lanjut bermain!. 
 
 about.button = Tentang
 name = Nama:
 noname = Pilih[accent] nama pemain[] dahulu.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Nama File:
 unlocked = Konten baru terbuka!
 completed = [accent]Terselesaikan
@@ -142,6 +148,7 @@ techtree = Cabang Teknologi
 research.list = [lightgray]Penelitian:
 research = Penelitian
 researched = [lightgray]{0} telah diteliti.
+research.progress = {0}% complete
 players = {0} pemain aktif
 players.single = {0} pemain aktif
 players.search = cari
@@ -151,13 +158,13 @@ server.kicked.kick = Anda telah dikeluarkan dari server!
 server.kicked.whitelist = Anda tidak ada di dalam whitelist.
 server.kicked.serverClose = Server ditutup.
 server.kicked.vote = Anda dipilih untuk dikeluarkan. Sampai jumpa!
-server.kicked.clientOutdated = Client kadaluarsa! Perbarui permainan Anda!
-server.kicked.serverOutdated = Server kadaluarsa! Tanya pemilik untuk diperbarui!
+server.kicked.clientOutdated = Client kadaluarsa! Perbarui mindustry Anda!
+server.kicked.serverOutdated = Server kadaluarsa! Tanya pemilik untuk memperbarui!
 server.kicked.banned = Anda telah dilarang untuk memasuki server ini.
 server.kicked.typeMismatch = Server ini tidak cocok dengan versi build Anda.
-server.kicked.playerLimit = Server ini penuh. Tunggu untuk slot kosong.
-server.kicked.recentKick = Anda baru saja dikeluarkan dari server ini.\nTunggu sebelum masuk lagi.
-server.kicked.nameInUse = Sudah ada pemain dengan nama itu \ndi server ini.
+server.kicked.playerLimit = Server ini penuh. Tunggu slot kosong.
+server.kicked.recentKick = Anda baru saja dikeluarkan dari server ini.\nTunggu sesaat sebelum masuk lagi.
+server.kicked.nameInUse = Sudah ada pemain dengan nama tersebut \ndi server ini.
 server.kicked.nameEmpty = Nama yang dipilih tidak valid.
 server.kicked.idInUse = Anda telah berada di server ini! Memasuki dengan dua akun tidak diizinkan.
 server.kicked.customClient = Server ini tidak mendukung versi modifikasi. Download versi resmi.
@@ -190,7 +197,7 @@ trace.mobile = Client Mobile: [accent]{0}
 trace.modclient = Client Modifikasi: [accent]{0}
 invalidid = Client ID tidak valid! Laporkan masalah.
 server.bans = Pemain Dilarang Masuk
-server.bans.none = Tidak ada pemain yang dilarang masuk!
+server.bans.none = Tidak ada pemain yang diberiizin masuk!
 server.admins = Admin
 server.admins.none = Tidak ada admin!
 server.add = Tambahkan Server
@@ -224,7 +231,6 @@ save.new = Simpanan Baru
 save.overwrite = Anda yakin ingin menindih \ntempat simpanan ini?
 overwrite = Tindih
 save.none = Tidak ada simpanan!
-saveload = [accent]Menyimpan...
 savefail = Gagal menyimpan permainan!
 save.delete.confirm = Anda yakin ingin menghapus simpanan ini?
 save.delete = Hapus
@@ -256,7 +262,7 @@ view.workshop = Lihat di Workshop
 workshop.listing = Sunting Daftar Workshop
 ok = OK
 open = Buka
-customize = Modifikasi
+customize = edit
 cancel = Batal
 openlink = Buka Tautan
 copylink = Salin Tautan
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Apakah Anda tahu apa yang dilakukan?\nTutorial dapat diu
 loading = [accent]Memuat...
 reloading = [accent]Memuat Ulang Mod...
 saving = [accent]Menyimpan...
+respawn = [accent][[{0}][] untuk muncul kembali ke inti
 cancelbuilding = [accent][[{0}][] untuk menghapus rencana
 selectschematic = [accent][[{0}][] untuk memilih+salin
 pausebuilding = [accent][[{0}][] untuk berhenti membangun
@@ -328,8 +335,9 @@ waves.never = <tidak pernah>
 waves.every = setiap
 waves.waves = gelombang
 waves.perspawn = per muncul
+waves.shields = shields/wave
 waves.to = sampai
-waves.boss = Bos
+waves.guardian = Guardian
 waves.preview = Pratinjau
 waves.edit = Sunting...
 waves.copy = Salin ke Papan klip
@@ -337,6 +345,11 @@ waves.load = Tempel dari Papan klip
 waves.invalid = Gelombang tidak valid di papan klip.
 waves.copied = Gelombang tersalin.
 waves.none = Tidak ada musuh yang didefinisikan.\nIngat bahwa susunan gelombang yang kosong akan diubah menjadi susunan gelombang standar secara otomatis.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Standar>
 details = Detail...
 edit = Sunting...
@@ -438,7 +451,7 @@ width = Lebar:
 height = Tinggi:
 menu = Menu
 play = Bermain
-campaign = Operasi
+campaign = kampanye
 load = Memuat
 save = Simpan
 fps = FPS: {0}
@@ -456,10 +469,12 @@ locked = Terkunci
 complete = [lightgray]Mencapai:
 requirement.wave = Capai gelombang {0} dalam {1}
 requirement.core = Hancurkan inti musuh dalam {0}
-requirement.unlock = Buka {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Lanjutkan Zona:\n[lightgray]{0}
 bestwave = [lightgray]Gelombang Terbaik: {0}
 launch = < MELUNCUR >
+launch.text = Launch
 launch.title = Berhasil Meluncur
 launch.next = [lightgray]kesempatan berikutnya di gelombang {0}
 launch.unable2 = [scarlet]Tidak dapat MELUNCUR.[]
@@ -467,13 +482,14 @@ launch.confirm = Ini akan meluncurkan semua sumber daya di inti.\nAnda tidak bis
 launch.skip.confirm = Jika Anda lewati sekarang, Anda tidak akan dapat meluncur hingga gelombang berikutnya.
 uncover = Buka
 configure = Konfigurasi Muatan
+loadout = Loadout
+resources = Resources 
 bannedblocks = Balok yang dilarang
 addall = Tambah Semu
-configure.locked = [lightgray]Buka konfigurasi muatan: Gelombang {0}.
-configure.invalid = Jumlah harua berupa angka diantara 0 dan {0}.
+launch.destination = Destination: {0}
+configure.invalid = Jumlah harus berupa angka diantara 0 dan {0}.
 zone.unlocked = [lightgray]{0} terbuka.
 zone.requirement.complete = Gelombang {0} terselesaikan:\nPersyaratan zona {1} tercapai.
-zone.config.unlocked = Permuatan terbuka:[lightgray]\n{0}
 zone.resources = Sumber Daya Terdeteksi:
 zone.objective = [lightgray]Objektif: [accent]{0}
 zone.objective.survival = Bertahan
@@ -492,35 +508,43 @@ error.io = Terjadi kesalahan jaringan I/O.
 error.any = Terjadi kesalahan Jaringan tidak diketahui.
 error.bloom = Gagal untuk menginisialisasi bloom.\nPerangkat Anda mungkin tidak mendukung fitur ini.
 
-zone.groundZero.name = Titik Nol
-zone.desertWastes.name = Gurun Gersang
-zone.craters.name = Kawah
-zone.frozenForest.name = Hutan Beku
-zone.ruinousShores.name = Pantai Hancur
-zone.stainedMountains.name = Gunung Bernoda
-zone.desolateRift.name = Retakan Terpencil
-zone.nuclearComplex.name = Kompleks Produksi Nuklir
-zone.overgrowth.name = Pertumbuhan
-zone.tarFields.name = Lahan Tar
-zone.saltFlats.name = Dataran Garam
-zone.impact0078.name = Impact 0078
-zone.crags.name = Tebing
-zone.fungalPass.name = Lintasan Jamur
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Lokasi optimal untuk memulai sekali lagi. Ancaman musuh rendah. Sumber daya sedikit.\nKumpulkan Tembaga dan Timah sebanyak - banyaknya.\nJalan terus.
-zone.frozenForest.description = Disini juga, dekat dengan pegunungan, spora telah menyebar. Suhu yang dingin tidak dapat menahan mereka selamanya.\n\nMulai jelajahi tenaga. Bangun generator pembakaran. Pelajari cara memakai mender.
-zone.desertWastes.description = Daerah limbah ini luas, sulit diprediksi, dan bersilangan dengan struktur bangunan terlantar.\nTerdapat batu bara di daerah ini. Bakar untuk membuat tenaga, atau membuat grafit.\n\n[lightgray]Lokasi pendaratan tidak dapat dijamin.
-zone.saltFlats.description = Di pinggiran gurun terdapat Dataran Garam. Sedikit sumber daya alam ditemukan di lokasi ini.\n\nPihak musuh telah mendirikan tempat penyimpanan disini. Hancurkan inti mereka. Jangan biarkan apapun berdiri.
-zone.craters.description = Air terakumulasi di kawah ini, peninggalan perang dahulu. Peroleh kembali area ini. Kumpulkan pasir. Buat metaglass. Pompa air untuk mendinginkan turret dan bor.
-zone.ruinousShores.description = Setelah daerah limbah, terdapat garis pantai. Dulunya, lokasi ini menjadi tempat jajaran pertahanan. Tidak banyak yang tersisa. Hanya struktur dasar pertahanan yang masih tidak rusak, yang lain hancur menjadi keping.\nLanjutkan ekspansi ke luar. Temukan kembali teknologinya.
-zone.stainedMountains.description = Lebih dalam terdapat pegunungan, masih murni dari spora.\nGali titanium yang melimpah di area ini. Pelajari bagaimana menggunakannya.\n\nKehadiran musuh lebih besar di sini. Jangan beri mereka waktu untuk mengirim unit terbaik mereka.
-zone.overgrowth.description = Area ini sangat rimbun, dekat dengan sumber spora.\nPihak musuh telah mendirikan pos kawalan di sini. Bangun unit dagger. Hancurkan inti mereka. Peroleh kembali apa yang telah hilang.
-zone.tarFields.description = Tempat produksi minyak di pinggiran, diantara pegunungan dan gurun. Salah satu dari sedikit area yang menjadi cadangan tar.\nMeskipun ditinggalkan, terdapat musuh yang kuat dekat daerah ini. Jangan meremehkan mereka.\n\n[lightgray]Telaah teknologi pengolahan minyak jika bisa.
-zone.desolateRift.description = Zona yang sangat berbahaya. Banyak sekali sumber daya alam, tetapi ruang yang sempit. Resiko tinggi untuk kerusakan. Pergi secepat mungkin. Jangan dibodohi karena jarak yang panjang antar serangan musuh.
-zone.nuclearComplex.description = Sebuah bekas fasilitas yang membuat dan mengolah thorium, hancur menjadi reruntuhan.\n[lightgray]Lakukan penelitian terhadap thorium dan fungsinya.\n\nMusuh terdapat di sini dengan jumlah yang sangat banyak, terus mencari penyerang.
-zone.fungalPass.description = Sebuah area transisi dari pegunungan tinggi ke rendah, dataran penuh spora. Sebuah tempat pengintaian milik musuh terletak disini.\nHancurkan.\nGunakan unit Dagger dan Crawler. Hancurkan kedua inti mereka.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = lokasi yang optimal untuk bermain satu kali lagi. Sangat sedikit musuh. Beberapa sumber daya.\nKumpulkan timah dan tembaga sebanyak yang anda bisa.\nPindah.
+sector.frozenForest.description = disini, dekat dengan gunung, spora spora sudah menyebar. Temperatur yang sangat rendah tidak dapat mempertahankan selamanya.\n\nBerusaha untuk kekuatan. Bangun generator pembakaran. Pelajari cara menggunakan mender.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Bahasa
 settings.data = Game Data
@@ -534,9 +558,12 @@ settings.graphics = Grafik
 settings.cleardata = Menghapus Data Permainan...
 settings.clear.confirm = Anda yakin ingin menghapus data ini?\nWaktu tidak bisa diulang kembali!
 settings.clearall.confirm = [scarlet]PERINGATAN![]\nIni akan menghapus semua data permainan, termasuk simpanan, peta, bukaan dan keybind.\nSetelah Anda menekan 'ok' permainan akan menghapus semua data dan keluar otomatis.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Jeda >
 clear = Bersih
 banned = [scarlet]Dilarang
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Ya
 no = Tidak
 info.title = Info
@@ -558,8 +585,11 @@ blocks.itemsmoved = Kecepatan Gerak
 blocks.launchtime = Waktu Diantara Peluncuran
 blocks.shootrange = Jarak
 blocks.size = Ukuran
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Kapasitas Zat Cair
 blocks.powerrange = Jarak Tenaga
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Koneksi Maksimal
 blocks.poweruse = Penggunaan Tenaga
 blocks.powerdamage = Tenaga/Pukulan
@@ -575,13 +605,18 @@ blocks.boosteffect = Efek Pendorong
 blocks.maxunits = Maks Unit Aktif
 blocks.health = Darah
 blocks.buildtime = Waktu Pembuatan
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Biaya Bangunan
 blocks.inaccuracy = Jarak Melenceng
 blocks.shots = Tembakan
 blocks.reload = Tembakan/Detik
 blocks.ammo = Amunisi
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Membutuhkan Bor yang Lebih Baik
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Kecepatan Bor: {0}/s
 bar.pumpspeed = Kecepatan Pompa: {0}/s
 bar.efficiency = Daya Guna: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Tenaga: {0}
 bar.poweroutput = Pengeluaran Tenaga: {0}
 bar.items = Item: {0}
 bar.capacity = Kapasitas: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Zat Cair
 bar.heat = Panas
 bar.power = Tenaga
 bar.progress = Perkembangan Pembangunan
-bar.spawned = Unit: {0}/{1}
 bar.input = Masukan
 bar.output = Keluaran
 
@@ -619,12 +655,16 @@ unit.liquidunits = unit zat cair
 unit.powerunits = unit tenaga
 unit.degrees = derajat
 unit.seconds = detik
+unit.minutes = mins
 unit.persecond = /detik
+unit.perminute = /min
 unit.timesspeed = x kecepatan
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = item
 unit.thousands = ribu
 unit.millions = juta
+unit.billions = b
 category.general = Umum
 category.power = Tenaga
 category.liquids = Zat Cair
@@ -639,6 +679,7 @@ setting.linear.name = Filter Bergaris
 setting.hints.name = Petunjuk
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Jeda Otomatis saat Membangun
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animasi Perairan
 setting.animatedshields.name = Animasi Pelindung
 setting.antialias.name = Antialiasi[lightgray] (membutuhkan restart)[]
@@ -663,7 +704,6 @@ setting.effects.name = Munculkan Efek
 setting.destroyedblocks.name = Tunjukkan Blok yang Telah Hancur
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Navigasi Pengantar Otomatis
-setting.coreselect.name = Izinkan Skema Inti
 setting.sensitivity.name = Sensitivitas Kontroler
 setting.saveinterval.name = Jarak Menyimpan
 setting.seconds = {0} Sekon
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milisekon
 setting.fullscreen.name = Layar Penuh
 setting.borderlesswindow.name = Jendela tak Berbatas[lightgray] (mungkin memerlukan mengulang kembali)
 setting.fps.name = Tunjukkan FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Tunjukkan Kunci Pilih Blok
 setting.vsync.name = VSync
 setting.pixelate.name = Mode Pixel[lightgray] (menonaktifkan animasi)
 setting.minimap.name = Tunjukkan Peta Kecil
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Tunjukkan Posisi Pemain
 setting.musicvol.name = Volume Musik
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Volume Sekeliling
 setting.mutemusic.name = Diamkan Musik
 setting.sfxvol.name = Volume Efek Suara
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Mayoritas kunci tidak mendukung mobile. Hanya gerakan
 category.general.name = Umum
 category.view.name = Melihat
 category.multiplayer.name = Bermain Bersama
+category.blocks.name = Block Select
 command.attack = Serang
 command.rally = Kumpul/Patroli
 command.retreat = Mundur
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Kunci: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Hapus Bangunan
 keybind.press = Tekan kunci...
 keybind.press.axis = Tekan sumbu atau kunci...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Pindah x
 keybind.move_y.name = Pindah y
 keybind.mouse_move.name = Ikut Mouse
-keybind.dash.name = Terbang
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Pilih Daerah
 keybind.schematic_menu.name = Menu Skema
 keybind.schematic_flip_x.name = Balik Skema X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Penaruhan Diagonal
 keybind.pick.name = Memilih Blok
 keybind.break_block.name = Menghancurkan Blok
 keybind.deselect.name = Batal Memilih
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Menembak
 keybind.zoom.name = Perbesar
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Ledakan Reaktor
 rules.wavetimer = Pengaturan Waktu Gelombang 
 rules.waves = Gelombang
 rules.attack = Mode Penyerangan
+rules.buildai = AI Building
 rules.enemyCheat = Sumber Daya A.I Musuh (Tim Merah) Tak Terbatas
-rules.unitdrops = Munculnya Unit
+rules.blockhealthmultiplier = Multiplikasi Darah Blok
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Multiplikasi Kecepatan Munculnya Unit
 rules.unithealthmultiplier = Multiplikasi Darah Unit
-rules.blockhealthmultiplier = Multiplikasi Darah Blok
-rules.playerhealthmultiplier = Multiplikasi Darah Pemain
-rules.playerdamagemultiplier = Multiplikasi Kekuatan Pemain
 rules.unitdamagemultiplier = Multiplikasi Kekuatan Unit
 rules.enemycorebuildradius = Dilarang Membangun Radius Inti Musuh :[lightgray] (blok)
-rules.respawntime = Waktu Respawn:[lightgray] (detik)
 rules.wavespacing = Jarak Gelombang:[lightgray] (detik)
 rules.buildcostmultiplier = Multiplikasi Harga Bangunan
 rules.buildspeedmultiplier = Multiplikasi Waktu Pembuatan Bangunan
 rules.deconstructrefundmultiplier = Penggembalian Dana Mendekonstraksi Blok
 rules.waitForWaveToEnd = Gelombang menunggu musuh
 rules.dropzoneradius = Radius Titik Muncul:[lightgray] (Blok)
-rules.respawns = Maksimal muncul kembali setiap gelombang
-rules.limitedRespawns = Batas Muncul Kembali
+rules.unitammo = Units Require Ammo
 rules.title.waves = Gelombang
-rules.title.respawns = Muncul Kembali
 rules.title.resourcesbuilding = Sumber Daya & Bangunan
-rules.title.player = Pemain
 rules.title.enemy = Musuh
 rules.title.unit = Unit
 rules.title.experimental = Eksperimental
+rules.title.environment = Environment
 rules.lighting = Penerangan
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Sinar Disekeliling
-rules.solarpowermultiplier = Kekuatan Panel Surya (kali)
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Item
 content.liquid.name = Zat Cair
@@ -827,10 +878,11 @@ liquid.water.name = Air
 liquid.slag.name = Terak
 liquid.oil.name = Minyak
 liquid.cryofluid.name = Cairan Dingin
-item.corestorable = [lightgray]Yang dapat disimpan di Inti: {0}
+
 item.explosiveness = [lightgray]Tingkat Keledakan: {0}%
 item.flammability = [lightgray]Tingkat Kebakaran: {0}%
 item.radioactivity = [lightgray]Tingkat Radioaktif: {0}%
+
 unit.health = [lightgray]Darah: {0}
 unit.speed = [lightgray]Kecepatan: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Kapasitas Panas: {0}
 liquid.viscosity = [lightgray]Kelekatan: {0}
 liquid.temperature = [lightgray]Suhu: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Batu Pasir
 block.grass.name = Rumput
 block.slag.name = Slag
 block.salt.name = Garam
-block.saltrocks.name = Batu Garam
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Kerikil
 block.tendrils.name = Sulur
-block.sandrocks.name = Batu Pasir
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Cemara Spora
-block.sporerocks.name = Batu Spora
-block.rock.name = Batu
-block.snowrock.name = Batu Salju
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Pinus Salju
 block.shale.name = Serpihan
 block.shale-boulder.name = Serpihan Batu Besar
 block.moss.name = Lumut
 block.shrubs.name = Semak-Semak
 block.spore-moss.name = Lumut Spora
-block.shalerocks.name = Batu Serpihan
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Dinding Kepingan
 block.scrap-wall-large.name = Dinding Kepingan Besar 1
 block.scrap-wall-huge.name = Dinding Kepingan Besar 2
@@ -890,13 +979,17 @@ block.craters.name = Kawah
 block.sand-water.name = Air Pasir
 block.darksand-water.name = Air Pasir Hitam
 block.char.name = Bara
-block.holostone.name = Batu Holo 
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Salju Es
-block.rocks.name = Batu
-block.icerocks.name = Batu Es
-block.snowrocks.name = Batu Salju
-block.dunerocks.name = Bukit Pasir
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Cemara
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Pohon Putih Mati
 block.white-tree.name = Pohon Putih
 block.spore-cluster.name = Kumpulan Spora
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Panel Gelap 4
 block.dark-panel-5.name = Panel Gelap 5
 block.dark-panel-6.name = Panel Gelap 6
 block.dark-metal.name = Besi Gelap
-block.ignarock.name = Batu Igna
+block.basalt.name = Basalt
 block.hotrock.name = Batu Panas
 block.magmarock.name = Batu Lahar
-block.cliffs.name = Tebing
 block.copper-wall.name = Dinding Tembaga
 block.copper-wall-large.name = Dinding Tembaga Besar
 block.titanium-wall.name = Dinding Titanium
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Gerbang Tidak Meluap
 block.silicon-smelter.name = Pelebur Silikon
 block.phase-weaver.name = Pengrajut Phase 
 block.pulverizer.name = Pulverisator
-block.cryofluidmixer.name = Penyampur Cairan Dingin
+block.cryofluid-mixer.name = Penyampur Cairan Dingin
 block.melter.name = Pencair
 block.incinerator.name = Penghangus
 block.spore-press.name = Penekan Spora
@@ -964,7 +1056,7 @@ block.diode.name = Dioda Baterai
 block.battery.name = Baterai
 block.battery-large.name = Baterai Besar
 block.combustion-generator.name = Generator Pembakar
-block.turbine-generator.name = Generator Turbin
+block.steam-generator.name = Generator Turbin
 block.differential-generator.name = Generator Majemuk
 block.impact-reactor.name = Reaktor Tumbukan
 block.mechanical-drill.name = Bor Mekanik
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Penyampur Peledak
 block.solar-panel.name = Panel Surya
 block.solar-panel-large.name = Panel Surya Besar
 block.oil-extractor.name = Penggali Minyak
-block.command-center.name = Pusat Perintah
-block.draug-factory.name = Pabrik Drone Penambang Draug
-block.spirit-factory.name = Pabrik Drone Spirit
-block.phantom-factory.name = Pabrik Drone Phantom
-block.wraith-factory.name = Pabrik Penyerang Wraith
-block.ghoul-factory.name = Pabrik Pengebom Ghoul
-block.dagger-factory.name = Pabrik Robot Dagger
-block.crawler-factory.name = Pabrik Robot Crawler 
-block.titan-factory.name = Pabrik Robot Titan
-block.fortress-factory.name = Pabrik Robot Fortress
-block.revenant-factory.name = Pabrik Penyerang Revenant
 block.repair-point.name = Tempat Perbaikan
 block.pulse-conduit.name = Selang Denyut
 block.plated-conduit.name = Pipa Terlapis
@@ -1036,6 +1117,29 @@ block.meltdown.name = Pelebur
 block.container.name = Kontainer
 block.launch-pad.name = Alas Peluncur
 block.launch-pad-large.name = Alas Peluncur Besar
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = biru
 team.crux.name = merah
 team.sharded.name = oranye
@@ -1043,21 +1147,7 @@ team.orange.name = jingga
 team.derelict.name = derelict
 team.green.name = hijau
 team.purple.name = ungu
-unit.spirit.name = Robot Spirit
-unit.draug.name = Robot Penambang Draug
-unit.phantom.name = Robot Phantom
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Pengebom Ghoul
-unit.wraith.name = Penyerang Wraith
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Peletus
-unit.chaos-array.name = Satuan Kekacauan
-unit.eradicator.name = Pemusnah
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tekan untuk lanjut>
 tutorial.intro = Kamu telah memasuki[scarlet] Tutorial Mindustry.[]\nMulai dengan[accent] menambang tembaga[]. Tekan bijih tembaga dekat intimu.\n\n[accent]{0}/{1} tembaga
 tutorial.intro.mobile = Kamu telah memasuki[scarlet] Tutorial Mindustry.[]\nGesek layar untuk bergerak.\n[accent]Gunakan 2 jari [] untuk mengecilkan dan membesarkan gambar.\nMulai dengan[accent] menambang tembaga[]. Dekati tembaganya, kemudian tekan bijih tembaga untuk mulai menambang.\n\n[accent]{0}/{1} tembaga
@@ -1100,17 +1190,7 @@ liquid.water.description = Umumnya digunakan untuk mendinginkan mesin-mesin dan
 liquid.slag.description = Berbagai tipe logam yang meleleh. Dapat dipisahkan menjadi mineral masing-masing, atau disemprokat ke musuh dijadikn senjata.
 liquid.oil.description = Bisa dibakar, diledakkan atau sebagai pendigin.
 liquid.cryofluid.description = Zat cair paling efisien untuk mendinginkan hal-hal.
-unit.draug.description = Drone penambang primitif. Murah untuk diproduksi. Dapat diperluas. Menambang tembaga dan timah secara otomatis. Mengirim hasil tambang menuju inti terdekat.
-unit.spirit.description = Unit pemulaan. muncul di inti secara standar. Menambang sumber daya dan memperbaiki blok.
-unit.phantom.description = Unit canggih. Menambang sumber daya dan memperbaiki blok. Lebih efektif dari drone spirit.
-unit.dagger.description = Unit darat dasar. Berguna dalam satu gerombolan.
-unit.crawler.description = Unit yang memiliki bom diletakkan di bagian atas. Tidak tahan lama. Meledak saat kontak dengan musuh.
-unit.titan.description = Unit darat berbaja yang canggih ini menyerang target darat dan udara.
-unit.fortress.description = Unit meriam darat kelas berat.
-unit.eruptor.description = Unit kelas berat didesain untuk menghancurkan struktur musuh. Menembak aliran terak ke tempat musuh, melelehkan dan membakar yang terkena.
-unit.wraith.description = Unit tabrak-lari yang cepat.
-unit.ghoul.description = Pengebom kelas berat.
-unit.revenant.description = Jajaran roket kelas berat.
+
 block.message.description = Menyimpan pesan. Digunakan untuk komunikasi antar sekutu.
 block.graphite-press.description = Memadatkan bongkahan batu bara menjadi lempengan grafit murni.
 block.multi-press.description = Versi pemadat grafit yang lebih bagus. Membutuhkan air dan tenaga untuk memproses batu bara lebih cepat dan efisien.
@@ -1119,7 +1199,7 @@ block.kiln.description = Membakar pasir dan timah menjadi kaca meta. Membutuhkan
 block.plastanium-compressor.description = Memproduksi plastanium dari minyak dan titanium.
 block.phase-weaver.description = Memproduksi kain phase dari thorium dan banyak pasir.
 block.alloy-smelter.description = Memproduksi campuran logam dari titanium, timah, silikon dan tembaga.
-block.cryofluidmixer.description = Mencampur air dan titanium menjadi cairan dingin yang lebih efisien untuk pendingin.
+block.cryofluid-mixer.description = Mencampur air dan titanium menjadi cairan dingin yang lebih efisien untuk pendingin.
 block.blast-mixer.description = Menggunakan minyak untuk membentuk pyratite menjadi senyawa peledak yang kurang mudah terbakar tetapi lebih eksplosif.
 block.pyratite-mixer.description = Mencampur batu bara, timah dan pasir menjadi pyratite yang sangat mudah terbakar.
 block.melter.description = Melelehkan kepingan menjadi terak untuk proses selanjutnya atau digunakan menara.
@@ -1185,7 +1265,7 @@ block.battery.description = Menyimpan tenaga jika ada kelimpahan dan memberikan
 block.battery-large.description = Menyimpan lebih banyak tenaga daripada baterai biasa.
 block.combustion-generator.description = Menghasilkan tenaga dengan membakar minyak atau bahan bakar.
 block.thermal-generator.description = Menghasilkan tenaga disaat ditaruh di lokasi yang panas.
-block.turbine-generator.description = Lebih efisien daripada generator pembakar, tetapi membutuhkan tambahan air.
+block.steam-generator.description = Lebih efisien daripada generator pembakar, tetapi membutuhkan tambahan air.
 block.differential-generator.description = Menghasilkan banyak sekali tenaga. Memanfaatkan perbedaan suhu dingin cairan pendingin dan suhu panas pyratite.
 block.rtg-generator.description = Generator yang tidak membutuhkan pendiginan tetapi lebih memberi sedikit tenaga daripada reaktor thorium.
 block.solar-panel.description = Menghasilkan jumlah tenaga kecil dari matahari.
@@ -1221,15 +1301,5 @@ block.ripple.description = Menara meriam besar yang menembak beberapa peluru sek
 block.cyclone.description = Menara penembak beruntun besar.
 block.spectre.description = Menara besar yang menembak dua peluru kuat sekaligus.
 block.meltdown.description = Menara besar ini menembak sinar panjang yang kuat.
-block.command-center.description = Memberi perintah kepada unit sekutu.\nMembuat unit untuk berpatroli, serang inti musuh atau mundur ke inti sekutu/pabrik. Jika tidak ada inti musuh, unit secara standar akan berpatroli disaat perintah serang.
-block.draug-factory.description = Memproduksi drone penambang draug.
-block.spirit-factory.description = Memproduksi drone ringan yang menambang sumber daya dan memulih blok.
-block.phantom-factory.description = Memproduksi drone canggih yang lebih efektif dibandingkan drone spirit.
-block.wraith-factory.description = Memproduksi unit tabrak-lari yang cepat.
-block.ghoul-factory.description = Memproduksi pengebom kelas berat.
-block.revenant-factory.description = Memproduksi unit laser udara kelas berat.
-block.dagger-factory.description = Memproduksi unit darat dasar.
-block.crawler-factory.description = Memproduksi unit dengan bom bunuh diri.
-block.titan-factory.description = Memproduksi unit darat canggih.
-block.fortress-factory.description = Memproduksi unit meriam darat kelas berat.
 block.repair-point.description = Terus menerus memulihkan unit terluka disekitar.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index e0c328d48d..c10f894851 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Pagina di itch.io con download per PC e versione web
 link.google-play.description = Elenco di Google Play Store
 link.f-droid.description = Catalogo F-Droid
 link.wiki.description = Wiki ufficiale di Mindustry
-link.feathub.description = Suggerisci nuove funzionalità
+link.suggestions.description = Suggerisci nuove funzionalità
 linkfail = Impossibile aprire il link! L'URL è stato copiato negli appunti.
 screenshot = Screenshot salvato a {0}
 screenshot.invalid = Mappa troppo pesante, probabilmente non c'è abbastanza spazio sul disco.
@@ -20,6 +20,8 @@ gameover = Il Nucleo è stato distrutto.
 gameover.pvp = La squadra[accent] {0}[] ha vinto!
 highscore = [accent]Nuovo record!
 copied = Copiato.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Suoni
 load.map = Mappe
@@ -63,8 +65,7 @@ stat.delivered = Risorse Lanciate:
 stat.playtime = Tempo Di Gioco:[accent] {0}
 stat.rank = Livello Finale: [accent]{0}
 
-launcheditems = [accent]Oggetti Lanciati
-launchinfo = [unlaunched][[LANCIA] il tuo Nucleo per ottenere gli oggetti indicati in blu.
+globalitems = [accent]Global Items
 map.delete = Sei sicuro di voler eliminare la mappa '[accent]{0}[]'?
 level.highscore = Miglior Punteggio: [accent]{0}
 level.select = Selezione del Livello
@@ -106,6 +107,7 @@ mods.guide = Guida per il modding
 mods.report = Segnala un Bug
 mods.openfolder = Apri Cartella
 mods.reload = Ricarica
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Abilitato
 mod.disabled = [scarlet]Disabilitato
@@ -113,6 +115,7 @@ mod.disable = Disabilita
 mod.content = Contenuto:
 mod.delete.error = Impossibile eliminare questa mod. Il file potrebbe essere in uso.
 mod.requiresversion = [scarlet]Versione minima richiesta: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Dipendenze mancanti: {0}
 mod.erroredcontent = [scarlet]Errori di Contenuto
 mod.errors = Si sono verificati degli errori durante il caricamento del contenuto.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Riavvio necessario
 mod.import = Importa Mod
 mod.import.file = Importa File
 mod.import.github = Importa Mod da GitHub
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Questo item fa parte della mod[accent] '{0}'[]. Per rimuoverlo, disinstalla questa mod.
 mod.remove.confirm = Questa mod verrà eliminata.
 mod.author = [lightgray]Autore:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Il tuo dispositivo non supporta le mod con gli script. Dev
 about.button = Info
 name = Nome:
 noname = Scegli un[accent] nome[] prima di unirti.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Nome File:
 unlocked = Nuovo contenuto sbloccato!
 completed = [accent]Completato
@@ -142,6 +148,7 @@ techtree = Albero Scoperta
 research.list = [lightgray]Ricerca:
 research = Ricerca
 researched = [lightgray]{0} cercati.
+research.progress = {0}% complete
 players = {0} giocatori online
 players.single = {0} giocatore online
 players.search = Cerca
@@ -224,7 +231,6 @@ save.new = Nuovo Salvataggio
 save.overwrite = Sei sicuro di voler sovrascrivere questo salvataggio?
 overwrite = Sovrascrivi
 save.none = Nessun salvataggio trovato!
-saveload = Salvataggio in corso...
 savefail = Salvataggio del gioco non riuscito!
 save.delete.confirm = Sei sicuro di voler eliminare questo salvataggio?
 save.delete = Elimina
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Sei sicuro di sapere cosa stai facendo? Il tutorial può
 loading = [accent]Caricamento in Corso...
 reloading = [accent]Ricaricamento delle mods...
 saving = [accent]Salvataggio in corso...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] per pulire la selezione
 selectschematic = [accent][[{0}][] per selezionare+copiare
 pausebuilding = [accent][[{0}][] per smettere di costruire
@@ -328,8 +335,9 @@ waves.never = <mai>
 waves.every = sempre
 waves.waves = ondata/e
 waves.perspawn = per spawn
+waves.shields = shields/wave
 waves.to = a
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Anteprima
 waves.edit = Modifica...
 waves.copy = Copia negli Appunti
@@ -337,6 +345,11 @@ waves.load = Carica dagli Appunti
 waves.invalid = Ondate dagli appunti non valide.
 waves.copied = Ondate copiate.
 waves.none = Nessun nemico impostato.\nNota che le disposizioni di ondate vuote verranno automaticamente rimpiazzate con la disposizione predefinita.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Predefinito>
 details = Dettagli...
 edit = Modifica...
@@ -456,10 +469,12 @@ locked = Bloccato
 complete = [lightgray]Completato:
 requirement.wave = Raggiungi l'ondata {0} in {1}
 requirement.core = Distruggi il Nucleo Nemico in {0}
-requirement.unlock = Sblocca {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Riprendi Zona:\n[lightgray]{0}
 bestwave = [lightgray]Ondata Migliore: {0}
 launch = < DECOLLARE >
+launch.text = Launch
 launch.title = Decollo Riuscito!
 launch.next = [lightgray]nuova opportunità all'ondata {0}
 launch.unable2 = [scarlet]IMPOSSIBILE DECOLLARE![]
@@ -467,13 +482,14 @@ launch.confirm = Questo trasporterà tutte le risorse nel tuo Nucleo.\nNon riusc
 launch.skip.confirm = Se salti adesso non riuscirai a decollare fino alle ondate successive
 uncover = Scopri
 configure = Configura Equipaggiamento
+loadout = Loadout
+resources = Resources 
 bannedblocks = Blocchi Banditi
 addall = Aggiungi Tutti
-configure.locked = [lightgray]Sblocca configurazione equipaggiamento: {0}.
+launch.destination = Destination: {0}
 configure.invalid = Il valore dev'essere un numero compresto tra 0 e {0}.
 zone.unlocked = [lightgray]{0} sbloccata.
 zone.requirement.complete = Ondata {0} raggiunta:\n[lightgray]{1}[] requisiti di zona soddisfatti.
-zone.config.unlocked = Equipaggiamento sbloccato:[lightgray]\n{0}
 zone.resources = [lightgray]Risorse Trovate:
 zone.objective = [lightgray]Obiettivo: [accent]{0}
 zone.objective.survival = Sopravvivere
@@ -492,35 +508,43 @@ error.io = Errore I/O di rete.
 error.any = Errore di rete sconosciuto.
 error.bloom = Errore dell'avvio delle shaders.\nIl tuo dispositivo potrebbe non supportarle.
 
-zone.groundZero.name = Terreno Zero
-zone.desertWastes.name = Rifiuti Desertici
-zone.craters.name = Crateri
-zone.frozenForest.name = Foresta Ghiacciata
-zone.ruinousShores.name = Spiaggie in Rovina
-zone.stainedMountains.name = Montagne Macchiate
-zone.desolateRift.name = Spaccatura Desolata
-zone.nuclearComplex.name = Complesso di Produzione Nucleare
-zone.overgrowth.name = Crescita Eccessiva
-zone.tarFields.name = Campi di Catrame
-zone.saltFlats.name = Saline
-zone.impact0078.name = Impatto 0078
-zone.crags.name = Dirupi
-zone.fungalPass.name = Passaggio Fungoso
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = La posizione ottimale per cominciare. Bassa minaccia nemica. Poche risorse.\nRaccogli quanto più piombo e rame possibile.\nProcedi.
-zone.frozenForest.description = Anche qui, più vicino alle montagne, le spore si sono diffuse. Le temperature rigide non possono contenerle per sempre.\nInizia la scoperta dell'energia. Costruisci generatori a combustione. Impara a usare i riparatori.
-zone.desertWastes.description = Questi rifiuti sono vasti, imprevedibili ed attraversati da strutture settoriali abbandonate.\n\nIl carbone è presente nella regione. Bruciatelo per ottenere energia o sintetizzate la grafite.\n\n[lightgray]Questa posizione di atterraggio non può essere garantita.
-zone.saltFlats.description = Alle periferie del deserto si trovano le saline. Poche risorse possono essere trovate in questa posizione.\n\nIl nemico ha eretto un complesso di archiviazione delle risorse qui. Sradicare il loro Nucleo. Non lasciare nulla in piedi.
-zone.craters.description = L'acqua si è accumulata in questo cratere, reliquia delle vecchie guerre. Recupera l'area. Raccogli la sabbia. Fondi il vetro metallico. Pompa l'acqua per raffreddare torrette e trivelle.
-zone.ruinousShores.description = Oltre i rifiuti, c'è il litorale. Una volta, questa posizione ospitava una schiera di difesa costiera. Non rimane molto. Solo le strutture di difesa più elementari sono rimaste incolume, tutto il resto ridotto a rottami.\nContinua l'espansione verso l'esterno. Riscopri la tecnologia.
-zone.stainedMountains.description = Più nell'entroterra si trovano le montagne, non ancora contaminate da spore.\nEstrai l'abbondante titanio in questa zona. Scopri come usarlo.\n\nLa presenza del nemico è maggiore qui. Non dare loro il tempo di inviare le loro unità più forti.
-zone.overgrowth.description = Quest'area è invasa, più vicina alla fonte delle spore.\nIl nemico ha stabilito qui un avamposto. Costruisci unità col pugnale. Distruggilo. Riprenditi ciò che è stato perso.
-zone.tarFields.description = La periferia di una zona di produzione di petrolio, tra le montagne e il deserto. Una delle poche aree con riserve di catrame utilizzabili.\nAnche se abbandonata, questa zona ha alcune pericolose forze nemiche nelle vicinanze. Non sottovalutarlo.\n\n[lightgray]Ricerca la tecnologia di lavorazione del petrolio, se possibile.
-zone.desolateRift.description = Una zona estremamente pericolosa. Risorse abbondanti, ma poco spazio. Alto rischio di distruzione. Lascia il prima possibile. Non lasciarti ingannare dalla lunga distanza tra gli attacchi nemici.
-zone.nuclearComplex.description = Un ex impianto per la produzione e la lavorazione del torio, ridotto in rovina.\n[lightgray]Ricerca il torio ed i suoi numerosi usi.\n\nIl nemico è presente qui in gran numero, alla costante ricerca di aggressori.
-zone.fungalPass.description = Un'area di transizione tra alte montagne e terre più basse, piene di spore. Qui si trova una piccola base di ricognizione nemica.\nDistruggila.\nUsa le unità Pugnale e Strisciatore. Elimina i due nuclei.
-zone.impact0078.description = <inserisci descrizione>
-zone.crags.description = <inserisci descrizione>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Lingua
 settings.data = Dati di Gioco
@@ -534,9 +558,12 @@ settings.graphics = Grafica
 settings.cleardata = Elimina Dati di Gioco
 settings.clear.confirm = Sei sicuro di voler cancellare i dati?\nQuesta operazione non può essere annullata!
 settings.clearall.confirm = [scarlet]ATTENZIONE![]\nQuesto cancellerà tutti i dati, inclusi salvataggi, mappe, oggetti sbloccati ed impostazioni.\nDopo aver premuto su 'ok' il gioco eliminerà i dati e si chiuderà automaticamente.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< In Pausa >
 clear = Pulisci
 banned = [scarlet]Bandito
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Si
 no = No
 info.title = Info
@@ -558,8 +585,11 @@ blocks.itemsmoved = Velocità di Movimento
 blocks.launchtime = Tempo fra Decolli
 blocks.shootrange = Raggio
 blocks.size = Dimensioni
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Capacità del Liquido
 blocks.powerrange = Raggio Energia
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Connessioni Massime
 blocks.poweruse = Utilizzo Energia
 blocks.powerdamage = Energia/Danno
@@ -575,13 +605,18 @@ blocks.boosteffect = Effetto Boost
 blocks.maxunits = Unità Attive Max
 blocks.health = Salute
 blocks.buildtime = Tempo di Costruzione
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Costo di Costruzione
 blocks.inaccuracy = Inaccuratezza
 blocks.shots = Colpi
 blocks.reload = Ricarica
 blocks.ammo = Munizioni
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Miglior Trivella Richiesta
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Velocità Scavo: {0}/s
 bar.pumpspeed = Velocità di Pompaggio: {0}/s
 bar.efficiency = Efficienza: {0}%
@@ -591,7 +626,8 @@ bar.poweramount = Energia: {0}
 bar.poweroutput = Energia in Uscita: {0}
 bar.items = Oggetti: {0}
 bar.capacity = Capacità: {0}
-bar.units = Unità: {0}/{1}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquido
 bar.heat = Calore
 bar.power = Energia
@@ -619,12 +655,16 @@ unit.liquidunits = unità liquidi
 unit.powerunits = unità energia
 unit.degrees = gradi
 unit.seconds = secondi
+unit.minutes = mins
 unit.persecond = /s
+unit.perminute = /min
 unit.timesspeed = x velocità
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = oggetti
 unit.thousands = k
 unit.millions = mln
+unit.billions = b
 category.general = Generali
 category.power = Energia
 category.liquids = Liquidi
@@ -639,6 +679,7 @@ setting.linear.name = Filtro Lineare
 setting.hints.name = Suggerimenti
 setting.flow.name = Visualizza Portata Nastri/Condotti
 setting.buildautopause.name = Pausa Automatica nella Costruzione
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Fluidi Animati
 setting.animatedshields.name = Scudi Animati
 setting.antialias.name = Antialias[lightgray] (richiede riavvio)[]
@@ -663,7 +704,6 @@ setting.effects.name = Visualizza Effetti
 setting.destroyedblocks.name = Visualizza Blocchi Distrutti
 setting.blockstatus.name = Visualizza Stato Blocchi
 setting.conveyorpathfinding.name = Posizionamento Nastri Trasportatori Intelligente
-setting.coreselect.name = Salva Nuclei nelle Schematiche
 setting.sensitivity.name = Sensibilità del Controller
 setting.saveinterval.name = Intervallo di Salvataggio Automatico
 setting.seconds = {0} secondi
@@ -672,10 +712,12 @@ setting.milliseconds = {0} millisecondi
 setting.fullscreen.name = Schermo Intero
 setting.borderlesswindow.name = Finestra Senza Bordi[lightgray] (potrebbe richiedere il riavvio)
 setting.fps.name = Mostra FPS e Ping
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Mostra Tasto di Selezione del Blocco
 setting.vsync.name = VSync
 setting.pixelate.name = Effetto Pixel[lightgray] (disabilita le animazioni)
 setting.minimap.name = Mostra Minimappa
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Mostra Posizione Giocatori
 setting.musicvol.name = Volume Musica
 setting.atmosphere.name = Mostra Atmosfera Pianeta
@@ -701,10 +743,14 @@ keybinds.mobile = [scarlet]La maggior parte dei controlli qui non sono funzionan
 category.general.name = Generale
 category.view.name = Visualizzazione
 category.multiplayer.name = Multigiocatore
+category.blocks.name = Block Select
 command.attack = Attacca
 command.rally = Guardia
 command.retreat = Ritirata
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Tasto: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Pulisci Costruzione
 keybind.press = Premi un tasto...
 keybind.press.axis = Premi un'asse o un tasto...
@@ -714,6 +760,7 @@ keybind.toggle_block_status.name = Attiva/Disattiva Stato Blocchi
 keybind.move_x.name = Muovi Orizzontalmente
 keybind.move_y.name = Muovi Verticalmente
 keybind.mouse_move.name = Segui il Mouse
+keybind.pan.name = Pan View
 keybind.boost.name = Scatto
 keybind.schematic_select.name = Seleziona Regione
 keybind.schematic_menu.name = Menu Schematica
@@ -741,6 +788,9 @@ keybind.diagonal_placement.name = Posiziona Diagonalmente
 keybind.pick.name = Scegli Blocco
 keybind.break_block.name = Rompi Blocco
 keybind.deselect.name = Deseleziona
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Spara
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -775,34 +825,34 @@ rules.reactorexplosions = Esplosioni Reattore
 rules.wavetimer = Timer Ondate
 rules.waves = Ondate
 rules.attack = Modalità Attacco
+rules.buildai = AI Building
 rules.enemyCheat = Risorse AI Infinite
-rules.unitdrops = Generazione Unità
+rules.blockhealthmultiplier = Moltiplicatore Danno Blocco
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Moltiplicatore Velocità Costruzione Unità
 rules.unithealthmultiplier = Moltiplicatore Vita Unità
-rules.blockhealthmultiplier = Moltiplicatore Danno Blocco
-rules.playerhealthmultiplier = Moltiplicatore Vita Giocatore
-rules.playerdamagemultiplier = Moltiplicatore Danno Giocatore
 rules.unitdamagemultiplier = Moltiplicatore Danno Unità
 rules.enemycorebuildradius = Raggio di protezione del Nucleo Nemico dalle costruzioni:[lightgray] (blocchi)
-rules.respawntime = Tempo di Rigeneratione:[lightgray] (secondi)
 rules.wavespacing = Tempo fra Ondate:[lightgray] (secondi)
 rules.buildcostmultiplier = Moltiplicatore Costo Costruzione
 rules.buildspeedmultiplier = Moltiplicatore Velocità Costruzione
 rules.deconstructrefundmultiplier = Moltiplicatore Rimborso di Smantellamento
 rules.waitForWaveToEnd = Le ondate aspettano fino a quando l'ondata precedente finisce
 rules.dropzoneradius = Raggio di Generazione:[lightgray] (blocchi)
-rules.respawns = Rigenerazioni per ondata max
-rules.limitedRespawns = Limite Rigenerazioni
+rules.unitammo = Units Require Ammo
 rules.title.waves = Ondate
-rules.title.respawns = Rigenerazioni
 rules.title.resourcesbuilding = Risorse e Costruzioni
-rules.title.player = Giocatori
 rules.title.enemy = Nemici
 rules.title.unit = Unità
 rules.title.experimental = Sperimentale
+rules.title.environment = Environment
 rules.lighting = Illuminazione
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Illuminazione\nAmbientale
-rules.solarpowermultiplier = Moltiplicatore Energia Solare
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Oggetti
 content.liquid.name = Liquidi
@@ -828,10 +878,11 @@ liquid.water.name = Acqua
 liquid.slag.name = Scoria
 liquid.oil.name = Petrolio
 liquid.cryofluid.name = Criofluido
-item.corestorable = [lightgray]Immagazzinabili nel Nucleo: {0}
+
 item.explosiveness = [lightgray]Esplosività: {0}
 item.flammability = [lightgray]Infiammabilità: {0}
 item.radioactivity = [lightgray]Radioattività: {0}
+
 unit.health = [lightgray]Salute: {0}
 unit.speed = [lightgray]Velocità: {0}
 unit.weapon = [lightgray]Armi: {0}
@@ -840,30 +891,67 @@ unit.minespeed = [lightgray]Velocità di Scavo: {0}%
 unit.minepower = [lightgray]Potenza di Scavo: {0}
 unit.ability = [lightgray]Abilità: {0}
 unit.buildspeed = [lightgray]Velocità di Costruzione: {0}%
+
 liquid.heatcapacity = [lightgray]Capacità Termica: {0}
 liquid.viscosity = [lightgray]Viscosità: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
 
+unit.dagger.name = Drone Pugnalatore
+unit.mace.name = Mace
+unit.fortress.name = Fortezza
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Strisciatore
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Scogliera
 block.sand-boulder.name = Masso di Sabbia
 block.grass.name = Erba
 block.slag.name = Scoria
 block.salt.name = Sale
-block.saltrocks.name = Rocce Salate
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Ciottoli
 block.tendrils.name = Viticci
-block.sandrocks.name = Rocce Sabbiose
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Pino di Spore
-block.sporerocks.name = Roccia di Spore
-block.rock.name = Masso
-block.snowrock.name = Masso Innevato
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Pino Innevato
 block.shale.name = Scisto
 block.shale-boulder.name = Masso di Scisto
 block.moss.name = Muschio
 block.shrubs.name = Arbusti
 block.spore-moss.name = Muschio di Spore
-block.shalerocks.name = Rocce di Scisto
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Muro di Rottami
 block.scrap-wall-large.name = Muro di Rottami Grande
 block.scrap-wall-huge.name = Muro di Rottami Enorme
@@ -891,13 +979,17 @@ block.craters.name = Crateri
 block.sand-water.name = Acqua Sabbiosa
 block.darksand-water.name = Acqua Sabbiosa Scura
 block.char.name = Carbone
-block.holostone.name = Pietra Holo
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Neve Ghiacciata
-block.rocks.name = Rocce
-block.icerocks.name = Rocce Ghiacciate
-block.snowrocks.name = Rocce Innevate
-block.dunerocks.name = Rocce delle Dune
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pino
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Albero Bianco Morto
 block.white-tree.name = Albero Morto
 block.spore-cluster.name = Agglomerato di Spore
@@ -913,10 +1005,9 @@ block.dark-panel-4.name = Pannello Scuro 4
 block.dark-panel-5.name = Pannello Scuro 5
 block.dark-panel-6.name = Pannello Scuro 6
 block.dark-metal.name = Metallo Scuro
-block.ignarock.name = Roccia Ignea
+block.basalt.name = Basalt
 block.hotrock.name = Roccia Bollente
 block.magmarock.name = Roccia Magmatica
-block.cliffs.name = Scogliere
 block.copper-wall.name = Muro di Rame
 block.copper-wall-large.name = Muro di Rame Grande 
 block.titanium-wall.name = Muro di Titanio
@@ -952,7 +1043,7 @@ block.underflow-gate.name = Separatore per Eccesso Inverso
 block.silicon-smelter.name = Fonderia
 block.phase-weaver.name = Tessitore di Fase
 block.pulverizer.name = Polverizzatore
-block.cryofluidmixer.name = Miscelatore di Liquidi
+block.cryofluid-mixer.name = Miscelatore di Liquidi
 block.melter.name = Fonditore
 block.incinerator.name = Inceneritore
 block.spore-press.name = Pressa di Spore
@@ -965,7 +1056,7 @@ block.diode.name = Diodo
 block.battery.name = Batteria
 block.battery-large.name = Batteria Grande
 block.combustion-generator.name = Generatore a Combustibile
-block.turbine-generator.name = Turbina a Vapore
+block.steam-generator.name = Turbina a Vapore
 block.differential-generator.name = Generatore Differenziale
 block.impact-reactor.name = Reattore ad Impatto
 block.mechanical-drill.name = Trivella Meccanica
@@ -995,17 +1086,6 @@ block.blast-mixer.name = Miscelatore d'Esplosivi
 block.solar-panel.name = Pannello Solare
 block.solar-panel-large.name = Pannello Solare Grande 
 block.oil-extractor.name = Estrattore di Petrolio
-block.command-center.name = Centro di Comando
-block.draug-factory.name = Fabbrica Droni Minatori
-block.spirit-factory.name = Fabbrica Droni Riparatori
-block.phantom-factory.name = Fabbrica Droni Fantasma
-block.wraith-factory.name = Fabbrica Combattenti Spettro
-block.ghoul-factory.name = Fabbrica Bombardieri Demoniaci
-block.dagger-factory.name = Fabbrica Droni Pugnalatori
-block.crawler-factory.name = Fabbrica Mech Strisciatore
-block.titan-factory.name = Fabbrica Mech Titano
-block.fortress-factory.name = Fabbrica Mech Fortezza
-block.revenant-factory.name = Fabbrica Combattenti Superstiti
 block.repair-point.name = Punto di Riparazione
 block.pulse-conduit.name = Condotto a Impulsi
 block.plated-conduit.name = Condotto Placcato
@@ -1037,6 +1117,29 @@ block.meltdown.name = Fusione
 block.container.name = Contenitore
 block.launch-pad.name = Ascensore Spaziale
 block.launch-pad-large.name = Ascensore Spaziale Avanzato
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = blu
 team.crux.name = rosso
 team.sharded.name = arancione
@@ -1044,21 +1147,7 @@ team.orange.name = arancione
 team.derelict.name = abbandonato
 team.green.name = verde
 team.purple.name = viola
-unit.spirit.name = Drone Spirito
-unit.draug.name = Drone Minatore
-unit.phantom.name = Drone Fantasma
-unit.dagger.name = Drone Pugnalatore
-unit.crawler.name = Strisciatore
-unit.titan.name = Titano
-unit.ghoul.name = Bombardiere Demoniaco
-unit.wraith.name = Combattente Spettro
-unit.fortress.name = Fortezza
-unit.revenant.name = Superstite
-unit.eruptor.name = Incandescente
-unit.chaos-array.name = Matrice del Caos
-unit.eradicator.name = Estirpatore
-unit.lich.name = Lich
-unit.reaper.name = Mietitore
+
 tutorial.next = [lightgray]<Clicca per continuare>
 tutorial.intro = Sei entrato nel[scarlet] Tutorial di Mindustry.[]\nUsa[accent] [[WASD][] per muoverti.\n[accent]Scorri[] per eseguire lo zoom.\nInizia[accent] minando il rame[]. Per farlo, posizionati sulla vena di rame vicina al tuo Nucleo e clicca su di essa.\n\n[accent]{0}/{1} rame
 tutorial.intro.mobile = Sei entrato nel[scarlet] Tutorial di Mindustry.[]\nScorri sullo schermo per muoverti.\n[accent]Avvicina due dita[] per eseguire lo zoom in/out.\nInizia [accent] scavando del rame[]. Clicca un minerale di rame vicino al tuo Nucleo per farlo.\n\n[accent]{0}/{1} rame
@@ -1101,17 +1190,7 @@ liquid.water.description = Il liquido più utile. Comunemente usato per il raffr
 liquid.slag.description = Diversi tipi di metalli fusi, mescolati insieme. Può essere separato nei suoi minerali costituenti o spruzzato sulle unità nemiche come un'arma.
 liquid.oil.description = Un liquido usato nella produzione avanzata.\nPuò essere convertito in carbone per uso combustibile o spruzzato ed incendiato come arma.
 liquid.cryofluid.description = Un liquido inerte e non corrosivo creato da acqua e titanio.\nÈ il liquido più efficiente per il raffreddamento.
-unit.draug.description = Un drone minerario primitivo. Economico da produrre. Sacrificabile. Scava automaticamente rame e piombo nelle vicinanze. Fornisce risorse estratte al Nucleo più vicino.
-unit.spirit.description = L'unità drone di partenza. Si genera nel Nucleo per impostazione predefinita. Scava automaticamente, raccoglie oggetti e ripara blocchi.
-unit.phantom.description = Un'unità drone avanzata. Segue i giocatori e gli aiuta nella costruzione delle strutture. Distrugge e ricostruisce i blocchi.
-unit.dagger.description = Un unità terrena base, molto più efficiente se in branco.
-unit.crawler.description = Un'unità di terra costituita da un telaio essenziale con potenti esplosivi legati sulla parte superiore. Non particolarmente resistente. Esplode a contatto con i nemici.
-unit.titan.description = Un'unità di terra corazzata avanzata equipaggiata con due piccoli lanciafiamme. Attacca sia bersagli terrestri che aerei.
-unit.fortress.description = Un'unità di terra di artiglieria pesante.
-unit.eruptor.description = Un mech pesante progettato per abbattere le strutture. Spara un flusso di scoria contro le fortificazioni nemiche, sciogliendole e dando fuoco a tutto.
-unit.wraith.description = Un'unità d'intercezione rapida ed efficiente.
-unit.ghoul.description = Un bombardiere pesante. Utilizza composti esplosivi o pirite come munizioni.
-unit.revenant.description = Un pesante lanciamissili volante.
+
 block.message.description = Memorizza un messaggio. Utilizzato per la comunicazione tra alleati.
 block.graphite-press.description = Comprime pezzi di carbone in fogli di grafite puri.
 block.multi-press.description = Una versione aggiornata della pressa per grafite. Impiega acqua ed energia per elaborare il carbone in modo rapido ed efficiente.
@@ -1120,7 +1199,7 @@ block.kiln.description = Fonde la sabbia ed il piombo in vetro metallico. Richie
 block.plastanium-compressor.description = Produce plastanio da petrolio e titanio.
 block.phase-weaver.description = Produce tessuto di fase da torio radioattivo ed elevate quantità di sabbia.
 block.alloy-smelter.description = Produce leghe di sovratensione da titanio, piombo, silicio e rame.
-block.cryofluidmixer.description = Combina acqua e titanio in criofluido che è molto più efficiente per il raffreddamento.
+block.cryofluid-mixer.description = Combina acqua e titanio in criofluido che è molto più efficiente per il raffreddamento.
 block.blast-mixer.description = Frantuma e mescola le spore con la pirite per produrre composto esplosivo.
 block.pyratite-mixer.description = Mescola carbone, piombo e sabbia in pirite altamente infiammabile.
 block.melter.description = Riscalda la pietra a temperature molto elevate per ottenere scoria liquida.
@@ -1186,7 +1265,7 @@ block.battery.description = Accumula energia ogni volta che c'è abbondanza e fo
 block.battery-large.description = Immagazzina molta più energia di una normale batteria.
 block.combustion-generator.description = Genera energia bruciando combustibile.
 block.thermal-generator.description = Genera una grande quantità di energia dalla lava.
-block.turbine-generator.description = Più efficiente di un generatore a combustione, ma richiede l'aggiunta di acqua.
+block.steam-generator.description = Più efficiente di un generatore a combustione, ma richiede l'aggiunta di acqua.
 block.differential-generator.description = Genera grandi quantità di energia. Utilizza la differenza di temperatura tra criofluido e pirite in combustione.
 block.rtg-generator.description = Un generatore che sfrutta il calore del decadimento di materiale radioattivo per produrre energia.\nNon richiede raffreddamento ma fornisce meno energia di un reattore al torio.
 block.solar-panel.description = Fornisce una piccola quantità di energia dal sole.
@@ -1222,15 +1301,5 @@ block.ripple.description = Una grande torretta di artiglieria che spara più col
 block.cyclone.description = Una grande torretta a fuoco rapido.
 block.spectre.description = Una grande torretta che spara due potenti proiettili contemporaneamente.
 block.meltdown.description = Una grande torretta che spara un potente laser a lungo raggio.
-block.command-center.description = Dà istruzioni alle unità alleate nella mappa. Comanda la ricongizione, l'attacco del Nucleo Nemico o la ritirata verso il proprio Nucleo o fabbrica.\nQuando non è presente un Nucleo Nemico, le unità pattuglieranno anche se viene ordinato un attacco.
-block.draug-factory.description = Produce droni per la raccolta mineraria.
-block.spirit-factory.description = Produce droni che riparano blocchi.
-block.phantom-factory.description = Produce droni avanzati che seguono il giocatore e lo assistono nella costruzione.
-block.wraith-factory.description = Produce unità intercettatrici veloci.
-block.ghoul-factory.description = Produce bombardieri pesanti.
-block.revenant-factory.description = Produce pesanti unità lanciamissili volanti.
-block.dagger-factory.description = Produce unità di base corpo a corpo di terra.
-block.crawler-factory.description = Produce unità di sciame veloci ed autodistruggenti.
-block.titan-factory.description = Produce unità terrestri avanzate e corazzate.
-block.fortress-factory.description = Produce unità di terra di artiglieria pesante.
 block.repair-point.description = Cura continuamente l'unità danneggiata più vicina.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index fb2537b0c0..fdb915ff96 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io でゲームをダウンロード
 link.google-play.description = Google Play ストアを開く
 link.f-droid.description = F-Droid を開く
 link.wiki.description = 公式 Mindustry Wiki
-link.feathub.description = 新機能を提案する
+link.suggestions.description = 新機能を提案する
 linkfail = リンクを開けませんでした!\nURLをクリップボードにコピーしました。
 screenshot = スクリーンショットを {0} に保存しました。
 screenshot.invalid = マップが広すぎます。スクリーンショットに必要なメモリが足りない可能性があります。
@@ -20,6 +20,8 @@ gameover = ゲームオーバー
 gameover.pvp = [accent] {0}[] チームの勝利!
 highscore = [accent]ハイスコアを更新!
 copied = コピーしました。
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = サウンド
 load.map = マップ
@@ -63,8 +65,7 @@ stat.delivered = 獲得した資源:
 stat.playtime = プレイ時間:[accent] {0}
 stat.rank = 最終ランク: [accent]{0}
 
-launcheditems = [accent]回収したアイテム
-launchinfo = [unlaunched][[発射] コアを発射すると青色で示されたアイテムを入手します。
+globalitems = [accent]Global Items
 map.delete = マップ "[accent]{0}[]" を削除してもよろしいですか?
 level.highscore = ハイスコア: [accent]{0}
 level.select = レベル選択
@@ -106,6 +107,7 @@ mods.guide = Mod作成ガイド
 mods.report = バグを報告する
 mods.openfolder = MODのフォルダを開く
 mods.reload = 再読み込み
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]有効
 mod.disabled = [scarlet]無効
@@ -113,6 +115,7 @@ mod.disable = 無効化
 mod.content = コンテンツ:
 mod.delete.error = MODを削除することができませんでした。
 mod.requiresversion = [scarlet]Modが要求する最低バージョン: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]依存関係がありません。: {0}
 mod.erroredcontent = [scarlet]コンテンツエラー
 mod.errors = コンテンツの読み込み中にエラーが発生しました。
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Modを有効にするには、この画面を開
 mod.import = Modをインポート
 mod.import.file = ファイルをインポート
 mod.import.github = GitHubからModをインポート
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = これは以下のModの一部です。[accent] '{0}'[] 削除するにはそのModを削除してください。
 mod.remove.confirm = このModを削除します。
 mod.author = [lightgray]著者:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = お使いのデバイスはScriptを使用したModをサ
 about.button = 情報
 name = 名前:
 noname = [accent]プレイヤー名[]を入力してください。
+planetmap = Planet Map
+launchcore = Launch Core
 filename = ファイル名:
 unlocked = 新しい要素をアンロック!
 completed = [accent]完了
@@ -142,6 +148,7 @@ techtree = テックツリー
 research.list = [lightgray]研究:
 research = 研究
 researched = [lightgray]{0} の研究が完了しました
+research.progress = {0}% complete
 players = {0} 人がオンライン
 players.single = {0} 人がオンライン
 players.search = 検索
@@ -224,7 +231,6 @@ save.new = 新規保存
 save.overwrite = このスロットに上書きしてもよろしいですか?
 overwrite = 上書き
 save.none = セーブデータが見つかりませんでした!
-saveload = 保存中...
 savefail = ゲームの保存に失敗しました!
 save.delete.confirm = このセーブデータを削除してよろしいですか?
 save.delete = 削除
@@ -339,6 +345,11 @@ waves.load = クリップボードから読み込む
 waves.invalid = クリップボードのウェーブは無効なウェーブです。
 waves.copied = ウェーブをコピーしました。
 waves.none = 敵が定義されていません。\n空のウェーブレイアウトはデフォルトのレイアウトに自動的に置き換えられます。
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<デフォルト>
 details = 詳細...
 edit = 編集...
@@ -458,10 +469,12 @@ locked = ロック
 complete = [lightgray]達成済み:
 requirement.wave = {1} でウェーブ {0} に到達
 requirement.core = {0} の敵のコアを破壊
-requirement.unlock = ロック解除 {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = 再開:\n[lightgray]{0}
 bestwave = [lightgray]最高ウェーブ: {0}
 launch = < 発射 >
+launch.text = Launch
 launch.title = 発射成功
 launch.next = [lightgray]次は ウェーブ {0} で発射可能です。
 launch.unable2 = [scarlet]発射できません。[]
@@ -469,13 +482,14 @@ launch.confirm = すべての資源をコアに搬入し、発射します。\n
 launch.skip.confirm = スキップすると、次の発射可能なウェーブまで発射できません。
 uncover = 開放
 configure = 積み荷の設定
+loadout = Loadout
+resources = Resources 
 bannedblocks = 禁止ブロック
 addall = すべて追加
-configure.locked = [lightgray]{0} を達成すると積み荷を設定できるようになります。
+launch.destination = Destination: {0}
 configure.invalid = 値は 0 から {0} の間でなければなりません。
 zone.unlocked = [lightgray]{0} がアンロックされました.
 zone.requirement.complete = ウェーブ {0} を達成:\n{1} の開放条件を達成しました。
-zone.config.unlocked = ロードアウトがアンロックされました。:[lightgray]\n{0}
 zone.resources = 発見した資源:
 zone.objective = [lightgray]目標: [accent]{0}
 zone.objective.survival = 敵からコアを守り切る
@@ -494,8 +508,21 @@ error.io = ネットワークエラーです。
 error.any = 不明なネットワークエラーです。
 error.bloom = ブルームの初期化に失敗しました。\n恐らくあなたのデバイスではブルームがサポートされていません。
 
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
+
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
 sector.groundZero.name = Ground Zero
-sector.desertWastes.name = Desert Wastes
 sector.craters.name = The Craters
 sector.frozenForest.name = Frozen Forest
 sector.ruinousShores.name = Ruinous Shores
@@ -506,12 +533,10 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+
 sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
-
 sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
-sector.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
 sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
-
 sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
 sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
 sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
@@ -520,11 +545,11 @@ sector.tarFields.description = The outskirts of an oil production zone, between
 sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
 sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
 sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
+
 settings.language = 言語
 settings.data = ゲームデータ
 settings.reset = デフォルトにリセット
 settings.rebind = 再設定
-
 settings.resetKey = リセット
 settings.controls = コントロール
 settings.game = ゲーム
@@ -533,9 +558,12 @@ settings.graphics = グラフィック
 settings.cleardata = データを削除...
 settings.clear.confirm = データを削除してもよろしいですか?\nこれを元に戻すことはできません!
 settings.clearall.confirm = [scarlet]警告![]\nこれはすべてのデータが削除されます。これにはセーブデータ、マップ、アンロック、キーバインドが含まれます。\n「ok」 を押すと、すべてのデータが削除され、自動的に終了します。
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< ポーズ >
 clear = 消去
 banned = [scarlet]使用禁止
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = はい
 no = いいえ
 info.title = 情報
@@ -557,8 +585,11 @@ blocks.itemsmoved = 輸送速度
 blocks.launchtime = 発射の待機時間
 blocks.shootrange = 範囲
 blocks.size = 大きさ
+blocks.displaysize = Display Size
 blocks.liquidcapacity = 液体容量
 blocks.powerrange = 電力範囲
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = 最大接続数
 blocks.poweruse = 電力使用量
 blocks.powerdamage = 電力/ダメージ
@@ -574,34 +605,40 @@ blocks.boosteffect = ブースト効果
 blocks.maxunits = 最大ユニット数
 blocks.health = 耐久値
 blocks.buildtime = 建設時間
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = 建設費用
 blocks.inaccuracy = 誤差
 blocks.shots = ショット
 blocks.reload = リロード速度
 blocks.ammo = 弾薬
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
+
 bar.drilltierreq = より高性能なドリルを使用してください
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = 採掘速度: {0}/秒
 bar.pumpspeed = ポンプの速度: {0}/s
 bar.efficiency = 効率: {0}%
-
 bar.powerbalance = 電力均衡: {0}/秒
 bar.powerstored = 総蓄電量: {0}/{1}
 bar.poweramount = 蓄電量: {0}
 bar.poweroutput = 発電量: {0}
 bar.items = アイテム: {0}
 bar.capacity = 容量: {0}
-bar.units = ユニット数: {0}/{1}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = 液体
 bar.heat = 熱
 bar.power = 電力
 bar.progress = 建設状況
 bar.input = 入力
 bar.output = 出力
+
 bullet.damage = [stat]{0}[lightgray] ダメージ
 bullet.splashdamage = [stat]{0}[lightgray] 範囲ダメージ 約[stat] {1}[lightgray] タイル
 bullet.incendiary = [stat]焼夷弾
 bullet.homing = [stat]追尾弾
-
 bullet.shock = [stat]電撃
 bullet.frag = [stat]爆発弾
 bullet.knockback = [stat]{0}[lightgray] ノックバック
@@ -609,21 +646,25 @@ bullet.freezing = [stat]凍結
 bullet.tarred = [stat]タール弾
 bullet.multiplier = [stat]弾薬 {0}[lightgray]倍
 bullet.reload = [stat]リロード速度 {0}[lightgray]倍
+
 unit.blocks = ブロック
 unit.powersecond = 電力/秒
 unit.liquidsecond = 液体/秒
 unit.itemssecond = アイテム/秒
-
 unit.liquidunits = 液体
 unit.powerunits = 電力
 unit.degrees = 度
 unit.seconds = 秒
+unit.minutes = mins
 unit.persecond = /秒
+unit.perminute = /min
 unit.timesspeed = 倍の速度
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = アイテム
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = 一般
 category.power = 電力
 category.liquids = 液体
@@ -638,6 +679,7 @@ setting.linear.name = リニアフィルター
 setting.hints.name = ヒント
 setting.flow.name = 資源流通量の表示
 setting.buildautopause.name = オートポーズビルディング
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = 流体のアニメーション
 setting.animatedshields.name = シールドのアニメーション
 setting.antialias.name = アンチエイリアス[lightgray] (再起動が必要)[]
@@ -662,7 +704,6 @@ setting.effects.name = 画面効果
 setting.destroyedblocks.name = 破壊されたブロックを表示
 setting.blockstatus.name = ブロックの状態を表示
 setting.conveyorpathfinding.name = コンベアー配置経路探索
-setting.coreselect.name = 設計図にコアを表示
 setting.sensitivity.name = 操作感度
 setting.saveinterval.name = 自動保存間隔
 setting.seconds = {0} 秒
@@ -671,10 +712,12 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = フルスクリーン
 setting.borderlesswindow.name = 境界の無いウィンドウ[lightgray] (再起動が必要になる場合があります)
 setting.fps.name = FPSを表示
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = ブロック選択キーを表示
 setting.vsync.name = 垂直同期
 setting.pixelate.name = ピクセル化[lightgray] (アニメーションが無効化されます)
 setting.minimap.name = ミニマップを表示
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = プレイヤーの位置表示
 setting.musicvol.name = 音楽 音量
 setting.atmosphere.name = 惑星の大気を表示
@@ -700,9 +743,11 @@ keybinds.mobile = [scarlet]モバイルでは多くのキーバインドが機
 category.general.name = 一般
 category.view.name = 表示
 category.multiplayer.name = マルチプレイ
+category.blocks.name = Block Select
 command.attack = 攻撃
 command.rally = 結集
 command.retreat = 後退
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]キー: [{0},
 keybind.respawn.name = リスポーン
 keybind.control.name = ユニットをコントロール
@@ -715,6 +760,7 @@ keybind.toggle_block_status.name = ブロックの状態表示の切り替え
 keybind.move_x.name = 左右移動
 keybind.move_y.name = 上下移動
 keybind.mouse_move.name = マウスを追う
+keybind.pan.name = Pan View
 keybind.boost.name = ブースト
 keybind.schematic_select.name = 地域の選択
 keybind.schematic_menu.name = 設計図メニュー
@@ -742,6 +788,9 @@ keybind.diagonal_placement.name = 斜め設置
 keybind.pick.name = ブロックの選択
 keybind.break_block.name = ブロックの破壊
 keybind.deselect.name = 選択解除
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = ショット
 keybind.zoom.name = ズーム
 keybind.menu.name = メニュー
@@ -770,19 +819,18 @@ mode.pvp.description = エリア内で他のプレイヤーと戦います。\n[
 mode.attack.name = アタック
 mode.attack.description = ウェーブがなく、敵の基地を破壊することを目指します。\n[gray]プレイするには、マップに赤色のコアが必要です。
 mode.custom = カスタムルール
+
 rules.infiniteresources = 資源の無限化
 rules.reactorexplosions = リアクターの爆発
 rules.wavetimer = ウェーブの自動進行
 rules.waves = ウェーブ
-
 rules.attack = アタックモード
+rules.buildai = AI Building
 rules.enemyCheat = 敵(赤チーム)の資源の無限化
-rules.unitdrops = ユニットの戦利品
+rules.blockhealthmultiplier = ブロックの体力倍率
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = ユニットの製造速度倍率
 rules.unithealthmultiplier = ユニットの体力倍率
-rules.blockhealthmultiplier = ブロックの体力倍率
-rules.playerhealthmultiplier = プレイヤーの体力倍率
-rules.playerdamagemultiplier = プレイヤーのダメージ倍率
 rules.unitdamagemultiplier = ユニットのダメージ倍率
 rules.enemycorebuildradius = 敵コア周辺の建設禁止区域の半径:[lightgray] (タイル)
 rules.wavespacing = ウェーブ間の待機時間:[lightgray] (秒)
@@ -791,21 +839,25 @@ rules.buildspeedmultiplier = 建設速度の倍率
 rules.deconstructrefundmultiplier = ブロック破壊時の還元倍率
 rules.waitForWaveToEnd = 敵が倒されるまでウェーブの進行を中断
 rules.dropzoneradius = 出現範囲の半径:[lightgray] (タイル)
+rules.unitammo = Units Require Ammo
 rules.title.waves = ウェーブ
-rules.title.respawns = 復活
 rules.title.resourcesbuilding = 資源 & 建設
-rules.title.player = プレイヤー
 rules.title.enemy = 敵
 rules.title.unit = ユニット
 rules.title.experimental = 実験的なゲームプレイ
+rules.title.environment = Environment
 rules.lighting = 霧
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = 霧の色
-rules.solarpowermultiplier = 太陽光効率
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
+
 content.item.name = アイテム
 content.liquid.name = 液体
 content.unit.name = ユニット
 content.block.name = ブロック
-
 item.copper.name = 銅
 item.lead.name = 鉛
 item.coal.name = 石炭
@@ -826,10 +878,11 @@ liquid.water.name = 水
 liquid.slag.name = スラグ
 liquid.oil.name = 石油
 liquid.cryofluid.name = 冷却水
-item.corestorable = [lightgray]コアに保存可能: {0}
+
 item.explosiveness = [lightgray]爆発性: {0}%
 item.flammability = [lightgray]可燃性: {0}%
 item.radioactivity = [lightgray]放射能: {0}%
+
 unit.health = [lightgray]耐久値: {0}
 unit.speed = [lightgray]速度: {0}
 unit.weapon = [lightgray]武器: {0}
@@ -838,30 +891,67 @@ unit.minespeed = [lightgray]採掘速度: {0}%
 unit.minepower = [lightgray]採掘性能: {0}
 unit.ability = [lightgray]能力: {0}
 unit.buildspeed = [lightgray]建築速度: {0}%
+
 liquid.heatcapacity = [lightgray]熱容量: {0}
 liquid.viscosity = [lightgray]粘度: {0}
 liquid.temperature = [lightgray]温度: {0}
+
+unit.dagger.name = ダガー
+unit.mace.name = Mace
+unit.fortress.name = フォートレス
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = クローラー
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = 崖
 block.sand-boulder.name = 巨大な礫
 block.grass.name = 草
 block.slag.name = スラグ
-
 block.salt.name = 岩塩氷河
-block.saltrocks.name = 岩塩
+block.salt-wall.name = Salt Wall
 block.pebbles.name = 小石
 block.tendrils.name = つる
-block.sandrocks.name = 砂岩
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = 胞子の松の木
-block.sporerocks.name = 胞子の岩
-block.rock.name = 岩
-block.snowrock.name = 雪の積もった岩
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = 松の木
 block.shale.name = 泥板岩
 block.shale-boulder.name = 泥板岩の丸石
 block.moss.name = コケ
 block.shrubs.name = 低木
 block.spore-moss.name = 胞子のコケ
-block.shalerocks.name = 泥板岩の岩
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = スクラップの壁
 block.scrap-wall-large.name = 大きなスクラップの壁
 block.scrap-wall-huge.name = とても大きなスクラップの壁
@@ -889,13 +979,17 @@ block.craters.name = クレーター
 block.sand-water.name = 濁った水
 block.darksand-water.name = 黒い砂で濁った水
 block.char.name = 焦げ跡
-block.holostone.name = ホロストーン
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = 雪氷
-block.rocks.name = 岩
-block.icerocks.name = 氷岩
-block.snowrocks.name = 雪の積もった岩
-block.dunerocks.name = 砂丘の岩
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = 松の木
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = 白い枯れた樹木
 block.white-tree.name = 白い樹木
 block.spore-cluster.name = 胞子の房
@@ -911,10 +1005,9 @@ block.dark-panel-4.name = ダークパネル 4
 block.dark-panel-5.name = ダークパネル 5
 block.dark-panel-6.name = ダークパネル 6
 block.dark-metal.name = ダークメタル
-block.ignarock.name = イグナロック
+block.basalt.name = Basalt
 block.hotrock.name = ホットロック
 block.magmarock.name = マグマの岩
-block.cliffs.name = 崖
 block.copper-wall.name = 銅の壁
 block.copper-wall-large.name = 巨大な銅の壁
 block.titanium-wall.name = チタンの壁
@@ -950,7 +1043,7 @@ block.underflow-gate.name = アンダーフローゲート
 block.silicon-smelter.name = シリコン溶鉱炉
 block.phase-weaver.name = フェーズ織機
 block.pulverizer.name = 粉砕機
-block.cryofluidmixer.name = 冷却ミキサー
+block.cryofluid-mixer.name = 冷却ミキサー
 block.melter.name = 融合機
 block.incinerator.name = 焼却炉
 block.spore-press.name = 胞子圧縮機
@@ -963,7 +1056,7 @@ block.diode.name = バッテリーダイオード
 block.battery.name = バッテリー
 block.battery-large.name = 大型バッテリー
 block.combustion-generator.name = 火力発電機
-block.turbine-generator.name = タービン発電機
+block.steam-generator.name = タービン発電機
 block.differential-generator.name = 差動発電機
 block.impact-reactor.name = インパクトリアクター
 block.mechanical-drill.name = 機械ドリル
@@ -993,7 +1086,6 @@ block.blast-mixer.name = 化合物ミキサー
 block.solar-panel.name = ソーラーパネル
 block.solar-panel-large.name = 大型ソーラーパネル
 block.oil-extractor.name = 石油抽出機
-block.command-center.name = 司令塔
 block.repair-point.name = 修復ポイント
 block.pulse-conduit.name = パルスパイプ
 block.plated-conduit.name = メッキパイプ
@@ -1025,6 +1117,29 @@ block.meltdown.name = メルトダウン
 block.container.name = コンテナー
 block.launch-pad.name = 発射台
 block.launch-pad-large.name = 大型発射台
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = ブルー
 team.crux.name = レッド
 team.sharded.name = オレンジ
@@ -1032,21 +1147,7 @@ team.orange.name = オレンジ
 team.derelict.name = 廃墟
 team.green.name = グリーン
 team.purple.name = パープル
-unit.spirit.name = スピリットドローン
-unit.draug.name = マイナードローン
-unit.phantom.name = ファントムドローン
-unit.dagger.name = ダガー
-unit.crawler.name = クローラー
-unit.titan.name = タイタン
-unit.ghoul.name = グールボンバー
-unit.wraith.name = レースファイター
-unit.fortress.name = フォートレス
-unit.revenant.name = レベナント
-unit.eruptor.name = ユーロター
-unit.chaos-array.name = ケアスアレー
-unit.eradicator.name = エラディケーター
-unit.lich.name = リッチ
-unit.reaper.name = リーパー
+
 tutorial.next = [lightgray]<タップして続ける>
 tutorial.intro = [scarlet]Mindustry チュートリアル[]へようこそ。\nまずは、コアの近くにある銅鉱石をタップして、[accent]銅を採掘[]してみましょう。\n\n[accent]銅: {0}/{1}
 tutorial.intro.mobile = [scarlet]Mindustry チュートリアル[]へようこそ。\n画面をスワイプで移動します。\n2本の指でつまんで拡大 · 縮小します。\nまずは、コアの近くにある銅鉱石をタップして、[accent]銅を採掘[]してみましょう。\n\n[accent]銅: {0}/{1}
@@ -1068,11 +1169,11 @@ tutorial.deposit = 機体にあるアイテムをドラッグアンドドロッ
 tutorial.waves = [lightgray]敵[]がやってきます。\n\n2ウェーブの間コアを守ってみましょう。[accent]クリック[]で弾を発射することができます。\nさらにドリルやデュオを設置しましょう。さらに銅を採掘しましょう。
 tutorial.waves.mobile = [lightgray]敵[]がやってきます。\n\n2ウェーブの間コアを守ってみましょう。あなたの機体は自動で敵を攻撃してくれます。\nさらにドリルやデュオを設置しましょう。さらに銅を採掘しましょう。
 tutorial.launch = 発射可能なウェーブに達すると、[accent]コアにある全ての資源を持って[]、マップから[accent]離脱する[]ことができます。\nこれらの資源は、新しい技術の研究に使用することができます。\n\n[accent]発射ボタンを押しましょう。
+
 item.copper.description = 便利な鉱石です。様々なブロックの材料として幅広く使われています。
 item.lead.description = 一般的で手軽な鉱石です。機械や液体輸送ブロックなどに使われます。
 item.metaglass.description = とても頑丈な強化ガラスです。液体の輸送やタンクとして幅広く使われています。
 item.graphite.description = 弾薬や絶縁体として利用されています。
-
 item.sand.description = 合金や融剤など広く使用されている一般的な材料です。
 item.coal.description = 一般的で有用な燃料です。
 item.titanium.description = 希少で非常に軽量な金属です。液体輸送やドリル、航空機などで使われます。
@@ -1089,17 +1190,7 @@ liquid.water.description = 機械の冷却や廃棄物の処理など幅広く
 liquid.slag.description = 様々な種類の鉱石が混ざり合っています。それぞれの鉱石に分類するか、噴射する武器として使用されます。
 liquid.oil.description = 高度な材料生産で使用される液体です。 燃料として石炭に変換したり、武器として噴霧して発火させることができます。
 liquid.cryofluid.description = 水とチタニウムから作られる不活性で非腐食性の液体です。 非常に高い熱容量を持っているため、冷却に使用されます。
-unit.draug.description = 基本的なマイニングドローンです。生産コストが低く、消耗品です。近くの銅と鉛を自動で採掘して、近くのコアへ輸送します。
-unit.spirit.description = 修理用のドローンユニットです。エリア内の破損したブロックを自動的に修復します。
-unit.phantom.description = 高度なドローンユニットです。プレイヤーに追従し、ブロックの建築を支援します。また、破壊されたブロックを再建築します。
-unit.dagger.description = 基本的な地上ユニットです。集団になると便利に使えます。
-unit.crawler.description = 自爆型の地上ユニットです。特に耐久性はなく、敵と接触すると爆発します。
-unit.titan.description = 高度な武装地上ユニットです。空と地上の両方の敵に攻撃を行います。2つの小型火炎放射器を装備しています。
-unit.fortress.description = 砲撃型の地上ユニットです。敵の建築物やユニットを長距離攻撃するための大砲を2つ装備しています。
-unit.eruptor.description = 建造物を破壊することに特化したユニットです。スラグの弾を発射し、建造物を溶かしたり、発火性の高い物質を燃やします。
-unit.wraith.description = 高速で突撃攻撃が可能な迎撃ユニットです。発電機を重点的に狙います。
-unit.ghoul.description = 重爆撃機です。敵のインフラを優先して破壊します。
-unit.revenant.description = 空中からミサイルを発射する重爆撃機です。
+
 block.message.description = メッセージを保存し、仲間間の通信に使用します。
 block.graphite-press.description = 石炭を圧縮し、黒鉛を生成します。
 block.multi-press.description = 黒鉛圧縮機のアップグレード版です。水と電力を使用して、より効率的に石炭を圧縮します。
@@ -1108,7 +1199,7 @@ block.kiln.description = 砂と鉛を溶かしてメタガラスを生成しま
 block.plastanium-compressor.description = オイルとチタンからプラスタニウムを製造します。
 block.phase-weaver.description = 放射性トリウムと多量の砂からフェーズファイバーを製造します。
 block.alloy-smelter.description = チタンや鉛、シリコン、銅からサージ合金を製造します。
-block.cryofluidmixer.description = 水とチタンから冷却に効率的な冷却水を製造します。
+block.cryofluid-mixer.description = 水とチタンから冷却に効率的な冷却水を製造します。
 block.blast-mixer.description = 可燃性のピラタイトを石油を使用してさらに爆発性化合物にします。
 block.pyratite-mixer.description = 石炭、鉛、砂から燃えやすいピラタイトを製造します。
 block.melter.description = 石を熱で溶かして溶岩を生成します。
@@ -1174,7 +1265,7 @@ block.battery.description = 余分な電力の充電して、貯めておくこ
 block.battery-large.description = 通常のバッテリーよりもたくさんの電力を溜めておくことができます。
 block.combustion-generator.description = 石油や可燃性の物質を燃やして発電します。
 block.thermal-generator.description = 溶岩から大量の電力を発電します。
-block.turbine-generator.description = 水を使って火力発電機より効率的に発電します。
+block.steam-generator.description = 水を使って火力発電機より効率的に発電します。
 block.differential-generator.description = 大量の電力を生成します。冷却水と燃焼したピラタイトの温度差を利用します。
 block.rtg-generator.description = トリウムリアクターよりも発電量は少ないですが、冷却を必要としない放射性同位体熱発電機(RTG)です。
 block.solar-panel.description = 太陽光から少量の電力を発電します。
@@ -1210,6 +1301,5 @@ block.ripple.description = 同時に複数ショットを発射する大型タ
 block.cyclone.description = 大型の連射型ターレットです。
 block.spectre.description = 一度に2発の強力な弾を放つ大型のターレットです。
 block.meltdown.description = 強力な長距離攻撃が可能な大型のターレットです。
-block.command-center.description = マップ全体のユニットに移動コマンドを発令します。\nユニットを巡回させたり、敵のコアを攻撃したり、自分のコアあるいは工場に撤退させたりします。敵のコアが存在しない場合、ユニットはデフォルトで攻撃状態の下で巡回します。
 block.repair-point.description = 近くの負傷したユニットを修復します。
-
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 51b3c033c0..87f3d00a1b 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -12,14 +12,16 @@ link.itch.io.description = PC 다운로드가 있는 itch.io 페이지
 link.google-play.description = Google Play 스토어 목록
 link.f-droid.description = F-Droid 카탈로그 목록
 link.wiki.description = 공식 Mindustry 위키
-link.feathub.description = 새로운 기능 제안
+link.suggestions.description = 새로운 기능 제안
 linkfail = 링크를 열지 못했습니다!\nURL이 클립보드에 복사되었습니다.
 screenshot = 스크린 샷이 {0} 에 저장되었습니다.
-screenshot.invalid = 맵이 너무 커서 스크린샷을 할 메모리가 부족할 수 있습니다.
+screenshot.invalid = 맵이 너무 커서 스크린샷에 사용될 메모리가 부족할 수 있습니다.
 gameover = 게임 오버
 gameover.pvp = [accent]{0}[] 팀이 승리했습니다!
 highscore = [accent]새로운 최고 점수!
 copied = 복사됨.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = 소리
 load.map = 맵
@@ -28,6 +30,7 @@ load.content = 컨텐츠
 load.system = 시스템
 load.mod = 모드
 load.scripts = 스크립트
+
 be.update = 새로운 Bleeding Edge 빌드 사용 가능:
 be.update.confirm = 지금 다운로드하고 다시 시작하시겠습니까?
 be.updating = 업데이트 중...
@@ -38,7 +41,7 @@ be.check = 업데이트 확인
 schematic = 설계도
 schematic.add = 설계도 저장하기
 schematics = 설계도들
-schematic.replace = 해당 이름의 설계도가 이미 존재합니다. 교체 하시겠습니까?
+schematic.replace = 해당 이름의 설계도가 이미 존재합니다. 교체하시겠습니까?
 schematic.exists = 해당 이름의 설계도가 이미 존재합니다.
 schematic.import = 설계도 가져오기...
 schematic.exportfile = 파일 내보내기
@@ -49,26 +52,26 @@ schematic.copy.import = 클립 보드에서 가져오기
 schematic.shareworkshop = 창작마당에 공유
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: 설계도 뒤집기
 schematic.saved = 설계도 저장됨.
-schematic.delete.confirm = 이 설계도는 완전히 삭제 될 것 입니다.
+schematic.delete.confirm = 이 설계도는 완전히 삭제될 것입니다.
 schematic.rename = 설계도 이름 바꾸기
 schematic.info = {0}x{1}, {2} 블록
-stat.wave = 패배 한 웨이브:[accent] {0}
+
+stat.wave = 패배한 웨이브:[accent] {0}
 stat.enemiesDestroyed = 파괴된 적:[accent] {0}
-stat.built = 건축 된 건물: [accent]{0}
-stat.destroyed = 건물 파괴됨: [accent]{0}
-stat.deconstructed = 건물 해체: [accent]{0}
+stat.built = 지어진 건물: [accent]{0}
+stat.destroyed = 파괴된 건물: [accent]{0}
+stat.deconstructed = 해체된 건물: [accent]{0}
 stat.delivered = 얻은 자원:
 stat.playtime = 플레이 시간: [accent] {0}
 stat.rank = 최종 순위: [accent]{0}
 
-launcheditems = [accent]보유 자원
-launchinfo = [출격되지 않음][[출격]파랑색으로 표시된 자원들을 얻습니다.
+globalitems = [accent]Global Items
 map.delete = 정말로 "[accent]{0}[]" 맵을 삭제하시겠습니까?
 level.highscore = 최고 점수: [accent]{0}
 level.select = 맵 선택
 level.mode = 게임 모드:
 coreattack = < 코어가 공격 받고 있습니다! >
-nearpoint = [[ [scarlet]낙하 지점 에서 나가세요[] ]\n적 낙하 시 낙하 지점 내 건물 및 유닛 파괴
+nearpoint = [[ [scarlet]낙하 지점에서 나가세요[] ]\n적 낙하 시 낙하 지점 내 건물 및 유닛 파괴
 database = 코어 데이터베이스
 savegame = 게임 저장
 loadgame = 게임 불러오기
@@ -95,6 +98,7 @@ uploadingpreviewfile = 미리 보기 파일 업로드 중
 committingchanges = 바뀐 점 적용
 done = 완료
 feature.unsupported = 기기가 이 기능을 지원하지 않습니다.
+
 mods.alphainfo = 현재 모드는 알파이며, [scarlet]버그가 많을 수 있습니다[].\n발견한 문제는 Mindustry Github 또는 Discord에 보고하세요.
 mods.alpha = [accent](알파)
 mods = 모드
@@ -111,7 +115,8 @@ mod.disable = 비활성화
 mod.content = 콘텐츠:
 mod.delete.error = 모드를 삭제할 수 없습니다. 파일이 사용 중일 수 있습니다.
 mod.requiresversion = [scarlet]필요한 최소 게임 버전: [accent]{0}
-mod.missingdependencies = [scarlet]누락된 종속성: {0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
+mod.missingdependencies = [scarlet]누락된 요구 모드: {0}
 mod.erroredcontent = [scarlet]콘텐츠 오류
 mod.errors = 콘텐츠를 로드하는 동안 오류가 발생함.
 mod.noerrorplay = [scarlet]오류가 있는 모드가 있습니다.[] 영향을 받는 모드를 비활성화 하거나 플레이 하기 전에 오류를 수정하세요.
@@ -122,17 +127,20 @@ mod.reloadrequired = [scarlet]재시작 필요
 mod.import = 모드 가져오기
 mod.import.file = 파일 가져오기
 mod.import.github = Github 에서 모드 가져오기
-mod.jarwarn = [scarlet]JAR 모드는 안전하지 않습니다.[]\n신뢰할 수 있는 소스에서 이 모드를 가져와야 합니다!
-mod.item.remove = 이 아이템은[accent] '{0}' 모드의 일부입니다. 이를 제거할려면 해당 모드를 제거하세요.
-mod.remove.confirm = 이 모드가 삭제 될 것입니다.
+mod.jarwarn = [scarlet]JAR 모드는 안전하지 않습니다.[]\n신뢰할 수 있는 소스에서 얻은 모드만을 사용해야 합니다!
+mod.item.remove = 이 자원은[accent] '{0}' 모드의 일부입니다. 이를 제거하려면 해당 모드를 제거하세요.
+mod.remove.confirm = 이 모드가 삭제될 것입니다.
 mod.author = [lightgray]제작자:[] {0}
-mod.missing = 이 저장 파일에는 최근에 업데이트 했거나 더이상 설치되지 않은 모드가 포함되어 있습니다. 저장 파일이 손상될 수 있습니다. 정말로 불러 오시겠습니까?\n[lighthray]모드들:\n{0}
+mod.missing = 이 저장 파일에는 최근에 업데이트되었거나 더 이상 설치되지 않은 모드가 포함되어 있습니다. 저장 파일이 손상될 수 있습니다. 정말로 불러 오시겠습니까?\n[lighthray]모드들:\n{0}
 mod.preview.missing = 창작마당에 모드를 업로드하기 전에 미리보기 이미지를 추가해야합니다.\n[accent]preview.png[] 라는 이름의 미리보기 이미지를 모드 폴더에 넣고 다시 시도하세요.
 mod.folder.missing = 창작마당에는 폴더 형태의 모드만 게시할 수 있습니다.\n모드를 폴더 형태로 바꾸려면 모드 파일을 모드 폴더에 압축을 풀고 이전 모드 파일을 삭제 후, 게임을 재시작하거나 모드를 다시 로드하십시오.
-mod.scripts.disable = 이 기기는 스크립트가 있는 모드를 지원하지 않습니다. 게임을 플레이 할려면 이 모드를 비활성화 해야 합니다.
+mod.scripts.disable = 이 기기는 스크립트가 있는 모드를 지원하지 않습니다. 게임을 플레이하려면 이 모드를 비활성화해야 합니다.
+
 about.button = 정보
 name = 이름:
 noname = 먼저 [accent]플레이어 이름[]을 설정하세요.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = 파일 이름:
 unlocked = 새로운 콘텐츠가 해금되었습니다!
 completed = [accent]완료됨
@@ -140,6 +148,7 @@ techtree = 연구 기록
 research.list = [lightgray]연구:
 research = 연구
 researched = [lightgray]{0} 연구 완료.
+research.progress = {0}% complete
 players = {0} 플레이어들
 players.single = {0} 플레이어
 players.search = 검색
@@ -149,7 +158,7 @@ server.kicked.kick = 서버에서 추방되었습니다!
 server.kicked.whitelist = 당신은 이 서버의 화이트리스트에 등록되어 있지 않습니다.
 server.kicked.serverClose = 서버 닫힘.
 server.kicked.vote = 당신은 투표로 추방되었습니다. 안녕히 계십시오.
-server.kicked.clientOutdated = 구버전 클라이언트 입니다! 게임을 업데이트하세요!
+server.kicked.clientOutdated = 구버전 클라이언트입니다! 게임을 업데이트하세요!
 server.kicked.serverOutdated = 구버전 서버입니다! 호스트에게 업데이트를 요청하세요!
 server.kicked.banned = 당신은 이 서버에서 차단되었습니다.
 server.kicked.typeMismatch = 이 서버는 현재 빌드 유형과 호환되지 않습니다.
@@ -162,13 +171,13 @@ server.kicked.customClient = 이 서버는 사용자 정의 빌드를 지원하
 server.kicked.gameover = 게임 오버!
 server.kicked.serverRestarting = 서버가 다시 시작되고 있습니다.
 server.versions = 당신의 버전: [accent] {0}[]\n서버 버전:[accent] {1}[]
-host.info = [accent]호스트[] 버튼은 포트[scarlet] 6567[]에서 호스팅합니다.\n같은 [lightgray]Wi-Fi 또는 LAN[]에 있는 모든 사용자들이 자신의 서버 목록에서 서버를 볼 수 있어야 합니다.\n\n사람들이 IP를 통해 어디서나 접속할 수 있게 할려면 [accent]포트 포워딩[]이 필요합니다.\n\n참고: 누군가 LAN 게임에 연결하는데 문제가 있는 경우 방화벽 설정에서 Mindustry 가 LAN에 액세스 할 수 있도록 허용했는지 확인하세요. 공용 네트워크는 가끔씩 서버 검색을 허용하지 않습니다.
-join.info = 여기에 연결할 [accent]서버 IP[]를 입력하거나 [accent]LAN[] 또는 [accent]글로벌[] 서버를 검색할 수 있습니다.\nLAN 및 WAN 멀티 플레이어 모두 지원됩니다.\n\n[lightgray]IP로 서버에 연결할려면 호스트에게 IP를 요청해야 합니다. 호스트 쪽의 장치에서 구글에 "내 IP" 라고 검색하면 쉽게 찾을 수 있습니다.
+host.info = [accent]호스트[] 버튼은 포트[scarlet] 6567[]에서 호스팅합니다.\n같은 [lightgray]Wi-Fi 또는 LAN[]에 있는 모든 사용자들이 자신의 서버 목록에서 서버를 볼 수 있어야 합니다.\n\n사람들이 IP를 통해 어디서나 접속할 수 있게 하려면 [accent]포트 포워딩[]이 필요합니다.\n\n참고: 누군가 LAN 게임에 연결하는 데 문제가 있는 경우 방화벽 설정에서 Mindustry가 LAN에 액세스 할 수 있도록 허용했는지 확인하세요. 공용 네트워크는 가끔씩 서버 검색을 허용하지 않습니다.
+join.info = 여기에 연결할 [accent]서버 IP[]를 입력하거나 [accent]LAN[] 또는 [accent]글로벌[] 서버를 검색할 수 있습니다.\nLAN 및 WAN 멀티 플레이어 모두 지원됩니다.\n\n[lightgray]IP로 서버에 연결하려면 호스트에게 IP를 요청해야 합니다. 호스트 쪽의 장치에서 구글에 "내 IP" 라고 검색하면 쉽게 찾을 수 있습니다.
 hostserver = 멀티플레이 서버 호스트
 invitefriends = 친구 초대
 hostserver.mobile = 서버\n열기
 host = 서버 열기
-hosting = [accent]서버 여는중...
+hosting = [accent]서버 여는 중...
 hosts.refresh = 새로고침
 hosts.discovering = LAN 게임 찾는중
 hosts.discovering.any = 서버 찾는중
@@ -186,7 +195,7 @@ trace.ip = IP: [accent]{0}
 trace.id = 고유 ID: [accent]{0}
 trace.mobile = 모바일 클라이언트: [accent]{0}
 trace.modclient = 사용자 지정 클라이언트: [accent]{0}
-invalidid = 잘못된 클라이언트 ID 입니다! 버그 보고서를 보내주세요.
+invalidid = 잘못된 클라이언트 ID입니다! 버그 보고서를 보내주세요.
 server.bans = 차단 목록
 server.bans.none = 차단된 플레이어를 찾을 수 없습니다!
 server.admins = 관리자들
@@ -220,7 +229,7 @@ server.invalidport = 잘못된 포트 번호입니다!
 server.error = [scarlet]서버 호스팅 오류.
 save.new = 새로 저장
 save.overwrite = 저장된 슬롯을 덮어 쓰시겠습니까?
-overwrite = 덮어 쓰기
+overwrite = 덮어쓰기
 save.none = 저장된 파일을 찾을 수 없습니다!
 savefail = 게임을 저장하지 못했습니다!
 save.delete.confirm = 이 저장을 삭제 하시겠습니까?
@@ -236,7 +245,7 @@ save.rename.text = 새 이름:
 selectslot = 저장슬롯을 선택하십시오.
 slot = [accent]슬롯 {0}
 editmessage = 메세지 편집
-save.corrupted = [accent]저장 파일이 손상되었거나 잘못된 파일입니다!
+save.corrupted = [accent]손상되었거나 잘못된 저장 파일입니다!
 empty = <비어있음>
 on = 활성화
 off = 비활성화
@@ -246,7 +255,7 @@ save.wave = {0} 웨이브
 save.mode = 게임모드: {0}
 save.date = 마지막 저장일: {0}
 save.playtime = 플레이 시간: {0}
-warning = 경고.
+warning = 경고
 confirm = 확인
 delete = 삭제
 view.workshop = 창작마당에서 보기
@@ -265,11 +274,11 @@ data.exported = 데이터를 내보냈습니다.
 data.invalid = 유효한 게임 데이터가 아닙니다.
 data.import.confirm = 외부 데이터를 가져오면 현재 게임 데이터를 [scarlet]모두[] 덮어쓰게 됩니다.\n[accent]이 작업은 취소할 수 없습니다![]\n\n데이터를 가져오면 게임이 즉시 종료됩니다.
 quit.confirm = 정말로 종료 하시겠습니까?
-quit.confirm.tutorial = 튜토리얼을 종료하시겠습니까?\n튜토리얼은[accent]설정->게임->튜토리얼[]에서 다시 해보실 수 있습니다.
+quit.confirm.tutorial = 튜토리얼을 종료하시겠습니까?\n튜토리얼은[accent]설정->게임->튜토리얼[]에서 다시 하실 수 있습니다.
 loading = [accent]불러오는중...
 reloading = [accent]모드 새로고침하는중...
 saving = [accent]저장중...
-respawn=코어에서 부활까지 [accent][[{0}][]초 남음.
+respawn = 코어에서 부활까지 [accent][[{0}][]초 남음.
 cancelbuilding = [accent][[{0}][] 를 눌러 계획 초기화
 selectschematic = [accent][[{0}][] 를 눌러 선택+복사
 pausebuilding = [accent][[{0}][] 를 눌러 건설 일시중지
@@ -278,7 +287,7 @@ wave = [accent]{0} 웨이브
 wave.waiting = 다음 웨이브까지[lightgray] {0}초
 wave.waveInProgress = [lightgray]웨이브 진행중
 waiting = [lightgray]대기중...
-waiting.players = 다른 플레이어들을 기다리는 중...
+waiting.players = 상대 플레이어를 기다리는 중...
 wave.enemies = [lightgray]적 유닛 {0}명 남음
 wave.enemy = [lightgray]{0}명 남음
 loadimage = 사진 불러오기
@@ -289,12 +298,12 @@ builtin = 내장
 map.delete.confirm = 정말로 이 맵을 삭제하시겠습니까? 이 명령은 취소할 수 없습니다!
 map.random = [accent]무작위 맵
 map.nospawn = 이 맵에 플레이어가 스폰 할 코어가 없습니다! 편집기에서 [accent]orange[] 코어를 맵에 추가하세요.
-map.nospawn.pvp = 이 맵에는 플레이어가 스폰할 적 코어가 없습니다! 편집기에서 [royal]orange 팀이 아닌[] 코어를 추가하세요.
+map.nospawn.pvp = 이 맵에는 적 플레이어가 스폰할 코어가 없습니다! 편집기에서 [royal]orange 팀이 아닌[] 코어를 추가하세요.
 map.nospawn.attack = 이 맵에는 플레이어가 공격할 수 있는 적의 코어가 없습니다! 에디터에서 [royal]빨간색[] 코어들을 맵에 추가하세요.
-map.invalid = 맵 로드중 오류: 맵 파일이 손상되었거나 잘못된 파일입니다.
+map.invalid = 맵 로드 오류: 맵 파일이 손상되었거나 잘못된 파일입니다.
 workshop.update = 아이템 업데이트
 workshop.error = 창작마당 세부 사항을 가져오는 중 오류가 발생했습니다: {0}
-map.publish.confirm = 이 지도를 게시 하시겠습니까?\n\n[lightgray]창작마당 EULA에 먼저 동의해야 하며, 그렇지 않으면 맵이 표시되지 않습니다!
+map.publish.confirm = 이 맵을 게시하시겠습니까?\n\n[lightgray]창작마당 EULA에 먼저 동의해야 하며, 그렇지 않으면 맵이 표시되지 않습니다!
 workshop.menu = 이 아이템으로 수행 할 작업을 선택하십시오.
 workshop.info = 아이템 정보
 changelog = 변경점 (선택 사항) :
@@ -312,7 +321,7 @@ editor.oregen.info = 광물 무작위 생성:
 editor.mapinfo = 맵 정보
 editor.author = 제작자:
 editor.description = 설명:
-editor.nodescription = 맵을 업로드하려면 최소 4자 이상의 설명이 있어야합니다.
+editor.nodescription = 맵을 업로드하려면 최소 4자 이상의 설명이 있어야 합니다.
 editor.waves = 웨이브:
 editor.rules = 규칙:
 editor.generation = 생성:
@@ -326,7 +335,7 @@ waves.never = 여기까지 유닛생성
 waves.every = 매
 waves.waves = 웨이브마다
 waves.perspawn = 생성
-waves.shields=보호막/웨이브
+waves.shields = 보호막/웨이브
 waves.to = 부터
 waves.guardian = 보호자
 waves.preview = 미리보기
@@ -336,6 +345,11 @@ waves.load = 클립보드에서 불러오기
 waves.invalid = 클립보드에 잘못된 웨이브 데이터가 있습니다.
 waves.copied = 웨이브 복사됨
 waves.none = 적 웨이브가 설정되지 않았습니다.\n비어있을 시 자동으로 기본 적 웨이브로 설정됩니다.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<기본값>
 details = 설명
 edit = 편집
@@ -347,9 +361,9 @@ editor.errorload = 파일을 불러오지 못했습니다.
 editor.errorsave = 파일을 저장하지 못했습니다.
 editor.errorimage = 이것은 맵이 아니라 사진입니다.\n\n3.5/build 40 맵을 가져올려면 편집기에서 '예전 맵 가져오기' 버튼을 사용하세요.
 editor.errorlegacy = 이 맵은 너무 오래되어 더 이상 지원되지 않는 구형 맵 형식을 사용합니다.
-editor.errornot = 이건 맵 파일이 아닙니다.
+editor.errornot = 맵 파일이 아닙니다.
 editor.errorheader = 이 맵 파일은 유효하지 않거나 손상되었습니다.
-editor.errorname = 맵에 이름이 지정되어 있지 않습니다. 저장 파일을 불러올려고 합니까?
+editor.errorname = 맵에 이름이 지정되어 있지 않습니다. 저장 파일을 불러오려 합니까?
 editor.update = 업데이트
 editor.randomize = 무작위
 editor.apply = 적용
@@ -384,7 +398,7 @@ editor.exists = 이 이름의 맵이 이미 존재합니다.
 editor.selectmap = 불러올 맵을 선택하세요:
 
 toolmode.replace = 재배치
-toolmode.replace.description = 단단한 블록에만 그립니다
+toolmode.replace.description = 단단한 블록에만 그립니다.
 toolmode.replaceall = 모두 재배치
 toolmode.replaceall.description = 맵에 있는 모든 블록을 재배치합니다.
 toolmode.orthogonal = 직각
@@ -397,6 +411,7 @@ toolmode.fillteams = 팀 채우기
 toolmode.fillteams.description = 블록 대신 팀 건물로 채웁니다.
 toolmode.drawteams = 팀 색상으로 그리기
 toolmode.drawteams.description = 블록 대신 팀 건물을 배치합니다.
+
 filters.empty = [lightgray]필터가 없습니다! 아래 버튼을 눌러 하나를 추가하세요.
 filter.distort = 왜곡
 filter.noise = 노이즈
@@ -441,42 +456,47 @@ load = 불러오기
 save = 저장
 fps = FPS: {0}
 ping = Ping: {0}ms
-language.restart = 언어를 설정을 적용할려면 게임을 다시 시작하세요.
+language.restart = 언어 설정을 적용하려면 게임을 다시 시작하세요.
 settings = 설정
 tutorial = 튜토리얼
 tutorial.retake = 튜토리얼 다시 시작
 editor = 편집기
 mapeditor = 맵 편집기
+
 abandon = 포기
 abandon.text = 이 지역과 모든 자원이 적에게 넘어갑니다.
 locked = 잠김
 complete = [lightgray]해금 조건 :
 requirement.wave = {1}지역에서 {0}웨이브 달성
 requirement.core = {0}지역에서 적 코어를 파괴
-requirement.unlock = {0}지역 해금
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = 지역 재개:\n[lightgray]{0}
 bestwave = [lightgray]최고 웨이브: {0}
 launch = < 출격 >
+launch.text = Launch
 launch.title = 출격 성공
 launch.next = [lightgray]다음 출격 기회는 {0} 웨이브에서 나타납니다.
 launch.unable2 = [scarlet]출격할 수 없습니다.[]
 launch.confirm = 이것은 당신의 코어에 있는 모든 자원을 출격 시킬 것입니다.\n당신은 이 기지로 다시 돌아올 수 없을 것입니다.
-launch.skip.confirm = 지금 건너뛰면 다음 출격 웨이브가 끝날 때 까지 출격할 수 없습니다.
+launch.skip.confirm = 지금 건너뛰면 다음 출격 웨이브가 끝날 때까지 출격할 수 없습니다.
 uncover = 지역 개방
 configure = 로드아웃 설정
+loadout = Loadout
+resources = Resources 
 bannedblocks = 금지된 블록들
 addall = 모두 추가
-configure.locked = [lightgray]로드아웃 구성 잠금 해제: {0}.
+launch.destination = Destination: {0}
 configure.invalid = 해당 값은 0에서 {0} 사이의 숫자여야 합니다.
 zone.unlocked = [lightgray]{0} 해금됨.
 zone.requirement.complete = {0}에 대한 요구 사항 충족:[lightgray]\n{1}
-zone.config.unlocked = 로드아웃 해금: [lightgray]\n{0}
 zone.resources = [lightgray]감지된 자원:
 zone.objective = [lightgray]목표: [accent]{0}
 zone.objective.survival = 생존
 zone.objective.attack = 적 코어 파괴
 add = 추가...
 boss.health = 보스 체력
+
 connectfail = [scarlet]연결 오류:\n\n[accent]{0}
 error.unreachable = 서버에 연결하지 못했습니다.\n서버 주소가 정확히 입력되었나요?
 error.invalidaddress = 잘못된 주소입니다.
@@ -487,28 +507,44 @@ error.mapnotfound = 맵 파일을 찾을 수 없습니다!
 error.io = 네트워크 I/O 오류.
 error.any = 알 수 없는 네트워크 오류.
 error.bloom = 블룸 그래픽 효과를 적용하지 못했습니다.\n당신의 기기가 이 기능을 지원하지 않는 것일 수도 있습니다.
-sector.groundZero.name=전초기지
-sector.craters.name=크레이터
-sector.frozenForest.name=얼어붙은 숲
-sector.ruinousShores.name=폐허
-sector.stainedMountains.name=얼룩진 산맥
-sector.desolateRift.name=황폐한 협곡
-sector.nuclearComplex.name=핵 생산 단지
-sector.overgrowth.name=과성장 지대
-sector.tarFields.name=타르 벌판
-sector.saltFlats.name=소금 사막
-sector.fungalPass.name=포자 지대
-sector.groundZero.description=이 장소는 다시 시작하기에 최적의 환경을 지닌 장소입니다. 적의 위협 수준이 낮으며, 자원이 거의 없습니다.\n가능 한 많은 양의 구리와 납을 수집하세요.\n이동 합시다.
-sector.frozenForest.description=이곳에서도, 산에 가까운 곳에 포자가 퍼졌습니다. 추운 온도에서도 포자들을 막을 수 없을 것 같습니다.\n화력 발전기를 건설하고, 멘더를 사용하는 방법을 배우세요.
-sector.saltFlats.description=이 소금 사막은 매우 척박하여 자원이 거의 없습니다.\n하지만 자원이 희소한 이곳에서도 적들의 요새가 발견되었습니다. 그들을 사막의 모래로 만들어버리십시오.
-sector.craters.description=물이 가득한 이 크레이터에는 옛 전쟁의 유물들이 쌓여있습니다.\n이곳을 다시 점령해 금속유리를 제작하고 물을 끌어올려 포탑과 드릴에 공급하여 더 좋은 효율로 방어선을 강화하십시오.
-sector.ruinousShores.description=이 지역은 과거 해안방어기지로 사용되었습니다.\n그러나 지금은 기본구조물만 남아있으니 이 지역을 어서 신속히 수리하여 외부로 세력을 확장한 뒤, 잃어버린 기술을 다시 회수하십시오.
-sector.stainedMountains.description=더 안쪽에는 포자에 오염된 산맥이 있지만, 이 곳은 포자에 오염되지 않았습니다.\n이 지역에서 티타늄을 채굴하고 이것을 어떻게 사용하는지 배우십시오.\n\n적들은 이곳에서 더 강력합니다. 더 강한 유닛들이 나올 때까지 시간을 낭비하지 마십시오.
-sector.overgrowth.description=이 곳은 포자들의 근원과 가까이에 있는 과성장 지대입니다. 적이 이 곳에 전초기지를 설립했습니다. 디거를 생산해 적의 코어를 박살 내고 우리가 잃어버린 것들을 되돌려받으십시오!
-sector.tarFields.description=산지와 사막 사이에 위치한 석유 생산지의 외곽 지역이며, 사용 가능한 타르가 매장되어 있는 희귀한 지역 중 하나입니다. 버려진 지역이지만 이곳에는 위험한 적군들이 있습니다. 그들을 과소평가하지 마십시오.\n\n[lightgray]석유 생산기술을 익히는 것이 도움이 될 것입니다.
-sector.desolateRift.description=극도로 위험한 지역입니다. 자원은 풍부하지만 사용 가능한 공간은 거의 없습니다. 코어 파괴의 위험성이 높으니 가능한 빨리 떠나십시오. 또한 적의 공격 딜레이가 길다고 안심하지 마십시오.
-sector.nuclearComplex.description=과거 토륨의 생산, 연구와 처리를 위해 운영되었던 시설입니다. 지금은 그저 폐허로 전락했으며, 다수의 적이 배치되어 있는 지역입니다. 그들은 끊임없이 당신을 공격할 것입니다.\n\n[lightgray]토륨의 다양한 사용법을 연구하고 익히십시오.
-sector.fungalPass.description=높은 산과 낮은 땅 사이의 전환 지역. 작은 적 정찰 기지가 여기에 있습니다.\n그것들을 파괴하세요.\n대거와 크롤러 유닛을 사용하여 두개의 코어를 파괴하세요.
+
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
+
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = 전초기지
+sector.craters.name = 크레이터
+sector.frozenForest.name = 얼어붙은 숲
+sector.ruinousShores.name = 폐허
+sector.stainedMountains.name = 얼룩진 산맥
+sector.desolateRift.name = 황폐한 협곡
+sector.nuclearComplex.name = 핵 생산 단지
+sector.overgrowth.name = 과성장 지대
+sector.tarFields.name = 타르 벌판
+sector.saltFlats.name = 소금 사막
+sector.fungalPass.name = 포자 지대
+
+sector.groundZero.description = 이 장소는 다시 시작하기에 최적의 환경을 지닌 장소입니다. 적의 위협 수준이 낮으며, 자원이 거의 없습니다.\n가능 한 많은 양의 구리와 납을 수집하세요.\n이동 합시다.
+sector.frozenForest.description = 이곳에서도, 산에 가까운 곳에 포자가 퍼졌습니다. 추운 온도에서도 포자들을 막을 수 없을 것 같습니다.\n화력 발전기를 건설하고, 멘더를 사용하는 방법을 배우세요.
+sector.saltFlats.description = 이 소금 사막은 매우 척박하여 자원이 거의 없습니다.\n하지만 자원이 희소한 이곳에서도 적들의 요새가 발견되었습니다. 그들을 사막의 모래로 만들어버리십시오.
+sector.craters.description = 물이 가득한 이 크레이터에는 옛 전쟁의 유물들이 쌓여있습니다.\n이곳을 다시 점령해 강화 유리를 제작하고 물을 끌어올려 포탑과 드릴에 공급하여 더 좋은 효율로 방어선을 강화하십시오.
+sector.ruinousShores.description = 이 지역은 과거 해안방어기지로 사용되었습니다.\n그러나 지금은 기본구조물만 남아있으니 이 지역을 어서 신속히 수리하여 외부로 세력을 확장한 뒤, 잃어버린 기술을 다시 회수하십시오.
+sector.stainedMountains.description = 더 안쪽에는 포자에 오염된 산맥이 있지만, 이 곳은 포자에 오염되지 않았습니다.\n이 지역에서 티타늄을 채굴하고 이것을 어떻게 사용하는지 배우십시오.\n\n적들은 이곳에서 더 강력합니다. 더 강한 유닛들이 나올 때까지 시간을 낭비하지 마십시오.
+sector.overgrowth.description = 이 곳은 포자들의 근원과 가까이에 있는 과성장 지대입니다. 적이 이 곳에 전초기지를 설립했습니다. 디거를 생산해 적의 코어를 박살 내고 우리가 잃어버린 것들을 되돌려받으십시오!
+sector.tarFields.description = 산지와 사막 사이에 위치한 석유 생산지의 외곽 지역이며, 사용 가능한 타르가 매장되어 있는 희귀한 지역 중 하나입니다. 버려진 지역이지만 이곳에는 위험한 적군들이 있습니다. 그들을 과소평가하지 마십시오.\n\n[lightgray]석유 생산기술을 익히는 것이 도움이 될 것입니다.
+sector.desolateRift.description = 극도로 위험한 지역입니다. 자원은 풍부하지만 사용 가능한 공간은 거의 없습니다. 코어 파괴의 위험성이 높으니 가능한 빨리 떠나십시오. 또한 적의 공격 딜레이가 길다고 안심하지 마십시오.
+sector.nuclearComplex.description = 과거 토륨의 생산, 연구와 처리를 위해 운영되었던 시설입니다. 지금은 그저 폐허로 전락했으며, 다수의 적이 배치되어 있는 지역입니다. 그들은 끊임없이 당신을 공격할 것입니다.\n\n[lightgray]토륨의 다양한 사용법을 연구하고 익히십시오.
+sector.fungalPass.description = 높은 산과 낮은 땅 사이의 전환 지역. 작은 적 정찰 기지가 여기에 있습니다.\n그것들을 파괴하세요.\n대거와 크롤러 유닛을 사용하여 두개의 코어를 파괴하세요.
 
 settings.language = 언어
 settings.data = 게임 데이터
@@ -522,16 +558,18 @@ settings.graphics = 그래픽
 settings.cleardata = 게임 데이터 초기화...
 settings.clear.confirm = 정말로 이 데이터를 지우시겠습니까?\n완료된 작업은 취소할 수 없습니다!
 settings.clearall.confirm = [scarlet]경고![]\n이 작업은 저장된 맵, 맵파일, 잠금 해제된 목록과 키 매핑, 그리고 모든 데이터를 삭제합니다.\n확인 버튼을 다시 눌러 모든 데이터를 삭제하고 게임에서 나갑니다.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< 일시정지 >
 clear = 초기화
 banned = [scarlet]차단됨
-unplaceable.sectorcaptured=[scarlet]점령된 구역이 필요합니다
+unplaceable.sectorcaptured = [scarlet]점령된 구역이 필요합니다
 yes = 예
 no = 아니오
 info.title = 정보
 error.title = [scarlet]오류가 발생했습니다.
 error.crashtitle = 오류가 발생했습니다
-unit.nobuild = [scarlet]유닛을 만들 수 없습니다
+unit.nobuild = [scarlet]이 유닛은 건설할 수 없습니다.
 blocks.input = 입력
 blocks.output = 출력
 blocks.booster = 가속
@@ -544,11 +582,14 @@ blocks.damage = 공격력
 blocks.targetsair = 공중 공격
 blocks.targetsground = 지상 공격
 blocks.itemsmoved = 이동 속도
-blocks.launchtime = 출격 사이의 시간
+blocks.launchtime = 출격 간격
 blocks.shootrange = 사거리
 blocks.size = 크기
+blocks.displaysize = Display Size
 blocks.liquidcapacity = 액체 용량
 blocks.powerrange = 전력 범위
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = 최대 연결 수
 blocks.poweruse = 전력 사용
 blocks.powerdamage = 전력/데미지
@@ -564,13 +605,16 @@ blocks.boosteffect = 가속 효과
 blocks.maxunits = 최대 활성 유닛수
 blocks.health = 체력
 blocks.buildtime = 건설 시간
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = 건설 재료
 blocks.inaccuracy = 오차각
 blocks.shots = 공격 속도
 blocks.reload = 발/초
 blocks.ammo = 탄약
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
-bar.drilltierreq = 더 좋은 드릴이 요구됨
+bar.drilltierreq = 더 좋은 드릴이 필요
 bar.noresources = 자원 부족
 bar.corereq = 코어 기지 필요
 bar.drillspeed = 드릴 속도: {0}/s
@@ -582,20 +626,22 @@ bar.poweramount = 전력: {0}
 bar.poweroutput = 전력 출력: {0}
 bar.items = 자원량: {0}
 bar.capacity = 용량: {0}
-bar.units = 유닛: {0}/{1}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[장비를 정지합니다]
 bar.liquid = 액체
 bar.heat = 발열
 bar.power = 전력
 bar.progress = 생산 진행도
 bar.input = 입력
 bar.output = 출력
+
 bullet.damage = [stat]{0}[lightgray] 피해
 bullet.splashdamage = [stat]{0}[lightgray] 범위 공격 ~[stat] {1}[lightgray] 타일
 bullet.incendiary = [stat]방화
 bullet.homing = [stat]유도
 bullet.shock = [stat]전격
 bullet.frag = [stat]파편
-bullet.knockback = [stat]{0}[lightgray] 충격
+bullet.knockback = [stat]{0}[lightgray] 밀침
 bullet.freezing = [stat]빙결
 bullet.tarred = [stat]타르
 bullet.multiplier = [stat]{0}[lightgray]x 탄약 배수
@@ -609,19 +655,23 @@ unit.liquidunits = 액체
 unit.powerunits = 전력
 unit.degrees = 도
 unit.seconds = 초
+unit.minutes = mins
 unit.persecond = /초
+unit.perminute = /min
 unit.timesspeed = x 배
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = 자원
 unit.thousands = 천
 unit.millions = 백만
+unit.billions = b
 category.general = 일반
 category.power = 전력
 category.liquids = 액체
-category.items = 아이템
+category.items = 자원
 category.crafting = 입력/출력
 category.shooting = 사격
-category.optional = 보조 아이템
+category.optional = 보조 자원
 setting.landscape.name = 가로화면 잠금
 setting.shadows.name = 그림자
 setting.blockreplace.name = 자동 블록 제안
@@ -660,14 +710,14 @@ setting.seconds = {0} 초
 setting.blockselecttimeout.name = 블록 선택 시간 초과
 setting.milliseconds = {0} 밀리 초
 setting.fullscreen.name = 전체 화면
-setting.borderlesswindow.name = 테두리 없는 창모드[lightgray] (재시작이 필요할 수 있습니다)
+setting.borderlesswindow.name = 테두리 없는 창 모드[lightgray] (재시작이 필요할 수 있습니다)
 setting.fps.name = FPS와 핑 표시
 setting.smoothcamera.name = 부드러운 시점
 setting.blockselectkeys.name = 블록 선택 키 표시
 setting.vsync.name = 수직 동기화
 setting.pixelate.name = 픽셀화
 setting.minimap.name = 미니맵 표시
-setting.coreitems.name = 코어에 있는 아이템 표시
+setting.coreitems.name = 코어에 있는 자원 표시
 setting.position.name = 플레이어 위치 표시
 setting.musicvol.name = 음악 크기
 setting.atmosphere.name = 행성 배경화면 표시
@@ -683,11 +733,11 @@ setting.chatopacity.name = 채팅창 투명도
 setting.lasersopacity.name = 전력 레이저 투명도
 setting.bridgeopacity.name = 터널 투명도
 setting.playerchat.name = 채팅 말풍선 표시
-public.confirm = 게임을 공개 표시하시겠습니까?\n[accent]모든 플레이어가 게임에 참여할 수 있습니다.\n[lightgray]설정->게임->멀티플레이 공용 서버로 표시에서 나중에 변경할 수 있습니다.\n\n[sky]번역자 추가[]\n[accent]친구끼리 한다고 이 기능을 활성화 한 뒤에, 친구 외에 다른 플레이어가 들어왔을 때\n해당 플레이어를 차단하는 행위는 비매너를 넘어서는 얌체 행위 그 자체입니다.\n정말로 [scarlet]많은 다른 플레이어들이 오길 원한다[]면 확인하세요.
+public.confirm = 게임을 모두에게 공개하시겠습니까?\n[accent]모든 플레이어가 게임에 참여할 수 있습니다.\n[lightgray]설정->게임->멀티플레이 공용 서버로 표시에서 나중에 변경할 수 있습니다.\n\n[sky]번역자 추가[]\n[accent]친구끼리 하려고 이 기능을 활성화 한 뒤에, 친구 외에 다른 플레이어가 들어왔을 때\n해당 플레이어를 차단하는 행위는 비매너를 넘어서는 얌체 행위 그 자체입니다.\n정말로 [scarlet]많은 다른 플레이어들이 오길 원한다[]면 확인하세요.
 public.beta = 베타 버전의 게임은 공개 서버를 만들 수 없습니다.
-uiscale.reset = UI 스케일이 변경되었습니다.\n"확인"버튼을 눌러 스케일을 확인하세요.\n[accent] {0}[][scarlet]초 후에 예전 설정으로 되돌리고 게임을 종료합니다...
-uiscale.cancel = 취소후 나가기
-setting.bloom.name = 블룸
+uiscale.reset = UI 스케일이 변경되었습니다.\n"확인"버튼을 눌러 저장하세요.\n[accent] {0}[][scarlet]초 후에 예전 설정으로 되돌리고 게임을 종료합니다...
+uiscale.cancel = 취소 후 나가기
+setting.bloom.name = 화려한 효과
 keybind.title = 조작키 설정
 keybinds.mobile = [scarlet]대부분의 키 맵핑은 모바일에서 작동하지 않습니다. 기본 이동만 지원됩니다.
 category.general.name = 일반
@@ -697,9 +747,10 @@ category.blocks.name = 블록 선택
 command.attack = 공격
 command.rally = 순찰
 command.retreat = 후퇴
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]키: [{0},
-keybind.respawn.name=리스폰
-keybind.control.name=유닛 제어
+keybind.respawn.name = 리스폰
+keybind.control.name = 유닛 제어
 keybind.clear_building.name = 설계도 초기화
 keybind.press = 키를 누르세요...
 keybind.press.axis = 마우스 휠 또는 키를 누르세요...
@@ -709,6 +760,7 @@ keybind.toggle_block_status.name = 블록 상태 토글
 keybind.move_x.name = X축 이동
 keybind.move_y.name = Y축 이동
 keybind.mouse_move.name = 커서를 따라서 이동
+keybind.pan.name = Pan View
 keybind.boost.name = 부스트
 keybind.schematic_select.name = 영역 설정
 keybind.schematic_menu.name = 설계도 메뉴
@@ -736,6 +788,9 @@ keybind.diagonal_placement.name = 대각선 설치
 keybind.pick.name = 블록 선택
 keybind.break_block.name = 블록 파괴
 keybind.deselect.name = 선택해제
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = 사격
 keybind.zoom.name = 확대
 keybind.menu.name = 메뉴
@@ -755,14 +810,14 @@ keybind.drop_unit.name = 유닛 떨구기
 keybind.zoom_minimap.name = 미니맵 확대
 mode.help.title = 모드 설명
 mode.survival.name = 생존
-mode.survival.description = 이것은 일반 모드입니다. 제한된 자원과 자동으로 시작되는 웨이브가 있습니다.\n[gray]플레이 할려면 맵에 적의 스폰지점이 필요합니다.
+mode.survival.description = 이것은 일반 모드입니다. 제한된 자원과 자동으로 시작되는 웨이브가 있습니다.\n[gray]플레이하려면 맵에 적의 스폰지점이 필요합니다.
 mode.sandbox.name = 샌드박스
 mode.sandbox.description = 무한한 자원과 웨이브 시작 타이머가 없습니다.
 mode.editor.name = 편집기
 mode.pvp.name = PvP
-mode.pvp.description = 다른 플레이어와 현장에서 싸우십시오.\n[gray]플레이 할려면 맵에 다른 색상의 코어가 2개 이상 있어야합니다.
+mode.pvp.description = 다른 플레이어와 현장에서 싸우십시오.\n[gray]플레이하려면 맵에 다른 색상의 코어가 2개 이상 있어야합니다.
 mode.attack.name = 공격
-mode.attack.description = 적의 기지를 파괴하세요.\n[gray]플레이 할려면 맵에 빨간색 코어가 필요합니다.
+mode.attack.description = 적의 기지를 파괴하세요.\n[gray]플레이하려면 맵에 빨간색 코어가 필요합니다.
 mode.custom = 사용자 정의 규칙
 
 rules.infiniteresources = 무한 자원
@@ -770,6 +825,7 @@ rules.reactorexplosions = 원자로 폭발
 rules.wavetimer = 웨이브 시간
 rules.waves = 웨이브
 rules.attack = 공격 모드
+rules.buildai = AI Building
 rules.enemyCheat = 무한 AI (빨간팀) 자원
 rules.blockhealthmultiplier = 블록 체력 배수
 rules.blockdamagemultiplier = 블록 공격력 배수
@@ -789,12 +845,16 @@ rules.title.resourcesbuilding = 자원 & 건축
 rules.title.enemy = 적
 rules.title.unit = 유닛
 rules.title.experimental = 실험적인 기능
-rules.title.environment=환경
+rules.title.environment = 환경
 rules.lighting = 조명
-rules.ambientlight = 주변 조명
-rules.solarpowermultiplier = 태양광 발전 배수
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
+rules.ambientlight = 자연 조명
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
-content.item.name = 아이템
+content.item.name = 자원
 content.liquid.name = 액체
 content.unit.name = 유닛
 content.block.name = 블록
@@ -808,51 +868,90 @@ item.silicon.name = 실리콘
 item.plastanium.name = 플라스터늄
 item.phase-fabric.name = 메타
 item.surge-alloy.name = 설금
-item.spore-pod.name = 포자 포드
+item.spore-pod.name = 포자 버섯
 item.sand.name = 모래
-item.blast-compound.name = 화합물
-item.pyratite.name = 피라타이트
-item.metaglass.name = 금속유리
+item.blast-compound.name = 폭발물
+item.pyratite.name = 파이라타이트
+item.metaglass.name = 강화 유리
 item.scrap.name = 고철
 liquid.water.name = 물
 liquid.slag.name = 광재
 liquid.oil.name = 기름
-liquid.cryofluid.name = 냉각 유체
-item.corestorable = [lightgray]코어에 저장 가능: {0}
+liquid.cryofluid.name = 냉각수
+
 item.explosiveness = [lightgray]폭발성: {0}
 item.flammability = [lightgray]인화성: {0}
 item.radioactivity = [lightgray]방사능: {0}
+
 unit.health = [lightgray]체력: {0}
 unit.speed = [lightgray]속도: {0}
 unit.weapon = [lightgray]무기: {0}
-unit.itemcapacity = [lightgray]아이템 수용량: {0}
+unit.itemcapacity = [lightgray]자원 수용량: {0}
 unit.minespeed = [lightgray]채광 속도: {0}%
 unit.minepower = [lightgray]채광 레벨: {0}
 unit.ability = [lightgray]능력: {0}
 unit.buildspeed = [lightgray]건설 속도: {0}%
-liquid.heatcapacity = [lightgray]발열 용량: {0}
+
+liquid.heatcapacity = [lightgray]비열: {0}
 liquid.viscosity = [lightgray]점도: {0}
 liquid.temperature = [lightgray]온도: {0}
+
+unit.dagger.name = 대거
+unit.mace.name = 메이스
+unit.fortress.name = 포트리스
+unit.nova.name = 노바
+unit.pulsar.name = 펄서
+unit.quasar.name = 퀘이사
+unit.crawler.name = 크롤러
+unit.atrax.name = 아트락스
+unit.spiroct.name = 스피록트
+unit.arkyid.name = 아키드
+unit.toxopid.name = Toxopid
+unit.flare.name = 플레어
+unit.horizon.name = 호라이즌
+unit.zenith.name = 제니스
+unit.antumbra.name = 안텀브라
+unit.eclipse.name = 이클립스
+unit.mono.name = 모노
+unit.poly.name = 폴리
+unit.mega.name = 메가
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = 리소
+unit.minke.name = 민케
+unit.bryde.name = 브리드
+unit.sei.name = 세이
+unit.omura.name = 오무라
+unit.alpha.name = 알파
+unit.beta.name = 베타
+unit.gamma.name = 감마
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = 시차
 block.cliff.name = 낭떠러지
 block.sand-boulder.name = 사암
 block.grass.name = 잔디
 block.slag.name = 광재
 block.salt.name = 소금
-block.saltrocks.name = 소금 바위
+block.salt-wall.name = 소금 벽
 block.pebbles.name = 조약돌
 block.tendrils.name = 덩굴
-block.sandrocks.name = 모래 바위
+block.sand-wall.name = 모래 벽
 block.spore-pine.name = 포자 덮인 소나무
-block.sporerocks.name = 포자 바위
-block.rock.name = 돌
-block.snowrock.name = 눈덩이
+block.spore-wall.name = 포자 벽
+block.boulder.name = 돌
+block.snow-boulder.name = 눈덩이
 block.snow-pine.name = 눈 덮인 소나무
 block.shale.name = 이판암
 block.shale-boulder.name = 둥근 이판암
 block.moss.name = 이끼
 block.shrubs.name = 관목
 block.spore-moss.name = 포자 이끼
-block.shalerocks.name = 이판암 바위
+block.shale-wall.name = 이판암 벽
 block.scrap-wall.name = 조각벽
 block.scrap-wall-large.name = 대형 조각벽
 block.scrap-wall-huge.name = 거대한 조각 벽
@@ -864,8 +963,8 @@ block.multi-press.name = 다중 압축기
 block.constructing = {0} [lightgray](제작중)
 block.spawn.name = 적 소환
 block.core-shard.name = 코어: 조각
-block.core-foundation.name = 코어: 재단
-block.core-nucleus.name = 코어: 핵
+block.core-foundation.name = 코어: 기반
+block.core-nucleus.name = 코어: 핵심
 block.deepwater.name = 깊은 물
 block.water.name = 물
 block.tainted-water.name = 오염된 물
@@ -878,15 +977,19 @@ block.ice.name = 얼음
 block.snow.name = 눈
 block.craters.name = 구덩이
 block.sand-water.name = 젖은 모래
-block.darksand-water.name = 젖은 검은모래
+block.darksand-water.name = 젖은 검은 모래
 block.char.name = 숯
-block.holostone.name = 홀로스톤
+block.dacite.name = 데이사이트
+block.dacite-wall.name = 데이사이트 벽
 block.ice-snow.name = 얼음눈
-block.rocks.name = 돌
-block.icerocks.name = 얼음바위
-block.snowrocks.name = 눈바위
-block.dunerocks.name = 모래돌
+block.stone-wall.name = 돌 벽
+block.ice-wall.name = 얼음 벽
+block.snow-wall.name = 눈 벽
+block.dune-wall.name = 모래 벽
 block.pine.name = 소나무
+block.dirt.name = 흙
+block.dirt-wall.name = 흙 벽
+block.mud.name = 진흙
 block.white-tree-dead.name = 죽은 하얀나무
 block.white-tree.name = 하얀 나무
 block.spore-cluster.name = 포자낭
@@ -902,10 +1005,9 @@ block.dark-panel-4.name = 어두운 패널 4
 block.dark-panel-5.name = 어두운 패널 5
 block.dark-panel-6.name = 어두운 패널 6
 block.dark-metal.name = 어두운 금속제
-block.ignarock.name = 얼은 바위
+block.basalt.name = 현무암
 block.hotrock.name = 뜨거운 바위
 block.magmarock.name = 용암 바위
-block.cliffs.name = 절벽
 block.copper-wall.name = 구리 벽
 block.copper-wall-large.name = 대형 구리 벽
 block.titanium-wall.name = 티타늄 벽
@@ -917,7 +1019,7 @@ block.phase-wall-large.name = 대형 메타 벽
 block.thorium-wall.name = 토륨 벽
 block.thorium-wall-large.name = 대형 토륨 벽
 block.door.name = 문
-block.door-large.name = 대형문
+block.door-large.name = 대형 문
 block.duo.name = 듀오
 block.scorch.name = 스코치
 block.scatter.name = 스캐터
@@ -927,7 +1029,7 @@ block.conveyor.name = 컨베이어
 block.titanium-conveyor.name = 티타늄 컨베이어
 block.plastanium-conveyor.name = 플라스터늄 컨베이어
 block.armored-conveyor.name = 장갑 컨베이어
-block.armored-conveyor.description = 티타늄 컨베이어와 같은 속도로 아이템을 운송하지만, 더 높은 방어력을 가지고 있습니다. 다른 컨베이어 벨트 이외 측면에서는 아이템을 받을 수 없습니다.
+block.armored-conveyor.description = 티타늄 컨베이어와 같은 속도로 자원을 운송하지만, 더 높은 방어력을 가지고 있습니다. 다른 컨베이어 벨트 이외 측면에서는 자원을 받을 수 없습니다.
 block.junction.name = 교차기
 block.router.name = 분배기
 block.distributor.name = 대형 분배기
@@ -935,13 +1037,13 @@ block.sorter.name = 필터
 block.inverted-sorter.name = 반전 필터
 block.message.name = 메모 블록
 block.illuminator.name = 조명
-block.illuminator.description = 작고, 간단하고, 설정 가능한 광원입니다. 작동 시킬려면 전력이 필요합니다.
-block.overflow-gate.name = 오버플로 게이트
-block.underflow-gate.name = 언더플로 게이트
+block.illuminator.description = 작고, 간단하고, 설정 가능한 광원입니다. 작동하려면 전력이 필요합니다.
+block.overflow-gate.name = 포화 필터
+block.underflow-gate.name = 불포화 필터
 block.silicon-smelter.name = 실리콘 제련소
 block.phase-weaver.name = 메타 합성기
 block.pulverizer.name = 분쇄기
-block.cryofluidmixer.name = 냉각 유체 제조기
+block.cryofluid-mixer.name = 냉각수 제조기
 block.melter.name = 융해기
 block.incinerator.name = 소각로
 block.spore-press.name = 포자 압축기
@@ -954,14 +1056,14 @@ block.diode.name = 배터리 다이오드
 block.battery.name = 배터리
 block.battery-large.name = 대형 배터리
 block.combustion-generator.name = 연소 발전기
-block.turbine-generator.name = 증기 발전기
+block.steam-generator.name = 증기 발전기
 block.differential-generator.name = 차동 발잔기
-block.impact-reactor.name = 임팩트 원자로
+block.impact-reactor.name = 핵융합 원자로
 block.mechanical-drill.name = 기계식 드릴
 block.pneumatic-drill.name = 공압 드릴
 block.laser-drill.name = 레이저 드릴
 block.water-extractor.name = 물 추출기
-block.cultivator.name = 제초기
+block.cultivator.name = 온실
 block.conduit.name = 파이프
 block.mechanical-pump.name = 기계식 펌프
 block.item-source.name = 자원 공급기
@@ -972,19 +1074,18 @@ block.power-void.name = 방전장치
 block.power-source.name = 전력 공급기
 block.unloader.name = 언로더
 block.vault.name = 창고
-block.wave.name = 웨이브
+block.wave.name = 파도
 block.swarmer.name = 스워머
 block.salvo.name = 살보
 block.ripple.name = 립플
 block.phase-conveyor.name = 메타 컨베이어
 block.bridge-conveyor.name = 다리 컨베이어
 block.plastanium-compressor.name = 플라스터늄 압축기
-block.pyratite-mixer.name = 피라타이트 혼합기
-block.blast-mixer.name = 화합물 혼합기
+block.pyratite-mixer.name = 파이라타이트 혼합기
+block.blast-mixer.name = 폭발물 혼합기
 block.solar-panel.name = 태양 전지판
 block.solar-panel-large.name = 대형 태양 전지판
 block.oil-extractor.name = 석유 추출기
-block.command-center.name = 커맨드 센터
 block.repair-point.name = 수리 지점
 block.pulse-conduit.name = 펄스 파이프
 block.plated-conduit.name = 도금된 파이프
@@ -1001,7 +1102,7 @@ block.thermal-pump.name = 화력 펌프
 block.thermal-generator.name = 화력 생성기
 block.alloy-smelter.name = 설금 제련소
 block.mender.name = 멘더
-block.mend-projector.name = 대형 수리 프로젝터
+block.mend-projector.name = 수리 프로젝터
 block.surge-wall.name = 설금 벽
 block.surge-wall-large.name = 큰 설금 벽
 block.cyclone.name = 사이클론
@@ -1017,18 +1118,28 @@ block.container.name = 컨테이너
 block.launch-pad.name = 출격 패드
 block.launch-pad-large.name = 대형 출격 패드
 block.segment.name = 세그먼트
+block.command-center.name = Command Center
 block.ground-factory.name = 지상 공장
 block.air-factory.name = 항공 공장
-block.naval-factory.name = 해군 공장
+block.naval-factory.name = 해양 공장
 block.additive-reconstructor.name = 첨가물 재구성기
 block.multiplicative-reconstructor.name = 다중 재구성기
 block.exponential-reconstructor.name = 지수 재구성기
 block.tetrative-reconstructor.name = 정서 재구성기
-block.mass-conveyor.name = 매스 컨베이어
+block.payload-conveyor.name = 화물 컨베이어
 block.payload-router.name = 화물 분배기
-block.disassembler.name = 분해기
+block.disassembler.name = 가속 분해기
 block.silicon-crucible.name = 실리콘 도가니
-block.large-overdrive-projector.name = 대형 과부하 프로젝터
+block.overdrive-dome.name = 대형 과부하 프로젝터
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = 파랑색 팀
 team.crux.name = 빨강색 팀
 team.sharded.name = 주황색 팀
@@ -1036,45 +1147,32 @@ team.orange.name = 주황색 팀
 team.derelict.name = 버려진 팀
 team.green.name = 초록색 팀
 team.purple.name = 보라색 팀
-#unit.spirit.name = 스피릿 수리 드론
-#unit.draug.name = 드라우그 채광 드론
-#unit.phantom.name = 팬텀 건설 드론
-#unit.dagger.name = 대거
-#unit.crawler.name = 크롤러
-#unit.titan.name = 타이탄
-#unit.ghoul.name = 구울 폭격기
-#unit.wraith.name = 유령 전투기
-#unit.fortress.name = 포트리스
-#unit.revenant.name = 망령 전함
-#unit.eruptor.name = 이럽터
-#unit.chaos-array.name = 혼돈 군주
-#unit.eradicator.name = 근절자
-#unit.lich.name = 리치
-#unit.reaper.name = 리퍼
+
 tutorial.next = [lightgray]<이 곳을 터치해 진행하세요>
 tutorial.intro = [scarlet]Mindustry 튜토리얼[]을 시작하겠습니다.\n[WASD] 키를 눌러 이동할 수 있습니다.\n[accent]스크롤[]을 해서 화면 확대와 축소를 합니다.\n[accent]구리[]를 채광하는 것부터 시작합니다. 코어 근처의 구리 광맥을 눌러 이 작업을 시작하세요.\n\n[accent]{0}/{1} 구리
 tutorial.intro.mobile = [scarlet]Mindustry 튜토리얼[]을 시작하겠습니다.\n화면을 드래그하여 이동이 가능합니다.\n두 손가락을 화면에 누른 후 모으거나 벌려 확대와 축소가 가능합니다.\n[accent]구리[]를 채광하는 것부터 시작합니다. 코어 근처의 구리 광맥을 눌러 이 작업을 시작하세요.\n\n[accent]{0}/{1} 구리
 tutorial.drill = 수동으로 채광하는 것은 효율이 낮습니다.\n[accent]드릴[]은 자동으로 드릴 바로 아래에 있는 광물들을 채광합니다.\n드릴 카테고리의 기계식 드릴을 선택하여 구리 광맥위에 설치하세요.\n마우스 오른쪽 버튼으로 취소가 가능합니다.
 tutorial.drill.mobile = 수동으로 채광하는 것은 효율이 낮습니다.\n[accent]드릴[]은 자동으로 드릴 밑에 있는 광물들을 채광합니다.\n드릴 카테고리의 기계식 드릴을 선택하여 구리 광맥위에 설치하세요.\n취소 버튼을 눌러 건축하기 전의 설계를 취소할 수 있습니다.
-tutorial.blockinfo = 각 블록마다 다른 특성을 가지고 있으며, 각 드릴은 특정 광석만 채굴할 수 있습니다.\n블록의 정보와 특성을 확인할려면, [accent]건설 메뉴에서 "?" 버튼을 선택하세요.[]\n\n[accent]지금 기계식 드릴의 정보를 보세요.
-tutorial.conveyor = [accent]컨베이어[]는 아이템을 코어로 운반하는데 사용됩니다.\n드릴에서 코어까지 컨베이어 경로를 만드세요.\n[accent]마우스를 길게 눌러 경로에 놓습니다.\n대각선으로 배치할 경로를 선택하는 동안 [accent]CTRL[] 키를 누른 상태로 유지하세요.\n스크롤 휠을 사용하여 블록을 배치하기 전에 블록을 회전시킬 수 있습니다.\n[accent]선 도구를 사용하여 컨베이어 2개를 놓은 다음, 아이템을 코어로 넣으세요.
-tutorial.conveyor.mobile = [accent]컨베이어[]는 아이템을 코어로 운반하는데 사용됩니다.\n드릴에서 코어까지 컨베이어 경로를 만드세요.\n[accent]몇 초 동안 손가락을 누른 상태에서 드래그 하여 경로를 그립니다.\n\n[accent]선 도구로 컨베이어 2개를 놓은 다음 아이템을 코어에 넣으세요.
-tutorial.turret = 아이템이 코어에 들어간 후에는 건물을 건설하는데 사용할 수 있습니다.\n모든 아이템이 건물에 사용될 수 있는 것은 아닙니다.\n건물에 사용되지 않는 아이템(예: [accent]석탄[] 또는 [accent]광재[])은 코어에 넣을 수 없습니다.\n[lightgray]적[]을 격추하기 위해 방어 건물을 세워야 합니다.\n기지 근처에 [accent]듀오 포탑[]을 건설하세요.
+tutorial.blockinfo = 각 블록마다 다른 특성을 가지고 있으며, 각 드릴은 특정 광석만 채굴할 수 있습니다.\n블록의 정보와 특성을 확인하려면, [accent]건설 메뉴에서 "?" 버튼을 선택하세요.[]\n\n[accent]지금 기계식 드릴의 정보를 보세요.
+tutorial.conveyor = [accent]컨베이어[]는 자원을 코어로 운반하는데 사용됩니다.\n드릴에서 코어까지 컨베이어 경로를 만드세요.\n[accent]마우스를 길게 눌러 경로에 놓습니다.\n대각선으로 배치할 경로를 선택하는 동안 [accent]CTRL[] 키를 누른 상태로 유지하세요.\n스크롤 휠을 사용하여 블록을 배치하기 전에 블록을 회전시킬 수 있습니다.\n[accent]선 도구를 사용하여 컨베이어 2개를 놓은 다음, 자원을 코어로 넣으세요.
+tutorial.conveyor.mobile = [accent]컨베이어[]는 자원을 코어로 운반하는데 사용됩니다.\n드릴에서 코어까지 컨베이어 경로를 만드세요.\n[accent]몇 초 동안 손가락을 누른 상태에서 드래그 하여 경로를 그립니다.\n\n[accent]선 도구로 컨베이어 2개를 놓은 다음 자원을 코어에 넣으세요.
+tutorial.turret = 자원이 코어에 들어간 후에는 건물을 건설하는데 사용할 수 있습니다.\n모든 자원이 건물에 사용될 수 있는 것은 아닙니다.\n건물에 사용되지 않는 자원(예: [accent]석탄[] 또는 [accent]광재[])은 코어에 넣을 수 없습니다.\n[lightgray]적[]을 격추하기 위해 방어 건물을 세워야 합니다.\n기지 근처에 [accent]듀오 포탑[]을 건설하세요.
 tutorial.drillturret = 듀오 포탑은 사격하는데 [accent]구리 탄약[]이 필요합니다.\n포탑 근처에 드릴을 설치하세요.\n구리를 공급하기 위해 컨베이어를 포탑으로 가도록 건설하세요.\n\n[accnet]탄약 운반: 0/1
-tutorial.pause = 전투 중에는 게임을 [accent]일시정지[] 할 수 있습니다.\n일시정지 되는 동안 건설을 대기시킬 수 있습니다.\n\n[accent]일시정지 할려면 스페이스 키를 누르세요.
-tutorial.pause.mobile = 싱글 플레이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]일시정지 할려면 왼쪽 상단에 있는 이 버튼을 누르세요.
+tutorial.pause = 전투 중에는 게임을 [accent]일시정지[] 할 수 있습니다.\n일시정지 되는 동안 건설을 대기시킬 수 있습니다.\n\n[accent]일시정지하려면 스페이스 키를 누르세요.
+tutorial.pause.mobile = 싱글 플레이에서는 게임을 [accent]일시정지[]할 수 있습니다.\n일시정지하면 교전과 더불어 건설까지 일시정지됩니다.\n\n[accent]일시정지하려면 왼쪽 상단에 있는 이 버튼을 누르세요.
 tutorial.unpause = 이제 스페이스를 누르면 일시정지가 해제됩니다.
 tutorial.unpause.mobile = 이제 다시 누르면 일시정지가 해제됩니다.
-tutorial.breaking = 블록은 종종 파괴 되어야 합니다.\n선택한 모든 블록을 파괴할려면 [accent]마우스 오른쪽 클릭을 길게 누르세요[].\n\n[accent]영역 선택을 사용하여 코어 왼쪽의 모든 조각벽을 파괴하세요.
-tutorial.breaking.mobile = 블록은 종종 파괴 되어야 합니다.\n[accent]삭제 모드[]를 선택한 다음 블록을 탭 하여 파괴할 수 있습니다.\n[accnet]몇 초 동안 손가락을 누르고 원하는 방향으로 드래그[]하여 범위 안에있는 블럭을 파괴하세요.\n그리고 체크 표시 버튼을 눌러 삭제 작업을 할 수 있습니다.\n[accent]영역 선택을 사용하여 코어 왼쪽의 모든 조각 벽을 파괴하세요.
-tutorial.withdraw = 경우에 따라 블록에서 아이템을 직접 가져와야 합니다.\n이 작업을 할려면 [accent]아이템이 있는 블록[]을 탭한 다음, 인벤토리에서 [accent]아이템[]을 탭하세요.\n[accent]누른 상태를 유지[]하면 여러개를 꺼낼 수 있습니다.\n\n[accent]코어에서 구리를 빼내세요.
-tutorial.deposit = 기체에서 목적지 블록으로 드래그하여 아이템을 블록에 넣으세요.\n\n[accent]구리를 다시 코어에 넣으세요[].
+tutorial.breaking = 블록은 종종 파괴 되어야 합니다.\n선택한 모든 블록을 파괴하려면 [accent]마우스 오른쪽 클릭을 길게 누르세요[].\n\n[accent]영역 선택을 사용하여 코어 왼쪽의 모든 조각벽을 파괴하세요.
+tutorial.breaking.mobile = 블록은 종종 파괴 되어야 합니다.\n[accent]삭제 모드[]를 선택한 다음 블록을 탭 하여 파괴할 수 있습니다.\n[accnet]몇 초 동안 손가락을 누르고 원하는 방향으로 드래그[]하여 범위 안에있는 블록을 파괴하세요.\n그리고 체크 표시 버튼을 눌러 삭제 작업을 할 수 있습니다.\n[accent]영역 선택을 사용하여 코어 왼쪽의 모든 조각 벽을 파괴하세요.
+tutorial.withdraw = 경우에 따라 블록에서 자원을 직접 가져와야 합니다.\n이 작업을 하려면 [accent]자원이 있는 블록[]을 탭한 다음, 인벤토리에서 [accent]자원[]을 탭하세요.\n[accent]누른 상태를 유지[]하면 여러개를 꺼낼 수 있습니다.\n\n[accent]코어에서 구리를 빼내세요.
+tutorial.deposit = 기체에서 목적지 블록으로 드래그하여 자원을 블록에 넣으세요.\n\n[accent]구리를 다시 코어에 넣으세요[].
 tutorial.waves = [lightgray]적[]이 다가옵니다.\n2 웨이브로부터 코어를 방어하세요. [accent]클릭[]하여 사격할 수 있습니다.\n더 많은 포탑과 드릴을 건설하고 구리를 더 모으세요.
 tutorial.waves.mobile = [lightgray]적[]이 다가옵니다.\n2 웨이브로부터 코어를 방어하세요. 당신의 기체는 자동으로 적을 향해 사격합니다.\n더 많은 포탑과 드릴을 건설하고 구리를 더 모으세요.
 tutorial.launch = 특정 웨이브에 도달하면 [accent]코어로 출격[] 을 할 수 있습니다.\n\n이렇게 얻은 자원을 사용하여 새로운 기술을 연구 할 수 있습니다.\n\n[accent]출격 버튼을 누르세요.
+
 item.copper.description = 가장 기본적인 건설 재료. 모든 유형의 블록에서 광범위하게 사용됩니다.
 item.lead.description = 기본 초반 재료. 전자 및 액체 수송 블록에서 광범위하게 사용되는 자원입니다.
-item.metaglass.description = 초강력 유리 화합물. 액체 분배 및 저장에 광범위하게 사용됩니다.
+item.metaglass.description = 초강력 방탄 유리. 액체 분배 및 저장에 광범위하게 사용됩니다.
 item.graphite.description = 탄약 및 전기 부품에 사용되는 무기질 탄소.
 item.sand.description = 제련에서 합금 또는 플럭스에서 광범위하게 사용되는 일반적인 재료.
 item.coal.description = 화석화된 식물 물질. 씨앗이 나오기 훨씬 전에 형성되었습니다. 연료 및 자원 생산에 광범위하게 사용됩니다.
@@ -1085,46 +1183,35 @@ item.silicon.description = 매우 유용한 반도체. 복잡한 전자 장치
 item.plastanium.description = 고급 기체 및 파편화 탄약에 사용되는 가볍고 연성이 있는 재료입니다.
 item.phase-fabric.description = 최첨단 전자 제품과 자기수리 기술에 사용되는 거의 무중력에 가까운 물질입니다.
 item.surge-alloy.description = 독특한 전기적 특성을 가진 고급 합금.
-item.spore-pod.description = 산업 목적을 위해 대기 농도에서 합성된 합성 포자 포드. 석유, 폭발물 및 연료로 전환하는 데 사용됩니다.
-item.blast-compound.description = 폭탄과 폭발물에 사용되는 불안정한 화합물. 포자 포드 및 기타 휘발성 물질로 합성할 수 있습니다. 연료로 사용하지 않는 것이 좋습니다.
+item.spore-pod.description = 산업 목적을 위해 대기 농도에서 합성된 포자 버섯. 석유, 폭발물 및 연료로 전환하는 데 사용됩니다.
+item.blast-compound.description = 폭탄과 폭발물에 사용되는 불안정한 화합물. 포자 버섯 및 기타 휘발성 물질로 합성할 수 있습니다. 연료로 사용하지 않는 것이 좋습니다.
 item.pyratite.description = 소이 무기에서 사용되는 매우 높은 가연성 물질.
 liquid.water.description = 가장 유용한 액체. 냉각기 및 폐기물 처리에 일반적으로 사용됩니다.
 liquid.slag.description = 다양한 종류의 금속들이 함께 섞여 녹아있습니다. 분리기를 이용해 다른 광물들로 분리하거나 탄약으로 사용해 적 부대를 향해 살포할 수 있습니다.
 liquid.oil.description = 고급 재료 생산에 사용되는 액체. 석탄으로 전환하거나 무기로 뿌려서 불을 지를 수 있습니다. 
 liquid.cryofluid.description = 물과 티타늄으로 만든 비 부식성 액체. 열 용량이 매우 높으며 냉각수로 광범위하게 사용됩니다.
-#unit.draug.description = 원시 광부 드론. 비용이 저렴하고 소모성입니다. 근처에서 구리와 납을 자동으로 채굴합니다. 채굴 된 자원을 가장 가까운 코어로 수송합니다.
-#unit.spirit.description = 채굴 대신 수리를 위해 개조된 드라우그 드론. 해당 지역의 손상된 블록을 자동으로 수리합니다.
-#unit.phantom.description = 고급 드론 유닛. 유저를 따라가며 블록 건설을 지원하고 파괴된 건물들을 다시 건설합니다.
-#unit.dagger.description = 가장 기본적은 지상 기체. 비용이 저렴하며 군중으로 사용시 압도적입니다.
-#unit.crawler.description = 높은 폭발물이있는 스트립 다운 프레임으로 구성된 접지 장치. 특별히 내구성이 없고 적과 닿으면 폭발합니다.
-#unit.titan.description = 고급 장갑 지상 유닛. 지상 및 공중 목표물을 모두 공격합니다. 소형 스코치급 화염 방사기 2개가 장착되어 있습니다.
-#unit.fortress.description = 중포병 기체. 적 구조물과 유닛에 대한 장거리 공격을 위해 개조된 헤일 종류의 대포 2개가 장착되어 있습니다.
-#unit.eruptor.description = 구조물을 파괴하도록 설계된 무거운 기체. 적 기지에서 광재를 발사하여 건물들을 녹이고 불을 지릅니다.
-#unit.wraith.description = 빠르고 치고 빠지는 요격 부대. 발전기를 목표로 합니다.
-#unit.ghoul.description = 튼튼한 지상 폭격기. 적 기지 구조에서 중요한 인프라를 목표로 공격합니다. 
-#unit.revenant.description = 유도 미사일을 가진 튼튼한 유닛.
 
-block.message.description = 메세지를 남깁니다. 같은 팀 간의 소통에 사용됩니다.
+block.message.description = 메시지를 남깁니다. 같은 팀 간의 소통에 사용됩니다.
 block.graphite-press.description = 석탄 덩어리를 순수한 흑연으로 압축합니다.
 block.multi-press.description = 흑연 압축기의 강화 버전. 석탄을 빠르고 효율적으로 처리하기 위해 물과 전력을 사용합니다.
 block.silicon-smelter.description = 순수한 석탄과 모래로 실리콘을 생산합니다.
-block.kiln.description = 모래를 제련하여 강화 유리라고 알려진 화합물로 만듭니다. 작동할려면 소량의 전력이 필요합니다.
+block.kiln.description = 모래를 제련하여 강화 유리라고 알려진 화합물로 만듭니다. 작동려면 소량의 전력이 필요합니다.
 block.plastanium-compressor.description = 석유와 티타늄으로 플라스터늄을 생산합니다.
 block.phase-weaver.description = 방사성 토륨과 모래에서 메타를 합성합니다. 작동하려면 엄청난 양의 전력이 필요합니다.
 block.alloy-smelter.description = 티타늄, 납, 실리콘, 구리를 결합하여 설금을 생산합니다.
-block.cryofluidmixer.description = 물과 미세 티타늄 분말을 냉각수로 혼합합니다. 토륨 원자로 사용에 필수적입니다.
-block.blast-mixer.description = 포자 클러스터를 피라타이트와 분쇄하고 혼합하여 화합물을 만듭니다.
-block.pyratite-mixer.description = 석탄, 납, 모래를 가연성이 높은 피라타이트로 만듭니다.
+block.cryofluid-mixer.description = 물과 미세 티타늄 분말을 냉각수로 혼합합니다. 토륨 원자로 사용에 필수적입니다.
+block.blast-mixer.description = 포자 클러스터를 파이라타이트와 분쇄하고 혼합하여 폭발물을 만듭니다.
+block.pyratite-mixer.description = 석탄, 납, 모래를 가연성이 높은 파이라타이트로 만듭니다.
 block.melter.description = 웨이브 포탑에서 추가 처리 또는 사용을 위해 고철을 광재로 녹입니다.
 block.separator.description = 광재를 미네랄 성분으로 분리합니다. 그리고 냉각된 결과를 출력합니다.
-block.spore-press.description = 포자 포드를 극압으로 압축하여 기름을 합성합니다.
+block.spore-press.description = 포자 버섯을 극압으로 압축하여 기름을 합성합니다.
 block.pulverizer.description = 고철을 뭉개서 고운 모래로 만듭니다.
 block.coal-centrifuge.description = 기름에서 석탄 덩어리를 추출합니다.
-block.incinerator.description = 넘치는 아이템이나 액체를 증발시킵니다.
+block.incinerator.description = 넘치는 자원이나 액체를 증발시킵니다.
 block.power-void.description = 입력된 모든 전력을 무효화합니다. 샌드박스 전용.
 block.power-source.description = 무한한 전력을 공급해주는 블록입니다. 샌드박스 전용.
-block.item-source.description = 아이템을 무한대로 출력합니다. 샌드박스 전용.
-block.item-void.description = 모든 아이템을 파괴합니다. 샌드박스 전용.
+block.item-source.description = 자원을 무한대로 출력합니다. 샌드박스 전용.
+block.item-void.description = 모든 자원을 파괴합니다. 샌드박스 전용.
 block.liquid-source.description = 액체를 무한히 출력합니다. 샌드박스 전용.
 block.liquid-void.description = 액체를 제거합니다. 샌드박스 전용.
 block.copper-wall.description = 저렴한 수비 블록.\n처음 몇 웨이브에서 코어와 포탑을 보호하는데 유용합니다.
@@ -1142,23 +1229,23 @@ block.surge-wall-large.description = 내구성이 매우 강한 방어 블록.\n
 block.door.description = 작은 문. 탭하여 열거나 닫을 수 있습니다.
 block.door-large.description = 큰 문. 탭하여 열거나 닫을 수 있습니다.\n여러 타일을 차지합니다.
 block.mender.description = 주변의 블록을 주기적으로 수리합니다. 웨이브 사이의 방어를 유지하게 합니다.\n선택적으로 실리콘을 사용하여 범위와 효율성을 향상시킵니다.
-block.mend-projector.description = 멘더의 강화 버전. 주변의 블록을 수리합니다.\n선택적으로 메타를 사용하여 범위와 효율성을 향상시킵니다.
+block.mend-projector.description = 소형 수리 프로젝터의 강화 버전. 주변의 블록을 수리합니다.\n선택적으로 메타를 사용하여 범위와 효율성을 향상시킵니다.
 block.overdrive-projector.description = 주변 건물의 속도를 높입니다.\n선택적으로 메타를 사용하여 범위와 효율성을 높입니다.
 block.force-projector.description = 건물과 내부의 유닛을 공격으로부터 보호하며, 그 주위에 육각형 역장을 형성합니다.\n너무 많은 손상이 지속되면 과열되며, 선택적으로 냉각수를 사용하여 과열을 방지할 수 있고, 메타는 역장의 크기를 늘리는 데 사용할 수 있습니다.
 block.shock-mine.description = 지뢰를 밟고 있는 적에게 피해를 입힙니다. 적에게는 거의 보이지 않습니다.
 block.conveyor.description = 기본 자원 수송 레일. 자원을 배치된 방향을 따라 이동시켜 자동으로 건물에 넣어줍니다. 회전식.
 block.titanium-conveyor.description = 고급 자원 수송 레일. 기본 컨베이어보다 자원을 더 빨리 이동시킵니다.
-block.plastanium-conveyor.description = 아이템을 일괄적으로 운송시킵니다. 컨베이에 뒤에서 아이템을 받고 앞쪽에 세 방향으로 내보냅니다.
+block.plastanium-conveyor.description = 자원을 일괄적으로 운송시킵니다. 컨베이에 뒤에서 자원을 받고 앞쪽에 세 방향으로 내보냅니다.
 block.junction.description = 2개의 컨베이어 벨트를 교차시키는 다리 역할을 합니다. 서로 다른 재료를 다른 장소로 운반하는 두 개의 다른 컨베이어의 상황에서 유용합니다.
 block.bridge-conveyor.description = 고급 자원 운송 블록. 지형이나 건물을 넘어 최대 3개 타일을 건너뛰고 자원을 운송할 수 있습니다.
-block.phase-conveyor.description = 고급 자원 운송 블록. 전력을 사용하여 여러 타일을 통해 연결된 컨베이어로 아이템을 순간이동 시킵니다.
-block.sorter.description = 아이템을 정렬합니다. 아이템이 선택과 일치하면 앞방향으로 통과하며, 그렇지 않을 경우 왼쪽과 오른쪽으로 출력됩니다.
-block.inverted-sorter.description = 표준 분류기와 같은 아이템을 처리하지만, 대신 선택된 아이템을 측면으로 출력합니다.
-block.router.description = 아이템을 받아서 최대 3개의 다른 방향으로 동일하게 출력합니다. 하나의 소스에서 여러 대상으로 재료를 분할하는데 유용합니다.\n\n[scarlet]공장에서 생산된 재료는 출력에 의해 막히게 되므로, 절대로 공장 옆에서 사용하지 마십시오.
-block.distributor.description = 고급 분배기. 아이템을 최대 7개의 다른 방향으로 동일하게 분할합니다.
+block.phase-conveyor.description = 고급 자원 운송 블록. 전력을 사용하여 여러 타일을 통해 연결된 컨베이어로 자원을 순간이동 시킵니다.
+block.sorter.description = 자원을 정렬합니다. 자원이 선택과 일치하면 앞방향으로 통과하며, 그렇지 않을 경우 왼쪽과 오른쪽으로 출력됩니다.
+block.inverted-sorter.description = 표준 분류기와 같은 자원을 처리하지만, 대신 선택된 자원을 측면으로 출력합니다.
+block.router.description = 자원을 받아서 최대 3개의 다른 방향으로 동일하게 출력합니다. 하나의 소스에서 여러 대상으로 재료를 분할하는 데 유용합니다.\n\n[scarlet]공장에서 생산된 재료는 출력에 의해 막히게 되므로, 절대로 공장 옆에서 사용하지 마십시오.
+block.distributor.description = 고급 분배기. 자원을 최대 7개의 다른 방향으로 동일하게 분할합니다.
 block.overflow-gate.description = 전면 경로가 차단 된 경우에만 왼쪽과 오른쪽으로 출력됩니다.
 block.underflow-gate.description = 오버플로 게이트의 반대. 왼쪽 및 오른쪽 경로가 차단되면 전면으로 출력됩니다.
-block.mass-driver.description = 최고의 아이템 운송 블록. 여러 아이템을 모아서 장거리에 걸쳐 다른 매스 드라이버에게 발사합니다. 작동하려면 전원이 필요합니다.
+block.mass-driver.description = 최고의 자원 운송 블록. 여러 자원을 모아서 장거리에 걸쳐 다른 매스 드라이버에게 발사합니다. 작동하려면 전원이 필요합니다.
 block.mechanical-pump.description = 느린 속도로 액체를 퍼올리지만, 전력를 사용하지 않는 펌프입니다.
 block.rotary-pump.description = 고급 펌프. 더 많은 액체를 퍼올리지만, 전력이 필요합니다.
 block.thermal-pump.description = 가장 강력한 펌프.
@@ -1173,32 +1260,32 @@ block.phase-conduit.description = 고급 액체 운송 블록. 전력을 사용
 block.power-node.description = 연결된 노드에 전력을 전송합니다. 노드는 인접한 블록에서 전력을 공급 받거나 전력을 공급 합니다.
 block.power-node-large.description = 더 넓은 범위의 고급 전력 노드.
 block.surge-tower.description = 사용 가능한 연결 수가 적은 장거리 전력 노드.
-block.diode.description = 배터리 전력은 이 블록을 통해 한 방향으로만 흐를 수 있지만, 다른 쪽의 전원이 덜 저장된 경우에만 가능합니다.
-block.battery.description = 에너지가 넘쳐날 때 완충제로 전력을 저장합니다. 전력에 적자가 발생할때 전력을 출력합니다.
+block.diode.description = 배터리 전력은 이 블록을 통해 한 방향으로만 흐를 수 있지만, 출력 방향 배터리의 전력이 더 적은 경우에만 가능합니다.
+block.battery.description = 에너지가 넘쳐날 때 완충재로 전력을 저장합니다. 전력에 적자가 발생할 때 전력을 출력합니다.
 block.battery-large.description = 일반 배터리보다 훨씬 더 많은 전력을 저장합니다.
 block.combustion-generator.description = 석탄과 같은 가연성 물질을 연소시켜 전력을 생산합니다.
 block.thermal-generator.description = 열이 있는 곳에 설치하면 전력이 생성됩니다.
-block.turbine-generator.description = 고급 연소 발전기. 더 효율적이지만 증기를 생성하기 위해 물이 필요합니다.
-block.differential-generator.description = 많은 량의 전력을 생성합니다. 냉각수와 불타는 피라타이트의 온도 차이를 이용합니다.
-block.rtg-generator.description = 간단하고 안정적인 발전기. 부패하는 방사성 화합물의 열을 이용하여 느린 속도로 전력을 생성합니다.
+block.steam-generator.description = 고급 연소 발전기. 더 효율적이지만 증기를 생성하기 위해 물이 필요합니다.
+block.differential-generator.description = 많은 양의 전력을 생성합니다. 냉각수와 불타는 파이라타이트의 온도 차이를 이용합니다.
+block.rtg-generator.description = 간단하고 안정적인 발전기. 붕괴하는 방사성 물질의 열을 이용하여 느린 속도로 전력을 생성합니다.
 block.solar-panel.description = 태양으로부터 소량의 전력을 생성합니다.
 block.solar-panel-large.description = 표준 태양 전지판보다 훨씬 더 효율적인 버전.
-block.thorium-reactor.description = 토륨으로부터 상당한 양의 전력을 생산합니다. 지속적인 냉각이 필요하며, 충분한 양의 냉각수가 공급되지 않으면 크게 폭발합니다. 전력 출력은 최대 재료 수용용량에 따라 달라집니다.
-block.impact-reactor.description = 최고 효율로 대량의 전력을 생산할 수 있는 고급 발전기. 프로세스를 시작할려면 상당한 전력 공급이 필요합니다.
-block.mechanical-drill.description = 가격이 싼 드릴. 적절한 타일에 설치하면 아이템을 천천히 느린 속도로 출력합니다. 기본 자원만 채굴할 수 있습니다.
+block.thorium-reactor.description = 토륨으로부터 상당한 양의 전력을 생산합니다. 지속적인 냉각이 필요하며, 충분한 양의 냉각수가 공급되지 않으면 크게 폭발합니다. 전력 출력은 토륨의 양에 따라 달라집니다.
+block.impact-reactor.description = 최고 효율로 대량의 전력을 생산할 수 있는 고급 발전기. 프로세스를 시작하려면 상당한 전력 공급이 필요합니다.
+block.mechanical-drill.description = 가격이 싼 드릴. 적절한 타일에 설치하면 자원을 천천히 느린 속도로 출력합니다. 기본 자원만 채굴할 수 있습니다.
 block.pneumatic-drill.description = 티타늄을 채광할 수 있는 향상된 드릴. 기계식 드릴보다 더 빠른 속도로 채굴합니다.
 block.laser-drill.description = 레이저 기술을 통해 더욱 빠르게 드릴링 할 수 있지만 전력이 필요합니다. 토륨 채굴 가능.
 block.blast-drill.description = 최상위 드릴. 많은 양의 전력이 필요합니다.
 block.water-extractor.description = 지하수를 추출합니다. 지표수가 없는 곳에서 사용합니다.
-block.cultivator.description = 대기 중의 작은 농도의 포자를 배양 가능한 포드로 배양합니다.
+block.cultivator.description = 대기 중의 작은 농도의 포자를 산업용 버섯으로 배양합니다.
 block.oil-extractor.description = 석유를 추출하기 위해 많은 양의 전력과 모래 및 물을 사용합니다.
-block.core-shard.description = 코어 캡슐의 첫번째 형태. 일단 파괴되면 해당 지역과의 모든 연결이 끊어집니다. 이런 일이 일어나지 않도록 하십시오.
-block.core-foundation.description = 코어의 두번째 버전. 더 나은 방어력과 자원을 저장합니다.
+block.core-shard.description = 코어 캡슐의 첫 번째 형태. 파괴되면 해당 지역과의 모든 연결이 끊어집니다. 이런 일이 일어나지 않도록 하십시오.
+block.core-foundation.description = 코어의 두 번째 버전. 더 나은 방어력과 자원을 저장합니다.
 block.core-nucleus.description = 코어 캡슐의 세 번째이자 마지막 형태입니다. 방어력이 매우 높고 대량의 자원을 저장할 수 있습니다.
-block.vault.description = 각 유형의 많은 양의 자원을 저장합니다. 언로더 블록을 사용하여 창고에서 아이템을 빼낼 수 있습니다.
-block.container.description = 각 유형의 소량의 자원을 저장합니다. 언로더 블록을 사용하여 컨테이너에서 아이템을 빼낼 수 있습니다.
-block.unloader.description = 근처의 비 수송 블록에서 아이템을 빼냅니다. 빼낼 자원 유형을 눌러 변경할 수 있십니다.
-block.launch-pad.description = 코어 출격 없이도 아이템을 묶어 출격시킬 수 있습니다.
+block.vault.description = 각 유형의 많은 양의 자원을 저장합니다. 언로더 블록을 사용하여 창고에서 자원을 빼낼 수 있습니다.
+block.container.description = 각 유형의 소량의 자원을 저장합니다. 언로더 블록을 사용하여 컨테이너에서 자원을 빼낼 수 있습니다.
+block.unloader.description = 근처의 비 수송 블록에서 자원을 빼냅니다. 눌러서 빼낼 자원을 변경할 수 있십니다.
+block.launch-pad.description = 코어 출격 없이도 자원을 묶어 출격시킬 수 있습니다.
 block.launch-pad-large.description = 출격 패드의 개선된 버전. 더 많은 자원을 저장하며 더 자주 출격합니다.
 block.duo.description = 작고 저렴한 포탑. 지상 유닛에 유용합니다.
 block.scatter.description = 필수 대공 포탑. 적군에게 납 덩어리, 고철, 또는 강화 유리 조각 덩어리를 뿌립니다.
@@ -1208,12 +1295,11 @@ block.wave.description = 중형 포탑. 적에게 액체를 발사합니다. 물
 block.lancer.description = 중형 대지 레이저 포탑. 강력한 에너지 빔을 충전하여 발사합니다.
 block.arc.description = 작은 근거리 전격 포탑. 적에게 전격 아크를 발사합니다.
 block.swarmer.description = 중형 미사일 포탑. 공중과 지상의 적을 모두 공격하며, 유도탄을 발사합니다.
-block.salvo.description = 더 큰 고급 듀오 포탑 버전입니다. 적에게 총알을 빠르게 발사합니다.
+block.salvo.description = 더 큰 고급 듀오 포탑입니다. 적에게 총알을 빠르게 발사합니다.
 block.fuse.description = 넓은 근거리 파편 포탑. 근처의 적에게 3개의 관통 총알을 발사합니다.
 block.ripple.description = 매우 강력한 포병 포탑. 원거리에 있는 적에게 포탄 무리를 쏘세요.
 block.cyclone.description = 대공 및 대지 포탑. 근처 유닛에게 폭발성 덩어리를 발사합니다.
 block.spectre.description = 거대한 이중 배럴 대포. 공중 및 지상 목표물에 큰 관통 철갑탄을 발사합니다.
 block.meltdown.description = 거대한 레이저 대포. 근처의 적에게 지속적인 레이버 빔을 충전하여 발사합니다. 냉각수가 있어야 작동합니다.
-block.command-center.description = 전장에서 아군 유닛에게 이동 명령을 내립니다.\n유닛을 모으거나 적의 코어를 공격하거나 코어/공장으로 후퇴시킵니다. 적의 코어가 없으면 유닛들은 기본적으로 공격 명령에 따라 순찰합니다.
-block.repair-point.description = 주변에서 가장 가까운 유닛들을 지속적으로 치료합니다.
-block.segment.description = 오고있는 발사체를 파괴합니다. 레이저는 목표 대상이 아닙니다.
+block.repair-point.description = 주변에서 가장 가까운 유닛을 지속적으로 치료합니다.
+block.segment.description = 날아오는 발사체를 요격합니다. 레이저는 목표 대상이 아닙니다.
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 9b1a01c642..a318c53f5f 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io puslapis su PC atsisiuntimu
 link.google-play.description = Google Play parduotuvės elementas
 link.f-droid.description = F-Droid katalogo elementas
 link.wiki.description = Oficialus Mindustry wiki
-link.feathub.description = Pasiūlykite naujas funkcijas
+link.suggestions.description = Pasiūlykite naujas funkcijas
 linkfail = Nepavyko atidaryti nuorodos!\nURL nukopijuotas į jūsų iškarpinę.
 screenshot = Ekrano kopija išsaugota į {0}
 screenshot.invalid = Žemėlapis yra per didelis, potencialiai nepakanka vietos išsaugoti ekrano kopiją.
@@ -20,6 +20,8 @@ gameover = Žaidimas Baigtas
 gameover.pvp = [accent] {0}[] komanda laimėjo!
 highscore = [accent]Naujas rekordas!
 copied = Nukopijuota.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Garsai
 load.map = Žemėlapiai
@@ -63,8 +65,7 @@ stat.delivered = Paleisti resursai:
 stat.playtime = Žaidimo trukmė:[accent] {0}
 stat.rank = Finalinis laipsnis: [accent]{0}
 
-launcheditems = [accent]Paleisti resursai
-launchinfo = [unlaunched][[PALEISKITE] savo branduolį norint gauti resursus, kurie yra paryškinti mėlynai.
+globalitems = [accent]Global Items
 map.delete = Ar esate tikri, jog norite ištrinti žemėlapį "[accent]{0}[]"?
 level.highscore = Rekordas: [accent]{0}
 level.select = Lygio pasirinkimas
@@ -106,6 +107,7 @@ mods.guide = Modifikavimo pagalba
 mods.report = Pranešti apie klaidas
 mods.openfolder = Atidaryti modifikacijų aplanką
 mods.reload = Perkrauti
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Modifikacijos:[orange] {0}
 mod.enabled = [lightgray]Įjungta
 mod.disabled = [scarlet]Išjungta
@@ -113,6 +115,7 @@ mod.disable = Išjungti
 mod.content = Tūrinys:
 mod.delete.error = Negalima ištrinti modifikacijos. Failas gali būti naudojamas.
 mod.requiresversion = [scarlet]Žemiausia privaloma žaidimo versija: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Trūkstamos priklausomybės: {0}
 mod.erroredcontent = [scarlet]Turinio klaidos.
 mod.errors = Įvyko klaida kraunant turinį.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Privalomas perkrovimas
 mod.import = Importuoti modifikaciją
 mod.import.file = Importuoti failą
 mod.import.github = Importuoti GitHub modifikaciją
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Šis elementas yra[accent] '{0}'[] modifikacijos dalis. Norėdami panaikinti ją turite pašalinti modifikaciją.
 mod.remove.confirm = Ši modifikacija bus pašalinta.
 mod.author = [lightgray]Autorius:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Apie
 name = Vardas:
 noname = Pirma pasirinkite[accent] žaidėjo vardą[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Failo pavadinimas:
 unlocked = Atrakintas naujas turinys!
 completed = [accent]Išrasta
@@ -142,6 +148,7 @@ techtree = Technologijų Medis
 research.list = [lightgray]Išradimai:
 research = Išrasti
 researched = [lightgray]{0} išrasta.
+research.progress = {0}% complete
 players = {0} žaidėjai
 players.single = {0} žaidėjas
 players.search = ieškoti
@@ -224,7 +231,6 @@ save.new = Naujas Išsaugojimas
 save.overwrite = Ar esate tikras, jog\n norite perrašyti šį elementą?
 overwrite = Perrašyti
 save.none = Nerasta jokių išsaugojimų!
-saveload = Išsaugoma...
 savefail = Nepavyko išsaugoti žaidimo!
 save.delete.confirm = Ar esate tikras, jog norite pašalinti šį išsaugojimą?
 save.delete = Šalinti
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Ar esate tikras, jog žinote ką darote?\nPradininkas ga
 loading = [accent]Kraunama...
 reloading = [accent]Iš naujo kraunamos modifikacijos...
 saving = [accent]Išsaugoma...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] plano išvalymui
 selectschematic = [accent][[{0}][] pasirinkimui+kopijavimui
 pausebuilding = [accent][[{0}][] statymo sustabdymui
@@ -328,8 +335,9 @@ waves.never = <niekada>
 waves.every = kiekvieną
 waves.waves = banga(os)
 waves.perspawn = per spawn
+waves.shields = shields/wave
 waves.to = iki
-waves.boss = Bosas
+waves.guardian = Guardian
 waves.preview = Apžiūra
 waves.edit = Redaguoti...
 waves.copy = Kopijuoti į iškarpinę
@@ -337,6 +345,11 @@ waves.load = Užkrauti iš iškarpinės
 waves.invalid = Klaidingos bangos iš iškarpinės.
 waves.copied = Bangos nukopijuotos.
 waves.none = Nėra nustatyta jokių priešų.\nĮsiminkite, jog tušti bangų maketai bus pakeisti numatytuoju maketu.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Numatytasis>
 details = Detaliau...
 edit = Redaguoti...
@@ -456,10 +469,12 @@ locked = Užrakinta
 complete = [lightgray]Įvykdyta:
 requirement.wave = Pasiekite {0} zonoje {1}
 requirement.core = Sunaikinkite priešų branduolį zonoje {0}
-requirement.unlock = Atrakinti {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Pratęsti zoną:\n[lightgray]{0}
 bestwave = [lightgray]Bangos rekordas: {0}
 launch = < PALEISTI >
+launch.text = Launch
 launch.title = Paleidimas sėkmingas
 launch.next = [lightgray]kita proga bangoje {0}
 launch.unable2 = [scarlet]Negalima PALEISTI.[]
@@ -467,13 +482,14 @@ launch.confirm = Tai paleis visus resursus jūsų branduolyje.\nJūs nebegalėsi
 launch.skip.confirm = Jei praleisite dabar, negalėsite paleisti iki vėlesnių bangų.
 uncover = Atidengti
 configure = Keisti resursų kiekį
+loadout = Loadout
+resources = Resources 
 bannedblocks = Uždrausti blokai
 addall = Pridėti visus
-configure.locked = [lightgray]Atrakinkite resursų kiekio keitimą: {0}.
+launch.destination = Destination: {0}
 configure.invalid = Kiekis turi būti numeris tarp 0 ir {0}.
 zone.unlocked = [lightgray]{0} atrakinta.
 zone.requirement.complete = Rekalavimai {0} įvykdyti:[lightgray]\n{1}
-zone.config.unlocked = Resursų keitimas atrakintas:[lightgray]\n{0}
 zone.resources = [lightgray]Aptikti resursai:
 zone.objective = [lightgray]Tikslas: [accent]{0}
 zone.objective.survival = Išgyventi
@@ -492,35 +508,43 @@ error.io = Tinklo I/O klaida.
 error.any = Nžinoma tinklo klaida.
 error.bloom = Nepavyko inicijuoti spindėjimo.\nJūsų įrenginys gali nepalaikyti šios funkcijos.
 
-zone.groundZero.name = Nulinė Žemė
-zone.desertWastes.name = Dykumos Dykvietės
-zone.craters.name = Krateriai
-zone.frozenForest.name = Užšalęs Miškas
-zone.ruinousShores.name = Sugriuvę krantai
-zone.stainedMountains.name = Beicuoti Kalnai
-zone.desolateRift.name = Apleistas Tarpeklis
-zone.nuclearComplex.name = Branduolinės Gamybos Kompleksas
-zone.overgrowth.name = Peraugimas
-zone.tarFields.name = Dervos Kaukai
-zone.saltFlats.name = Druskos Lygumos
-zone.impact0078.name = Poveikis 0078
-zone.crags.name = Uolos
-zone.fungalPass.name = Grybų perėja
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Optimali vieta pradėjimui iš naujo. Mažas priešų pavojus. Keletas Resursų.\nSurinkite kuo daugiau Švino ir Vario.\nJudėkite toliau.
-zone.frozenForest.description = Net čia, arčiau kalnų, išplito sporos. Šalti orai jų negali išlaikyti visą amžinybę.\n\nPradėkite kelionę į energijos gamybą. Pastatykite vidaus degimo variklius. Išmokite naudoti taisytojus.
-zone.desertWastes.description = Šios dykvietės yra plačios, nenuspėjamos ir nusėtos apleistais sektoriaus pastatais.\nŠiame regione yra anglies. Naudokite ją gaminti energiją arba sintetinkite į grafitą.\n\n[lightgray]Ši nusileidimo vieta negali būti garantuota.
-zone.saltFlats.description = Dykumos pakraštyje driekiasi Druskos Lygumos. Keletas resursų gali būti rasta šioje vietoje.\n\nČia priešai pasistatė savo resursų sandėlių kompleksą. Sunaikinkite jų branduolį. Nepalikite nieko gyvo.
-zone.craters.description = Vanduo susikaupė krateryje, senų karų relikvijoje. Atsiimkite zoną. Rinkite smėlį. Lydykite Meta Stiklą. Pumpuokite vandenį bokštams ir grąžtams aušinti.
-zone.ruinousShores.description = Po dykviečių yra kranto linija. Kartą, šio vietoje buvo pakrantės apsauga. Nebedaug išliko. Tik paprasčiausios gynybos struktūros išliko nesudaužytos, visa kita virto laužu.\nTęskite plėtimasi į išorę. Iš naujo atraskite technologijas.
-zone.stainedMountains.description = Toliau žemėje driekiasi kalnai.\nIšgaukite titaną, kurio gausu šioje zonoje. Išmokite jį naudoti.\n\nČia priešų kiekis yra didesnis. Neduokite jiems laiko siųsti stipriausius vienetus.
-zone.overgrowth.description = Ši vieta yra peraugusi, arčiau sporų šaltinio.\nPriešai įsikūrė gyvenvietę. Pasigaminkite Titanus. Sunaikinkite ją. Atgaukite tai, kas buvo prarasta.
-zone.tarFields.description = Pakraštys naftos produkcijos zonos, tarp kalnų ir dykumų. Viena iš keleto zonų su galimais panaudoti dervos resursais.\nNors apleista, ši zona turi pavojingų priešo pajėgų netoliese. Nenuvertinkite jų.\n\n[lightgray]Išraskite naftos apdirbimo technologijas, jei įmanoma.
-zone.desolateRift.description = Ekstremaliai pavojinga zona. Daugybė resursų, tačiau mažai vietos. Didelė sunaikinimo rizika. Palikite kuo greičiau. Neapsaugaukite ilgais laikais tarpais tarp priešo atakų.
-zone.nuclearComplex.description = Buvusi gamykla torio gamybai ir apdirbimui, sumažinta iki griuvėsių.\n[lightgray]Atraskite Torį ir panaudojimo būdus.\n\nPriešas būna dideliais kiekiais, pastoviai besižvalgantys puolimo.
-zone.fungalPass.description = Perėjimas tarp aukštų kalnų ir žemesnių,  sporomis apaugusių žemių. Čia įsikūrusi nedidelė priešų žvalgybos bazė.\nSunaikinkite ją.\nNaudokite Dagerių ir Krolerių vienetus. Sunaikinkite abu branduolius.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Kalba
 settings.data = Žaidimo Duomenys
@@ -534,9 +558,12 @@ settings.graphics = Grafikos
 settings.cleardata = Išvalyti žaidimo duomenis...
 settings.clear.confirm = Ar tikrai norite ištrinti šiuos duomenis?\nTai negali būti atkurta!
 settings.clearall.confirm = [scarlet]ĮSPĖJIMAS![]\nTai ištrins visus duomenis, įskaitant išsaugojimus, žemėlapius, atrakinimus ir mygtukų pakeitimus.\nVos paspaudus 'gerai' žaidimas ištrins visus duomenis ir išsijungs.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Sustabdyta >
 clear = Išvalyti
 banned = [scarlet]Užblokuota
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Taip
 no = Ne
 info.title = Informacija
@@ -558,8 +585,11 @@ blocks.itemsmoved = Judėjimo Greitis
 blocks.launchtime = Laikas Tarp Paleidimų
 blocks.shootrange = Atstumas
 blocks.size = Dydis
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Skysčių Talpumas
 blocks.powerrange = Energijos Skleidimo Atstumas
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Maks. Jungčių Kiekis
 blocks.poweruse = Energijos Suvartojimas
 blocks.powerdamage = Power/Damage
@@ -575,13 +605,18 @@ blocks.boosteffect = Pastiprinimo Efektas
 blocks.maxunits = Maks. Aktyvių Vienetų Kiekis
 blocks.health = Gyvybės
 blocks.buildtime = Statymo Laikas
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Statymo Kaina
 blocks.inaccuracy = Netikslumas
 blocks.shots = Šūviai
 blocks.reload = Šūviai per sekundę
 blocks.ammo = Šoviniai
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Privalomas Geresnis Grąžtas
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Grąžto Greitis: {0}/s
 bar.pumpspeed = Pompos Greitis: {0}/s
 bar.efficiency = Efektyvumas: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Energija: {0}
 bar.poweroutput = Energijos Išeiga: {0}
 bar.items = Daiktai: {0}
 bar.capacity = Talpumas: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Skystis
 bar.heat = Karščiai
 bar.power = Jėga
 bar.progress = Statymo Progresas
-bar.spawned = Vienetai: {0}/{1}
 bar.input = Įeiga
 bar.output = Išeiga
 
@@ -619,12 +655,16 @@ unit.liquidunits = skysčio vienetai
 unit.powerunits = energijos vienetai
 unit.degrees = laipsnių
 unit.seconds = sekundės
+unit.minutes = mins
 unit.persecond = /sek.
+unit.perminute = /min
 unit.timesspeed = x greičio
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = daiktai
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Bendra
 category.power = Energija
 category.liquids = Skysčiai
@@ -639,6 +679,7 @@ setting.linear.name = Linijinis Filtravimas
 setting.hints.name = Užuominos
 setting.flow.name = Rodyti Resursų Srauto Geritį[scarlet] (experimental)
 setting.buildautopause.name = Automatinis Statybų Sustabdymas
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Vandens Animacija
 setting.animatedshields.name = Skydų Animacija
 setting.antialias.name = Glodinimas[lightgray] (reikalingas perkrovimas)[]
@@ -663,7 +704,6 @@ setting.effects.name = Rodyti Efektus
 setting.destroyedblocks.name = Rodyti Sugriautus Blokus
 setting.blockstatus.name = Rodyti Blokų Būseną
 setting.conveyorpathfinding.name = Konvejerio Paskirties Vietos Nustatymas
-setting.coreselect.name = Leisti Schemų Branduolius
 setting.sensitivity.name = Valdymo Jautrumas
 setting.saveinterval.name = Išsaugojimo Intervalas
 setting.seconds = {0} sekundžių
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milisekundžių
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Langas Be Pakrasčių[lightgray] (gali reikėti perkrauti)
 setting.fps.name = Rodyti FPS ir Ping
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Rodyti Blokų Pasirinkimo Mygtukus
 setting.vsync.name = VSync
 setting.pixelate.name = Pikseliavimas
 setting.minimap.name = Rodyti Mini Žemėlapį
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Rodyti Žaidėjų Pozicijas
 setting.musicvol.name = Muzikos Garsumas
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Aplinkos Garsas
 setting.mutemusic.name = Nutildyti Muziką
 setting.sfxvol.name = SFX Garsumas
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Dauguma valdymo mygtukų neveikia telefone. Tik papar
 category.general.name = Bendra
 category.view.name = Vaizdas
 category.multiplayer.name = Žaidimas Tinkle
+category.blocks.name = Block Select
 command.attack = Pulti
 command.rally = Susitelkti
 command.retreat = Atsitraukti
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Išvalyti Statybas
 keybind.press = Paspauskite mygtuką...
 keybind.press.axis = Paspauskite aši arba mygtuką...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Įjungti/Išjungti Blokų Statusus
 keybind.move_x.name = Judėjimas X ašimi
 keybind.move_y.name = Judėjimas Y ašimi
 keybind.mouse_move.name = Sekti Pelę
-keybind.dash.name = Greitas Judėjimas
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Pasirinkite Regioną
 keybind.schematic_menu.name = Schemų Meniu
 keybind.schematic_flip_x.name = Apversti schemą per X ašį
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Įstrižas Padėjimas
 keybind.pick.name = Pasirinkti Bloką
 keybind.break_block.name = Išgriauti Bloką
 keybind.deselect.name = Panaikinti Pasirinkimą
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Šauti
 keybind.zoom.name = Keisti Vaizdo Mastelį
 keybind.menu.name = Meniu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reaktorių Sprogimai
 rules.wavetimer = Bangų Laikmatis
 rules.waves = Bangos
 rules.attack = Puolimo Režimas
+rules.buildai = AI Building
 rules.enemyCheat = Neriboti Kompiuterio (Raudonosios Komandos) Resursai
-rules.unitdrops = Vienetų Išmetimai
+rules.blockhealthmultiplier = Blokų Gyvybių Daugiklis
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Vienetų Gamybos Greičio Daugiklis
 rules.unithealthmultiplier = Vienetų Gyvybių Daugiklis
-rules.blockhealthmultiplier = Blokų Gyvybių Daugiklis
-rules.playerhealthmultiplier = Žaidėjų Gyvybių Daugiklis
-rules.playerdamagemultiplier = Žaidėjų Žalos Daugiklis
 rules.unitdamagemultiplier = Vienetų Žalos Daugiklis
 rules.enemycorebuildradius = Nestatymo aplink priešų branduolį spindulys:[lightgray] (blokais)
-rules.respawntime = Prisikėlimo Laikas:[lightgray] (sek.)
 rules.wavespacing = Tarpai Tarp Bangų:[lightgray] (sek.)
 rules.buildcostmultiplier = Statymo Kainų Daugiklis
 rules.buildspeedmultiplier = Statymo Greičio Daugiklis
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Laukti, kol pasibaigs banga
 rules.dropzoneradius = Išmetimo Zonos Spindulys:[lightgray] (blokais)
-rules.respawns = Maks. Prisikėlimų Kiekis Per Bangą
-rules.limitedRespawns = Riboti Prisikėlimus
+rules.unitammo = Units Require Ammo
 rules.title.waves = Bangos
-rules.title.respawns = Prisikėlimai
 rules.title.resourcesbuilding = Resursai ir Pastatai
-rules.title.player = Žaidėjai
 rules.title.enemy = Priešai
 rules.title.unit = Vienetai
 rules.title.experimental = Eksperimentinis
+rules.title.environment = Environment
 rules.lighting = Apšvietimas
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Aplinkos Šviesa
-rules.solarpowermultiplier = Saulės Energijos Daugiklis
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Daiktai
 content.liquid.name = Skysčiai
@@ -827,10 +878,11 @@ liquid.water.name = Vanduo
 liquid.slag.name = Šlakas
 liquid.oil.name = Nafta
 liquid.cryofluid.name = Krio Skystis
-item.corestorable = [lightgray]Įmanoma laikyti branduolyje: {0}
+
 item.explosiveness = [lightgray]Sprogstamumas: {0}%
 item.flammability = [lightgray]Degumas: {0}%
 item.radioactivity = [lightgray]Radioaktyvumas: {0}%
+
 unit.health = [lightgray]Gyvybės: {0}
 unit.speed = [lightgray]Greitis: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Karščio Talpumas: {0}
 liquid.viscosity = [lightgray]Klampumas: {0}
 liquid.temperature = [lightgray]Temperatūra: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Smėlio Riedulys
 block.grass.name = Žolė
 block.slag.name = Slag
 block.salt.name = Druska
-block.saltrocks.name = Druskos Akmenys
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Akmenukai
 block.tendrils.name = Tendrilės
-block.sandrocks.name = Smėlėtos Uolienos
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Sporinė Pušis
-block.sporerocks.name = Sporinės Uolienos
-block.rock.name = Uolienos
-block.snowrock.name = Sniego Uolienos
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snieginė Pušis
 block.shale.name = Skalūnas
 block.shale-boulder.name = Skalūno Riedulys
 block.moss.name = Samanos
 block.shrubs.name = Krūmai
 block.spore-moss.name = Sporų Samanos
-block.shalerocks.name = Skalūno Uolienos
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Laužo Siena
 block.scrap-wall-large.name = Didelė Laužo Siena
 block.scrap-wall-huge.name = Didžiulė Laužo Siena
@@ -890,13 +979,17 @@ block.craters.name = Krateriai
 block.sand-water.name = Smėlio vanduo
 block.darksand-water.name = Tamsaus Smėlio Vanduo
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ledinis Sniegas
-block.rocks.name = Uolienos
-block.icerocks.name = Ledo Uolienos
-block.snowrocks.name = Sniego Uolienos
-block.dunerocks.name = Kopų Uolienos
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pušis
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Baltas Medis, Miręs
 block.white-tree.name = Baltas Medis
 block.spore-cluster.name = Spore Cluster
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Tamsioji Plokštė 4
 block.dark-panel-5.name = Tamsioji Plokštė 5
 block.dark-panel-6.name = Tamsioji Plokštė 6
 block.dark-metal.name = Tamsusis Metalas
-block.ignarock.name = Igna Uoliena
+block.basalt.name = Basalt
 block.hotrock.name = Karštoji Uoliena
 block.magmarock.name = Magmos Uoliena
-block.cliffs.name = Uolos
 block.copper-wall.name = Vario Siena
 block.copper-wall-large.name = Didelė Vario Siena
 block.titanium-wall.name = Titano Siena
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Neperpildymo Užtvara
 block.silicon-smelter.name = Silicio Lydykla
 block.phase-weaver.name = Fazinė Audykla
 block.pulverizer.name = Pulverizatorius
-block.cryofluidmixer.name = Krio Skysčio Maišytojas
+block.cryofluid-mixer.name = Krio Skysčio Maišytojas
 block.melter.name = Lydytuvas
 block.incinerator.name = Deginimo krosnis
 block.spore-press.name = Sporų Presas
@@ -964,7 +1056,7 @@ block.diode.name = Baterijos Diodas
 block.battery.name = Baterija
 block.battery-large.name = Didelė Baterija
 block.combustion-generator.name = Vidaus Degimo Generatorius
-block.turbine-generator.name = Garų Generatorius
+block.steam-generator.name = Garų Generatorius
 block.differential-generator.name = Diferencialinis Generatorius
 block.impact-reactor.name = Smūginis Reaktorius
 block.mechanical-drill.name = Mechaninis Grąžtas
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Sprogiklio Maišytuvas
 block.solar-panel.name = Saulės Baterija
 block.solar-panel-large.name = Didelė Saulės Baterija
 block.oil-extractor.name = Naftos Trauktuvas
-block.command-center.name = Komandų Centras
-block.draug-factory.name = Draug Miner Dronų Gamykla
-block.spirit-factory.name = Spirit Repair Dronų Gamykla
-block.phantom-factory.name = Phantom Builder Dronų Gamykla
-block.wraith-factory.name = Wraith Fighter Gamykla
-block.ghoul-factory.name = Ghoul Bomber Gamykla
-block.dagger-factory.name = Dagger Mech Gamykla
-block.crawler-factory.name = Crawler Mech Gamykla
-block.titan-factory.name = Titan Mech Gamykla
-block.fortress-factory.name = Fortress Mech Gamykla
-block.revenant-factory.name = Revenant Fighter Gamykla
 block.repair-point.name = Taisymo Taškas
 block.pulse-conduit.name = Pulsinis Vamzdis
 block.plated-conduit.name = Padengtas Vamzdis
@@ -1036,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Talpykla
 block.launch-pad.name = Paleidimo Aikštelė
 block.launch-pad-large.name = Didelė Paleidimo Aikštelė
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = mėlyna
 team.crux.name = raudona
 team.sharded.name = oranžinė
@@ -1043,21 +1147,7 @@ team.orange.name = oranžinė
 team.derelict.name = apleista
 team.green.name = žalia
 team.purple.name = violetinė
-unit.spirit.name = Spirit Repair Dronas
-unit.draug.name = Draug Miner Dronas
-unit.phantom.name = Phantom Builder Dronas
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titanas
-unit.ghoul.name = Ghoul Bomber
-unit.wraith.name = Wraith Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Paspauskite norėdami tęsti>
 tutorial.intro = Jūs įžengėte į [scarlet] Mindustry Pradininką.[]\nNaudokite[accent] [[WASD][] norėdami judėti.\n[accent]Naudoktie vidurinį pelės klavišą[] norėdami pakeisti mastelį.\nPradėkite nuo[accent] Vario kasimo[]. Pajudėkite arčiau jo, tada spauskite ant Vario venos, kuri yra šalia jūsų, norėdami kasti varį.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = Jūs įžengėte į [scarlet] Mindustry Pradininką.[]\nBraukite per ekraną norėdami judėti.\n[accent]Braukite dviemis pirštais priešingomis kryptimis[] norėdami keisti mastelį.\nPradėkite nuo[accent] Vario kasimo[]. Pradėkite nuo[accent] Vario kasimo[]. Pajudėkite arčiau jo, tada spauskite ant Vario venos, kuri yra šalia jūsų, norėdami kasti varį.\n\n[accent]{0}/{1} copper
@@ -1100,17 +1190,7 @@ liquid.water.description = Naudingiausias skystis. Dažniausiai naudojamas įren
 liquid.slag.description = Įvairių rūšių metalai susilydę tarpusavyję. Gali būti atskirti į sudedamasias medžiagas arba išpurkšti ant priešų.
 liquid.oil.description = Skystis, naudojamas pažangių medžiagų gamyboje. Gali būti konvertuota į anglį arba gali būti išpurkšta ir padegta.
 liquid.cryofluid.description = Inertiškas, neėsdinantis skystis gaminamas iš vandens ir titano. Atlaiko ypač didelį karštį. Plačiai naudojamas kaip aušinimo skystis.
-unit.draug.description = Primityvus kasimo dronas. Pigus. Panaudojamas. Automatiškai kasa netoliese esantį varį ir šviną. Pristato iškastus resursus į  artimiausią branduolį.
-unit.spirit.description = Modifikuotas draug dronas, skirtas taisyti, o ne kasti. Automatiškai taiso zonoje esančiu sugadintus blokus.
-unit.phantom.description = Pažengęs dronų vienetas. Seka žaidėjus. Padeda statybose.
-unit.dagger.description = Paprasčiausias žemės vienetas. Pigus pagaminti. Galingas, kai naudojamas būriais.
-unit.crawler.description = Antžeminis vienetas, kurį sudaro rėmas ir ant viršaus užrišti sprogmenys. Nelabai patvarus. Sprogsta kontaktuodamas su priešais.
-unit.titan.description = Pažengęs, šarvuotas antžeminis vienetas. Puola žemę ir orą. Apginkluotas dvejais miniatiūriniais "Scorch" klasės liepsnosvaidžiais.
-unit.fortress.description = Sunkiosios artilerijos vienetas. Apginkluotas dvejomis modifikuotomis "Hail" tipo  patrankomis priešo struktūrų ir pajėgų užpuolimui iš tolimo atstumo.
-unit.eruptor.description = Sunkusis vienetas skirtas nugriauti struktūras. Šaudo šlako srovėmis į priešo įtvirtinimus jas išlydydamas ir uždegdamas degias medžiagas.
-unit.wraith.description = Greitas, smok ir bėk vienetas. Taikosi į energijos generatorius.
-unit.ghoul.description = Sunkusis bombonešis. Pereina per priešo struktūras taikydamasis į kritinę infrastruktūrą.
-unit.revenant.description = Sunkus, skraidantis raketų masyvas.
+
 block.message.description = Laiko žinutę. Naudojama komunikacijai tarp sąjungininkų.
 block.graphite-press.description = Sukompresuoja anglies gabalus į grynas grafito plokštes.
 block.multi-press.description = Patobulinta grafito preso versija. Pasitelkia vandenį ir energiją greitam ir efektyviam anglies apdirbimui.
@@ -1119,7 +1199,7 @@ block.kiln.description = Sulydo smėlį ir stiklą į junginį žinomą kaip met
 block.plastanium-compressor.description = Gamina plastaniumą iš naftos ir titano.
 block.phase-weaver.description = Susintetina fazinį audinį iš radioaktyvaus torio ir smėlio. Veikimui reikalingas didžiulis kiekis energijos.
 block.alloy-smelter.description = Sumaišo titaną, šviną, silicį ir varį į viršįtampį lydinį.
-block.cryofluidmixer.description = Maišo vandenį ir smulkias titano dulkes į krio skystį. Būtinas torio reaktoriaus naudojimui.
+block.cryofluid-mixer.description = Maišo vandenį ir smulkias titano dulkes į krio skystį. Būtinas torio reaktoriaus naudojimui.
 block.blast-mixer.description = Susmulkina ir sumaišo sporas su piratitu ir pagamina sprogųjį junginį.
 block.pyratite-mixer.description = Sumaišo anglį, šviną ir smėlį į itin degų piratitą.
 block.melter.description = Išlydo metalo laužą į šlaką tolesniam apdorojimui arba naudojimui wave bokštuose.
@@ -1185,7 +1265,7 @@ block.battery.description = Laiko enegiją kaip buferis, kai reikalinga papildom
 block.battery-large.description = Laiko daugiau energijos negu paprasta baterija.
 block.combustion-generator.description = Gamina energiją degindamas degias medžiagas kaip anglis.
 block.thermal-generator.description = Gamina energiją, kai pastatytas karštose vietose.
-block.turbine-generator.description = Pažangesnis vidaus degimo generatorius. Efektyvesnis, bet papildomai reikalauja vandens sukurti garams.
+block.steam-generator.description = Pažangesnis vidaus degimo generatorius. Efektyvesnis, bet papildomai reikalauja vandens sukurti garams.
 block.differential-generator.description = Gamina didelį kiekį energijos. Pasitelkia temperatūrų skirtumą tarp krio skysčio ir degančio piratito.
 block.rtg-generator.description = Paprastas, patikimas generatorius. Naudoja yrančių junginių karštį energijos gamybai.
 block.solar-panel.description = Suteikia mažą kiekį energijos iš saulės.
@@ -1221,15 +1301,5 @@ block.ripple.description = Itin galingas artilerijos bokštas. Dideliais atstuma
 block.cyclone.description = Didelis bokštas puolantis, tiek žemę, tiek orą. Šaudo sprogstančius šovinius į priešus.
 block.spectre.description = Milžiniškas dvivamzdis bokštas. Šaudo didelius, kiaurai per šarvus einančius šovinius į taikinius esančius ant žemės ir ore.
 block.meltdown.description = Milžiniška lazerinė patranka. Užsikrauna ir šaudo lazerinius spindulius į aplinkinius priešus. Veikimui reikalingas aušinimo skystis.
-block.command-center.description = Išduoda judėjimo komandas sąjungininkų vienetams visame žemėlapyje.\nPriverčia vienetus susitelkti, pulti priešų branduolį ir pasitraukti iki branduolio/vientų gamyklos. Kai nėra priešų branduolio, vienetai būna sargyboje, kai nustatyas puolimas.
-block.draug-factory.description = Gamina kasimo dronus.
-block.spirit-factory.description = Gamina pastatus taisančius dronus.
-block.phantom-factory.description = Gamina pažengusius statybų donus
-block.wraith-factory.description = Gamina greitus, smok-ir-bėk vienetus.
-block.ghoul-factory.description = Gamina sunkiuosius bombonešius.
-block.revenant-factory.description = Gamina sunkiuosius vienetus su raketomis.
-block.dagger-factory.description = Gamina paprastus antžeminius vienetus.
-block.crawler-factory.description = Gamina greitus spietinius susisprogdinančius vienetus.
-block.titan-factory.description = Gamina pažangesnius antžeminius vienetus.
-block.fortress-factory.description = Gamina antžeminius sunkiosios artilerijos vienetus.
 block.repair-point.description = Pastoviai gydo artimiausius netoliese esančius vienetus.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 8465a8a0d8..634b6eb00e 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io pagina met pc-downloads
 link.google-play.description = Google Play store vermelding
 link.f-droid.description = F-Droid catalogus vermelding
 link.wiki.description = Officiële Mindustry wiki
-link.feathub.description = Stel iets voor
+link.suggestions.description = Stel iets voor
 linkfail = Kan link niet openen!\nDe URL is gekopieerd naar je klembord
 screenshot = Schermafbeeling opgeslagen in {0}
 screenshot.invalid = Map is te groot, Mogelijk niet genoeg geheugen beschikbaar voor een schermafbeelding.
@@ -20,6 +20,8 @@ gameover = Spel afgelopen
 gameover.pvp = het[accent] {0}[] team heeft gewonnen!
 highscore = [accent]Nieuw topscore!
 copied = Gekopieerd.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Geluid
 load.map = Kaarten
@@ -63,8 +65,7 @@ stat.delivered = Middelen Gelanceerd:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Eindrang: [accent]{0}
 
-launcheditems = [accent]Gelanceerde items
-launchinfo = [unlaunched][[LANCEER] je core om de in blauw gekleurde items te krijgen.
+globalitems = [accent]Global Items
 map.delete = Weet je zeker dat je de map wilt verwijderen? "[accent]{0}[]"?
 level.highscore = Topscore: [accent]{0}
 level.select = Selecteer Level
@@ -106,6 +107,7 @@ mods.guide = Modding Handboek
 mods.report = Rapporteer Bug
 mods.openfolder = Open Mod Map
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aan
 mod.disabled = [scarlet]Uit
@@ -113,6 +115,7 @@ mod.disable = Deactiveer
 mod.content = Content:
 mod.delete.error = Mod verwijderen mislukt. Bestand mogelijk in gebruik.
 mod.requiresversion = [scarlet]Vereist minimaal mindustry versie: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Missende benodigdheden: {0}
 mod.erroredcontent = [scarlet]Inhoud Fouten
 mod.errors = Er hebben zich fouten voordaan tijdens het laden van de inhoud.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Herladen Vereist
 mod.import = Importeer Mod
 mod.import.file = Import File
 mod.import.github = Importeer GitHub Mod
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Dit item is onderdeel van de[accent] '{0}'[] mod. Verwijder deze eerst.
 mod.remove.confirm = Deze mod zal worden verwijderd.
 mod.author = [lightgray]Auteur:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Over
 name = Naam:
 noname = Maak eerst een[accent] Speler naam[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Bestandsnaam:
 unlocked = Nieuwe inhoud ontgrendeld!
 completed = [accent]Voltooid
@@ -142,6 +148,7 @@ techtree = Tech boom
 research.list = [lightgray]Onderzoek:
 research = Onderzoek
 researched = [lightgray]{0} Onderzocht.
+research.progress = {0}% complete
 players = {0} Spelers online
 players.single = {0} Speler online
 players.search = search
@@ -224,7 +231,6 @@ save.new = Nieuwe Save
 save.overwrite = Weet je zeker dat je deze\nsave wilt overschrijven?
 overwrite = Overschrijf
 save.none = Geen saves gevonden!
-saveload = [accent]Bewaren...
 savefail = Bewaren is mislukt!
 save.delete.confirm = Weet je zeker dat je deze save wilt verwijderen?
 save.delete = Verwijder
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Weet je zeker dat je weet wat je doet?\nJe kan de tutori
 loading = [accent]Laden...
 reloading = [accent]Mods herladen...
 saving = [accent]Opslaan...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] om blauwdruk te verwijderen
 selectschematic = [accent][[{0}][] om te selecteren + kopiëren
 pausebuilding = [accent][[{0}][] om bouwen te pauzeren
@@ -328,8 +335,9 @@ waves.never = <nooit>
 waves.every = elke
 waves.waves = ronde(s)
 waves.perspawn = per keer
+waves.shields = shields/wave
 waves.to = tot
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Voorvertoning
 waves.edit = Bewerk...
 waves.copy = Kopiër naar klembord
@@ -337,6 +345,11 @@ waves.load = Laad van klembord
 waves.invalid = Ongeldige rondes in klenbord.
 waves.copied = Rondes Gekopiëerd.
 waves.none = Geen vijanden ingesteld.\nLege rondes worden automatisch gevuld met de standaard waardes.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Standaard>
 details = Details...
 edit = Bewerk...
@@ -456,10 +469,12 @@ locked = Op slot
 complete = [lightgray]Voltooid:
 requirement.wave = Berijk ronde {0} in {1}
 requirement.core = Vernietig vijandige core in {0}
-requirement.unlock = Ontgrendel: {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Hervat zone:\n[lightgray]{0}
 bestwave = [lightgray]Beste ronde: {0}
 launch = < LANCEER >
+launch.text = Launch
 launch.title = Lancering Sucessvol
 launch.next = [lightgray]volgende lanceerkans in ronde {0}
 launch.unable2 = [scarlet]Lanceren niet mogelijk.[]
@@ -467,13 +482,14 @@ launch.confirm = Dit lanceert alle items in je core.\nJe zal niet meer terug kun
 launch.skip.confirm = Als je nu niet lanceert zul je moeten wachten tot de volgende mogelijkheid.
 uncover = Ontdek
 configure = Configureer startinventaris
+loadout = Loadout
+resources = Resources 
 bannedblocks = Verboden Blokken
 addall = Voeg Alles Toe
-configure.locked = [lightgray]Speel startinventaris configuratie vrij:\nronde{0}.
+launch.destination = Destination: {0}
 configure.invalid = Hoeveelheid moet een getal zijn tussen 0 en {0}.
 zone.unlocked = [lightgray]{0} vrijgespeeld.
 zone.requirement.complete = Ronde {0} berijkt:\n{1} zone vrijgespeeld.
-zone.config.unlocked = Startinventaris vrijgespeeld:[lightgray]\n{0}
 zone.resources = Vindbare grondstoffen:
 zone.objective = [lightgray]Doel: [accent]{0}
 zone.objective.survival = Overleef
@@ -492,35 +508,43 @@ error.io = Netwerk I/O fout.
 error.any = Onbekende netwerk fout.
 error.bloom = Bloom aanzetten mislukt.\nJe apparaat ondersteunt het waarschijnlijk niet.
 
-zone.groundZero.name = Grond Nul
-zone.desertWastes.name = Woestijnpuin
-zone.craters.name = De kraters
-zone.frozenForest.name = Bevroren Bos
-zone.ruinousShores.name = Vervallen Kust
-zone.stainedMountains.name = Bekladde Berg
-zone.desolateRift.name = Verlaten Kloof
-zone.nuclearComplex.name = Vervallen Kernreactor
-zone.overgrowth.name = Overgroeid
-zone.tarFields.name = Teervelden
-zone.saltFlats.name = Zoutvlaktes
-zone.impact0078.name = Impact 0078
-zone.crags.name = Crags
-zone.fungalPass.name = Schimmelpad
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = De optimale plek om weer tot kracht te komen. Weinig gevaar. Weinig grondstoffen.\nDelf zoveel mogelijk lood en koper als je kan.\nVertrek.
-zone.frozenForest.description = Ook hier, dicht bij de bergen, hebben de schimmels zich verspreid. De koude tempratuur houdt ze niet voor eeuwig tegen.\n\nBegin de industriële revolutie. Bouw fossiele generatoren. Leer hoe te repareren.
-zone.desertWastes.description = Deze woestijn is groot, onvoorspelbaar, en vol met oude technologie.\nSteenkool is hier te vinden. Verbrand het om stroom op te wekken, of verwerk het tot grafiet.\n\n[lightgray]Of het hier veilig is is een tweede.
-zone.saltFlats.description = Aan de randen van de woestijn liggen de zoutvlaktes. Weinig grondstoffen zijn hier te vinden.\n\nDe vijand heeft hier rantsoenen opgeslagen. Vernietig hun core. Laat niks staan.
-zone.craters.description = Water heeft zich hier opgehoopt, herrinering aan de vroegere oorlog. Herover dit gebied. Delf zand. Maak glas. Pomp water in je wapens en boren om ze te koelen.
-zone.ruinousShores.description = Voorbij de ruines is de kust. Lang geleden werd de kust hier verdedigd maar er is weinig van terug te vinden. Enkel de meest simpele verdedigingswerken staan nog overeind, \nGa door met uitbereiden, herontdek de verloren techniek.
-zone.stainedMountains.description = Verder vanaf de kust liggen de bergen, nog niet aangetast door de schimmels.\nDelf de grote hoeveelheiden titanium titanium in het gebied en leer het te gebruiken.\n\nDe vijand is krachtig hier. Geef ze geen tijd om je te overrompelen.
-zone.overgrowth.description = Dit gebied is overgroeid, dichter bij de bron van de schimmels.\nDe vijand heeft hier een uitkijkpost. Bouw dolk units. Vernietig de vijand. Herneem wat ooit verloren was.
-zone.tarFields.description = De randen van een olieveld, tussen de bergen en de woestijn. Een van de weinige plekken met bruikbare olie.\nOndanks dat het verlaten is, zijn er wel krachtige vijanden in de buurt. Onderschat ze niet.\n\n[lightgray]Onderzoek wat je verder allemaal met olie kan doen.
-zone.desolateRift.description = Een zeer gevaarlijk gebied. Veel grondstoffen, maar weinig ruimte. Grote kans op verwoesting. Lanceer zo snel mogelijk. Word niet overmoedig door de lange tijd tussen de rondes.
-zone.nuclearComplex.description = Een voormalige installatie voor de productie en verwerking van thorium ligt er nu verlaten bij.\n[lightgray]Onderzoek thorium en de vele toepassingen ervan.\n\nDe vijand is hier aanwezig in grote getalen, constant waakzaam voor aanvallers.
-zone.fungalPass.description = Een transitiegebied tussen de hogergelegen bergen en de lagergelegen, beschimmelde gebieden. Een kleine verkenningsbasis is hier gepositioneerd.\nVernietig het.\nGebruik Dolk en Kruiper units. Maak de twee cores onbruikbaar.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Taal
 settings.data = Game Data
@@ -534,9 +558,12 @@ settings.graphics = Grafisch
 settings.cleardata = Wis Game Data...
 settings.clear.confirm = Weet je zeker dat je deze data wilt verwijderen?\nDit is niet terug te draaien!
 settings.clearall.confirm = [scarlet]WAARSCHUWING![]\nDit verwijderd alle data, inclusief saves, kaarten, technologie en bedienings-instellingen.\nAls je op doorgaat wist het spel al je data en stopt automatisch.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Gepauzeerd >
 clear = Wis
 banned = [scarlet]Verbannen
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Ja
 no = Nee
 info.title = Informatie
@@ -558,8 +585,11 @@ blocks.itemsmoved = Beweegingssnelheid
 blocks.launchtime = Tijd tussen lanceringen
 blocks.shootrange = Bereik
 blocks.size = Formaat
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Vloeistofcapaciteit
 blocks.powerrange = Stroombereik
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Maximale Hoeveelheid Connecties
 blocks.poweruse = Stroomverbruik
 blocks.powerdamage = Stroom/Schade
@@ -575,13 +605,18 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Maximaal Actieve Units
 blocks.health = Levenspunten
 blocks.buildtime = Bouwtijd
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Bouwkosten
 blocks.inaccuracy = Onnauwkeurigheid
 blocks.shots = Shoten
 blocks.reload = Schoten/Seconde
 blocks.ammo = Ammunitie
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Betere miner nodig
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Mining Snelheid: {0}/s
 bar.pumpspeed = Pompsnelheid: {0}/s
 bar.efficiency = Rendement: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Stroom: {0}
 bar.poweroutput = Stroom Output: {0}
 bar.items = Items: {0}
 bar.capacity = Capaciteit: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Vloeistof
 bar.heat = Warmte
 bar.power = Stroom
 bar.progress = Bouw Voortgang
-bar.spawned = Units: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -619,12 +655,16 @@ unit.liquidunits = vloeistofeenheid
 unit.powerunits = stroomeenheid
 unit.degrees = graden
 unit.seconds = secondes
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x snelheid
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = items
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Algemeen
 category.power = Stroom
 category.liquids = Vloeisof
@@ -639,6 +679,7 @@ setting.linear.name = Linear Filtering
 setting.hints.name = Hints
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Pauzeer Bouw Automatisch
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animeer Water
 setting.animatedshields.name = Animeer Schilden
 setting.antialias.name = Antialias[lightgray] (herstart vereist)[]
@@ -663,7 +704,6 @@ setting.effects.name = Toon Effecten
 setting.destroyedblocks.name = Toon Vernietigde Blokken
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Lopendeband Plaats Hulp
-setting.coreselect.name = Sta cores toe in ontwerpen
 setting.sensitivity.name = Gevoeligheid Controller
 setting.saveinterval.name = Autosave Interval
 setting.seconds = {0} Seconden
@@ -672,12 +712,15 @@ setting.milliseconds = {0} millisecondes
 setting.fullscreen.name = Volledig scherm
 setting.borderlesswindow.name = Borderless Venster[lightgray] (wellicht herstart vereist)
 setting.fps.name = Show FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Toon Blok Selectie Toetscombinaties
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate [lightgray](mogelijk verminderde performance)
 setting.minimap.name = Toon Minimap
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Toon Speler Posities
 setting.musicvol.name = Muziek Volume
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Achtergronds Volume
 setting.mutemusic.name = Demp Muziek
 setting.sfxvol.name = SFX Volume
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]De meeste keybinds werken niet voor mobiel. Enkel sta
 category.general.name = Algemeen
 category.view.name = Toon
 category.multiplayer.name = Multiplayer
+category.blocks.name = Block Select
 command.attack = Val aan
 command.rally = Groepeer
 command.retreat = Terugtrekken
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Toets: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Stop met bouwen
 keybind.press = Druk op een toets...
 keybind.press.axis = Druk of swipe een toets...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Beweeg x
 keybind.move_y.name = Beweeg y
 keybind.mouse_move.name = Volg Muis
-keybind.dash.name = Vlieg
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Selecteer gebied
 keybind.schematic_menu.name = Ontwerp Menu
 keybind.schematic_flip_x.name = Spiegel ontwerp X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Plaats Diagonaal
 keybind.pick.name = Kies Blok
 keybind.break_block.name = Breek Blok
 keybind.deselect.name = Deselecteer
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Schiet
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Ontploffende Reactors
 rules.wavetimer = Ronde timer
 rules.waves = Rondes
 rules.attack = Aanval modus
+rules.buildai = AI Building
 rules.enemyCheat = Oneindige AI grondstoffen
-rules.unitdrops = Unit Drops
+rules.blockhealthmultiplier = Blok Health Vermenigvulder
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Spawn Snelheid Vermenigvulder
 rules.unithealthmultiplier = Unit Health Vermenigvulder
-rules.blockhealthmultiplier = Blok Health Vermenigvulder
-rules.playerhealthmultiplier = Speler Health Vermenigvulder
-rules.playerdamagemultiplier = Speler Damage Vermenigvulder
 rules.unitdamagemultiplier = Unit Damage Vermenigvulder
 rules.enemycorebuildradius = Niet-Bouw Bereik Vijandelijke Cores:[lightgray] (tegels)
-rules.respawntime = Herspawn Tijd:[lightgray] (sec)
 rules.wavespacing = Tijd Tussen Rondes:[lightgray] (sec)
 rules.buildcostmultiplier = Bouw kosten Vermenigvulder
 rules.buildspeedmultiplier = Bouw snelheid Vermenigvulder
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Rondes wachten tot alles is verslagen
 rules.dropzoneradius = Vijandelijke Spawn Diameter:[lightgray] (tegels)
-rules.respawns = Maximale Levens Per Ronde
-rules.limitedRespawns = Maximale Levens
+rules.unitammo = Units Require Ammo
 rules.title.waves = Rondes
-rules.title.respawns = Respawn
 rules.title.resourcesbuilding = Grondstoffen & Bouwen
-rules.title.player = Spelers
 rules.title.enemy = Tegenstanders
 rules.title.unit = Units
 rules.title.experimental = Experimenteel
+rules.title.environment = Environment
 rules.lighting = Belichting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Mist
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Items
 content.liquid.name = Vloeisof
@@ -827,10 +878,11 @@ liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Olie
 liquid.cryofluid.name = Koelvloeistof
-item.corestorable = [lightgray]Kan in de Core: {0}
+
 item.explosiveness = [lightgray]Explosivieit: {0}%
 item.flammability = [lightgray]Vlambaarheid: {0}%
 item.radioactivity = [lightgray]Radioactiviteit: {0}%
+
 unit.health = [lightgray]Health: {0}
 unit.speed = [lightgray]Snelheid: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Warmte Capaciteit: {0}
 liquid.viscosity = [lightgray]Viscositeit: {0}
 liquid.temperature = [lightgray]Tempratuur: {0}
 
+unit.dagger.name = Dolk
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Kruiper
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Zandkei
 block.grass.name = Gras
 block.slag.name = Slag
 block.salt.name = Zout
-block.saltrocks.name = Zoutsteen
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Steentjes
 block.tendrils.name = Tendrils
-block.sandrocks.name = Zandsteen
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Sporenden
-block.sporerocks.name = Schimmelsteen
-block.rock.name = Steen
-block.snowrock.name = Sneeuwsteen
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Sneeuwden
 block.shale.name = Schalie
 block.shale-boulder.name = Schalie Kei
 block.moss.name = Mos
 block.shrubs.name = Bosje
 block.spore-moss.name = Spore Moss
-block.shalerocks.name = Shale Steens
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Oud ijzeren m
 block.scrap-wall-large.name = Large Scrap Muur
 block.scrap-wall-huge.name = Huge Scrap Muur
@@ -890,13 +979,17 @@ block.craters.name = Krarters
 block.sand-water.name = Zand water
 block.darksand-water.name = Donker Zand Water
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ice Snow
-block.rocks.name = Stenen
-block.icerocks.name = Ijs Stenen
-block.snowrocks.name = Snow Steens
-block.dunerocks.name = Dune Steens
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Den
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Witte Boom Dood
 block.white-tree.name = Witte Boom
 block.spore-cluster.name = Spore Cluster
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Donker Paneel 4
 block.dark-panel-5.name = Donker Paneel 5
 block.dark-panel-6.name = Donker Paneel 6
 block.dark-metal.name = Donker Metaal
-block.ignarock.name = Igna Steen
+block.basalt.name = Basalt
 block.hotrock.name = Lava Steen
 block.magmarock.name = Magma Steen
-block.cliffs.name = Rotswand
 block.copper-wall.name = Koperen Muur
 block.copper-wall-large.name = Grote Koperen Muur
 block.titanium-wall.name = Titanium Muur
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Siliciumsmelter
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Vermorzelaar
-block.cryofluidmixer.name = Cryofluid Mixer
+block.cryofluid-mixer.name = Cryofluid Mixer
 block.melter.name = Smelter
 block.incinerator.name = Verbrandingsoven
 block.spore-press.name = Schimmelpers
@@ -964,7 +1056,7 @@ block.diode.name = Batterij Diode
 block.battery.name = Batterij
 block.battery-large.name = Grote Batterij
 block.combustion-generator.name = Fossiele Generator
-block.turbine-generator.name = Turbine Generator
+block.steam-generator.name = Turbine Generator
 block.differential-generator.name = Verschiltemperatuurgenerator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanische Boor
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Zonnepaneel
 block.solar-panel-large.name = Groot zonnepaneel
 block.oil-extractor.name = Olieput
-block.command-center.name = Commando centrum
-block.draug-factory.name = Draug Miner Drone Factory
-block.spirit-factory.name = Spirit Drone Factory
-block.phantom-factory.name = Phantom Drone Factory
-block.wraith-factory.name = Wraith Fighter Factory
-block.ghoul-factory.name = Ghoul Bomber Factory
-block.dagger-factory.name = Dagger Mech Factory
-block.crawler-factory.name = Crawler Mech Factory
-block.titan-factory.name = Titan Mech Factory
-block.fortress-factory.name = Fortress Mech Factory
-block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Repair Point
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Gepantserde Pijp
@@ -1036,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Doos
 block.launch-pad.name = Lanceerplatform
 block.launch-pad-large.name = Groot Lanceerplatform
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = blauw
 team.crux.name = rood
 team.sharded.name = oranje
@@ -1043,21 +1147,7 @@ team.orange.name = oranje
 team.derelict.name = wees
 team.green.name = groen
 team.purple.name = paars
-unit.spirit.name = Spirit Drone
-unit.draug.name = Draug Miner Drone
-unit.phantom.name = Phantom Drone
-unit.dagger.name = Dolk
-unit.crawler.name = Kruiper
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
-unit.wraith.name = Wraith Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Klik om verder te gaan>
 tutorial.intro = Welkom bij de[scarlet] Mindustry Tutorial.[]\nBegin met het[accent] mijnen van koper[]. Klik op een vakje met koper om het te mijnen.\n\n[accent]{0}/{1} koper
 tutorial.intro.mobile = Welkom bij de[scarlet] Mindustry Tutorial.[]\nSleep over het scherm om te bewegen.\n[accent]Knijp met 2 vingers [] om in en uit te zoomen.\nBegin met het[accent] mijnen van koper[]. Beweeg dichterbij, en klik er dan op.\n\n[accent]{0}/{1} koper
@@ -1100,17 +1190,7 @@ liquid.water.description = Commonly used for cooling machines and waste processi
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.
 liquid.cryofluid.description = The most efficient liquid for cooling things down.
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
-unit.spirit.description = The starter drone unit. Spawns in the core by default. Automatically mines ores and repairs blocks.
-unit.phantom.description = An advanced drone unit. Automatically mines ores and repairs blocks. Significantly more effective than a spirit drone.
-unit.dagger.description = A basic ground unit. Useful in swarms.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
-unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets.
-unit.fortress.description = A heavy artillery ground unit.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = A fast, hit-and-run interceptor unit.
-unit.ghoul.description = A heavy carpet bomber.
-unit.revenant.description = A heavy, hovering missile array.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
@@ -1119,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into metaglass. Requires small amo
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand.
 block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
-block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
+block.cryofluid-mixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
 block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Melts down scrap into slag for further processing or usage in turrets.
@@ -1185,7 +1265,7 @@ block.battery.description = Stores power whenever there is an abundance and prov
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning oil or flammable materials.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.steam-generator.description = More efficient than a combustion generator, but requires additional water.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
 block.solar-panel.description = Genereert een klein beetje zonne-energie.
@@ -1221,15 +1301,5 @@ block.ripple.description = A large artillery turret which fires several shots si
 block.cyclone.description = A large rapid fire turret.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to patrol, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
-block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
-block.ghoul-factory.description = Produces heavy carpet bombers.
-block.revenant-factory.description = Produces heavy laser air units.
-block.dagger-factory.description = Produces basic ground units.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produces advanced, armored ground units.
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index a8cdad0f7c..ce59b257f7 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Itch.io pagina met de PC downloads en online versie
 link.google-play.description = Mindustry op Google Play
 link.f-droid.description = F-Droid catalogus
 link.wiki.description = Officiële Mindustry-wiki
-link.feathub.description = Suggest new features
+link.suggestions.description = Suggest new features
 linkfail = Openen van link mislukt!\nDe link is gekopiëerd naar je klembord.
 screenshot = Locatie screenshot: {0}
 screenshot.invalid = Kaart te groot, mogelijks te weinig geheugen voor een screenshot te kunnen maken.
@@ -20,6 +20,8 @@ gameover = Game Over
 gameover.pvp = Het[accent] {0}[] team heeft gewonnen!
 highscore = [accent]Nieuw record!
 copied = Gekopieerd.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Geluiden
 load.map = Kaarten
@@ -63,8 +65,7 @@ stat.delivered = Gronstoffen meegenomen:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Eindresultaat: [accent]{0}
 
-launcheditems = [accent]Meegenomen grondstoffen
-launchinfo = [unlaunched][[LAUNCH] je kern om de met blauw aangeduide voorwerpen te verkrijgen.
+globalitems = [accent]Global Items
 map.delete = Ben je zeker dat je de kaart "[accent]{0}[]" wilt verwijderen?
 level.highscore = Beste score: [accent]{0}
 level.select = Selecteer level
@@ -106,6 +107,7 @@ mods.guide = Handleiding tot Modding
 mods.report = Bug Rapporteren
 mods.openfolder = Open Mod Folder
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Ingeschakeld
 mod.disabled = [scarlet]Uitgeschakeld
@@ -113,6 +115,7 @@ mod.disable = Schakel uit
 mod.content = Content:
 mod.delete.error = Kan mod niet verwijderen. Bestand is mogelijk in gebruik.
 mod.requiresversion = [scarlet]Requires min game version: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Herladen Vereist
 mod.import = Importeer Mod
 mod.import.file = Import File
 mod.import.github = Importeer GitHub Mod
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = Deze mod zal worden verwijderd.
 mod.author = [lightgray]Auteur:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Over
 name = Naam:
 noname = Kies eerst[accent] een naam[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Bestandsnaam:
 unlocked = Ontgrendeld!
 completed = [accent]Voltooid
@@ -142,6 +148,7 @@ techtree = Technische vooruitgang
 research.list = [lightgray]Onderzoek:
 research = Onderzoek
 researched = [lightgray]{0} onderzocht.
+research.progress = {0}% complete
 players = {0} spelers online
 players.single = {0} speler online
 players.search = search
@@ -224,7 +231,6 @@ save.new = Nieuwe save
 save.overwrite = Ben je zeker dat je deze save\nwilt overschrijven?
 overwrite = Vervang
 save.none = Geen saves gevonden!
-saveload = [accent]Opslaan...
 savefail = Opslaan mislukt!
 save.delete.confirm = Ben je zeker dat je deze save wil verwijderen?
 save.delete = Verwijder
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Ben je zeker dat je nu weet wat je doet?\nDe tutorial ka
 loading = [accent]Aan het laden...
 reloading = [accent]Mods Herladen...
 saving = [accent]Aan het opslaan...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] om het plan te annuleren
 selectschematic = [accent][[{0}][] om te selecter+kopieren
 pausebuilding = [accent][[{0}][] om het bouwen te pauseren
@@ -328,8 +335,9 @@ waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
 waves.perspawn = per spawn
+waves.shields = shields/wave
 waves.to = to
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
 waves.copy = Copy to Clipboard
@@ -337,6 +345,11 @@ waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
@@ -456,10 +469,12 @@ locked = Locked
 complete = [lightgray]Reach:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
-requirement.unlock = Unlock {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Resume Zone:\n[lightgray]{0}
 bestwave = [lightgray]Best Wave: {0}
 launch = < LAUNCH >
+launch.text = Launch
 launch.title = Launch Successful
 launch.next = [lightgray]next opportunity at wave {0}
 launch.unable2 = [scarlet]Unable to LAUNCH.[]
@@ -467,13 +482,14 @@ launch.confirm = This will launch all resources in your core.\nYou will not be a
 launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = Add All
-configure.locked = [lightgray]Unlock configuring loadout:\nWave {0}.
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = Resources Detected:
 zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
@@ -492,35 +508,43 @@ error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
-zone.groundZero.name = Ground Zero
-zone.desertWastes.name = Desert Wastes
-zone.craters.name = The Craters
-zone.frozenForest.name = Frozen Forest
-zone.ruinousShores.name = Ruinous Shores
-zone.stainedMountains.name = Stained Mountains
-zone.desolateRift.name = Desolate Rift
-zone.nuclearComplex.name = Nuclear Production Complex
-zone.overgrowth.name = Overgrowth
-zone.tarFields.name = Tar Fields
-zone.saltFlats.name = Salt Flats
-zone.impact0078.name = Impact 0078
-zone.crags.name = Crags
-zone.fungalPass.name = Fungal Pass
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
-zone.frozenForest.description = Even here, closer to mountains, the spores have spread. The fridgid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
-zone.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
-zone.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
-zone.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
-zone.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
-zone.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
-zone.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build dagger units. Destroy it. Reclaim that which was lost.
-zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
-zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
-zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Language
 settings.data = Game Data
@@ -534,9 +558,12 @@ settings.graphics = Graphics
 settings.cleardata = Clear Game Data...
 settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone!
 settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Paused >
 clear = Clear
 banned = [scarlet]Banned
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Yes
 no = No
 info.title = Info
@@ -558,8 +585,11 @@ blocks.itemsmoved = Move Speed
 blocks.launchtime = Time Between Launches
 blocks.shootrange = Range
 blocks.size = Size
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Liquid Capacity
 blocks.powerrange = Power Range
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
@@ -575,13 +605,18 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
 blocks.ammo = Ammo
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Better Drill Required
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
 bar.progress = Build Progress
-bar.spawned = Units: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -619,12 +655,16 @@ unit.liquidunits = liquid units
 unit.powerunits = power units
 unit.degrees = degrees
 unit.seconds = seconds
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x speed
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = items
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = General
 category.power = Power
 category.liquids = Liquids
@@ -639,6 +679,7 @@ setting.linear.name = Linear Filtering
 setting.hints.name = Hints
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animated Water
 setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
@@ -663,7 +704,6 @@ setting.effects.name = Display Effects
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Autosave Interval
 setting.seconds = {0} Seconds
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
 setting.fps.name = Show FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate [lightgray](may decrease performance, disables animations)
 setting.minimap.name = Show Minimap
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Music Volume
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only
 category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
+category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Clear Building
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Dash
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Shoot
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
+rules.buildai = AI Building
 rules.enemyCheat = Infinite AI (Red Team) Resources
-rules.unitdrops = Unit Drops
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Player Health Multiplier
-rules.playerdamagemultiplier = Player Damage Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
-rules.respawntime = Respawn Time:[lightgray] (sec)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves wait for enemies
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
-rules.respawns = Max respawns per wave
-rules.limitedRespawns = Limit Respawns
+rules.unitammo = Units Require Ammo
 rules.title.waves = Waves
-rules.title.respawns = Respawns
 rules.title.resourcesbuilding = Resources & Building
-rules.title.player = Players
 rules.title.enemy = Enemies
 rules.title.unit = Units
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Items
 content.liquid.name = Liquids
@@ -827,10 +878,11 @@ liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
-item.corestorable = [lightgray]Storable in Core: {0}
+
 item.explosiveness = [lightgray]Explosiveness: {0}%
 item.flammability = [lightgray]Flammability: {0}%
 item.radioactivity = [lightgray]Radioactivity: {0}%
+
 unit.health = [lightgray]Health: {0}
 unit.speed = [lightgray]Speed: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viscosity: {0}
 liquid.temperature = [lightgray]Temperature: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
 block.grass.name = Grass
 block.slag.name = Slag
 block.salt.name = Salt
-block.saltrocks.name = Salt Rocks
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pebbles
 block.tendrils.name = Tendrils
-block.sandrocks.name = Sand Rocks
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spore Pine
-block.sporerocks.name = Spore Rocks
-block.rock.name = Rock
-block.snowrock.name = Snow Rock
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
 block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
-block.shalerocks.name = Shale Rocks
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -890,13 +979,17 @@ block.craters.name = Craters
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ice Snow
-block.rocks.name = Rocks
-block.icerocks.name = Ice rocks
-block.snowrocks.name = Snow Rocks
-block.dunerocks.name = Dune Rocks
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pine
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Dark Panel 4
 block.dark-panel-5.name = Dark Panel 5
 block.dark-panel-6.name = Dark Panel 6
 block.dark-metal.name = Dark Metal
-block.ignarock.name = Igna Rock
+block.basalt.name = Basalt
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
-block.cliffs.name = Cliffs
 block.copper-wall.name = Copper Wall
 block.copper-wall-large.name = Large Copper Wall
 block.titanium-wall.name = Titanium Wall
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silicon Smelter
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Pulverizer
-block.cryofluidmixer.name = Cryofluid Mixer
+block.cryofluid-mixer.name = Cryofluid Mixer
 block.melter.name = Melter
 block.incinerator.name = Incinerator
 block.spore-press.name = Spore Press
@@ -964,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Turbine Generator
+block.steam-generator.name = Turbine Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
-block.command-center.name = Command Center
-block.draug-factory.name = Draug Miner Drone Factory
-block.spirit-factory.name = Spirit Drone Factory
-block.phantom-factory.name = Phantom Drone Factory
-block.wraith-factory.name = Wraith Fighter Factory
-block.ghoul-factory.name = Ghoul Bomber Factory
-block.dagger-factory.name = Dagger Mech Factory
-block.crawler-factory.name = Crawler Mech Factory
-block.titan-factory.name = Titan Mech Factory
-block.fortress-factory.name = Fortress Mech Factory
-block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Repair Point
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
@@ -1036,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = blue
 team.crux.name = red
 team.sharded.name = orange
@@ -1043,21 +1147,7 @@ team.orange.name = orange
 team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
-unit.spirit.name = Spirit Drone
-unit.draug.name = Draug Miner Drone
-unit.phantom.name = Phantom Drone
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
-unit.wraith.name = Wraith Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1100,17 +1190,7 @@ liquid.water.description = Commonly used for cooling machines and waste processi
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.
 liquid.cryofluid.description = The most efficient liquid for cooling things down.
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
-unit.spirit.description = The starter drone unit. Spawns in the core by default. Automatically mines ores and repairs blocks.
-unit.phantom.description = An advanced drone unit. Automatically mines ores and repairs blocks. Significantly more effective than a spirit drone.
-unit.dagger.description = A basic ground unit. Useful in swarms.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
-unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets.
-unit.fortress.description = A heavy artillery ground unit.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = A fast, hit-and-run interceptor unit.
-unit.ghoul.description = A heavy carpet bomber.
-unit.revenant.description = A heavy, hovering missile array.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
@@ -1119,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into metaglass. Requires small amo
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand.
 block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
-block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
+block.cryofluid-mixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
 block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Melts down scrap into slag for further processing or usage in turrets.
@@ -1185,7 +1265,7 @@ block.battery.description = Stores power whenever there is an abundance and prov
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning oil or flammable materials.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.steam-generator.description = More efficient than a combustion generator, but requires additional water.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
 block.solar-panel.description = Provides a small amount of power from the sun.
@@ -1221,15 +1301,5 @@ block.ripple.description = A large artillery turret which fires several shots si
 block.cyclone.description = A large rapid fire turret.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to patrol, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
-block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
-block.ghoul-factory.description = Produces heavy carpet bombers.
-block.revenant-factory.description = Produces heavy laser air units.
-block.dagger-factory.description = Produces basic ground units.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produces advanced, armored ground units.
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index e9fc5c3bdf..f0c67c6a88 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Strona itch.io z oficjanymi wersjami do pobrania
 link.google-play.description = Strona w sklepie Google Play
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Oficjana Wiki Mindustry
-link.feathub.description = Zaproponuj nowe funkcje
+link.suggestions.description = Zaproponuj nowe funkcje
 linkfail = Nie udało się otworzyć linku!\nURL został skopiowany.
 screenshot = Zapisano zdjęcie w {0}
 screenshot.invalid = Zrzut ekranu jest zbyt duży. Najprawdopodobniej brakuje miejsca w pamięci urządzenia.
@@ -20,6 +20,8 @@ gameover = Koniec Gry
 gameover.pvp = Zwyciężyła drużyna [accent]{0}[]!
 highscore = [accent] Nowy rekord!
 copied = Skopiowano.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Dźwięki
 load.map = Mapy
@@ -63,8 +65,7 @@ stat.delivered = Surowce wystrzelone:
 stat.playtime = Czas Gry:[accent] {0}
 stat.rank = Ocena: [accent]{0}
 
-launcheditems = [accent]Wystrzelone przedmioty
-launchinfo = [unlaunched][[WYSTRZEL] rdzeń aby uzyskać przedmioty oznaczone na niebiesko.
+globalitems = [accent]Global Items
 map.delete = Jesteś pewny, że chcesz usunąć "[accent]{0}[]"?
 level.highscore = Rekord: [accent]{0}
 level.select = Wybrany poziom
@@ -106,6 +107,7 @@ mods.guide = Poradnik do modów
 mods.report = Zgłoś Błąd
 mods.openfolder = Otwórz folder z modami
 mods.reload = Przeładuj
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Włączony
 mod.disabled = [scarlet]Wyłączony
@@ -113,6 +115,7 @@ mod.disable = Wyłącz
 mod.content = Content:
 mod.delete.error = Nie udało się usunąć moda. Plik może być w użyciu.
 mod.requiresversion = [scarlet]Wymaga gry w wersji co najmniej: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Brakujące zależności: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Wystąpił błąd podczas ładowania treści.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Wymagany restart
 mod.import = Importuj Mod
 mod.import.file = Importuj Plik
 mod.import.github = Importuj mod z GitHuba
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Ten przedmiot jest częścią moda[accent] '{0}'[]. Aby usunąć go, odinstaluj modyfikację.
 mod.remove.confirm = Ten mod zostanie usunięty.
 mod.author = [lightgray]Autor:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Twoje urządzenie nie wspiera modów ze skryptami. Musisz
 about.button = O Grze
 name = Nazwa:
 noname = Najpierw wybierz[accent] nazwę gracza[].
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Nazwa Pliku:
 unlocked = Odblokowano nową zawartość!
 completed = [accent]Ukończony
@@ -142,6 +148,7 @@ techtree = Drzewo Technologiczne
 research.list = [lightgray]Badania:
 research = Badaj
 researched = [lightgray]{0} zbadane.
+research.progress = {0}% complete
 players = {0} graczy
 players.single = {0} gracz
 players.search = search
@@ -224,7 +231,6 @@ save.new = Nowy zapis
 save.overwrite = Czy na pewno chcesz nadpisać zapis gry?
 overwrite = Nadpisz
 save.none = Nie znaleziono zapisów gry!
-saveload = Zapisywanie...
 savefail = Nie udało się zapisać gry!
 save.delete.confirm = Czy na pewno chcesz usunąć ten zapis gry?
 save.delete = Usuń
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Jesteś pewien?\nSamouczek może zostać powtórzony w[a
 loading = [accent]Ładowanie...
 reloading = [accent]Przeładowywanie Modów...
 saving = [accent]Zapisywanie...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] by wyczyścić plan
 selectschematic = [accent][[{0}][] by wybrać+skopiować
 pausebuilding = [accent][[{0}][] by wstrzymać budowę
@@ -328,8 +335,9 @@ waves.never = <nigdy>
 waves.every = co
 waves.waves = fal(e)
 waves.perspawn = co pojawienie
+waves.shields = shields/wave
 waves.to = do
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Podgląd
 waves.edit = Edytuj...
 waves.copy = Kopiuj Do Schowka
@@ -337,6 +345,11 @@ waves.load = Załaduj Ze Schowka
 waves.invalid = Nieprawidłowe fale w schowku.
 waves.copied = Fale zostały skopiowane.
 waves.none = Brak zdefiniowanych wrogów.\nPamiętaj, że puste układy fal zostaną automatycznie zastąpione układem domyślnym.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Domyślne>
 details = Detale...
 edit = Edytuj...
@@ -456,10 +469,12 @@ locked = Zablokowane
 complete = [lightgray]Ukończone:
 requirement.wave = Osiągnij falę {0} w {1}
 requirement.core = Zniszcz Rdzeń wroga w {0}
-requirement.unlock = Odblokuj {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Kontynuuj Strefę:\n[lightgray]{0}
 bestwave = [lightgray]Najwyższa fala: {0}
 launch = < WYSTRZEL >
+launch.text = Launch
 launch.title = Wystrzelenie udane
 launch.next = [lightgray]Następna okazja przy fali {0}
 launch.unable2 = [scarlet]WYSTRZELENIE niedostępne.[]
@@ -467,13 +482,14 @@ launch.confirm = Spowoduje to wystrzelenie wszystkich surowców w rdzeniu.\nNie
 launch.skip.confirm = Jeśli teraz przejdziesz do kolejnej fali, nie będziesz miał możliwości wystrzelenia do czasu pokonania dalszych fal.
 uncover = Odkryj
 configure = Skonfiguruj Ładunek
+loadout = Loadout
+resources = Resources 
 bannedblocks = Zabronione bloki
 addall = Dodaj wszystkie
-configure.locked = [lightgray]Dotrzyj do fali {0},\naby skonfigurować ładunek.
+launch.destination = Destination: {0}
 configure.invalid = Ilość musi być liczbą pomiędzy 0 a {0}.
 zone.unlocked = [lightgray]Strefa {0} odblokowana.
 zone.requirement.complete = Fala {0} osiągnięta:\n{1} Wymagania strefy zostały spełnione.
-zone.config.unlocked = Ładunek odblokowany:[lightgray]\n{0}
 zone.resources = [lightgray]Wykryte Zasoby:
 zone.objective = [lightgray]Cel: [accent]{0}
 zone.objective.survival = Przeżyj
@@ -492,35 +508,43 @@ error.io = Błąd sieciowy I/O.
 error.any = Nieznany błąd sieci.
 error.bloom = Nie udało się załadować bloom.\nTwoje urządzenie może nie wspierać tej funkcji.
 
-zone.groundZero.name = Wybuch Lądowy
-zone.desertWastes.name = Pustynne Pustkowia
-zone.craters.name = Kratery
-zone.frozenForest.name = Zamrożony Las
-zone.ruinousShores.name = Zniszczone Przybrzeża
-zone.stainedMountains.name = Zabarwione Góry
-zone.desolateRift.name = Ponura Szczelina
-zone.nuclearComplex.name = Centrum Wyrobu Jądrowego
-zone.overgrowth.name = Przerośnięty Las
-zone.tarFields.name = Pola Smołowe
-zone.saltFlats.name = Solne Równiny
-zone.impact0078.name = Uderzenie 0078
-zone.crags.name = Urwisko
-zone.fungalPass.name = Grzybowa Przełęcz
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Optymalna lokalizacja, aby rozpocząć jeszcze raz. Niewielkie zagrożenie. Niewiele zasobów.\nZbierz jak najwięcej miedzi i ołowiu, tyle ile jest możliwe.\nPrzejdź do następnej strefy jak najszybciej.
-zone.frozenForest.description = Nawet tutaj, bliżej gór, zarodniki rozprzestrzeniły się. Niskie temperatury nie mogą ich zatrzymać na zawsze.\n\nRozpocznij przedsięwzięcie od władzy. Buduj generatory spalinowe. Naucz się korzystać z naprawiaczy.
-zone.desertWastes.description = Te pustkowia są rozległe, nieprzewidywalne, i znajdują się na nich opuszczone struktury.\nW tym regionie jest dostep do węgla. Użyj go do produkcji energii lub do stworzenia grafitu.\n\n[lightgray]Nie jest pewne gdzie znajduje się miejsce lądowania.
-zone.saltFlats.description = Na obrzeżach pustyni spoczywają Solne Równiny. Można tu znaleźć niewiele surowców.\n\nWrogowie zbudowali tu bazę składującą surowce. Zniszcz ich rdzeń. Zniszcz wszystko co stanie ci na drodze.
-zone.craters.description = W tym kraterze zebrała się woda. Pozostałość dawnych wojen. Odzyskaj ten teren. Wykop piasek. Wytop metaszkło. Pompuj wodę do działek obronnych i wierteł by je schłodzić.
-zone.ruinousShores.description = Za pustkowiami ciągnie się linia brzegowa. Kiedyś znajdowała się tu przybrzeżna linia obronna. Niewiele z niej zostało. Ostały się tylko podstawowe struktury obronne, z reszty został tylko złom.\nKontynuuj eksploracje. Odkryj pozostawioną tu technologię.
-zone.stainedMountains.description = W głębi lądu leżą góry, jeszcze nieskażone przez zarodniki.\nWydobądź tytan, który jest obfity w tym regionie. Dowiedz się, jak z niego korzystać.\n\nObecność wroga jest tutaj większa. Nie daj im czasu na wysłanie swoich najsilniejszych jednostek.
-zone.overgrowth.description = Obszar ten jest zarośnięty, bliżej źródła zarodników.\nWróg założył tu placówkę. Zbuduj jednostki Nóż. Zniszcz go. Odzyskaj to, co nam odebrano.
-zone.tarFields.description = Obrzeża strefy produkcji ropy, między górami a pustynią. Jeden z niewielu obszarów z rezerwami użytecznej smoły.\nMimo że ta strefa jest opuszczona, w pobliżu znajdują się niebezpieczne siły wroga.  Nie lekceważ ich.\n\n[lightgray]Jeśli to możliwe, zbadaj technologię przetwarzania oleju.
-zone.desolateRift.description = Strefa wyjątkowo niebezpieczna. Obfita w zasoby ale mało miejsca. Wysokie zagrożenie. Opuść tę strefe jak najszybciej. Nie daj się zwieść długiemu odstępowi między atakami wroga.
-zone.nuclearComplex.description = Dawny zakład produkcji i przetwarzania toru, zamieniony w ruinę.\n[lightgray]Zbadaj tor i jego zastosowania.\n\nWróg jest tutaj obecny w dużej ilości, nieustannie przeszukuje teren.
-zone.fungalPass.description = Przejściowy obszar pomiędzy wysokimi górami a nisko znajdującymi się, ogarniętymi przez zarodniki równinami. Znajduje się tu mała postawiona przez wrogów baza zwiadowcza.\nZniszcz ją.\nUżyj jednostek Nóż i Pełzak. Zniszcz oba rdzenie.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Punkt Zerowy
+sector.craters.name = Kratery
+sector.frozenForest.name = Zamrożony Las
+sector.ruinousShores.name = Zniszczone Przybrzeża
+sector.stainedMountains.name = Zabarwione Góry
+sector.desolateRift.name = Ponura Szczelina
+sector.nuclearComplex.name = Centrum Wyrobu Jądrowego
+sector.overgrowth.name = Przerośnięty Las
+sector.tarFields.name = Pola Smołowe
+sector.saltFlats.name = Solne Równiny
+sector.fungalPass.name = Grzybowa Przełęcz
+
+sector.groundZero.description = Optymalna lokalizacja, aby rozpocząć jeszcze raz. Niskie zagrożenie. Niewiele zasobów.\nZbierz jak najwięcej miedzi i ołowiu, tyle ile jest możliwe.\nPrzejdź do następnej strefy jak najszybciej.
+sector.frozenForest.description = Nawet tutaj, bliżej gór, zarodniki rozprzestrzeniły się. Niskie temperatury nie mogą ich zatrzymać na zawsze.\n\nRozpocznij przedsięwzięcie od władzy. Buduj generatory spalinowe. Naucz się korzystać z naprawiaczy.
+sector.saltFlats.description = Na obrzeżach pustyni spoczywają Solne Równiny. Można tu znaleźć niewiele surowców.\n\nWrogowie zbudowali tu bazę składującą surowce. Zniszcz ich rdżeń. Zniszcz wszystko co stanie ci na drodze.
+sector.craters.description = W tym kraterze zebrała się woda. Pozostałość dawnych wojen. Odzyskaj ten teren. Wykop piasek. Wytop metaszkło. Pompuj wodę do działek obronnych i wierteł by je schłodzić
+sector.ruinousShores.description = Za pustkowiami ciągnie się linia brzegowa. Kiedyś znajdowała się tu przybrzeżna linia obronna. Niewiele z niej zostało. Ostały się tylko podstawowe struktury obronne, z reszty został tylko złom.\nKontynuuj eksploracje. Odkryj pozostawioną tu technologię.
+sector.stainedMountains.description = W głębi lądu leżą góry, jeszcze nieskażone przez zarodniki.\nWydobądź obfity tytan w tym obszarze. Dowiedz się, jak z niego korzystać.\n\nObecność wroga jest tutaj większa. Nie daj im czasu na wysłanie swoich najsilniejszych jednostek.
+sector.overgrowth.description = Obszar ten jest zarośnięty, bliżej źródła zarodników.\nWróg założył tu placówkę. Zbuduj jednostki Nóż. Zniszcz to. Odzyskaj to, co nam odebrano.
+sector.tarFields.description = Obrzeża strefy produkcji ropy, między górami a pustynią. Jeden z niewielu obszarów z rezerwami użytecznej smoły.\nMimo że ta strefa jest opuszczona, w pobliżu znajdują się niebezpieczne siły wroga.  Nie lekceważ ich.\n\n[lightgray]Jeśli to możliwe, zbadaj technologię przetwarzania oleju.
+sector.desolateRift.description = Strefa wyjątkowo niebezpieczna. Obfita w zasoby ale mało miejsca. Wysokie ryzyko zniszczenia. Opuść tę strefe jak najszybciej. Nie daj się zwieść długiemu odstępowi między atakami wroga.
+sector.nuclearComplex.description = Dawny zakład produkcji i przetwarzania toru, zredukowny do ruin.\n[lightgray]Zbadaj tor i jego zastosowania.\n\nWróg jest tutaj obecny w dużej ilości, nieustannie poszukuje napastników.
+sector.fungalPass.description = Przejściowy obszar pomiędzy wysokimi górami a nisko znajdującymi się, ogarniętymi przez zarodniki równinami. Znajduje się tu mała postawiona przez wrogów baza zwiadowcza.\nZniszcz ją.\nUżyj jednostek Nóż i Pełzak. Zniszcz oba rdzenie.
 
 settings.language = Język
 settings.data = Dane Gry
@@ -534,9 +558,12 @@ settings.graphics = Grafika
 settings.cleardata = Wyczyść Dane Gry...
 settings.clear.confirm = Czy jesteś pewien że chcesz usunąć te dane?\nPo tym nie ma powrotu!
 settings.clearall.confirm = [scarlet]UWAGA![]\nTo wykasuje wszystkie dane, włącznie z zapisanymi grami i mapami, ustawienami, i znanymi technologiami.\nKiedy naciśniesz 'ok', gra usunie wszystkie swoje dane i automatycznie wyłączy się.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Wstrzymano >
 clear = Wyczyść
 banned = [scarlet]Zbanowano
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Tak
 no = Nie
 info.title = Informacje
@@ -558,8 +585,11 @@ blocks.itemsmoved = Prędkość poruszania się
 blocks.launchtime = Czas pomiędzy wystrzeleniami
 blocks.shootrange = Zasięg
 blocks.size = Rozmiar
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Pojemność cieczy
 blocks.powerrange = Zakres mocy
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Maksymalna ilość połączeń
 blocks.poweruse = Zużycie prądu
 blocks.powerdamage = Moc/Zniszczenia
@@ -575,13 +605,18 @@ blocks.boosteffect = Efekt wzmocnienia
 blocks.maxunits = Maksymalna ilość jednostek
 blocks.health = Zdrowie
 blocks.buildtime = Czas budowy
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Koszt budowy
 blocks.inaccuracy = Niecelność
 blocks.shots = Strzały
 blocks.reload = Strzałów/sekundę
 blocks.ammo = Amunicja
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Wymagane Lepsze Wiertło
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Prędkość wiertła: {0}/s
 bar.pumpspeed = Prędkość pompy: {0}/s
 bar.efficiency = Efektywność: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Moc: {0}
 bar.poweroutput = Wyjście mocy: {0}
 bar.items = Przedmiotów: {0}
 bar.capacity = Pojemność: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Płyn
 bar.heat = Ciepło
 bar.power = Prąd
 bar.progress = Postęp Budowy
-bar.spawned = Jednostki: {0}/{1}
 bar.input = Wejście
 bar.output = Wyjście
 
@@ -619,12 +655,16 @@ unit.liquidunits = jednostek płynu
 unit.powerunits = jednostek prądu
 unit.degrees = stopnie
 unit.seconds = sekundy
+unit.minutes = mins
 unit.persecond = /sekundę
+unit.perminute = /min
 unit.timesspeed = x prędkość
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = przedmioty
 unit.thousands = tys.
 unit.millions = mln
+unit.billions = b
 category.general = Główne
 category.power = Prąd
 category.liquids = Płyny
@@ -639,6 +679,7 @@ setting.linear.name = Filtrowanie Liniowe
 setting.hints.name = Podpowiedzi
 setting.flow.name = Wyświetl szybkość przepływu zasobów[scarlet] (eksperymentalne)
 setting.buildautopause.name = Automatycznie zatrzymaj budowanie
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animowana woda
 setting.animatedshields.name = Animowana tarcza
 setting.antialias.name = Antyaliasing[lightgray] (wymaga restartu)[]
@@ -663,7 +704,6 @@ setting.effects.name = Wyświetlanie efektów
 setting.destroyedblocks.name = Wyświetl zniszczone bloki
 setting.blockstatus.name = Wyświetl status bloków
 setting.conveyorpathfinding.name = Ustalanie ścieżki przenośników
-setting.coreselect.name = Zezwalaj na rdzenie w schematach
 setting.sensitivity.name = Czułość kontrolera
 setting.saveinterval.name = Interwał automatycznego zapisywania
 setting.seconds = {0} sekund
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milisekund
 setting.fullscreen.name = Pełny ekran
 setting.borderlesswindow.name = Bezramkowe okno[lightgray] (może wymagać restartu)
 setting.fps.name = Pokazuj FPS oraz ping
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Pokazuj skróty klawiszowe bloków
 setting.vsync.name = Synchronizacja pionowa
 setting.pixelate.name = Pikselacja [lightgray](wyłącza animacje)
 setting.minimap.name = Pokaż Minimapę
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Pokazuj położenie gracza
 setting.musicvol.name = Głośność muzyki
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Głośność otoczenia
 setting.mutemusic.name = Wycisz muzykę
 setting.sfxvol.name = Głośność dźwięków
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Większość skrótów klawiszowych nie funkcjonuje w
 category.general.name = Ogólne
 category.view.name = Wyświetl
 category.multiplayer.name = Wielu graczy
+category.blocks.name = Block Select
 command.attack = Atakuj
 command.rally = Zbierz
 command.retreat = Wycofaj
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Klawisz: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Wyczyść budynek
 keybind.press = Naciśnij wybrany klawisz...
 keybind.press.axis = Naciśnij oś lub klawisz...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Poruszanie w poziomie
 keybind.move_y.name = Poruszanie w pionie
 keybind.mouse_move.name = Podążaj Za Myszą
-keybind.dash.name = Dash
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Wybierz region
 keybind.schematic_menu.name = Menu schematów
 keybind.schematic_flip_x.name = Obróć schemat horyzontalnie
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Budowa po skosie
 keybind.pick.name = Wybierz Blok
 keybind.break_block.name = Zniszcz Blok
 keybind.deselect.name = Odznacz
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Strzelanie
 keybind.zoom.name = Przybliżanie
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Eksplozje reaktorów
 rules.wavetimer = Zegar fal
 rules.waves = Fale
 rules.attack = Tryb ataku
+rules.buildai = AI Building
 rules.enemyCheat = Nieskończone zasoby komputera-przeciwnika (czerwonego zespołu)
-rules.unitdrops = Surowce ze zniszczonych jednostek
+rules.blockhealthmultiplier = Mnożnik życia bloków
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Mnożnik prędkości tworzenia jednostek
 rules.unithealthmultiplier = Mnożnik życia jednostek
-rules.blockhealthmultiplier = Mnożnik życia bloków
-rules.playerhealthmultiplier = Mnożnik życia gracza
-rules.playerdamagemultiplier = Mnożnik obrażeń gracza
 rules.unitdamagemultiplier = Mnożnik obrażeń jednostek
 rules.enemycorebuildradius = Zasięg blokady budowy przy rdzeniu wroga:[lightgray] (kratki)
-rules.respawntime = Czas odrodzenia:[lightgray] (sek)
 rules.wavespacing = Odstępy między falami:[lightgray] (sek)
 rules.buildcostmultiplier = Mnożnik kosztów budowania
 rules.buildspeedmultiplier = Mnożnik prędkości budowania
 rules.deconstructrefundmultiplier = Mnożnik Zwrotu Dekonstrukcji
 rules.waitForWaveToEnd = Fale czekają na przeciwników
 rules.dropzoneradius = Zasięg strefy zrzutu:[lightgray] (kratki)
-rules.respawns = Maksymalna ilośc odrodzeń na falę
-rules.limitedRespawns = Ogranicz Odrodzenia
+rules.unitammo = Units Require Ammo
 rules.title.waves = Fale
-rules.title.respawns = Odrodzenia
 rules.title.resourcesbuilding = Zasoby i Budowanie
-rules.title.player = Gracze
 rules.title.enemy = Przeciwnicy
 rules.title.unit = Jednostki
 rules.title.experimental = Eksperymentalne
+rules.title.environment = Environment
 rules.lighting = Oświetlenie
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Otaczające Światło
-rules.solarpowermultiplier = Mnożnik Energii Słonecznej
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Przedmioty
 content.liquid.name = Płyny
@@ -827,10 +878,11 @@ liquid.water.name = Woda
 liquid.slag.name = Żużel
 liquid.oil.name = Ropa
 liquid.cryofluid.name = Lodociecz
-item.corestorable = [lightgray]Przechowywalne w rdzeniu: {0}
+
 item.explosiveness = [lightgray]Wybuchowość: {0}
 item.flammability = [lightgray]Palność: {0}
 item.radioactivity = [lightgray]Promieniotwórczość: {0}
+
 unit.health = [lightgray]Zdrowie: {0}
 unit.speed = [lightgray]Prędkość: {0}
 unit.weapon = [lightgray]Broń: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Prędkość kopania: {0}%
 unit.minepower = [lightgray]Moc kopania: {0}
 unit.ability = [lightgray]Umiejętność: {0}
 unit.buildspeed = [lightgray]Prędkość budowania: {0}%
+
 liquid.heatcapacity = [lightgray]Wytrzymałość na przegrzewanie: {0}
 liquid.viscosity = [lightgray]Lepkość: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
 
+unit.dagger.name = Nóż
+unit.mace.name = Mace
+unit.fortress.name = Forteca
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Pełzak
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Błysk
+unit.horizon.name = Horyzont
+unit.zenith.name = Zenit
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Zaćmienie
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Klif
 block.sand-boulder.name = Piaskowy Głaz
 block.grass.name = Trawa
 block.slag.name = Żużel
 block.salt.name = Sól
-block.saltrocks.name = Skały Solne
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Kamyki
 block.tendrils.name = Wić
-block.sandrocks.name = Skały Piaskowe
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Sosna Zarodnikowa
-block.sporerocks.name = Skała Zarodnikowa
-block.rock.name = Skały
-block.snowrock.name = Skały śnieżne
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Sosna śniegowa
 block.shale.name = Łupek
 block.shale-boulder.name = Głaz Łupkowy
 block.moss.name = Mech
 block.shrubs.name = Krzewy
 block.spore-moss.name = Mech Zarodnikowy
-block.shalerocks.name = Skały Łupkowe
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Ściana ze Złomu
 block.scrap-wall-large.name = Duża Ściana ze Złomu
 block.scrap-wall-huge.name = Ogromna Ściana ze Złomu
@@ -890,13 +979,17 @@ block.craters.name = Kratery
 block.sand-water.name = Woda z Piaskiem
 block.darksand-water.name = Woda z Ciemnym Piaskiem
 block.char.name = Popiół
-block.holostone.name = Błyszczący kamień
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Lodowy Śnieg
-block.rocks.name = Skały
-block.icerocks.name = Lodowe skały
-block.snowrocks.name = Śnieżne Skały
-block.dunerocks.name = Skały wydmowe
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Sosna
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Białe Drzewo Martwe
 block.white-tree.name = Białe Drzewo
 block.spore-cluster.name = Skupisko Zarodników
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Ciemny Panel 4
 block.dark-panel-5.name = Ciemny Panel 5
 block.dark-panel-6.name = Ciemny Panel 6
 block.dark-metal.name = Ciemny Metal
-block.ignarock.name = Skała Wulkaniczna
+block.basalt.name = Basalt
 block.hotrock.name = Gorący Kamień
 block.magmarock.name = Skała magmowa
-block.cliffs.name = Klify
 block.copper-wall.name = Miedziana Ściana
 block.copper-wall-large.name = Duża Miedziana Ściana
 block.titanium-wall.name = Tytanowa Ściana
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Brama Niedomiaru
 block.silicon-smelter.name = Huta Krzemu
 block.phase-weaver.name = Fazowa Fabryka
 block.pulverizer.name = Rozkruszacz
-block.cryofluidmixer.name = Mieszacz Lodocieczy
+block.cryofluid-mixer.name = Mieszacz Lodocieczy
 block.melter.name = Przetapiacz
 block.incinerator.name = Spalacz
 block.spore-press.name = Prasa Zarodników
@@ -964,7 +1056,7 @@ block.diode.name = Dioda baterii
 block.battery.name = Bateria
 block.battery-large.name = Duża Bateria
 block.combustion-generator.name = Generator Spalinowy
-block.turbine-generator.name = Generator Parowy
+block.steam-generator.name = Generator Parowy
 block.differential-generator.name = Generator Różnicowy
 block.impact-reactor.name = Reaktor Uderzeniowy
 block.mechanical-drill.name = Wiertło Mechaniczne
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Wybuchowy Mieszacz
 block.solar-panel.name = Panel Słoneczny
 block.solar-panel-large.name = Duży Panel Słoneczny
 block.oil-extractor.name = Ekstraktor Ropy
-block.command-center.name = Centrum Dowodzenia
-block.draug-factory.name = Fabryka Dronów Draug
-block.spirit-factory.name = Fabryka Dronów Duch
-block.phantom-factory.name = Fabryka Dronów Widmo
-block.wraith-factory.name = Fabryka Myśliwców Widmo
-block.ghoul-factory.name = Fabryka Bombowców Upiór
-block.dagger-factory.name = Fabryka Mechów Nóż
-block.crawler-factory.name = Fabryka Mechów Pełzacz
-block.titan-factory.name = Fabryka Mechów Tytan
-block.fortress-factory.name = Fabryka Mechów Forteca
-block.revenant-factory.name = Fabryka Krążowników Zjawa
 block.repair-point.name = Punkt Naprawy
 block.pulse-conduit.name = Rura Pulsacyjna
 block.plated-conduit.name = Opancerzona rura
@@ -1027,7 +1108,7 @@ block.surge-wall-large.name = Duża Ściana Elektrum
 block.cyclone.name = Cyklon
 block.fuse.name = Lont
 block.shock-mine.name = Mina
-block.overdrive-projector.name = Projektor Przyśpieszający
+block.overdrive-projector.name = Projektor Pola Overdrive
 block.force-projector.name = Projektor Pola Siłowego
 block.arc.name = Piorun
 block.rtg-generator.name = Generator RTG
@@ -1036,6 +1117,29 @@ block.meltdown.name = Rozpad
 block.container.name = Kontener
 block.launch-pad.name = Wyrzutnia
 block.launch-pad-large.name = Duża Wyrzutnia
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Fabryka Naziemna
+block.air-factory.name = Fabryka Powietrzna
+block.naval-factory.name = Fabryka Morska
+block.additive-reconstructor.name = Rekonstruktor Addytywny
+block.multiplicative-reconstructor.name = Rekonstruktor Multiplikatywny
+block.exponential-reconstructor.name = Rekonstruktor Wykładniczy
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Przenośnik Masowy
+block.payload-router.name = Rozdzielacz Ładunku
+block.disassembler.name = Dezasembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Kopuła Pola Overdrive
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = niebieski
 team.crux.name = czerwony
 team.sharded.name = żółty
@@ -1043,21 +1147,7 @@ team.orange.name = pomarańczowy
 team.derelict.name = szary
 team.green.name = zielony
 team.purple.name = fioletowy
-unit.spirit.name = Dron Naprawczy Duch
-unit.draug.name = Dron Wydobywczy Draug
-unit.phantom.name = Dron Budowniczy Widmo
-unit.dagger.name = Nóż
-unit.crawler.name = Pełzak
-unit.titan.name = Tytan
-unit.ghoul.name = Bombowiec Upiór
-unit.wraith.name = Myśliwiec Widmo
-unit.fortress.name = Forteca
-unit.revenant.name = Zjawa
-unit.eruptor.name = Roztapiacz
-unit.chaos-array.name = Chaos
-unit.eradicator.name = Niszczyciel
-unit.lich.name = Obudzony
-unit.reaper.name = Żniwiarz
+
 tutorial.next = [lightgray]<Kliknij, aby kontynuować>
 tutorial.intro = Wszedłeś do[scarlet] Samouczka Mindustry.[]\nUżyj [accent][[WASD][], aby poruszyć się.\n[accent]Przytrzymaj [[Ctrl] podczas przewijania[], aby przybliżyć i oddalić widok.\nZacznij od[accent] wydobycia miedzi[]. W tym celu przybliż się, a następnie dotknij żyły rudy miedzi w pobliżu rdzenia.\n\n[accent]{0}/{1} miedź
 tutorial.intro.mobile = Wszedłeś do[scarlet] Samouczka Mindustry.[]\nPrzesuń palcem po ekranie, aby poruszyć się.\n[accent]Użyj dwóch palcy[], aby przybliżyć i oddalić widok.\nZacznij od[accent] wydobycia miedzi[]. W tym celu przybliż się, a następnie dotknij żyły rudy miedzi w pobliżu rdzenia.\n\n[accent]{0}/{1} miedź
@@ -1100,17 +1190,7 @@ liquid.water.description = Powszechnie używana do schładzania budowli i przetw
 liquid.slag.description = Wiele różnych metali stopionych i zmieszanych razem. Może zostać rozdzielony na jego metale składowe, albo wystrzelony w wrogie jednostki i użyty jako broń.
 liquid.oil.description = Używany w do produkcji złożonych materiałów. Może zostać przetworzony na węgiel, lub wystrzelony w wrogów przez wieżyczke.
 liquid.cryofluid.description = Obojętna, niekorozyjna ciecz utworzona z wody i tytanu
-unit.draug.description = Prymitywny dron górniczy. Tani w produkcji. Przeznaczony na stracenie. Automatycznie wydobywa miedź i ołów w pobliżu. Dostarcza wydobyte zasoby do najbliższego rdzenia.
-unit.spirit.description = Zmodyfikowany dron draug, zaprojektowany do naprawy zamiast do wydobywania. Automatycznie naprawia wszelkie uszkodzone bloki w obszarze.
-unit.phantom.description = Zaawansowana jednostka dronów. Podąża za użytkownikiem. Pomaga w budowie bloków.
-unit.dagger.description = Podstawowy mech lądowy. Sam jest słaby, lecz przydatny w dużych ilościach.
-unit.crawler.description = Jednostka naziemna składająca się z rozebranej ramy z przypiętymi na górze materiałami wybuchowymi. Niezbyt trwały. Wybucha przy kontakcie z wrogami. Chodzi na czterech nogach jak pies.
-unit.titan.description = Zaawansowana, opancerzona jednostka naziemna. Atakuje zarówno cele naziemne, jak i powietrzne. Wyposażony w dwa miniaturowe miotacze ognia typu Płomień.
-unit.fortress.description = Ciężki mech artyleryjski. Wyposażony w dwa zmodyfikowane działa typu gradowego do ataku na dalekie odległości na konstrukcje i jednostki wroga.
-unit.eruptor.description = Ciężki mech stworzony do niszczenia struktur. Strzela wiązką żużlu w kierunku fortyfikacji wroga, Topiąc je oraz podpalając łatwopalne przedmioty.
-unit.wraith.description = Szybka jednostka, stosuje taktykę uderz-uciekaj. Namierza jakiekolwiek źródło prądu.
-unit.ghoul.description = Ciężki bombowiec dywanowy. Rozdziera struktury wroga, atakując krytyczną infrastrukturę.
-unit.revenant.description = Ciężka, unosząca sie platforma z rakietami.
+
 block.message.description = Przechowuje wiadomość. Wykorzystywane do komunikacji pomiędzy sojusznikami.
 block.graphite-press.description = Kompresuje kawałki węgla w czyste blaszki grafitu.
 block.multi-press.description = Ulepszona wersja prasy grafitowej. Używa wody i prądu do kompresowania węgla szybko i efektywnie.
@@ -1119,7 +1199,7 @@ block.kiln.description = Stapia ołów i piasek na metaszkło. Wymaga małej ilo
 block.plastanium-compressor.description = Wytwarza plastan z oleju i tytanu.
 block.phase-weaver.description = Produkuje Włókna Fazowe z radioaktywnego toru i dużych ilości piasku.
 block.alloy-smelter.description = Produkuje stop Elektrum z tytanu, ołowiu, krzemu i miedzi.
-block.cryofluidmixer.description = Łączy wodę i tytan w lodociecz, który jest znacznie bardziej wydajny w chłodzeniu niż woda.
+block.cryofluid-mixer.description = Łączy wodę i tytan w lodociecz, który jest znacznie bardziej wydajny w chłodzeniu niż woda.
 block.blast-mixer.description = Kruszy i miesza skupiska zarodników z piratytem, tworząc związek wybuchowy.
 block.pyratite-mixer.description = Miesza węgiel, ołów i piasek tworząc bardzo łatwopalny piratian.
 block.melter.description = Przetapia złom na żużel do dalszego przetwarzania lub użycia w wieżyczkach
@@ -1155,7 +1235,7 @@ block.force-projector.description = Wytwarza pole siłowe w kształcie sześciok
 block.shock-mine.description = Zadaje obrażenia jednostkom wroga którzy na nią wejdą. Ledwo widoczne dla wrogów.
 block.conveyor.description = Podstawowy blok transportowy dla przedmiotów. Automatycznie przesyła przedmioty naprzód do działek oraz maszyn. Można obrócić.
 block.titanium-conveyor.description = Zaawansowany blok transportowy dla przedmiotów. Przesyła przedmioty szybciej od zwykłego przenośnika.
-block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.
+block.plastanium-conveyor.description = Przenosi przedmity partiami. Przyjmuje przedmioty z tyłu i rozładowuje je w trzech kierunkach z przodu. Wymaga wielu punktów ładujących i rozładowujących w celu osiągnięcia maksymalnej przepustowości.
 block.junction.description = Używany jako most dla dwóch krzyżujących się przenośników. Przydatne w sytuacjach kiedy dwa różne przenośniki transportują różne surowce do różnych miejsc.
 block.bridge-conveyor.description = Zaawansowany blok transportujący. Pozwala na przenoszenie przedmiotów nawet do 3 bloków na każdym terenie, przez każdy budynek.
 block.phase-conveyor.description = Zaawansowany blok transportowy dla przedmiotów. Używa energii do teleportacji przedmiotów do połączonego transportera fazowego na spore odległości.
@@ -1185,7 +1265,7 @@ block.battery.description = Przechowuje energię przy nadwyżce produkcji oraz d
 block.battery-large.description = Przechowuje o wiele wiecej prądu niż standardowa bateria.
 block.combustion-generator.description = Wytwarza energię poprzez spalanie łatwopalnych materiałów.
 block.thermal-generator.description = Generuje prąd kiedy jest postawiony na źródłach ciepła.
-block.turbine-generator.description = Zaawansowana wersja Generatora Spalinowego. Jest wydajniejszy niż Generator Spalinowy, ale wymaga wody do generowania pary.
+block.steam-generator.description = Zaawansowana wersja Generatora Spalinowego. Jest wydajniejszy niż Generator Spalinowy, ale wymaga wody do generowania pary.
 block.differential-generator.description = Generuje duże ilości prądu. Wykorzystuje różnice temperatur pomiędzy Lodocieczą a spalanym Piratianem.
 block.rtg-generator.description = Prosty, niezawodny generator. Wykorzystuje ciepło powstałe z rozpadu izotopów promieniotwórczych. Nie wymaga chłodzenia, ale produkuje mniej energii od reaktora torowego.
 block.solar-panel.description = Wytwarza małe ilości prądu wykorzystując energię słoneczną.
@@ -1221,16 +1301,5 @@ block.ripple.description = Duża wieża artyleryjska, która strzela jednocześn
 block.cyclone.description = Duża szybkostrzelna wieża.
 block.spectre.description = Duże działo dwulufowe, które strzela potężnymi pociskami przebijającymi pancerz w jednostki naziemne i powietrzne.
 block.meltdown.description = Duże działo laserowe, które strzela potężnymi wiązkami dalekiego zasięgu. Wymaga chłodzenia.
-block.command-center.description = Wydaje polecenia ruchu sojuszniczym jednostkom na całej mapie.\nPowoduje patrolowanie jednostek, atakowanie wrogiego rdzenia lub wycofanie się do rdzenia/fabryki. Gdy nie ma rdzenia wroga, jednostki będą domyślnie patrolować pod dowództwem ataku.
-block.draug-factory.description = Produkuje drony wydobywcze Draug.
-block.spirit-factory.description = Produkuje lekkie drony, które naprawiają bloki.
-block.phantom-factory.description = Produkuje zaawansowane drony które pomagają przy budowie.
-block.wraith-factory.description = Produkuje szybkie jednostki powietrzne typu "uderz i uciekaj".
-block.ghoul-factory.description = Produkuje ciężkie bombowce dywanowe.
-block.revenant-factory.description = Produkuje ciężkie jednostki powietrzne z wyrzutniami rakiet.
-block.dagger-factory.description = Produkuje podstawowe jednostki lądowe.
-block.crawler-factory.description = Produkuje szybkie jednostki lądowe typu "kamikaze".
-block.titan-factory.description = Produkuje zaawansowane, opancerzone jednostki lądowe.
-block.fortress-factory.description = Produkuje naziemne jednostki ciężkiej artylerii.
 block.repair-point.description = Bez przerw naprawia najbliższą uszkodzoną jednostkę w jego zasięgu.
-
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 055f783fc9..7754faa059 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Página do Itch.io com os downloads
 link.google-play.description = Página da Google Play store
 link.f-droid.description = Listamento de catalogo do F-Droid
 link.wiki.description = Wiki oficial do Mindustry
-link.feathub.description = Sugira novos conteúdos
+link.suggestions.description = Sugira novos conteúdos
 linkfail = Falha ao abrir o link\nO Url foi copiado para a área de transferência.
 screenshot = Screenshot salvo para {0}
 screenshot.invalid = Este mapa é grande demais, você pode estar potencialmente sem memória suficiente para captura de tela.
@@ -20,6 +20,8 @@ gameover = O núcleo foi destruído.
 gameover.pvp = O time[accent] {0}[] ganhou!
 highscore = [accent]Novo recorde!
 copied = Copiado
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Sons
 load.map = Mapas
@@ -63,8 +65,7 @@ stat.delivered = Recursos lançados:
 stat.playtime = Tempo jogado:[accent] {0}
 stat.rank = Classificação final: [accent]{0}
 
-launcheditems = [accent]Itens lançados
-launchinfo = [unlaunched][[LANCE] seu núcleo para obter os itens indicados em azul.
+globalitems = [accent]Global Items
 map.delete = Certeza que quer deletar o mapa "[accent]{0}[]"?
 level.highscore = Melhor\npontuação: [accent] {0}
 level.select = Seleção de fase
@@ -106,6 +107,7 @@ mods.guide = Guia de mods
 mods.report = Reportar um Bug
 mods.openfolder = Abrir pasta de mods
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Ativado
 mod.disabled = [scarlet]Desativado
@@ -113,6 +115,7 @@ mod.disable = Desati-\nvar
 mod.content = Content:
 mod.delete.error = Incapaz de deletar o mod. O arquivo talvez esteja em uso.
 mod.requiresversion = [scarlet]Requer no mínimo versão [accent]{0} [scarlet]do jogo. 
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Dependências ausentes: {0}
 mod.erroredcontent = [scarlet]Erros no conteúdo
 mod.errors = Ocorreram erros ao carregar o conteúdo.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Recarregamento necessário
 mod.import = Importar mod
 mod.import.file = Import File
 mod.import.github = Importar mod do GitHub
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Este item é parte do mod[accent] '{0}'[]. Para removê-lo, desinstale esse mod.
 mod.remove.confirm = Este mod será deletado.
 mod.author = [lightgray]Autor:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Sobre
 name = Nome:
 noname = Escolha[accent] um nome[] primeiro.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Nome do arquivo:
 unlocked = Novo bloco desbloqueado!
 completed = [accent]Completado
@@ -142,6 +148,7 @@ techtree = Árvore Tecnológica
 research.list = [lightgray]Pesquise:
 research = Pesquisar
 researched = [lightgray]{0} Pesquisado.
+research.progress = {0}% complete
 players = {0} Jogadores ativos
 players.single = {0} Jogador ativo
 players.search = Procurar
@@ -224,7 +231,6 @@ save.new = Novo save
 save.overwrite = Você tem certeza que quer sobrescrever este save?
 overwrite = sobrescrever
 save.none = Nenhum save encontrado!
-saveload = [accent]Salvando...
 savefail = Falha ao salvar jogo!
 save.delete.confirm = Certeza que quer deletar este save?
 save.delete = Deletar
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Você tem certeza que você sabe o que você esta fazend
 loading = [accent]Carregando...
 reloading = [accent]Recarregando mods...
 saving = [accent]Salvando...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] para cancelar a construção
 selectschematic = [accent][[{0}][] para selecionar + copiar
 pausebuilding = [accent][[{0}][] para parar a construção
@@ -328,8 +335,9 @@ waves.never = <nunca>
 waves.every = a cada
 waves.waves = Horda(s)
 waves.perspawn = por spawn
+waves.shields = shields/wave
 waves.to = para
-waves.boss = Chefão
+waves.guardian = Guardian
 waves.preview = Pré-visualizar
 waves.edit = Editar...
 waves.copy = Copiar para área de transferência
@@ -337,6 +345,11 @@ waves.load = Carregar da área de transferência
 waves.invalid = Hordas inválidas na área de transferência.
 waves.copied = Hordas copiadas.
 waves.none = Sem hordas definidas.\nNote que layouts vazios de hordas serão automaticamente substituídos pelo layout padrão.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<padrão>
 details = Detalhes...
 edit = Editar...
@@ -456,10 +469,12 @@ locked = Trancado
 complete = [lightgray]Completo:
 requirement.wave = Alcançar a Horda {0} em {1}
 requirement.core = Destruir o núcleo inimigo em {0}
-requirement.unlock = Desbloquear {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Resumir Zona:\n[lightgray]{0}
 bestwave = [lightgray]Melhor: {0}
 launch = Lançar
+launch.text = Launch
 launch.title = Lançamento feito com sucesso
 launch.next = [lightgray]Próxima oportunidade na Horda {0}
 launch.unable2 = [scarlet]Impossível lançar.[]
@@ -467,13 +482,14 @@ launch.confirm = Isto vai lançar todos os seus recursos no seu núcleo.\nVoce n
 launch.skip.confirm = Se você pular a horda agora, você não será capaz de lançar até hordas futuras.
 uncover = Descobrir
 configure = Configurar carregamento
+loadout = Loadout
+resources = Resources 
 bannedblocks = Blocos Banidos
 addall = Adicionar Todos
-configure.locked = [lightgray]Alcançe a horda {0}\npara configurar o carregamento.
+launch.destination = Destination: {0}
 configure.invalid = A quantidade deve ser um número entre 0 e {0}.
 zone.unlocked = [lightgray]{0} Desbloqueado.
 zone.requirement.complete = Horda {0} alcançada:\n{1} Requerimentos da zona alcançada.
-zone.config.unlocked = Equipamento desbloqueado:[lightgray]\n{0}
 zone.resources = Recursos detectados:
 zone.objective = [lightgray]Objetivo: [accent]{0}
 zone.objective.survival = Sobreviver
@@ -492,35 +508,43 @@ error.io = Erro I/O de internet.
 error.any = Erro de rede desconhecido.
 error.bloom = Falha ao inicializar bloom.\nSeu dispositivo talvez não o suporte.
 
-zone.groundZero.name = Marco zero
-zone.desertWastes.name = Ruínas do Deserto
-zone.craters.name = As crateras
-zone.frozenForest.name = Floresta congelada
-zone.ruinousShores.name = Costas Ruinosas
-zone.stainedMountains.name = Montanhas manchadas
-zone.desolateRift.name = Fenda desolada
-zone.nuclearComplex.name = Complexo Nuclear
-zone.overgrowth.name = Crescimento excessivo
-zone.tarFields.name = Campos de Piche
-zone.saltFlats.name = Planícies de sal
-zone.impact0078.name = Impacto 0078
-zone.crags.name = Penhascos
-zone.fungalPass.name = Passagem de fungos
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Uma ótima localização para começar de novo. Baixa ameaça inimiga. Poucos recursos.\nColete o máximo de chumbo e cobre possível.\nContinue!
-zone.frozenForest.description = Até aqui, perto das montanhas, os esporos se espalharam. As baixas temperaturas não podem contê-los para sempre.\n\nComeçe a busca por energia. Construa geradores à combustão. Aprenda a usar os reparadores (menders).
-zone.desertWastes.description = Estas ruínas são vastas, imprevisíveis, e cruzadas por estruturas abandonadas.\nCarvão está presente na região. O queime por energia, ou sintetize grafite.\n\n[lightgray]Este local de pouso não pode ser garantido.
-zone.saltFlats.description = Nos arredores do deserto estão as Planícies de Sal. Poucos recursos podem ser encontrados neste lugar.\n\nO inimigo ergueu um complexo de armazenamento aqui. Erradique seu núcleo. Não deixe nada de pé.
-zone.craters.description = Água se acumulou nesta cratera, relíquia de guerras antigas. Recupere a área. Colete areia. Derreta metavidro. Bombeie água para resfriar torretas e brocas.
-zone.ruinousShores.description = Depois das ruínas está o litoral. Uma vez, este local abrigou uma matriz de defesa costeira. Não restou muito disso. Apenas as estruturas de defesa mais básicas restaram ilesas, todo o resto se reduziu a sucata.\nContinue a expansão para fora. Redescubra a tecnologia.
-zone.stainedMountains.description = Mais para o interior estão as montanhas, ainda intocadas por esporos.\nExtraia o titânio abundante nesta área. Aprenda como usá-lo.\n\nA presença inimiga é maior aqui. Não os dê tempo de enviar suas tropas mais fortes.
-zone.overgrowth.description = Esta área tem crescimento excessivo, mais perto da fonte de esporos.\nO inimgo estabeleceu um posto avançado aqui. Construa unidades dagger. Destrua-o. Recupere o que sobrou.
-zone.tarFields.description = Nos arredores de uma zona de produção de petróleo, entre as montanhas e o deserto. Uma das poucas áreas com reservas utilizáveis de piche.\nApesar de abandonada, esta área possui perigosas forças inimigas por perto. Não as subestime.\n\n[lightgray]Pesquise tecnologias de processamento de petróleo se possível.
-zone.desolateRift.description = Uma zona extremamente perigosa. Recursos abundantes, porém pouco espaço. Alto risco de destruição. Saia o mais rápido possível. Não seja enganado pelo longo espaço de tempo entre os ataques inimigos.
-zone.nuclearComplex.description = Uma antiga instalação para produção e processamento de tório, reduzido a ruínas.\n[lightgray]Pesquise o tório e seus muitos usos.\n\nO inimigo está presente aqui em grandes números, constantemente à procura de atacantes.
-zone.fungalPass.description = Uma area de transição entre montanhas altas e baixas, terras cheias de esporos. Uma pequena base de reconhecimento inimiga está localizada aqui.\nDestrua-a.\nUse as unidades crawler e dagger. Destrua os dois núcleos.
-zone.impact0078.description = <insira descrição aqui>
-zone.crags.description = <Insira descrição aqui>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Idioma
 settings.data = Dados do jogo
@@ -534,9 +558,12 @@ settings.graphics = Gráficos
 settings.cleardata = Apagar dados
 settings.clear.confirm = Certeza que quer limpar a os dados?\nOque é feito não pode ser desfeito!
 settings.clearall.confirm = [scarlet]Aviso![]\nIsso vai limpar todo os arquivos, incluindo jogos salvos, mapas, teclas personalizadas e desbloqueados.\nQuando apertar 'ok' todos os arquivos serão apagados e o jogo irá sair automaticamente.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = Pausado
 clear = Limpo
 banned = [scarlet]BANIDO
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Sim
 no = Não
 info.title = [accent]Informação
@@ -558,8 +585,11 @@ blocks.itemsmoved = Velocidade de movimento
 blocks.launchtime = Tempo entre Disparos.
 blocks.shootrange = Alcance
 blocks.size = Tamanho
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Capacidade de Líquido
 blocks.powerrange = Alcance da Energia
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Conexões Máximas
 blocks.poweruse = Uso de energia
 blocks.powerdamage = Dano/Poder
@@ -575,13 +605,18 @@ blocks.boosteffect = Efeito do Impulso
 blocks.maxunits = Máximo de unidades ativas
 blocks.health = Saúde
 blocks.buildtime = Tempo de construção
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Custo de construção
 blocks.inaccuracy = Imprecisão
 blocks.shots = Tiros
 blocks.reload = Tiros por segundo
 blocks.ammo = Munição
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Broca melhor necessária.
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Velocidade da Broca: {0}/s
 bar.pumpspeed = Velocidade da Bomba: {0}/s
 bar.efficiency = Eficiência: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Energia: {0}
 bar.poweroutput = Saída de energia: {0}
 bar.items = Itens: {0}
 bar.capacity = Capacidade: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquido
 bar.heat = Aquecer
 bar.power = Poder
 bar.progress = Progresso da construção
-bar.spawned = Unidades: {0}/{1}
 bar.input = Entrada
 bar.output = Sainda
 
@@ -619,12 +655,16 @@ unit.liquidunits = unidades de liquido
 unit.powerunits = unidades de energia
 unit.degrees = Graus
 unit.seconds = segundos
+unit.minutes = mins
 unit.persecond = por segundo
+unit.perminute = /min
 unit.timesspeed = x Velocidade
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = itens
 unit.thousands = k
 unit.millions = m
+unit.billions = b
 category.general = Geral
 category.power = Energia
 category.liquids = Líquidos
@@ -639,6 +679,7 @@ setting.linear.name = Filtragem linear
 setting.hints.name = Dicas
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Pausar construções automaticamente
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Água animada
 setting.animatedshields.name = Escudos animados
 setting.antialias.name = Filtro suavizante[lightgray] (reinicialização requerida)[]
@@ -663,7 +704,6 @@ setting.effects.name = Efeitos
 setting.destroyedblocks.name = Mostrar Blocos Destruídos
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Esteiras Encontram Caminho
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Sensibilidade do Controle
 setting.saveinterval.name = Intervalo de Auto Salvamento
 setting.seconds = {0} segundos
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milissegundos
 setting.fullscreen.name = Tela Cheia
 setting.borderlesswindow.name = Janela sem borda[lightgray] (Pode precisar reiniciar)
 setting.fps.name = Mostrar FPS e Ping
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Mostrar teclas de seleção de blocos
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelizado [lightgray](Pode diminuir a performace)
 setting.minimap.name = Mostrar minimapa
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Mostrar a posição do Jogador
 setting.musicvol.name = Volume da Música
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Volume do Ambiente
 setting.mutemusic.name = Desligar Música
 setting.sfxvol.name = Volume de Efeitos
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]A maior parte das teclas aqui não são funcionais em
 category.general.name = Geral
 category.view.name = Ver
 category.multiplayer.name = Multijogador
+category.blocks.name = Block Select
 command.attack = Atacar
 command.rally = Reunir
 command.retreat = Recuar
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Tecla: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Limpar construção
 keybind.press = Pressione uma tecla...
 keybind.press.axis = Pressione um eixo ou tecla...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Mover no eixo x
 keybind.move_y.name = Mover no eixo Y
 keybind.mouse_move.name = Seguir Mouse
-keybind.dash.name = Arrancada
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Selecionar região
 keybind.schematic_menu.name = Menu de Esquemas
 keybind.schematic_flip_x.name = Girar o Esquema no eixo X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Colocação diagonal
 keybind.pick.name = Pegar bloco
 keybind.break_block.name = Quebrar bloco
 keybind.deselect.name = Desselecionar
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Atirar
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reatores explodem
 rules.wavetimer = Tempo de horda
 rules.waves = Hordas
 rules.attack = Modo de ataque
+rules.buildai = AI Building
 rules.enemyCheat = Recursos de IA Infinitos
-rules.unitdrops = Inimigos dropam itens
+rules.blockhealthmultiplier = Multiplicador de vida do bloco
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de unidade
 rules.unithealthmultiplier = Multiplicador de vida de unidade
-rules.blockhealthmultiplier = Multiplicador de vida do bloco
-rules.playerhealthmultiplier = Multiplicador da vida de jogador
-rules.playerdamagemultiplier = Multiplicador do dano de jogador
 rules.unitdamagemultiplier = Multiplicador de dano de Unidade
 rules.enemycorebuildradius = Raio de "Não-criação" de core inimigo:[lightgray] (blocos)
-rules.respawntime = Tempo de renascimento:[lightgray] (seg)
 rules.wavespacing = Espaço de tempo entre hordas:[lightgray] (seg)
 rules.buildcostmultiplier = Multiplicador de custo de construção
 rules.buildspeedmultiplier = Multiplicador de velocidade de construção
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Hordas esperam inimigos
 rules.dropzoneradius = Raio da zona de spawn:[lightgray] (blocos)
-rules.respawns = Respawn maximos por horda
-rules.limitedRespawns = Respawn limitados
+rules.unitammo = Units Require Ammo
 rules.title.waves = Hordas
-rules.title.respawns = Respawns
 rules.title.resourcesbuilding = Recursos e Construções
-rules.title.player = Jogadores
 rules.title.enemy = Inimigos
 rules.title.unit = Unidades
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Iluminação
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Luz ambiente
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Itens
 content.liquid.name = Líquidos
@@ -827,10 +878,11 @@ liquid.water.name = Água
 liquid.slag.name = Escória
 liquid.oil.name = Petróleo
 liquid.cryofluid.name = Fluído Criogênico
-item.corestorable = [lightgray]Armazenável no núcleo: {0}
+
 item.explosiveness = [lightgray]Explosibilidade: {0}
 item.flammability = [lightgray]Inflamabilidade: {0}
 item.radioactivity = [lightgray]Radioatividade: {0}
+
 unit.health = [lightgray]Vida: {0}
 unit.speed = [lightgray]Velocidade: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidade de aquecimento: {0}
 liquid.viscosity = [lightgray]Viscosidade: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
 
+unit.dagger.name = Adaga
+unit.mace.name = Mace
+unit.fortress.name = Fortaleza
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Rastejante
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Pedregulho de areia
 block.grass.name = Grama
 block.slag.name = Slag
 block.salt.name = Sal
-block.saltrocks.name = Pedras De Sal
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pedrinhas
 block.tendrils.name = Gavinhas
-block.sandrocks.name = Pedras de areia
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Pinheiro de esporo
-block.sporerocks.name = Pedras de esporo
-block.rock.name = Rocha
-block.snowrock.name = Rocha com neve
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Pinheiro com neve
 block.shale.name = Xisto
 block.shale-boulder.name = Pedra de Xisto
 block.moss.name = Musgo
 block.shrubs.name = Arbusto
 block.spore-moss.name = Musgo de Esporos
-block.shalerocks.name = Rochas de Xisto
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Muro de sucata
 block.scrap-wall-large.name = Muro grande de sucata
 block.scrap-wall-huge.name = Muro enorme de sucata
@@ -890,13 +979,17 @@ block.craters.name = Crateras
 block.sand-water.name = Água sobre areia
 block.darksand-water.name = Água sobre areia escura
 block.char.name = Char
-block.holostone.name = Pedra holo
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Gelo de neve
-block.rocks.name = Rochas
-block.icerocks.name = Rochas de gelo
-block.snowrocks.name = Rochas de neve
-block.dunerocks.name = Rochas da duna
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pinheiro
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Árvore branca morta
 block.white-tree.name = Árvore branca
 block.spore-cluster.name = Aglomerado de esporos
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Painel escuro 4
 block.dark-panel-5.name = Painel escuro 5
 block.dark-panel-6.name = Painel escuro 6
 block.dark-metal.name = Metal escuro
-block.ignarock.name = Rocha ígnea
+block.basalt.name = Basalt
 block.hotrock.name = Rocha quente
 block.magmarock.name = Rocha de magma
-block.cliffs.name = Colinas
 block.copper-wall.name = Muro de Cobre
 block.copper-wall-large.name = Muralha de Cobre
 block.titanium-wall.name = Muro de Titânio
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Comporta invertida
 block.silicon-smelter.name = Fundidora de silicio
 block.phase-weaver.name = Palheta de fase
 block.pulverizer.name = Pulverizador
-block.cryofluidmixer.name = Misturador de Crio Fluido
+block.cryofluid-mixer.name = Misturador de Crio Fluido
 block.melter.name = Aparelho de fusão
 block.incinerator.name = Incinerador
 block.spore-press.name = Prensa de Esporo
@@ -964,7 +1056,7 @@ block.diode.name = Diodo
 block.battery.name = Bateria
 block.battery-large.name = Bateria grande
 block.combustion-generator.name = Gerador à combustão
-block.turbine-generator.name = Gerador à vapor
+block.steam-generator.name = Gerador à vapor
 block.differential-generator.name = Gerador diferencial
 block.impact-reactor.name = Reator De impacto
 block.mechanical-drill.name = Broca Mecânica
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Misturador de Explosão
 block.solar-panel.name = Painel Solar
 block.solar-panel-large.name = Painel Solar Grande
 block.oil-extractor.name = Bomba de Petróleo
-block.command-center.name = Centro de comando
-block.draug-factory.name = Fábrica de drone de mineração Adaga
-block.spirit-factory.name = Fábrica de drone de reparo Espirito
-block.phantom-factory.name = Fábrica de drone de construção Fantasma
-block.wraith-factory.name = Fábrica de lutadores Sombra
-block.ghoul-factory.name = Fábrica de Bombardeiros Corvos
-block.dagger-factory.name = Fábrica de Mecas Adaga
-block.crawler-factory.name = Fábrica de Mecas Rasteiros
-block.titan-factory.name = Fábrica de Mecas Titã
-block.fortress-factory.name = Fábrica de Meca Fortaleza
-block.revenant-factory.name = Fábrica de lutadores Revenant
 block.repair-point.name = Ponto de Reparo
 block.pulse-conduit.name = Cano de Tinânio
 block.plated-conduit.name = Cano blindado
@@ -1036,6 +1117,29 @@ block.meltdown.name = Fusão
 block.container.name = Contâiner
 block.launch-pad.name = Plataforma de lançamento
 block.launch-pad-large.name = Plataforma de lançamento grande
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = Azul
 team.crux.name = Vermelho
 team.sharded.name = Fragmentado
@@ -1043,21 +1147,7 @@ team.orange.name = Alaranjado
 team.derelict.name = Abandonado
 team.green.name = Verde
 team.purple.name = Roxa
-unit.spirit.name = Drone Espirito
-unit.draug.name = Drone minerador Drauger
-unit.phantom.name = Drone Fantasma
-unit.dagger.name = Adaga
-unit.crawler.name = Rastejante
-unit.titan.name = Titã
-unit.ghoul.name = Bombardeiro Corvo
-unit.wraith.name = Lutador Sombra
-unit.fortress.name = Fortaleza
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Matriz do caos
-unit.eradicator.name = Erradicador
-unit.lich.name = Lich
-unit.reaper.name = Ceifador
+
 tutorial.next = [lightgray]<Toque para continuar>
 tutorial.intro = Você entrou no Tutorial do[scarlet] Mindustry.[]\nUse[accent] [[WASD][] para se mover.\n[accent]Roda do mouse[] para aumentar e diminuir o zoom.\nComece[accent] minerando cobre[]. Toque em um veio de minério de cobre para fazer isso.\n\n[accent]{0}/{1} Cobre
 tutorial.intro.mobile = Você entrou no Tutorial do[scarlet] Mindustry.[]\nPasse o dedo na tela para se mover.\n[accent]Use os dois dedos [] para alterar o zoom.\nComece[accent] minerando cobre[]. Se aproxime dele, e toque numa veia de cobre perto do seu núcleo.\n\n[accent]{0}/{1} Cobre
@@ -1100,17 +1190,7 @@ liquid.water.description = O líquido mais útil, comumente usado em resfriament
 liquid.slag.description = Vários metais derretidos misturados juntos. Pode ser separado em seus minerais constituentes, ou jogado nas unidades inimigas como uma arma.
 liquid.oil.description = Um líquido usado na produção de materias avançados. Pode ser convertido em carvão como combustível, ou pulverizado e incendiado como arma.
 liquid.cryofluid.description = A maneira mais eficiente de resfriar qualquer coisa, até seu corpo quando está calor, mas não faça isto.
-unit.draug.description = Um drone de mineração primitivo. Barato para produzir. Descartável. Minera automaticamente cobre e chumbo nas proximidades. Entrega os recursos minerados para o núcleo mais próximo.
-unit.spirit.description = Um drone drauger modificado, desenhado para reparo em vez de mineração. Automaticamente conserta qualquer bloco danificado na área.
-unit.phantom.description = Um drone avançado. Segue usuários. Ajuda na construção de blocos.
-unit.dagger.description = A mais básica armadura terrestre. Barato para produzir. Esmagadora quando usada em enxames.
-unit.crawler.description = Uma unidade terrestre que consiste em um despojado quadro com grandes explosivos amarrados no topo. Não particularmente durável. Explode no contato com inimigos.
-unit.titan.description = Uma avançada unidade terrestre armadurada. Ataca alvos aéreos e terrestres. Equipada com dois pequenos lança chamas.
-unit.fortress.description = Uma armadura de artilharia pesada. Equipada com dois canhões tipo granizo modificados para assalto de longa distância em estruturas e unidades inimigas.
-unit.eruptor.description = Uma unidade pesada desenhada para derrubar estruturas. Atira um monte de escória nas fortificações inimigas, derretendo e colocando-as em chamas.
-unit.wraith.description = Uma rápida, unidade interceptadora hit-and-run (atacar e correr). Mira em geradores de energia.
-unit.ghoul.description = Um bombardeiro pesado. Rompe estruturas inimigas, mirando em infraestrutura crítica.
-unit.revenant.description = Uma matriz de mísseis pesada e flutuante.
+
 block.message.description = Armazena uma mensagem. Usado para comunicação entre aliados.
 block.graphite-press.description = Comprime pedaços de carvão em lâminas de grafite puro.
 block.multi-press.description = Uma versão melhorada da prensa de grafite. Usa água e energia para processar carvão rápida e eficientemente.
@@ -1119,7 +1199,7 @@ block.kiln.description = Derrete chumbo e areia no composto conhecido como metav
 block.plastanium-compressor.description = Produz plastânio usando petróleo e titânio.
 block.phase-weaver.description = Produz tecido de fase usando tório radioativo e areia. Requer massivas quantidades de energia para funcionar.
 block.alloy-smelter.description = Combina titânio, chumbo, silicio e cobre para produzir liga de surto.
-block.cryofluidmixer.description = Mistura água e pó fino de titânio para produzir criofluido. Essencial para o uso do reator a tório.
+block.cryofluid-mixer.description = Mistura água e pó fino de titânio para produzir criofluido. Essencial para o uso do reator a tório.
 block.blast-mixer.description = Quebra e mistura aglomerados de esporos com piratita para produzir composto de explosão.
 block.pyratite-mixer.description = Mistura carvão, chumbo e areia em piratita altamente inflamável.
 block.melter.description = Derrete sucata em escória para processamento posterior ou uso em torretas.
@@ -1185,7 +1265,7 @@ block.battery.description = Armazena energia em tempos de energia excedente. Lib
 block.battery-large.description = Guarda muito mais energia que uma bateria comum.
 block.combustion-generator.description = Gera energia queimando materiais inflamáveis, como carvão.
 block.thermal-generator.description = Gera energia quando colocado em lugares quentes.
-block.turbine-generator.description = Mais eficiente que o gerador à combustão, mas requer água adicional para a geração de vapor.
+block.steam-generator.description = Mais eficiente que o gerador à combustão, mas requer água adicional para a geração de vapor.
 block.differential-generator.description = Gera grandes quantidades de energia. Utiliza a diferença de temperatura entre o Fluido Criogênico e a Piratita.
 block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos que não precisa de refriamento mas dá muito menos energia que o reator de tório.
 block.solar-panel.description = Gera pequenas quantidades de energia do sol.
@@ -1221,15 +1301,5 @@ block.ripple.description = Uma torre de artilharia extremamente poderosa. Dispar
 block.cyclone.description = Uma grande torre que dispara balas explosivas que se fragmentam em unidades aéreas e terrestres próximas. 
 block.spectre.description = Um grande canhão massivo. Dispara grandes tiros perfuradores de blindagem em inimigos aéreos e terrestres. 
 block.meltdown.description = Um grande canhão laser massivo. Carrega e dispara um poderoso e persistente feixe nos seus inimigos. Requer uma refrigeração para ser operada.    
-block.command-center.description = Emite comandos de movimento para unidades aliadas através do mapa.\nFaz unidades se reagruparem, atacarem um núcleo inimigo ou recuar para o núcleo/fábrica. Quando não há nucleo inimigo, unidades vão ficar perto da área de spawn dos inimigos sob o comando atacar.
-block.draug-factory.description = Produz drones de mineração drauger.
-block.spirit-factory.description = produz drones Espirito de reparo estrutural.
-block.phantom-factory.description = Produz drones de Fantasma construção avançados.
-block.wraith-factory.description = Produz Sombra, de ataque rápido hit-and-run (atacar e correr)
-block.ghoul-factory.description = Produz Corvos, bombardeiros pesados.
-block.revenant-factory.description = Produz unidades Revenant, que atiram mísseis e voam.
-block.dagger-factory.description = Produz Adagas, unidades terrestres.
-block.crawler-factory.description = Produz unidades Rasteiro, terrestres de auto destruição.
-block.titan-factory.description = Produz unidades Titã, avancadas, armaduradas e terrestres.
-block.fortress-factory.description = Produz unidades Torre, terrestres pesadas de artilharia.
 block.repair-point.description = Continuamente repara a unidade danificada mais proxima.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 01b872892f..0b6948191b 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Pagina da Itch.io com os Descarregamentos
 link.google-play.description = Listamento do google play store
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Wiki oficial do Mindustry
-link.feathub.description = Sugerir novas funcionalidades
+link.suggestions.description = Sugerir novas funcionalidades
 linkfail = Falha ao abrir a ligação\nO Url foi copiado
 screenshot = Screenshot gravado para {0}
 screenshot.invalid = Mapa grande demais, Potencialmente sem memória suficiente para captura.
@@ -20,6 +20,8 @@ gameover = O núcleo foi destruído.
 gameover.pvp = O time[accent] {0}[] ganhou!
 highscore = [accent]Novo recorde!
 copied = Copiado.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Sons
 load.map = Mapas
@@ -63,8 +65,7 @@ stat.delivered = Recursos lançados:
 stat.playtime = Tempo jogado:[accent] {0}
 stat.rank = Rank Final: [accent]{0}
 
-launcheditems = [accent]Itens lançados
-launchinfo = [unlaunched][[LAUNCH] seu núcleo para obter os itens indicados em azul.
+globalitems = [accent]Global Items
 map.delete = Certeza que quer deletar o mapa "[accent]{0}[]"?
 level.highscore = Melhor\npontuação: [accent] {0}
 level.select = Seleção de Fase
@@ -106,6 +107,7 @@ mods.guide = Guia de mods
 mods.report = Reportar Bug
 mods.openfolder = Abrir pasta de Mods
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Ativado
 mod.disabled = [scarlet]Desativado
@@ -113,6 +115,7 @@ mod.disable = Desativar
 mod.content = Content:
 mod.delete.error = Incapaz de apagar o mod. Ficheiro já em uso.
 mod.requiresversion = [scarlet]Requer versão minima de jogo: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Dependências ausentes: {0}
 mod.erroredcontent = [scarlet]Erros de conteudo
 mod.errors = Ocorreram erros ao carregar o conteúdo.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]É necessario recarregar
 mod.import = Importar Mod
 mod.import.file = Import File
 mod.import.github = Importar Mod pelo GitHub
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Este item faz parte do [accent] '{0}'[] mod. Para lhe remover, desinstala o mod.
 mod.remove.confirm = Este mod irá ser apagado.
 mod.author = [lightgray]Autor:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Sobre
 name = Nome:
 noname = Escolha[accent] um nome[] primeiro.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Nome do ficheiro:
 unlocked = Novo bloco Desbloqueado!
 completed = [accent]Completado
@@ -142,6 +148,7 @@ techtree = Árvore de tecnologia
 research.list = [lightgray]Pesquise:
 research = Pesquisa
 researched = [lightgray]{0} pesquisado.
+research.progress = {0}% complete
 players = {0} Jogadores Ativos
 players.single = {0} Jogador Ativo
 players.search = search
@@ -224,7 +231,6 @@ save.new = Novo gravamento
 save.overwrite = Você tem certeza que quer sobrescrever este gravamento?
 overwrite = Gravar sobre
 save.none = Nenhum gravamento encontrado!
-saveload = [accent]Gravando...
 savefail = Falha ao gravar jogo!
 save.delete.confirm = Certeza que quer deletar este gravamento?
 save.delete = Deletar
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Você tem certeza você sabe o que você esta fazendo?\n
 loading = [accent]Carregando...
 reloading = [accent]Recarregar mods...
 saving = [accent]Gravando...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] para apagar o plano
 selectschematic = [accent][[{0}][] para selecionar+copy
 pausebuilding = [accent][[{0}][] para pausar construção
@@ -328,8 +335,9 @@ waves.never = <nunca>
 waves.every = a cada
 waves.waves = Hordas(s)
 waves.perspawn = por spawn
+waves.shields = shields/wave
 waves.to = para
-waves.boss = Chefe
+waves.guardian = Guardian
 waves.preview = Pré visualizar
 waves.edit = Editar...
 waves.copy = Copiar para área de transferência
@@ -337,6 +345,11 @@ waves.load = Carregar da área de transferência
 waves.invalid = Hordas inválidas na área de transferência.
 waves.copied = Hordas copiadas.
 waves.none = Sem hordas definidas.\nNote que layouts vazios de hordas serão automaticamente substituídos pelo layout padrão.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<padrão>
 details = Detalhes...
 edit = Editar...
@@ -456,10 +469,12 @@ locked = Trancado
 complete = [lightgray]Completo:
 requirement.wave = Ronda alcançada {0} / {1}
 requirement.core = Destruir Núcleo Inimigo em {0}
-requirement.unlock = Destrava {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Resumir Zona:\n[lightgray]{0}
 bestwave = [lightgray]Melhor: {0}
 launch = Lançar
+launch.text = Launch
 launch.title = Lançamento feito com sucesso
 launch.next = [lightgray]Próxima oportunidade na Horda {0}
 launch.unable2 = [scarlet]Impossível lançar.[]
@@ -467,13 +482,14 @@ launch.confirm = Isto vai lançar todos os seus recursos no seu núcleo.\nVoce n
 launch.skip.confirm = Se você pular a horda agora, você não será capaz de lançar até hordas mais avançadas.
 uncover = Descobrir
 configure = Configurar carregamento
+loadout = Loadout
+resources = Resources 
 bannedblocks = Blocos banidos
 addall = Adiciona tudo
-configure.locked = [lightgray]Alcançe a horda {0}\npara configurar o carregamento.
+launch.destination = Destination: {0}
 configure.invalid = A quantidade deve ser um número entre 0 e {0}.
 zone.unlocked = [lightgray]{0} Desbloqueado.
 zone.requirement.complete = Horda {0} alcançada:\n{1} Requerimentos da zona alcançada.
-zone.config.unlocked = Loadout destravada:[lightgray]\n{0}
 zone.resources = Recursos detectados:
 zone.objective = [lightgray]Objetivo: [accent]{0}
 zone.objective.survival = Sobreviver
@@ -492,35 +508,43 @@ error.io = Erro I/O de internet.
 error.any = Erro de rede desconhecido.
 error.bloom = Falha ao inicializar bloom.\nSeu aparelho talvez não o suporte.
 
-zone.groundZero.name = Marco zero
-zone.desertWastes.name = Ruínas do Deserto
-zone.craters.name = As crateras
-zone.frozenForest.name = Floresta congelada
-zone.ruinousShores.name = Costas Ruinosas
-zone.stainedMountains.name = Montanhas manchadas
-zone.desolateRift.name = Fenda desolada
-zone.nuclearComplex.name = Complexo de Produção Nuclear
-zone.overgrowth.name = Crescimento excessivo
-zone.tarFields.name = Campos de Piche
-zone.saltFlats.name = Planícies de sal
-zone.impact0078.name = Impacto 0078
-zone.crags.name = Penhascos
-zone.fungalPass.name = Passagem Fúngica
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Uma ótima localização para começar de novo. Baixa ameaça inimiga. Poucos recursos.\nColete o máximo de chumbo e cobre possível.\nContinue!
-zone.frozenForest.description = Até aqui, perto das montanhas, os esporos se espalharam. As baixas temperaturas não podem contê-los para sempre.\n\nComeçe a busca por energia. Construa geradores à combustão. Aprenda a usar os reparadores (menders).
-zone.desertWastes.description = Estas ruínas são vastas, imprevisíveis, e cruzadas por estruturas abandonadas.\nCarvão está presente na região. O queime por energia, ou sintetize grafite.\n\n[lightgray]Este local de pouso não pode ser garantido.
-zone.saltFlats.description = Nos arredores do deserto estão as Planícies de Sal. Poucos recursos podem ser encontrados neste lugar.\n\nO inimigo ergueu um complexo de armazenamento aqui. Erradique seu núcleo. Não deixe nada de pé.
-zone.craters.description = Água se acumulou nesta cratera, relíquia de guerras antigas. Recupere a área. Colete areia. Derreta metavidro. Bombeie água para resfriar torretas e brocas.
-zone.ruinousShores.description = Depois das ruínas está o litoral. Uma vez, este local abrigou uma matriz de defesa costeira. Não restou muito disso. Apenas as estruturas de defesa mais básicas restaram ilesas, todo o resto se reduziu a sucata.\nContinue a expansão para fora. Redescubra a tecnologia.
-zone.stainedMountains.description = Mais para o interior estão as montanhas, ainda intocadas por esporos.\nExtraia o titânio abundante nesta área. Aprenda como usá-lo.\n\nA presença inimiga é maior aqui. Não os dê tempo de enviar suas tropas mais fortes.
-zone.overgrowth.description = Esta área tem crescimento excessivo, mais perto da fonte de esporos.\nO inimgo estabeleceu um posto avançado aqui. Construa unidades dagger. Destrua-o. Recupere o que sobrou.
-zone.tarFields.description = Nos arredores de uma zona de produção de petróleo, entre as montanhas e o deserto. Uma das poucas áreas com reservas utilizáveis de piche.\nApesar de abandonada, esta área possui perigosas forças inimigas por perto. Não as subestime.\n\n[lightgray]Pesquise tecnologias de processamento de petróleo se possível.
-zone.desolateRift.description = Uma zona extremamente perigosa. Recursos abundantes, porém pouco espaço. Alto risco de destruição. Saia o mais rápido possível. Não seja enganado pelo longo espaço de tempo entre os ataques inimigos.
-zone.nuclearComplex.description = Uma antiga instalação para produção e processamento de tório, reduzido a ruínas.\n[lightgray]Pesquise o tório e seus muitos usos.\n\nO inimigo está presente aqui em grandes números, constantemente à procura de atacantes.
-zone.fungalPass.description = Uma area de transição entre montanhas altas e baixas, terras cheias de esporos. Uma pequena base de reconhecimento inimiga está localizada aqui.\nDestrua-a.\nUse as unidades crawler e dagger. Destrua os dois núcleos.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Linguagem
 settings.data = Dados do jogo
@@ -534,9 +558,12 @@ settings.graphics = Gráficos
 settings.cleardata = Apagar dados...
 settings.clear.confirm = Certeza que quer limpar a os dados?\nOque é feito não pode ser desfeito!
 settings.clearall.confirm = [scarlet]Aviso![]\nIsso vai limpar toda a data, Incluindo saves, mapas, Keybinds e desbloqueados.\nQuando apertar 'ok' Vai apagar toda a data e sair automaticamente.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = Pausado
 clear = Limpar
 banned = [scarlet]Banido
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Sim
 no = Não
 info.title = [accent]Informação
@@ -558,8 +585,11 @@ blocks.itemsmoved = Velocidade de movimento
 blocks.launchtime = Tempo entre tiros
 blocks.shootrange = Alcance
 blocks.size = Tamanho
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Capacidade de Líquido
 blocks.powerrange = Alcance da Energia
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Uso de energia
 blocks.powerdamage = Dano/Poder
@@ -575,13 +605,18 @@ blocks.boosteffect = Efeito do Boost
 blocks.maxunits = Máximo de unidades ativas
 blocks.health = Saúde
 blocks.buildtime = Tempo de construção
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Custo de construção
 blocks.inaccuracy = Imprecisão
 blocks.shots = Tiros
 blocks.reload = Tiros por segundo
 blocks.ammo = Munição
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Broca melhor necessária.
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Velocidade da broca: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Eficiência: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Energia: {0}
 bar.poweroutput = Saída de energia: {0}
 bar.items = Itens: {0}
 bar.capacity = Capacidade: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquido
 bar.heat = Aquecimento
 bar.power = Poder
 bar.progress = Progresso da construção
-bar.spawned = Unidades: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -619,12 +655,16 @@ unit.liquidunits = Unidades de liquido
 unit.powerunits = Unidades de energia
 unit.degrees = Graus
 unit.seconds = segundos
+unit.minutes = mins
 unit.persecond = por segundo
+unit.perminute = /min
 unit.timesspeed = x Velocidade
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = itens
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Geral
 category.power = Poder
 category.liquids = Líquidos
@@ -639,6 +679,7 @@ setting.linear.name = Filtragem linear
 setting.hints.name = Hints
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Água animada
 setting.animatedshields.name = Escudos animados
 setting.antialias.name = Filtro suavizante[lightgray] (reinicialização requerida)[]
@@ -663,7 +704,6 @@ setting.effects.name = Efeitos
 setting.destroyedblocks.name = Mostrar Blocos Destruidos
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Localização do caminho do transportador
-setting.coreselect.name = Permitir cores esquemáticas
 setting.sensitivity.name = Sensibilidade do Controle
 setting.saveinterval.name = Intervalo de autogravamento
 setting.seconds = {0} Segundos
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milissegundos
 setting.fullscreen.name = Ecrã inteiro
 setting.borderlesswindow.name = Janela sem borda[lightgray] (Pode precisar reiniciar)
 setting.fps.name = Mostrar FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelizado [lightgray](Pode diminuir a performace)
 setting.minimap.name = Mostrar minimapa
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Volume da Música
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Volume do ambiente
 setting.mutemusic.name = Desligar Música
 setting.sfxvol.name = Volume de Efeitos
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]A maior parte das teclas aqui não são funcionais em
 category.general.name = Geral
 category.view.name = Ver
 category.multiplayer.name = Multijogador
+category.blocks.name = Block Select
 command.attack = Atacar
 command.rally = Reunir
 command.retreat = Recuar
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Limpar Edificio
 keybind.press = Pressione uma tecla...
 keybind.press.axis = Pressione uma Axis ou tecla...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = mover_x
 keybind.move_y.name = mover_y
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Correr
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Selecionar região
 keybind.schematic_menu.name = Menu esquemático
 keybind.schematic_flip_x.name = Rodar esquema X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Colocação diagonal
 keybind.pick.name = Pegar bloco
 keybind.break_block.name = Quebrar bloco
 keybind.deselect.name = Deselecionar
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Atirar
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Tempo de horda
 rules.waves = Hordas
 rules.attack = Modo de ataque
+rules.buildai = AI Building
 rules.enemyCheat = Recursos de IA Infinitos
-rules.unitdrops = Unidade solta
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de unidade
 rules.unithealthmultiplier = Multiplicador de vida de unidade
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Multiplicador da vida de jogador
-rules.playerdamagemultiplier = Multiplicador do dano de jogador
 rules.unitdamagemultiplier = Multiplicador de dano de Unidade
 rules.enemycorebuildradius = Raio de "Não-criação" de core inimigo:[lightgray] (blocos)
-rules.respawntime = Tempo de renascimento:[lightgray] (seg)
 rules.wavespacing = Espaço entre hordas:[lightgray] (seg)
 rules.buildcostmultiplier = Multiplicador de custo de construção
 rules.buildspeedmultiplier = Multiplicador de velocidade de construção
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = hordas esperam inimigos
 rules.dropzoneradius = Raio da zona de spawn:[lightgray] (blocos)
-rules.respawns = Respawn maximos por horda
-rules.limitedRespawns = Respawn limitados
+rules.unitammo = Units Require Ammo
 rules.title.waves = Hordas
-rules.title.respawns = Respawns
 rules.title.resourcesbuilding = Recursos e Construções
-rules.title.player = Jogadores
 rules.title.enemy = Inimigos
 rules.title.unit = Unidades
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Itens
 content.liquid.name = Liquidos
@@ -827,10 +878,11 @@ liquid.water.name = Água
 liquid.slag.name = Escória
 liquid.oil.name = Petróleo
 liquid.cryofluid.name = Crio Fluido
-item.corestorable = [lightgray]Storable in Core: {0}
+
 item.explosiveness = [lightgray]Explosibilidade: {0}
 item.flammability = [lightgray]Inflamabilidade: {0}
 item.radioactivity = [lightgray]Radioatividade: {0}
+
 unit.health = [lightgray]Vida: {0}
 unit.speed = [lightgray]Velocidade: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidade de aquecimento: {0}
 liquid.viscosity = [lightgray]Viscosidade: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortaleza
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Pedregulho de areia
 block.grass.name = Grama
 block.slag.name = Slag
 block.salt.name = Sal
-block.saltrocks.name = Pedras De Sal
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pedrinhas
 block.tendrils.name = Gavinhas
-block.sandrocks.name = Pedras de areia
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Pinheiro de esporo
-block.sporerocks.name = Pedras de esporo
-block.rock.name = Rocha
-block.snowrock.name = Rocha com neve
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Pinheiro com neve
 block.shale.name = Xisto
 block.shale-boulder.name = Pedra de xisto
 block.moss.name = Musgo
 block.shrubs.name = Arbusto
 block.spore-moss.name = Musgo de esporos
-block.shalerocks.name = Rohas de xisto
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Muro de sucata
 block.scrap-wall-large.name = Muro grande de sucata
 block.scrap-wall-huge.name = Muro enorme de sucata
@@ -890,13 +979,17 @@ block.craters.name = Crateras
 block.sand-water.name = Água sobre areia
 block.darksand-water.name = Água sobre areia escura
 block.char.name = Char
-block.holostone.name = Pedra holo
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Gelo de neve
-block.rocks.name = Rochas
-block.icerocks.name = Rochas de gelo
-block.snowrocks.name = Rochas de neve
-block.dunerocks.name = Rochas da duna
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pinheiro
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Árvore branca morta
 block.white-tree.name = Árvore branca
 block.spore-cluster.name = Aglomerado de esporos
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Painel escuro 4
 block.dark-panel-5.name = Painel escuro 5
 block.dark-panel-6.name = Painel escuro 6
 block.dark-metal.name = Metal escuro
-block.ignarock.name = Rocha ígnea
+block.basalt.name = Basalt
 block.hotrock.name = Rocha quente
 block.magmarock.name = Rocha de magma
-block.cliffs.name = Colinas
 block.copper-wall.name = Parede de Cobre
 block.copper-wall-large.name = Parede de Cobre Grande
 block.titanium-wall.name = Parede de titânio
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Portão Desobrecarregado
 block.silicon-smelter.name = Fundidora de silicio
 block.phase-weaver.name = Palheta de fase
 block.pulverizer.name = Pulverizador
-block.cryofluidmixer.name = Misturador de Crio Fluido
+block.cryofluid-mixer.name = Misturador de Crio Fluido
 block.melter.name = Aparelho de fusão
 block.incinerator.name = Incinerador
 block.spore-press.name = Prensa de Esporo
@@ -964,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Bateria
 block.battery-large.name = Bateria Grande
 block.combustion-generator.name = Gerador a combustão
-block.turbine-generator.name = Gerador de Turbina
+block.steam-generator.name = Gerador de Turbina
 block.differential-generator.name = Gerador diferencial
 block.impact-reactor.name = Reator De Impacto
 block.mechanical-drill.name = Broca Mecânica
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Misturador de Explosão
 block.solar-panel.name = Painel Solar
 block.solar-panel-large.name = Painel Solar Grande
 block.oil-extractor.name = Extrator de petróleo
-block.command-center.name = Centro de comando
-block.draug-factory.name = Fábrica de drone de mineração Draug
-block.spirit-factory.name = Fábrica de drone de reparo Spirit
-block.phantom-factory.name = Fábrica de drone de construção Phantom
-block.wraith-factory.name = Fábrica de lutadores Wraith
-block.ghoul-factory.name = Fábrica de Bombardeiros Ghoul
-block.dagger-factory.name = Fábrica de mech Dagger
-block.crawler-factory.name = Fábrica de mech Crawler
-block.titan-factory.name = Fábrica de mech titan
-block.fortress-factory.name = Fábrica de mech Fortress
-block.revenant-factory.name = Fábrica de lutadores Revenant
 block.repair-point.name = Ponto de Reparo
 block.pulse-conduit.name = Cano de Pulso
 block.plated-conduit.name = Plated Conduit
@@ -1036,6 +1117,29 @@ block.meltdown.name = Fusão
 block.container.name = Contâiner
 block.launch-pad.name = Plataforma de lançamento
 block.launch-pad-large.name = Plataforma de lançamento grande
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = Azul
 team.crux.name = Vermelho
 team.sharded.name = orange
@@ -1043,21 +1147,7 @@ team.orange.name = Laranja
 team.derelict.name = derelict
 team.green.name = Verde
 team.purple.name = Roxo
-unit.spirit.name = Drone Spirit
-unit.draug.name = Drone minerador Draug
-unit.phantom.name = Drone Phantom
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Bombardeiro Ghoul
-unit.wraith.name = Lutador Wraith
-unit.fortress.name = Fortaleza
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Arraia do caos
-unit.eradicator.name = Erradicador
-unit.lich.name = Lich
-unit.reaper.name = Ceifador
+
 tutorial.next = [lightgray]<Toque para continuar>
 tutorial.intro = Entraste no[scarlet] Tutorial do Mindustry.[]\nComeçe[accent] minerando cobre[]. Toque em um veio de minério de cobre para fazer isso.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = Entraste no[scarlet] Mindustry Tutorial.[]\nPasse o dedo na tela para mover.\n[accent]Use 2 dedos [] para manipular o zoom.\nComeça por by[accent] minerar cobre[].Aproxime-se dele e toque uma veia de minério de cobre perto do seu núcleo para fazer isso.\n\n[accent]{0}/{1} copper
@@ -1100,17 +1190,7 @@ liquid.water.description = O líquido mais útil, comumente usado em resfriament
 liquid.slag.description = Vários metais derretidos misturados juntos. Pode ser separado em seus minerais constituentes, ou jogado nas unidades inimigas como uma arma.
 liquid.oil.description = Um líquido usado na produção de materias avançados. Pode ser convertido em carvão como combustível, ou pulverizado e incendiado como arma.
 liquid.cryofluid.description = A maneira mais eficiente de resfriar qualquer coisa, até seu corpo quando está calor, mas não faça isto.
-unit.draug.description = Um drone de mineração primitivo. Barato para produzir. Descartável. Minera automaticamente cobre e chumbo nas proximidades. Entrega os recursos minerados para o núcleo mais próximo.
-unit.spirit.description = Um drone draug modificado, desenhado para reparo em vez de mineração. Automaticamente conserta qualquer bloco danificado na área.
-unit.phantom.description = Um drone avançado. Segue utilizadores. Ajuda na construção de blocos.
-unit.dagger.description = A mais básica armadura terrestre. Barato para produzir. Esmagadora quando usada em enxames.
-unit.crawler.description = Uma unidade terrestre que consiste em um despojado quadro com grandes explosivos amarrados no topo. Não particularmente durável. Explode no contato com inimigos.
-unit.titan.description = Uma avançada unidade terrestre armadurada. Ataca alvos aéreos e terrestres. Equipada com dois pequenos lança chamas.
-unit.fortress.description = Uma armadura de artilharia pesada. Equipada com dois canhões tipo granizo modificados para assalto de longa distância em estruturas e unidades inimigas.
-unit.eruptor.description = Uma unidade pesada desenhada para derrubar estruturas. Atira um monte de escória nas fortificações inimigas, derretendo e colocando-as em chamas.
-unit.wraith.description = Uma rápida, unidade interceptadora hit-and-run (atacar e correr). Mira em geradores de energia.
-unit.ghoul.description = Um bombardeiro pesado. Rompe estruturas inimigas, mirando em infraestrutura crítica.
-unit.revenant.description = Uma matriz de mísseis pesada e flutuante.
+
 block.message.description = Armazena uma mensagem. Usado para comunicação entre aliados.
 block.graphite-press.description = Comprime pedaços de carvão em lâminas de grafite puro.
 block.multi-press.description = Uma versão melhorada da prensa de grafite. Usa água e energia para processar carvão rápida e eficientemente.
@@ -1119,7 +1199,7 @@ block.kiln.description = Derrete chumbo e areia no composto conhecido como metav
 block.plastanium-compressor.description = Produz plastânio usando petróleo e titânio.
 block.phase-weaver.description = Produz tecido de fase usando tório radioativo e areia. Requer massivas quantidades de energia para funcionar.
 block.alloy-smelter.description = Combina titânio, chumbo, silicio e cobre para produzir liga de surto.
-block.cryofluidmixer.description = Mistura água e pó fino de titânio para produzir criofluido. Essencial para o uso do reator a tório.
+block.cryofluid-mixer.description = Mistura água e pó fino de titânio para produzir criofluido. Essencial para o uso do reator a tório.
 block.blast-mixer.description = Quebra e mistura aglomerados de esporos com piratita para produzir composto de explosão.
 block.pyratite-mixer.description = Mistura carvão, chumbo e areia em piratita altamente inflamável
 block.melter.description = Derrete sucata em escória para processamento posterior ou uso em torretas.
@@ -1185,7 +1265,7 @@ block.battery.description = Armazena energia em tempos de energia excedente. Lib
 block.battery-large.description = Guarda muito mais energia que uma beteria comum.
 block.combustion-generator.description = Gera energia usando combustível ou petróleo.
 block.thermal-generator.description = Gera uma quantidade grande de energia usando lava.
-block.turbine-generator.description = Mais eficiente que o gerador de Combustão, Mas requer agua adicional.
+block.steam-generator.description = Mais eficiente que o gerador de Combustão, Mas requer agua adicional.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos Que não precisa de refriamento Mas da muito menos energia que o reator de torio.
 block.solar-panel.description = Gera pequenas quantidades de energia do sol.
@@ -1221,15 +1301,5 @@ block.ripple.description = Uma grande torre que atira simultaneamente.
 block.cyclone.description = Uma grande torre de tiro rapido.
 block.spectre.description = Uma grande torre que da dois tiros poderosos ao mesmo tempo.
 block.meltdown.description = Uma grande torre que atira dois raios poderosos ao mesmo tempo.
-block.command-center.description = Emite comandos de movimento para unidades aliadas através do mapa.\nFaz unidades se reagruparem, atacarem um núcleo inimigo ou recuar para o núcleo/fábrica. Quando não há nucleo inimigo, unidades vão ficar perto da área de spawn dos inimigos sob o comando atacar.
-block.draug-factory.description = Produz drones de mineração drawg.
-block.spirit-factory.description = produz drones Spirit de reparo estrutural.
-block.phantom-factory.description = Produz drones de construção avançados.
-block.wraith-factory.description = Produz unidades rápidas hit-and-run (atacar e correr)
-block.ghoul-factory.description = Produz bombardeiros pesados.
-block.revenant-factory.description = Produz unidades laser, pesadas e terrestres.
-block.dagger-factory.description = Produz unidades terrestres.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produz unidades avancadas, armaduradas e terrestres.
-block.fortress-factory.description = Produz unidades terrestres pesadas de artilharia.
 block.repair-point.description = Continuamente repara a unidade danificada mais proxima.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
new file mode 100644
index 0000000000..221ab0aab6
--- /dev/null
+++ b/core/assets/bundles/bundle_ro.properties
@@ -0,0 +1,1305 @@
+credits.text = Creat de [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits = Credite
+contributors = Traducători și contributori
+discord = Intrați pe serverul de Discord al Mindustry!
+link.discord.description = Chatul oficial de pe Discord al Mindustry
+link.reddit.description = Subredditul Mindustry
+link.github.description = Codul sursă al jocului
+link.changelog.description = Lista schimbărilor din update
+link.dev-builds.description = Builduri instabile ale dezvoltatorului
+link.trello.description = Pagina oficială de Trello pentru funcțiile planificate
+link.itch.io.description = Pagina itch.io cu descărcările pentru PC
+link.google-play.description = Google Play
+link.f-droid.description = Catalogul F-Droid
+link.wiki.description = Wikiul oficial al Mindustry
+link.suggestions.description = Sugerează noi funcții
+linkfail = Linkul nu a putut fi deschis!\nAdresa URL a fost copiată.
+screenshot = Captură de ecran salvată la {0}
+screenshot.invalid = Harta e prea mare. Se poate să nu existe suficientă memorie pentru captura de ecran.
+gameover = Jocul s-a încheiat
+gameover.pvp = Echipa [accent] {0}[] este câștigătoare!
+highscore = [accent]Scor maxim nou!
+copied = Copiat.
+indev.popup = [accent]v6[] este momentan în [accent]alpha[].\n[lightgray]Asta înseamnă că:[]\n[scarlet]- Campania este complet neterminată[]\n- Majoritatea [scarlet]AI-ului unităților[] nu funcționează bine\n- Multe unități sunt neterminate\n- Modul campanie nu este terminat \n- Tot ce vedeți se poate schimba sau poate fi eliminat.\n\nPentru a raporta buguri și crashuri intrați pe [accent]Github[].
+indev.notready = Această secțiune a jocului nu este gata încă.
+
+load.sound = Sunete
+load.map = Hărți 
+load.image = Imagini
+load.content = Conținut 
+load.system = Sistem
+load.mod = Moduri
+load.scripts = Scripturi
+
+be.update = Un nou build Bleeding Edge este disponibil:
+be.update.confirm = Îl descarci și repornești acum?
+be.updating = Se face update...
+be.ignore = Ignoră
+be.noupdates = Niciun update disponibil.
+be.check = Verifică updateurile
+
+schematic = Schemă
+schematic.add = Salvează Schema...
+schematics = Scheme
+schematic.replace = O schemă cu acel nume există deja. O înlocuiți?
+schematic.exists = O schemă cu acel nume există deja.
+schematic.import = Importă Schema...
+schematic.exportfile = Exportă Fișier
+schematic.importfile = Importă Fișier
+schematic.browseworkshop = Intră pe Workshop
+schematic.copy = Copiază în Clipboard
+schematic.copy.import = Importă din Clipboard
+schematic.shareworkshop = Partajează pe Workshop
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Întoarce Schemă 
+schematic.saved = Schemă salvată. 
+schematic.delete.confirm = Schema această va fi ștearsă permanent.
+schematic.rename = Redenumește Schema
+schematic.info = {0}x{1}, {2} blocuri
+
+stat.wave = Valuri Învinse:[accent] {0}
+stat.enemiesDestroyed = Inamici Distruși:[accent] {0}
+stat.built = Structuri Construite:[accent] {0}
+stat.destroyed = Structuri Distruse:[accent] {0}
+stat.deconstructed = Structuri Deconstruite:[accent] {0}
+stat.delivered = Resurse Lansate:
+stat.playtime = Timp Joc:[accent] {0}
+stat.rank = Rang Final: [accent]{0}
+
+globalitems = [accent]Materiale Globale
+map.delete = Sigur vrei să ștergi harta "[accent]{0}[]"?
+level.highscore = Scor Maxim: [accent]{0}
+level.select = Selectează Nivelul
+level.mode = Mod de Joc:
+coreattack = < Nucleul este atacat! >
+nearpoint = [[ [scarlet]PLEACĂ DE LA PUNCTUL DE LANSARE IMEDIAT[] ]\nanihilare imminentă
+database = Datele Nucleului
+savegame = Salvează Jocul 
+loadgame = Încarcă Jocul
+joingame = Intră în Joc
+customgame = Personalizat
+newgame = Joc Nou
+none = <nimic>
+minimap = Minihartă
+position = Poziție
+close = Închide 
+website = Site
+quit = Abandonează 
+save.quit = Salvează și Închide
+maps = Hărți
+maps.browse = Selectează Hărți 
+continue = Continuă
+maps.none = [lightgray]Nu s-au găsit hărți!
+invalid = Invalid
+pickcolor = Alege Culoarea
+preparingconfig = Se Pregătește Configurația 
+preparingcontent = Se Pregătește Conținutul 
+uploadingcontent = Se Încarcă Conținutul 
+uploadingpreviewfile = Se Încarcă Previzualizarea Fișierului 
+committingchanges = Se Încarcă Schimbările 
+done = Gata
+feature.unsupported = Dispozitivul tău nu suportă această funcție.
+
+mods.alphainfo = Modurile sunt încă în alpha și[scarlet] pot avea multe buguri[].\nRaportați orice probleme apărute pe Githubul Mindustry sau pe Discord.
+mods.alpha = [accent](Alpha)
+mods = Moduri
+mods.none = [lightgray]Nu s-au găsit moduri!
+mods.guide = Ghid de Modding
+mods.report = Raportează Bug
+mods.openfolder = Deschide Folder
+mods.reload = Reîncarcă 
+mods.reloadexit = Jocul se va opri ca să reîncarce modurile.
+mod.display = [gray]Mod:[orange] {0}
+mod.enabled = [lightgray]Activat
+mod.disabled = [scarlet]Dezactivat
+mod.disable = Dezactivează
+mod.content = Conținut:
+mod.delete.error = Nu s-a putut șterge modul. Fișierul ar putea fi în uz.
+mod.requiresversion = [scarlet]Ai nevoie de versiunea de joc minimă: [accent]{0}
+mod.outdated = [scarlet]Nu este compatibil cu V6 (no minGameVersion: 105)
+mod.missingdependencies = [scarlet]Dependențe Lipsă: {0}
+mod.erroredcontent = [scarlet]Erori de Conținut
+mod.errors = Au apărut erori la încărcarea conținutului.
+mod.noerrorplay = [scarlet]Modurile tale au erori.[] Dezactivează modurile afectate sau repară erorile înainte să joci.
+mod.nowdisabled = [scarlet]Modul '{0}' are dependențe lipsă:[accent] {1}\n[lightgray]Mai întâi trebuie să descarci aceste moduri.\nAcest mod va fi dezactivat automat.
+mod.enable = Activează
+mod.requiresrestart = Jocul se va închide acum pt a aplica modificările modurilor.
+mod.reloadrequired = [scarlet]E Nevoie de o Repornire
+mod.import = Importă Mod
+mod.import.file = Importă Fișier
+mod.import.github = Importă din GitHub
+mod.jarwarn = [scarlet]Modurile în format JAR nu sunt sigure.[]\nAi grijă să importezi acest mod dintr-o sursă de încredere!
+mod.item.remove = Acest obiect este parte din modul [accent] '{0}'[]. Ca să îl poți elimina, dezinstalează acel mod.
+mod.remove.confirm = Acest mod va fi șters.
+mod.author = [lightgray]Autor:[] {0}
+mod.missing = Această salvare conține moduri cărora le-ai făcut update recent sau nu mai sunt instalate. Fișierul poate fi corupt. Sigur vrei să îl încarci?\n[lightgray]Moduri:\n{0}
+mod.preview.missing = Înainte să publici acest mod pe Workshop, trebuie să adaugi o imagine pt previzualizare.\nPune o imagine numită[accent] preview.png[] în folderul modului și încearcă din nou.
+mod.folder.missing = Doar modurile din câmpul folder pot fi publicate pe Workshop.\nPt a converti orice mod într-un folder, dezarhivează zipul într-un folder și șterge vechiul zip, apoi repornește jocul sau reîncărcă-ți modurile.
+mod.scripts.disable = Dispozitivul tău nu suportă moduri cu scripturi. Trebuie să dezactivezi aceste moduri ca să joci jocul.
+
+about.button = Despre
+name = Nume:
+noname = Mai întâi alege un [accent] nume de jucător[].
+planetmap = Harta Planetei
+launchcore = Lansează Nucleu
+filename = Nume Fișier:
+unlocked = Nou conținut deblocat!
+completed = [accent]Finalizat
+techtree = Tehnologie
+research.list = [lightgray]Cercetare:
+research = Cercetează 
+researched = [lightgray]{0} cercetat.
+research.progress = {0}% finalizat
+players = {0} jucători
+players.single = {0} jucător
+players.search = caută
+players.notfound = [gray]niciun jucător găsit
+server.closing = [accent]Se închide serverul...
+server.kicked.kick = S-ar putea să fi fost dat afară de pe server!
+server.kicked.whitelist = Nu ești în lista albă a serverului.
+server.kicked.serverClose = Server închis.
+server.kicked.vote = Ai fost dat afară de către ceilalți jucători. La revedere.
+server.kicked.clientOutdated = Client învechit! Fă-ți update la joc!
+server.kicked.serverOutdated = Server învechit! Roagă gazda să facă update!
+server.kicked.banned = Ești interzis pe acest server.
+server.kicked.typeMismatch = Acest server nu este compatibil cu tipul tău de build.
+server.kicked.playerLimit = Serverul acesta e plin. Așteaptă pt un loc liber.
+server.kicked.recentKick = Ai fost dat afară recent.\nAșteaptă înainte de a te reconecta.
+server.kicked.nameInUse = Cineva cu același nume\neste deja pe server.
+server.kicked.nameEmpty = Numele ales este invalid.
+server.kicked.idInUse = Ești deja pe acest server! Nu poți conecta două conturi.
+server.kicked.customClient = Acest server nu suportă builduri personalizate. Descarcă o versiune oficială.
+server.kicked.gameover = Joc încheiat!
+server.kicked.serverRestarting = Acest server se repornește.
+server.versions = Versiunea ta:[accent] {0}[]versiunea serverului:[accent] {1}[]
+host.info = Butonul [accent]găzduiește[] va găzdui un server pe portul [scarlet]6567[]. \nOrice persoană de pe același port [lightgray]wifi sau rețea locală[] ar trebui să-ți vadă serverul în lista lor de servere.\n\nDacă vrei ca lumea să se poată conecta de oriunde cu IP-ul, este nevoie de [accent]port forwarding[].\n\n[lightgray]Notă: Dacă cineva are probleme în a se conecta la jocul tău LAN, verifică dacă ai lăsat Mindustry să acceseze rețeaua locală în setările de firewall. De menționat este faptul că uneori rețelele publice nu permit descoperirea serverului.
+join.info = Aici poți scrie un [accent]IP de server[] pt a te conecta, a descoperi [accent]rețeaua locală[] sau serverele [accent]globale[] pt a te conecta la ele.\nAtât multiplayerul LAN cât și cel WAN este suportat.\n\n[lightgray]Dacă vrei să te conectezi la cineva cu IP-ul, trebuie să ceri gazdei IP-ul său, care poate fi găsit căutând pe Google "my ip' de pe dispozitivul lor.
+hostserver = Găzduiește Joc Multiplayer
+invitefriends = Invită Prieteni
+hostserver.mobile = Găzduiește Joc
+host = Găzduiește 
+hosting = [accent]Se deschide serverul...
+hosts.refresh = Reîncarcă
+hosts.discovering = Se caută jocur LAN
+hosts.discovering.any = Se caută jocuri
+server.refreshing = Se reîncarcă serverul
+hosts.none = [lightgray]Nu s-au găsit jocuri locale!
+host.invalid = [scarlet]Nu s-a putut face conectarea la gazdă!
+
+servers.local = Servere Locale
+servers.remote = Servere de la Distanță 
+servers.global = Servere ale Comunității
+
+trace = Urmărește Jucător
+trace.playername = Nume jucător: [accent]{0}
+trace.ip = IP: [accent]{0}
+trace.id = ID unic: [accent]{0}
+trace.mobile = Client Mobil: [accent]{0}
+trace.modclient = Client Personalizat: [accent]{0}
+invalidid = ID client invalid! Raportează bugul.
+server.bans = Interziși 
+server.bans.none = Nu s-au găsit jucători intreziși!
+server.admins = Admini
+server.admins.none = Nu s-au găsit admini!
+server.add = Adăugă server
+server.delete = Sigur vrei să ștergi acest server?
+server.edit = Editează Server
+server.outdated = [scarlet]Server Învechit![]
+server.outdated.client = [scarlet]Client Învechit![]
+server.version = [gray]v{0} {1}
+server.custombuild = [accent]Build Personalizat 
+confirmban = Sigur vrei să interzici jucătorul "{0}[white]"?
+confirmkick = Sigur vrei să-l dai afară pe "{0}[white]"?
+confirmvotekick = Sigur vrei să-l dai afară pe "{0}[white]"?
+confirmunban = Sigur vrei ca acest jucător să nu mai fie interzis?
+confirmadmin = Sigur vrei să-l faci pe "{0}[white]" un admin?
+confirmunadmin = Sigur vrei ca "{0}[white]" să nu mai fie un admin?
+joingame.title = Alătură-te Jocului
+joingame.ip = Adresă:
+disconnect = Deconectat.
+disconnect.error = Eroare de conexiune.
+disconnect.closed = Conexiune închisă.
+disconnect.timeout = Întârzie să răspundă.
+disconnect.data = Nu s-au putut încărca datele lumii!
+cantconnect = Nu te-ai putut alătura jocului ([accent]{0}[]).
+connecting = [accent]Conectare...
+connecting.data = [accent]Se încarcă datele hărții...
+server.port = Port:
+server.addressinuse = Adresa este deja în uz!
+server.invalidport = Număr de port invalid!
+server.error = [scarlet]Eroare la găzduirea serverului.
+save.new = Nouă Salvare
+save.overwrite = Sigur vrei să scrii peste \nacest slot de salvare?
+overwrite = Scrie Peste
+save.none = Nu s-au găsit salvări!
+savefail = Salvarea jocului a eșuat!
+save.delete.confirm = Sigur vrei să ștergi această salvare?
+save.delete = Șterge
+save.export = Exportă Salvarea
+save.import.invalid = [accent]Salvarea aceasta e invalidă!
+save.import.fail = [scarlet]Importul salvării a eșuat: [accent]{0}
+save.export.fail = [scarlet]Exportul salvării a eșuat: [accent]{0}
+save.import = Importă Salvarea
+save.newslot = Numele Salvării:
+save.rename = Redenumire
+save.rename.text = Noul nume:
+selectslot = Selectează o salvare.
+slot = [accent]Slotul {0}
+editmessage = Editează Mesaj
+save.corrupted = Fișier salvare corupt sau invalid!
+empty = <gol>
+on = Pornit
+off = Oprit
+save.autosave = Autosalvare: {0}
+save.map = Hartă: {0}
+save.wave = Valul {0}
+save.mode = Mod de Joc: {0}
+save.date = Ultima Salvare: {0}
+save.playtime = Timp în Joc: {0}
+warning = Atenție
+confirm = Confirmă
+delete = Șterge
+view.workshop = Vezi în Workshop
+workshop.listing = Editează Listarea din Workshop
+ok = OK
+open = Deschide
+customize = Personalizează Regulile
+cancel = Anulare
+openlink = Deschidr Linkul
+copylink = Copiază Linkul
+back = Înapoi 
+data.export = Exportă Date
+data.import = Importă Date
+data.openfolder = Deschide Folderul cu Date
+data.exported = Date exportate.
+data.invalid = Aceste date de joc nu sunt valide.
+data.import.confirm = Importul de date externe va suprascrie[scarlet] toate[] datele tale de joc curente.\n[accent]Acest proces este ireversibil![]\n\nOdată ce datele sunt importate, jocul tău se va opri imediat.
+quit.confirm = Sigur vrei să abandonezi?
+quit.confirm.tutorial = Sigur știi ce faci?\nTutorialul poate fi reluat în[accent] Setări->Joc->Reia Tutorialul.[]
+loading = [accent]Se încarcă...
+reloading = [accent]Se Reincarcă Modurile...
+saving = [accent]Se salvează...
+respawn = [accent][[{0}][] ca să te refaci în nucleu
+cancelbuilding = [accent][[{0}][] pt a curăța planul
+selectschematic = [accent][[{0}][] pt selectare+copiere
+pausebuilding = [accent][[{0}][] pt a face o pauză de la construit
+resumebuilding = [scarlet][[{0}][] pt a continua construitul
+wave = [accent]Valul {0}
+wave.waiting = [lightgray]Val în {0}
+wave.waveInProgress = [lightgray]Val în desfășurare 
+waiting = [lightgray]În așteptare...
+waiting.players = Se așteaptă jucătorii...
+wave.enemies = [lightgray]Mai sunt {0} inamici
+wave.enemy = [lightgray]Mai e {0} inamic
+loadimage = Încarcă Imagine
+saveimage = Salvează Imagine
+unknown = Necunoscut
+custom = Personalizată
+builtin = Prestabilită
+map.delete.confirm = Ești sigur că vrei să ștergi această hartă? Acțiunea este ireversibilă!
+map.random = [accent]Hartă Aleatorie
+map.nospawn = Harta asta nu are niciun nucleu în care vor apărea jucătorii! Adaugă un nucleu[accent] portocaliu[] acestei hărți în editor.
+map.nospawn.pvp = Această hartă nu are niciun nucleu inamic în care să apară jucătorii! Adaugă nuclee[scarlet] care nu sunt portocalii[] acestei hărți în editor.
+map.nospawn.attack = Această hartă nu are niciun nucleu inamic pe care să îl atace jucătorii! Adaugă un nucleu[scarlet] roșu[] acestei hărți în editor.
+map.invalid = Eroare la încărcarea hărții: fișier corupt sau invalid.
+workshop.update = Fă Update la Item
+workshop.error = Eroare la preluarea detaliilor din Workshop: {0}
+map.publish.confirm = Sigur vrei să publici această hartă?\n\n[lightgray] Asigură-te că ești de acord cu Termenii și Condițiile Workshop mai întâi, sau hărțile tale nu vor fi publicate!
+workshop.menu = Selectează ce ai vrea să faci cu acest item.
+workshop.info = Informații despre Item
+changelog = Schimbări (opțional):
+eula = Steam EULA (Termeni și Condiții)
+missing = Acest item a fost șters sau mutat.\n[lightgray]Listarea de pe Workshop a fost automat dezlegată.
+publishing = [accent]Se Publică...
+publish.confirm = Sigur vrei să publici asta?\n\n[lightgray]Asigură-te că ai verificat Termenii și Condițiile Workshop mai întâi, sau itemurile tale nu vor apărea!
+publish.error = Eroare la publicarea itemului: {0}
+steam.error = Inițializarea serviciilor Steam a eșuat.\nEroare: {0}
+
+editor.brush = Pensulă
+editor.openin = Deschide în Editor
+editor.oregen = Generarea Minereurilor
+editor.oregen.info = Generarea Minereurilor:
+editor.mapinfo = Informații Hartă
+editor.author = Autor:
+editor.description = Descriere:
+editor.nodescription = O hartă trebuie să aibă o descriere care să conțină măcar 4 caractere înainte să fie publicată.
+editor.waves = Valuri:
+editor.rules = Reguli:
+editor.generation = Generare:
+editor.ingame = Editează în Joc
+editor.publish.workshop = Publică pe Workshop
+editor.newmap = Hartă Nouă 
+workshop = Workshop
+waves.title = Valuri
+waves.remove = Elimină
+waves.never = <niciodată>
+waves.every = la fiecare
+waves.waves = val(uri)
+waves.perspawn = per apariție
+waves.shields = scuturi/val
+waves.to = până la
+waves.guardian = Gardian
+waves.preview = Previzualizare
+waves.edit = Editează...
+waves.copy = Copiază în Clipboard
+waves.load = Încarcă din Clipboard
+waves.invalid = Valuri invalide în clipboard.
+waves.copied = Valuri copiate.
+waves.none = Niciun inamic definit.\nDe reținut că o listă de valuri goală va fi înlocuită automat cu lista de valuri prestabilită.
+
+wavemode.counts = numere
+wavemode.totals = totaluri
+wavemode.health = viață
+
+editor.default = [lightgray]<Prestabilit>
+details = Detalii...
+edit = Editare...
+editor.name = Nume:
+editor.spawn = Adaugă Unitate
+editor.removeunit = Înlătură Unitate
+editor.teams = Echipe
+editor.errorload = Eroare la încărcarea fișierului.
+editor.errorsave = Eroare la salvarea fișierului.
+editor.errorimage = Aceasta este o imagine, nu o hartă.\n\nDacă vrei să imporți o hartă din versiunile 3.5/build 40, folosește butonul 'Importă Hartă Veche' din editor.
+editor.errorlegacy = Hartă aceasta este prea veche, și folosește un format învechit care nu mai este suportat.
+editor.errornot = Acesta nu este un fișier cu o hartă.
+editor.errorheader = Acest fișier de hartă este invalid sau corupf.
+editor.errorname = Harta nu are un nume definit. Încerci cumva să încarci un fișier cu o salvare de joc?
+editor.update = Update
+editor.randomize = Aleatoriu
+editor.apply = Aplică 
+editor.generate = Generează
+editor.resize = Schimbă Dimensiune
+editor.loadmap = Încarcă Harta
+editor.savemap = Salvează Harta
+editor.saved = Salvat!
+editor.save.noname = Hartă ta nu are un nume! Setează unul în meniul 'Informații despre hartă'.
+editor.save.overwrite = Hartă ta suprascrie o hartă prestabilită! Alege un nume diferit în meniul 'Informații despre hartă'.
+editor.import.exists = [scarlet]Nu s-a putut importa:[] o hartă prestabilită numită '{0}' deja există!
+editor.import = Importă...
+editor.importmap = Importă Hartă
+editor.importmap.description = Importă o hartă deja existentă
+editor.importfile = Importă Fișier
+editor.importfile.description = Importă un fișier hartă extern
+editor.importimage = Importă Hartă Veche (Imagine)
+editor.importimage.description = Importă o hartă imagine externă 
+editor.export = Exportă...
+editor.exportfile = Exportă Fișier
+editor.exportfile.description = Exportă un fișier hartă 
+editor.exportimage = Exportă o Hartă Imagine
+editor.exportimage.description = Exportă o hartă imagine conținând doar teren de bază 
+editor.loadimage = Importă Hartă Imagine
+editor.saveimage = Exportă Hartă Imagine
+editor.unsaved = Sigur vrei să ieși?\n[scarlet]Orice schimbări nesalvate vor fi pierdute.
+editor.resizemap = Schimbă Dimensiunea Hărții
+editor.mapname = Nume Hartă:
+editor.overwrite = [accent]Atenție! \nAceastă hartă va suprascrie o hartă existentă.
+editor.overwrite.confirm = [scarlet]Atenție![] o hartă cu acest nume există deja. Sigur vrei să o suprascrii?\n"[accent]{0}[]"
+editor.exists = Există deja o hartă cu același nume.
+editor.selectmap = Selectează o hartă de încărcat:
+
+toolmode.replace = Înlocuiește
+toolmode.replace.description = Desenează doar pe blocurile solide.
+toolmode.replaceall = Înlocuiește-le pe toate
+toolmode.replaceall.description = Înlocuiește toate blocurile solide de pe hartă.
+toolmode.orthogonal = Ortogonal
+toolmode.orthogonal.description = Desenează doar linii ortogonale.
+toolmode.square = Pătrat
+toolmode.square.description = Pensulă pătrată.
+toolmode.eraseores = Șterge Minereurile
+toolmode.eraseores.description = Șterge doar minereurile.
+toolmode.fillteams = Umplere Echipe
+toolmode.fillteams.description = Umple hartă cu echipe în loc de blocuri.
+toolmode.drawteams = Desenează Echipe
+toolmode.drawteams.description = Desenează echipe în loc de blocuri.
+
+filters.empty = [lightgray]Fără filtre! Adaugă unul folosind butonul de mai jos.
+filter.distort = Distorsionare
+filter.noise = Zgomot Vizual
+filter.enemyspawn = Selectare Punct de Lansare Inamic
+filter.corespawn = Selectare Nucleu
+filter.median = Mediană
+filter.oremedian = Mediană Minereu
+filter.blend = Amestecare
+filter.defaultores = Miercuri Prestabilite
+filter.ore = Minereu
+filter.rivernoise = Zgomot Vizual Râuri 
+filter.mirror = Oglindă 
+filter.clear = Curăță 
+filter.option.ignore = Ignoră
+filter.scatter = Împrăștie 
+filter.terrain = Teren
+filter.option.scale = Scară
+filter.option.chance = Șansă 
+filter.option.mag = Magnitudine
+filter.option.threshold = Cantitate
+filter.option.circle-scale = Scară circulară
+filter.option.octaves = Octave
+filter.option.falloff = Cădere 
+filter.option.angle = Unghi
+filter.option.amount = Cantitate
+filter.option.block = Bloc
+filter.option.floor = Podea
+filter.option.flooronto = Podea țintă
+filter.option.wall = Perete
+filter.option.ore = Minereu
+filter.option.floor2 = Podea Secundară
+filter.option.threshold2 = Cantitate Secundară
+filter.option.radius = Rază 
+filter.option.percentile = Procent
+
+width = Lățime:
+height = Înălțime:
+menu = Meniu
+play = Joacă 
+campaign = Campanie
+load = Încarcă
+save = Salvează
+fps = FPS: {0}
+ping = Ping: {0}ms
+language.restart = Vă rugăm să reporniți jocul pentru că setările de limbă să aibă efect.
+settings = Setări
+tutorial = Tutorial
+tutorial.retake = Reia Tutorial
+editor = Editor
+mapeditor = Editor Hărți
+
+abandon = Abandonează 
+abandon.text = Zona aceasta și toate resursele ei vor fi cedate inamicului.
+locked = Blocat
+complete = [lightgray]Finalizat:
+requirement.wave = Ajungi la valul {0} în {1}
+requirement.core = Distruge Nucleu Inamic în{0}
+requirement.research = Cercetează {0}
+requirement.capture = Capturează {0}
+resume = Revin la Zonă:\n[lightgray]{0}
+bestwave = [lightgray]Cel Mai Bun Val: {0}
+launch = < LANSARE >
+launch.text = Lansează 
+launch.title = Lansare Finalizată
+launch.next = [lightgray]următoarea ocazie la valul {0}
+launch.unable2 = [scarlet]Imposibil de LANSAT.[]
+launch.confirm = Asta va lansa toate resursele din nucleu.\nNu te vei mai putea întoarce la această bază.
+launch.skip.confirm = Dacă sari acum, Nu vei mai putea lansa decât valurile viitoare.
+uncover = Descoperă
+configure = Configurează Încărcarea 
+loadout = Încărcare 
+resources = Resurse
+bannedblocks = Blocuri Interzise
+addall = Adaugă-le pe toate
+launch.destination = Destination: {0}
+configure.invalid = Cantitatea trebuie să fie un număr între 0 și {0}.
+zone.unlocked = [lightgray]{0} deblocat(ă).
+zone.requirement.complete = Cerințele pt {0} finalizate:[lightgray]\n{1}
+zone.resources = [lightgray]Resurse Detectate:
+zone.objective = [lightgray]Obiectiv: [accent]{0}
+zone.objective.survival = Supraviețuiește 
+zone.objective.attack = Distruge Nucleul Inamic
+add = Adaugă...
+boss.health = Viața Gardianului
+
+connectfail = [scarlet]Eroare de conexiune:\n\n[accent]{0}
+error.unreachable = Nu s-a putut ajunge la server.\nesigur adresa e scrisă corect?
+error.invalidaddress = Adresă invalidă.
+error.timedout = Răspuns întârziat!\nAsigură-te că gazda are port forwarding activat, și că adresa este corectă!
+error.mismatch = Eroare de pachet:\nPosibil ca versiunea de client/server să nu se potrivească.\nAsigură-te că tu și gazda aveți ultima versiune de Mindustry!
+error.alreadyconnected = Deja conectat.
+error.mapnotfound = Fișierul hărții nu a fost găsit!
+error.io = Eroare de rețea I/O.
+error.any = Eroare de rețea necunoscută.
+error.bloom = Inițializarea strălucirii a eșuat.\nS-ar putea ca dispozitivul tău să nu suporte funcția.
+
+weather.rain.name = Ploaie
+weather.snow.name = Ninsoare
+weather.sandstorm.name = Furtună de nisip
+weather.sporestorm.name = Furtună de spori
+
+sectors.unexplored = [lightgray]Neexplorat
+sectors.resources = Resurse:
+sectors.production = Producție:
+sectors.stored = Stocat:
+sectors.resume = Revino
+sectors.launch = Lansare
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = Locația optimă pt a începe încă odată. Risc de inamici scăzut. Puține resurse.\nAdună cât de mult plumb și cupru se poate.\nMergi mai departe.
+sector.frozenForest.description = Chiar și aici, aproape de munți, sperii s-au împrăștiat. Temperaturile reci nu-i pot reține la infinit.\n\nÎncepe călătoria către electricitate. Construiește generatoare de combustie. Învață să folosești reparatoare.
+sector.saltFlats.description = La periferia deșertului stau Salt Flats. Puține resurse pot fi găsite în această locație.\n\nInamicul a ridicat un complex-depozit aici. Distruge-le nucleul. Nu lăsa nimic în urmă.
+sector.craters.description = Apa s-a acumulat în acest crater, rămășiță a vechilor războaie. Cucerește din nou zona. Adună nisip. Toarnă-l în metasticlă. Pompează apă pt a răci armele și burghiele.
+sector.ruinousShores.description = După deșerturi vine țărmul. Odată, locația aceasta a avut un sistem de apărare de coastă. N-a rămas mult din el. Doar structurile de apărare cele mai de bază  rămas în picioare, restul fiind redus la fier vechi.\nContinuă expansiunea în afară. Redescoperă tehnologia.
+sector.stainedMountains.description = Mai înspre continent sunt munții, încă neatinși de spori.\nExtrage abundentele resurse de titan din zonă. Învață cum să-l folosești.\n\nPrezența inamicului e mai mare aici. Nu le da timp să-și trimită cele mai puternice unități.
+sector.overgrowth.description = Zona asta e plină de buruieni, mai aproape de sursa sporilor.\nInamicul și-a stabilit un adăpost aici. Construiește unități Titan. Distruge-o. Cucerește din nou ce s-a pierdut.
+sector.tarFields.description = O zonă aflată la periferia unei zone de producție petrolieră, între munți și deșert. Una din puținele zone cu resurse utilizabile de țiței.\nDeși abandonată, zona aceasta are niște forțe inamice periculoase înapropiere. Nu le subestima.\n\n[lightgray]Cercetează tehnologia de procesare a petrolului dacă se poate.
+sector.desolateRift.description = O zonă extrem de periculoasă. Multe resurse, dar puțin spațiu. Mare risc de distrugere. Pleacă cât mai curând. Nu te lăsa păcălit de timpul mare dintre atacurile inamice.
+sector.nuclearComplex.description = O fostă facilitate pt producerea și procesarea de torium, redusă la ruine.\n[lightgray]Cercetează toriul și multele sale utilizări.\n\nInamicul e prezent aici în mari numere, căutând constând atacatori.
+sector.fungalPass.description = O zonă de tranziție dintre munții înalți și zonele joase, pline cu spori. O mică bază de recunoaștere a inamicului este localizată aici.\nDistruge-o.\nFolosește unități Dagger și Crawler. Distruge cele 2 nuclee.
+
+settings.language = Limbă
+settings.data = Datele Jocului
+settings.reset = Resetează
+settings.rebind = Reatribuie
+settings.resetKey = Resetează 
+settings.controls = Controale
+settings.game = Joc
+settings.sound = Sunet
+settings.graphics = Grafică
+settings.cleardata = Șterge Datele Jocului...
+settings.clear.confirm = Sigur vrei să ștergi datele?\nCe e făcut nu poate fi desfăcut!
+settings.clearall.confirm = [scarlet]Atenție![]\nAsta va șterge toate datele, inclusiv salvări, hărți, deblocări și atribuiri de controale.\nOdată ce apeși 'ok' jocul va șterge toate datele și se va închide automat.
+settings.clearsaves.confirm = Sigur vrei să ștergi toate salvările?
+settings.clearsaves = Șterge Salvările
+paused = [accent]< Pauză >
+clear = Curăță 
+banned = [scarlet]Interzis
+unplaceable.sectorcaptured = [scarlet]Ai nevoie de un sector capturat
+yes = Da
+no = Nu
+info.title = Info
+error.title = [scarlet]A apărut o eroare.
+error.crashtitle = A apărut o eroare.
+unit.nobuild = [scarlet]Unitatea nu poate construi.
+blocks.input = Necesită
+blocks.output = Produce
+blocks.booster = Booster
+blocks.tiles = Teren Necesar
+blocks.affinities = Efecte Teren
+block.unknown = [lightgray]???
+blocks.powercapacity = Capacitate electrică 
+blocks.powershot = Electricitate/Glonț
+blocks.damage = Forță
+blocks.targetsair = Lovește Aeronave
+blocks.targetsground = Lovește Artilerie
+blocks.itemsmoved = Viteza de Mișcare a Materialelor
+blocks.launchtime = Timp între Lansări
+blocks.shootrange = Rază
+blocks.size = Mărime
+blocks.displaysize = Mărimea Monitorului Logic
+blocks.liquidcapacity = Capacitate Lichid
+blocks.powerrange = Raza Electrică 
+blocks.linkrange = Raza Legăturilor
+blocks.instructions = Instrucțiuni 
+blocks.powerconnections = Maxim Conexiuni
+blocks.poweruse = Consum Electricitate 
+blocks.powerdamage = Electricitate/Forța Glonțului
+blocks.itemcapacity = Capacitate Materiale
+blocks.basepowergeneration = Generare Electricitate (Bază)
+blocks.productiontime = Timp Producție
+blocks.repairtime = Durata Reparării Blocului
+blocks.speedincrease = Creștere Viteză 
+blocks.range = Rază 
+blocks.drilltier = Minabile
+blocks.drillspeed = Viteză Burghiu (Bază)
+blocks.boosteffect = Efect de Boost
+blocks.maxunits = Maxim Unități Active
+blocks.health = Viață
+blocks.buildtime = Timp Construcție
+blocks.maxconsecutive = Maxim Consecutive
+blocks.buildcost = Cost Construcție
+blocks.inaccuracy = Inacuratețe
+blocks.shots = Lovituri
+blocks.reload = Lovituri/Secundă
+blocks.ammo = Muniție
+blocks.shieldhealth = Viața Scutului
+blocks.cooldowntime = Timp de Reîncărcare
+
+bar.drilltierreq = Burghiu Mai Bun Necesar
+bar.noresources = Resurse lipsă 
+bar.corereq = Plasare pe Nucleu Necesară 
+bar.drillspeed = Viteză Minare: {0}/s
+bar.pumpspeed = Viteză Pompare: {0}/s
+bar.efficiency = Eficiență: {0}%
+bar.powerbalance = Electricitate: {0}/s
+bar.powerstored = Stocată: {0}/{1}
+bar.poweramount = Electricitate: {0}
+bar.poweroutput = Electricitate Produsă: {0}
+bar.items = Materiale: {0}
+bar.capacity = Capacitate: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
+bar.liquid = Lichid
+bar.heat = Căldură 
+bar.power = Electricitate 
+bar.progress = Progres
+bar.input = Necesită 
+bar.output = Produce
+
+bullet.damage = [stat]{0}[lightgray] forță
+bullet.splashdamage = [stat]{0}[lightgray] forță explozivă ~[stat] {1}[lightgray] pătrate
+bullet.incendiary = [stat]incendiar
+bullet.homing = [stat]cu radar
+bullet.shock = [stat]șoc
+bullet.frag = [stat]fragil
+bullet.knockback = [stat]{0} [lightgray]împingere
+bullet.freezing = [stat]înghețat 
+bullet.tarred = [stat]lipicios
+bullet.multiplier = [stat]{0}[lightgray]x multiplicator muniție
+bullet.reload = [stat]{0}[lightgray]x lovituri
+
+unit.blocks = blocuri
+unit.powersecond = electricitate/secundă
+unit.liquidsecond = unități lichid/secundă
+unit.itemssecond = materiale/secundă
+unit.liquidunits = unități lichid
+unit.powerunits = electricitate
+unit.degrees = grade
+unit.seconds = secunde
+unit.minutes = min
+unit.persecond = /sec
+unit.perminute = /min
+unit.timesspeed = x viteză 
+unit.percent = %
+unit.shieldhealth = viața scutului
+unit.items = materiale
+unit.thousands = mii
+unit.millions = mil
+unit.billions = b
+category.general = General
+category.power = Electricitate
+category.liquids = Lichide
+category.items = Materiale
+category.crafting = Necesită/Produce
+category.shooting = Lovire
+category.optional = Îmbunătățiri opționale 
+setting.landscape.name = Blochează Mod Peisaj
+setting.shadows.name = Umbre
+setting.blockreplace.name = Sugestii Plasare Automats
+setting.linear.name = Filtrare Liniară
+setting.hints.name = Indicii
+setting.flow.name = Afișează Rata de Curgere a lichidelor
+setting.buildautopause.name = Autopauză de la Construit
+setting.mapcenter.name = Auto Centrează Harta La Jucător 
+setting.animatedwater.name = Fluide Animate
+setting.animatedshields.name = Scuturi Animate
+setting.antialias.name = Antialiasing[lightgray] (necesită repornire)[]
+setting.playerindicators.name = Indicatori Jucător 
+setting.indicators.name = Indicatori Inamic
+setting.autotarget.name = Auto-Țintire
+setting.keyboard.name = Controale Mouse+Tastatură
+setting.touchscreen.name = Controale Touchscreen
+setting.fpscap.name = FPS Maxim
+setting.fpscap.none = Niciuna
+setting.fpscap.text = FPS (0)
+setting.uiscale.name = Scară Interfață [lightgray] (repornirea necesară)[]
+setting.swapdiagonal.name = Plasează Mereu Diagonal
+setting.difficulty.training = Antrenament
+setting.difficulty.easy = Ușor 
+setting.difficulty.normal = Normal
+setting.difficulty.hard = Greu
+setting.difficulty.insane = Nebunesc
+setting.difficulty.name = Dificultate:
+setting.screenshake.name = Agitare Ecran
+setting.effects.name = Vezi Efectele
+setting.destroyedblocks.name = Vezi Blocurile Distruse
+setting.blockstatus.name = Vezi Statusul Blocului
+setting.conveyorpathfinding.name = Găsirea Drumului la Plasarea Benzii
+setting.sensitivity.name = Sensibilitatea Controlului
+setting.saveinterval.name = Interval de Salvare
+setting.seconds = {0} secunde
+setting.blockselecttimeout.name = Selectarea Blocului a Întârziat 
+setting.milliseconds = {0} millisecunde
+setting.fullscreen.name = Ecran Complet
+setting.borderlesswindow.name = Fereastră Fără Margine[lightgray] (repornirea poate fi necesară)
+setting.fps.name = Vezi FPS & Ping
+setting.smoothcamera.name = Cameră Graduală
+setting.blockselectkeys.name = Vezi Detalii Cheie cu Privire la Selectarea Blocurilor
+setting.vsync.name = VSync
+setting.pixelate.name = Pixelează
+setting.minimap.name = Vezi Miniharta
+setting.coreitems.name = Vezi Materialele din Nucleu (neterminat)
+setting.position.name = Vezi Poziția Jucătorului
+setting.musicvol.name = Volumul Muzicii
+setting.atmosphere.name = Vezi Atmosfera Planetelor 
+setting.ambientvol.name = Volum Ambiental
+setting.mutemusic.name = Muzica pe Mut
+setting.sfxvol.name = Volum SFX
+setting.mutesound.name = Sunetul pe Mut
+setting.crashreport.name = Trimite Rapoarte de Crash anonime
+setting.savecreate.name = Auto-Creează Salvări
+setting.publichost.name = Vizibilitatea Jocurilor Publice
+setting.playerlimit.name = Limita Jucătorilor 
+setting.chatopacity.name = Opacitate Chat
+setting.lasersopacity.name = Opacitate Laser Electric
+setting.bridgeopacity.name = Opacitate Poduri
+setting.playerchat.name = Vezi Chat Temporar
+public.confirm = Vrei să îți faci jocul public?\n[accent]Oricine va putea intra în jocurile tale.\n[lightgray]Asta se poate schimba mai târziu în Setări->Joc->Vizibilitatea Jocurilor Publice.
+public.beta = De reținut că versiunile beta ale jocului nu poate face servere publice.
+uiscale.reset = Scara interfeței a fost schimbată.\nApasă "OK" pt a confirma această scară.\n[scarlet]Revin setările și se iese în [accent] {0}[] secunde...
+uiscale.cancel = Anulare și ieșire 
+setting.bloom.name = Strălucire 
+keybind.title = Reatribuie Taste
+keybinds.mobile = [scarlet]Majoritatea tastelor atribuite aici nu funcționează pe mobil. Doar mișcările direcționale de bază sunt suportate.
+category.general.name = General
+category.view.name = Privire
+category.multiplayer.name = Multiplayer
+category.blocks.name = Selectare Bloc
+command.attack = Atac
+command.rally = Adunare
+command.retreat = Retragere
+command.idle = Inactiv
+placement.blockselectkeys = \n[lightgray]Taste: [{0},
+keybind.respawn.name = Regenerare
+keybind.control.name = Controlează Unități 
+keybind.clear_building.name = Șterge Clădirea 
+keybind.press = Apasă o tastă...
+keybind.press.axis = Apasă o axă sau o tastă...
+keybind.screenshot.name = Captură Hartă
+keybind.toggle_power_lines.name = Oprește/Pornește Statusul Electricelor
+keybind.toggle_block_status.name = Oprește/Pornește Statusul Blocurilor
+keybind.move_x.name = Mergi pe X
+keybind.move_y.name = Mergi pe Y
+keybind.mouse_move.name = Urmărește Mouseul
+keybind.pan.name = Mișcă Harta
+keybind.boost.name = Boost
+keybind.schematic_select.name = Selectează Regiunea
+keybind.schematic_menu.name = Meniu Scheme
+keybind.schematic_flip_x.name = Întoarce Schema X
+keybind.schematic_flip_y.name = Întoarce Schema Y
+keybind.category_prev.name = Categoria precedentă
+keybind.category_next.name = Categoria următoare
+keybind.block_select_left.name = Selectează Bloc Stânga 
+keybind.block_select_right.name = Selectează Bloc Dreapta
+keybind.block_select_up.name = Selectează Bloc Sus
+keybind.block_select_down.name = Selectează Bloc Jos
+keybind.block_select_01.name = Categorie 1
+keybind.block_select_02.name = Categorie 2
+keybind.block_select_03.name = Categorie 3
+keybind.block_select_04.name = Categorie 4
+keybind.block_select_05.name = Categorie 5
+keybind.block_select_06.name = Categorie 6
+keybind.block_select_07.name = Categorie 7
+keybind.block_select_08.name = Categorie 8
+keybind.block_select_09.name = Categorie 9
+keybind.block_select_10.name = Categorie 10
+keybind.fullscreen.name = Ecran Complet
+keybind.select.name = Selectează/Trage
+keybind.diagonal_placement.name = Plasare Diagonală
+keybind.pick.name = Ia Bloc
+keybind.break_block.name = Distruge Bloc
+keybind.deselect.name = Deselectează
+keybind.pickupCargo.name = Ridică Încărcătura
+keybind.dropCargo.name = Aruncă Încărcătura
+keybind.command.name = Comandă Unitățile
+keybind.shoot.name = Trage
+keybind.zoom.name = Zoom
+keybind.menu.name = Meniu
+keybind.pause.name = Pauză
+keybind.pause_building.name = Pauză/Reia Construit
+keybind.minimap.name = Minihartă
+keybind.chat.name = Chat
+keybind.player_list.name = Listă Jucători 
+keybind.console.name = Consolă
+keybind.rotate.name = Rotește 
+keybind.rotateplaced.name = Rotește Existent (Ține)
+keybind.toggle_menus.name = Pornește/Oprește Meniuri
+keybind.chat_history_prev.name = Previzualizare Istoric Chat
+keybind.chat_history_next.name = Chat History Next
+keybind.chat_scroll.name = Scroll Chat
+keybind.drop_unit.name = Lasă Unitatea
+keybind.zoom_minimap.name = Zoom Minihartă
+mode.help.title = Descrierea modurilor
+mode.survival.name = Supraviețuire
+mode.survival.description = Modul normal. Resurse limitate și valuri automate.\n[gray]E nevoie de locuri de lansare a inamicilor pt a juca.
+mode.sandbox.name = Sandbox
+mode.sandbox.description = Resurse infinite și fără ceas pt valuri.
+mode.editor.name = Editor
+mode.pvp.name = PvP
+mode.pvp.description = Luptă împotriva altor jucători local.\n[gray]E nevoie de 2 nuclee colorate diferit pe hartă pt a juca.
+mode.attack.name = Atac
+mode.attack.description = Distruge baza inamicului. \n[gray]E nevoie de un nucleu roșu pe hartă pt a juca.
+mode.custom = Reguli Personalizate
+
+rules.infiniteresources = Resurse Infinite
+rules.reactorexplosions = Explozia Reactoarelor
+rules.wavetimer = Valuri pe Timp
+rules.waves = Valuri
+rules.attack = Modul Atac
+rules.buildai = AI-ul Construiește
+rules.enemyCheat = Resurse infinite pt AI (echipa roșie)
+rules.blockhealthmultiplier = Multiplicatorul Vieții Blocurilor
+rules.blockdamagemultiplier = Multiplicatorul Deteriorării Blocurilor
+rules.unitbuildspeedmultiplier = Multiplicatorul Vitezei de Producere a Unităților
+rules.unithealthmultiplier = Multiplicatorul Vieții Unităților
+rules.unitdamagemultiplier = Multiplicatorul Deteriorării Unităților
+rules.enemycorebuildradius = Interzisă Construirea în Jurul Nucleului Inamic:[lightgray] (pătrate)
+rules.wavespacing = Spațiul Dintre Valuri:[lightgray] (sec)
+rules.buildcostmultiplier = Multiplicatorul Costului Construcției
+rules.buildspeedmultiplier = Multiplicatorul Vitezei de Construcție
+rules.deconstructrefundmultiplier = Multiplicatorul Recompensei la Deconstrucție
+rules.waitForWaveToEnd = Valurile Așteaptă Inamicii
+rules.dropzoneradius = Raza Zonei de Lansare:[lightgray] (pătrate)
+rules.unitammo = Unitățile Necesită Muniție
+rules.title.waves = Valuri
+rules.title.resourcesbuilding = Resurse și Construit
+rules.title.enemy = Inamici
+rules.title.unit = Unități
+rules.title.experimental = Experimental
+rules.title.environment = Mediu
+rules.lighting = Luminozitate
+rules.fire = Foc
+rules.explosions = Explozia Deteriorează Blocul/Unitatea
+rules.ambientlight = Ambient
+rules.weather = Vreme
+rules.weather.frequency = Frevență:
+rules.weather.duration = Durată:
+
+content.item.name = Materiale
+content.liquid.name = Lichide
+content.unit.name = Unități
+content.block.name = Blocuri
+item.copper.name = Cupru
+item.lead.name = Plumb
+item.coal.name = Cărbune
+item.graphite.name = Grafit
+item.titanium.name = Titan
+item.thorium.name = Toriu
+item.silicon.name = Silicon
+item.plastanium.name = Plastaniu
+item.phase-fabric.name = Fibră-Fază
+item.surge-alloy.name = Supra Aliaj
+item.spore-pod.name = Păstaie de Spori
+item.sand.name = Nisip
+item.blast-compound.name = Compus Explozibil
+item.pyratite.name = Piratită
+item.metaglass.name = Metasticlă
+item.scrap.name = Fier Vechi
+liquid.water.name = Apă
+liquid.slag.name = Zgură
+liquid.oil.name = Petrol
+liquid.cryofluid.name = Criofluid
+
+item.explosiveness = [lightgray]Explozivitate: {0}%
+item.flammability = [lightgray]Inflamabilitate: {0}%
+item.radioactivity = [lightgray]Radioactivitate: {0}%
+
+unit.health = [lightgray]Viață: {0}
+unit.speed = [lightgray]Viteză: {0}
+unit.weapon = [lightgray]Armă: {0}
+unit.itemcapacity = [lightgray]Capacitatea de Material: {0}
+unit.minespeed = [lightgray]Viteza de Minare: {0}%
+unit.minepower = [lightgray]Puterea Minării: {0}
+unit.ability = [lightgray]Abilitate: {0}
+unit.buildspeed = [lightgray]Viteza de Construcție: {0}%
+
+liquid.heatcapacity = [lightgray]Capacitatea de Căldură: {0}
+liquid.viscosity = [lightgray]Vâscozitatea: {0}
+liquid.temperature = [lightgray]Temperatura: {0}
+
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Punct de Realimentare
+block.parallax.name = Parallax
+block.cliff.name = Deal
+block.sand-boulder.name = Bolovan de Nisip
+block.grass.name = Iarbă
+block.slag.name = Zgură
+block.salt.name = Sare
+block.salt-wall.name = Perete de Sare
+block.pebbles.name = Pietricele
+block.tendrils.name = Cârcei
+block.sand-wall.name = Perete de Nisip
+block.spore-pine.name = Pom de Spori
+block.spore-wall.name = Perete de Spori
+block.boulder.name = Bolovan
+block.snow-boulder.name = Bolovan de Zăpadă
+block.snow-pine.name = Pom de Gheață
+block.shale.name = Șist
+block.shale-boulder.name = Piatră de Șist
+block.moss.name = Mușchi
+block.shrubs.name = Tufișuri
+block.spore-moss.name = Mușchi de Spori
+block.shale-wall.name = Perete de Șist
+block.scrap-wall.name = Perete de Fier Vechi
+block.scrap-wall-large.name = Perete Mare de Fier Vechi
+block.scrap-wall-huge.name = Perete Uriaș de Fier Vechi
+block.scrap-wall-gigantic.name = Perete Gigantic de Fier Vechi
+block.thruster.name = Propulsor
+block.kiln.name = Cuptor
+block.graphite-press.name = Presă de Grafit
+block.multi-press.name = Multi-Presă
+block.constructing = {0} [lightgray](În Construcție)
+block.spawn.name = Punctul de Lansare Inamic
+block.core-shard.name = Nucleu: Shard
+block.core-foundation.name = Nucleu: Foundation
+block.core-nucleus.name = Nucleu: Core
+block.deepwater.name = Apă Adâncă
+block.water.name = Apă
+block.tainted-water.name = Apă Tulbure
+block.darksand-tainted-water.name = Apă Tulbure cu Nisip Negru
+block.tar.name = Păcură
+block.stone.name = Piatră
+block.sand.name = Nisip
+block.darksand.name = Nisip Negru
+block.ice.name = Gheață
+block.snow.name = Zăpadă
+block.craters.name = Cratere
+block.sand-water.name = Apă cu Nisip
+block.darksand-water.name = Apă cu Nisip Negru
+block.char.name = Turbă
+block.dacite.name = Dacit
+block.dacite-wall.name = Perete de Dacit
+block.ice-snow.name = Gheață Înzăpezită
+block.stone-wall.name = Perete de Piatră
+block.ice-wall.name = Perete de Gheață
+block.snow-wall.name = Perete de Zăpadă
+block.dune-wall.name = Perete Dună
+block.pine.name = Pom
+block.dirt.name = Pământ
+block.dirt-wall.name = Perete de Pământ
+block.mud.name = Noroi
+block.white-tree-dead.name = Pom Alb Mort
+block.white-tree.name = Pom Alb
+block.spore-cluster.name = Grup de Spori
+block.metal-floor.name = Podea de Metal 1
+block.metal-floor-2.name = Podea de Metal 2
+block.metal-floor-3.name = Podea de Metal 3
+block.metal-floor-5.name = Podea de Metal 4
+block.metal-floor-damaged.name = Podea de Metal Deteriorată
+block.dark-panel-1.name = Panou Negru 1
+block.dark-panel-2.name = Panou Negru 2
+block.dark-panel-3.name = Panou Negru 3
+block.dark-panel-4.name = Panou Negru 4
+block.dark-panel-5.name = Panou Negru 5
+block.dark-panel-6.name = Panou Negru 6
+block.dark-metal.name = Metal Negru
+block.basalt.name = Bazalt
+block.hotrock.name = Piatră Caldă
+block.magmarock.name = Piatră cu Magmă
+block.copper-wall.name = Perete de Cupru
+block.copper-wall-large.name = Perete Mare de Cupru
+block.titanium-wall.name = Perete de Titan
+block.titanium-wall-large.name = Perete Mare de Titan
+block.plastanium-wall.name = Perete de Plastaniu
+block.plastanium-wall-large.name = Perete Mare de Plastaniu
+block.phase-wall.name = Perete de Fază
+block.phase-wall-large.name = Perete Mare de Fază
+block.thorium-wall.name = Perete de Toriu
+block.thorium-wall-large.name = Perete Mare de Toriu
+block.door.name = Ușă
+block.door-large.name = Ușă Mare
+block.duo.name = Duo
+block.scorch.name = Scorch
+block.scatter.name = Scatter
+block.hail.name = Hail
+block.lancer.name = Lancer
+block.conveyor.name = Bandă
+block.titanium-conveyor.name = Bandă de Titan
+block.plastanium-conveyor.name = Bandă de Plastaniu
+block.armored-conveyor.name = Bandă Armată
+block.armored-conveyor.description = Cară materialele la aceeași viteză ca benzile de titan, dar posedă o armură. Nu acceptă materiale de pe lateral decât de la alte benzi armate.
+block.junction.name = Intersecție
+block.router.name = Router
+block.distributor.name = Distributor
+block.sorter.name = Sortator
+block.inverted-sorter.name = Sortator Invers
+block.message.name = Mesaj
+block.illuminator.name = Iluminator
+block.illuminator.description = O sursă de lumină mică, compactă, configurabilă. Necesită electricitate pt a funcționa.
+block.overflow-gate.name = Poartă de Revărsare
+block.underflow-gate.name = Poartă de Subversare
+block.silicon-smelter.name = Topitor de Silicon
+block.phase-weaver.name = Țesătorie de Fază
+block.pulverizer.name = Pulverizator
+block.cryofluid-mixer.name = Mixer de Criofluid
+block.melter.name = Topitor
+block.incinerator.name = Incinerator
+block.spore-press.name = Presă de Spori
+block.separator.name = Separator
+block.coal-centrifuge.name = Centifugă de Cărbune
+block.power-node.name = Nod Electric
+block.power-node-large.name = Nod Electric Mare
+block.surge-tower.name = Turn de Supratensiune
+block.diode.name = Diodă de Baterie
+block.battery.name = Baterie
+block.battery-large.name = Baterie Mare
+block.combustion-generator.name = Generator pe Combustie
+block.steam-generator.name = Generator pe Abur
+block.differential-generator.name = Generator Diferențial
+block.impact-reactor.name = Reactor de Impact
+block.mechanical-drill.name = Burghiu Mecanic
+block.pneumatic-drill.name = Burghiu Pneumatic
+block.laser-drill.name = Burghiu cu Laser
+block.water-extractor.name = Extractor de Apă
+block.cultivator.name = Cultivator
+block.conduit.name = Conductă
+block.mechanical-pump.name = Pompă Mecanică
+block.item-source.name = Sursă de Material
+block.item-void.name = Portal de Material
+block.liquid-source.name = Sursă de Lichid
+block.liquid-void.name = Portal de Lichid
+block.power-void.name = Consumator de Electricitate
+block.power-source.name = Electricitate Infinită
+block.unloader.name = Descărcător
+block.vault.name = Seif
+block.wave.name = Wave
+block.swarmer.name = Swarmer
+block.salvo.name = Salvo
+block.ripple.name = Ripple
+block.phase-conveyor.name = Bandă de Fază
+block.bridge-conveyor.name = Pod de Bandă
+block.plastanium-compressor.name = Compresor de Plastaniu
+block.pyratite-mixer.name = Mixer de Piratită
+block.blast-mixer.name = Mixer de Explozibil
+block.solar-panel.name = Panou Solar
+block.solar-panel-large.name = Panou Solar Mare
+block.oil-extractor.name = Extractor de Petrol
+block.repair-point.name = Punct de Reparare
+block.pulse-conduit.name = Conductă cu Puls
+block.plated-conduit.name = Conductă Armată
+block.phase-conduit.name = Conductă de Fază
+block.liquid-router.name = Router de Lichid
+block.liquid-tank.name = Rezervor de Lichid
+block.liquid-junction.name = Intersecție de Lichid
+block.bridge-conduit.name = Pod de Conductă
+block.rotary-pump.name = Pompă Rotativă
+block.thorium-reactor.name = Reactor de Toriu
+block.mass-driver.name = Distributor în Masă
+block.blast-drill.name = Burghiu Tornadă
+block.thermal-pump.name = Pompă Termală
+block.thermal-generator.name = Generator Termal
+block.alloy-smelter.name = Topitorie Aliaj
+block.mender.name = Reparator
+block.mend-projector.name = Proiector de Reparare
+block.surge-wall.name = Perete de Aliaj
+block.surge-wall-large.name = Perete Mare de Aliaj
+block.cyclone.name = Ciclon
+block.fuse.name = Fuse
+block.shock-mine.name = Mină cu Șocuri
+block.overdrive-projector.name = Proiector de Suprasolicitare
+block.force-projector.name = Proiector de Forță
+block.arc.name = Arc
+block.rtg-generator.name = Generator RTG
+block.spectre.name = Specter
+block.meltdown.name = Meltdown
+block.container.name = Container
+block.launch-pad.name = Platformă de Lansare
+block.launch-pad-large.name = Platformă de Lansare Mare
+block.segment.name = Segment
+block.command-center.name = Centru de Comandă
+block.ground-factory.name = Fabrică Unități Artilerie
+block.air-factory.name = Fabrică Unități Aeriene
+block.naval-factory.name = Fabrică Unități Navale
+block.additive-reconstructor.name = Reconstructor Aditiv
+block.multiplicative-reconstructor.name = Reconstructor Multiplicativ
+block.exponential-reconstructor.name = Reconstructor Exponențial
+block.tetrative-reconstructor.name = Reconstructor Tetrativ
+block.payload-conveyor.name = Bandă în Masă
+block.payload-router.name = Router în Masă
+block.disassembler.name = Dezasamblator
+block.silicon-crucible.name = Creuzet de Silicon
+block.overdrive-dome.name = Dom de Suprasolicitare
+
+block.switch.name = Întrerupător
+block.micro-processor.name = Microprocesor
+block.logic-processor.name = Procesor Logic
+block.hyper-processor.name = Hyperprocesor
+block.logic-display.name = Monitor Logic
+block.large-logic-display.name = Monitor Logic Mare
+block.memory-cell.name = Celulă de Memorie
+
+team.blue.name = albastră
+team.crux.name = roșie
+team.sharded.name = portocalie
+team.orange.name = portocalie
+team.derelict.name = abandon
+team.green.name = verde
+team.purple.name = mov
+
+tutorial.next = [lightgray]<Click pt a continua>
+tutorial.intro = Bun venit în[scarlet] Tutorialul Mindustry.[]\nFolosește[accent] [[WASD][] ca să te miști.\n[accent]Cu rotița[] poți face harta mai mare sau mai mică.\nÎncepe prin[accent] a mina cupru[]. Apropie-te de el, Apoi apasă pe un minereu de cupru de lângă nucleul tău.\n\n[accent]{0}/{1} cupru
+tutorial.intro.mobile = Bun venit în[scarlet] Tutorialul Mindustry.[]\nGlisează pe ecran pt a te mișca.\n[accent]Trage cu 2 degete[] pt face harta mai mare sau mai mică.\nÎncepe prin[accent] a mina cupru[]. Apropie-te de el, Apoi apasă pe un minereu de cupru de lângă nucleul tău.\n\n[accent]{0}/{1} cupru
+tutorial.drill = Mineritul manual este ineficient.\n[accent]Burghiele[] pot mina automat.\nDă click pe tabul burghie din colțul din dreapta-jos.\nSelectează[accent] burghiul mecanic[]. Plasează-l pe un minereu de cupru dând click.\nPoți selecta burghiul și apăsând [accent][[2][] apoi rapid [accent][[1][], indiferent de ce tab este deschis.\n[accent]Click-dreapta[] ca să te oprești din a construi.
+tutorial.drill.mobile = Mineritul manual este ineficient.\n[accent]Burghiele[] pot mina automat.\nDă click pe tabul burghie din colțul din dreapta-jos.\nSelectează[accent] burghiul mecanic[]. Plasează-l pe un minereu de cupru dând click, apoi apasă pe[accent] bifa[] de mai jos pt a-ți confirma selecția.\nApasă pe[accent] butonul X[] pt a anula plasarea.
+tutorial.blockinfo = Fiecare bloc are statistici diferite. Fiecare burghiu poate mina minereuri diferite.\nPt a verifica informațiile despre un bloc,[accent] dă click pe butonul "?" care apare când blocul este selectat din meniu.[]\n\n[accent]Accesează informații despre Burghiul Mecanic.[]
+tutorial.conveyor = [accent]Benzile[] se folosesc pt a transporta materiale la nucleu.\nConstruiește o bandă rulantă de la burghiu către nucleu.\n[accent]Ține apăsat pe mouse pt a desena o linie.[]\nȚine[accent] CTRL[] în timp se plasezi o line pt a o plasa diagonal.\nFolosește rotița pt a roti blocurile înainte să le plasezi.\n[accent]Plasează 2 benzi, apoi livrează un material la nucleu.
+tutorial.conveyor.mobile = [accent]Benzile[] se folosesc pt a transporta materiale la nucleu.\nConstruiește o bandă rulantă de la burghiu către nucleu.\n[accent] Construiește o linie ținând degetul pe ecran câteva secunde și apoi[] trage într-o direcție.\n\n[accent]Plasează 2 benzi, apoi livrează un material la nucleu.
+tutorial.turret = Odată ce un material intră în nucleu, poate fi folosit pt a construi.\nDe reținut că nu toate materialele pot fi folosite pt construit.\nMaterialele care nu sunt folosite pt construit, cum ar fi[accent] cărbunele[] sau[accent] fierul vechi[], nu pot fi puse în nucleu.\nTrebuie să construiești structuri defensive ca să te aperi de[lightgray] inamici[].\nConstruiește [accent]o armă duo[] lângă baza ta.
+tutorial.drillturret = Armele Duo au nevoie de[accent] muniție de cupru[] pt a trage.\nPlasează un burghiu lângă armă.\nConstruiește o bandă către armă pt a o alimenta cu muniție de cupru.\n\n[accent]Muniție livrată: 0/1
+tutorial.pause = În timpul luptei, poți[accent] da pauză la joc.[]\nPoți planifica construcții în timpul pauzei.\n\n[accent]Apasă pe space pt a da pauză.
+tutorial.pause.mobile = În timpul luptei, poți[accent] da pauză la joc.[]\nPoți planifica construcții în timpul pauzei.\n\n[accent]Apasă butonul din colțul din stânga sus pt a da pauză.
+tutorial.unpause = Acum apasă space din nou pt a continua.
+tutorial.unpause.mobile = Acum apasă-l din nou pt a continua.
+tutorial.breaking = Uneori, blocurile trebuie distruse.\n[accent]Ține apăsat pe click dreapta[] pt a distruge toate blocurile dintr-o selecție.[]\n\n[accent]Distruge toate blocurile de fier vechi din stânga nucleului.
+tutorial.breaking.mobile = Uneori, blocurile trebuie distruse.\n[accent]Selectează modul deconstrucție[], aopi dă click pe un bloc pt a-l distruge.\nDistruge o zonă ținând apăsat cu degetul pt câteva secunde[] și apoi trăgând într-o direcție.\nApasă bifa de mai jos pt a confirma distrugerea.\n\n[accent]Distruge toate blocurile de fier vechi din stânga nucleului.
+tutorial.withdraw = Câteodată a lua materiale direct din blocuri este necesar.\nPt a face asta, [accent]dă click pe un bloc[] cu materiale în el, apoi [accent]dă click pe materialul[] din inventar.\nMai multe materiale pot fi luate [accent]făcând click și ținând apăsat[].\n\n[accent]Ia niște cupru din nucleu.[]
+tutorial.deposit = Depozitează materiale înapoi în blocuri trăgând din nava ta către blocul de destinație.\n\n[accent]Depozitează cuprul înapoi în nucleu.[]
+tutorial.waves = [lightgray]Inamicul[] se apropie.\n\nApără nucleul timp de 2 valuri.[accent] Click[] pt a trage cu arma.\nConstruiește mai multe arme și burghie. Minează mai mult cupru.
+tutorial.waves.mobile = [lightgray]Inamicul[] se apropie.\n\nApără nucleul timp de 2 valuri. Nava ta va trage automat către inamici.\nConstruiește mai multe arme și burghie. Minează mai mult cupru.
+tutorial.launch = Odată ce ajungi la un anumit val, poți [accent]lansa nucleul[], lăsându-ți apărările în urmă și[accent] obținând toate resursele din nucleu.[]\nResursele obținute pot fi apoi folosite pt a cerceta noi tehnologii.\n\n[accent]Apasă butonul de lansare.
+
+item.copper.description = Materialul structural cel mai de bază. Folosit în mod extensiv în toate tipurile de blocuri.
+item.lead.description = Un material de bază. Folosit în mod extensiv în electronice și blocuri transportoare de lichid.
+item.metaglass.description = Un compus de sticlă super rezistent. Folosit în mod extensiv pt distribuirea și stocarea de lichide.
+item.graphite.description = Carbon mineralizat, folosit pt muniție și componente electrice.
+item.sand.description = Un material des întâlnit care se folosește extensiv în topitorii, în special pt aliaje.
+item.coal.description = Materie vegetală fosilizată, formată cu mult înainte de evenimentul însămânțării. Folosit extensiv ca combustibil și pt producerea de resurse.
+item.titanium.description = Un metal rar și super ușor folosit extensiv pt transportul lichidelor, burghie și aeronautică.
+item.thorium.description = Un metal dens, radioactiv, folosit ca suport structural și combustibil nuclear.
+item.scrap.description = Rămășițe ale structurilor și unităților vechi. Conține urme ale multor metale diferite.
+item.silicon.description = Un semiconductor extrem de folositor. Aplicații în energia solară, electronice complexe și muniție cu radar.
+item.plastanium.description = Un material ușor, flexibil folosit în aeronautica avansată și muniție fragilă.
+item.phase-fabric.description = O substanță cu greutate aproape de 0 folosită în electronica avansată și tehnologia de autoreparare.
+item.surge-alloy.description = Un aliaj avansat cu proprietăți electrice unice.
+item.spore-pod.description = O păstaie de spori, sintetizați din concentrațiile atmosferice pt utilizări industriale. Folosit pt a fi convertit în petrol, explozibili și combustibil.
+item.blast-compound.description = Un compus instabil folosit în bombe și explozibili. Sintetizat din păstăile de spori și alte materiale volatile. Folosirea ca combustibil nu e recomandată.
+item.pyratite.description = O substanță extrem de inflamabilă folosită în armele incendiare.
+liquid.water.description = Cel mai util lichid. Folosit deseori pt răcirea mașinăriilor și procesarea deșeurilor.
+liquid.slag.description = Diferite tipuri de metal topit amestacate laolaltă. Poate fi separat în materialele constituente, sau pulverizat înspre unitățile inamice ca armă.
+liquid.oil.description = Un lichid folosit în producerea de materiale avansate. Poate fi convertit în cărbune pt combustibil, sau pulverizat și ars ca armă.
+liquid.cryofluid.description = Un lichid inert, non coroziv creat din apă și titan. Are o capacitate de absorbție a căldurii mare. Folosit în mod extensiv ca răcitor.
+
+block.message.description = Păstrează un mesaj. Folosit pt comunicarea dintre aliați.
+block.graphite-press.description = Compresează bucăți de cărbune în plăci de grafit pur.
+block.multi-press.description = O versiune mai bună a presei de grafit. Folosește apă și electricitate pt a procesa cărbunele rapid și eficient.
+block.silicon-smelter.description = Transformă nisipul și cărbunele pur. Produce silicon.
+block.kiln.description = Toarnă nisip și plumb în compusul numit metasticlă. Necesită puțină electricitate pt pornire.
+block.plastanium-compressor.description = Produce plastaniu din petrol și titan.
+block.phase-weaver.description = Sintetizează fibră-fază din toriu radioactiv și nisip. Necesită electricitate pt a funcționa.
+block.alloy-smelter.description = Combină titan, plumb, silicon și cupru pt a produce supra aliaj.
+block.cryofluid-mixer.description = Amestecă apă și pudră fină de titan în criofluid. Esențial pt folosirea în reactoarele de toriu.
+block.blast-mixer.description = Zdrobește și amestecă gramezi de spori cu piratită pt a produce un compus explozibil.
+block.pyratite-mixer.description = Amestecă niște cărbune, plumb și nisip în inflamabila piratită.
+block.melter.description = Topește fierul vechi în zgură pt procesare ulterioară sau folosire în armele Wave.
+block.separator.description = Separă zgura în componentele sale minerale. Furnizează rezultatul răcit.
+block.spore-press.description = Compresează păstăi de spori sub presiuni extreme pt a sintetiza petrol.
+block.pulverizer.description = Zdrobește fierul vechi în nisip fin.
+block.coal-centrifuge.description = Solidifică petrolul în bucăți de cărbune.
+block.incinerator.description = Vaporizează orice exces de material sau lichid primește.
+block.power-void.description = Consumă toată electricitatea primită. Doar în modul sandbox.
+block.power-source.description = Generează electricitate infinită. Doar în modul sandbox.
+block.item-source.description = Generează materiale la infinit. Doar în modul sandbox.
+block.item-void.description = Distruge orice material. Doar în modul sandbox.
+block.liquid-source.description = Generează lichide la infinit. Doar în modul sandbox.
+block.liquid-void.description = Distruge orice lichid. Doar în modul sandbox.
+block.copper-wall.description = Un perete defensiv ieftin.\nUtil pt a proteja nucleul și armele în primele valuri.
+block.copper-wall-large.description = Un perete defensiv ieftin.\nUtil pt a proteja nucleul și armele în primele valuri.\nSe întinde pe mai multe pătrate.
+block.titanium-wall.description = Un perete defensiv de rezistență moderată.\nFurnizează protecție moderată împotriva inamicilor.
+block.titanium-wall-large.description = Un perete defensiv de rezistență moderată.\nFurnizează protecție moderată împotriva inamicilor. \nSe întinde pe mai multe pătrate.
+block.plastanium-wall.description = Un tip special de perete care absoarbe laserele electrice și blochează conectarea automată a nodurilor electrice.
+block.plastanium-wall-large.description = Un tip special de perete care absoarbe laserele electrice și blochează conectarea automată a nodurilor electrice.\nSe întinde pe mai multe pătrate.
+block.thorium-wall.description = Un perete defenziv puternic. \nProtecție decentă împotriva inamicilor.
+block.thorium-wall-large.description = Un perete defenziv puternic. \nProtecție decentă împotriva inamicilor.\nSe întinde pe mai multe pătrate.
+block.phase-wall.description = Un perete învelit într-un material reflexiv special bazat pe fibra-fază. Reflectă majoritatea gloanțelor la impact.
+block.phase-wall-large.description = Un perete învelit într-un material reflexiv special bazat pe fibra-fază. Reflectă majoritatea gloanțelor la impact.\nSe întinde pe mai multe pătrate.
+block.surge-wall.description = Un perete defensiv extrem de durabil.\nStrânge electricitate statică la contactul cu gloanțele, lansând-o la întâmplare.
+block.surge-wall-large.description = Un perete defensiv extrem de durabil.\nStrânge electricitate statică la contactul cu gloanțele, lansând-o la întâmplare.\nSe întinde pe mai multe pătrate.
+block.door.description = O ușă mică. Poate fi deschisă sau închisă dând click.
+block.door-large.description = O ușă mare. Poate fi deschisă sau închisă dând click.\nSe întinde pe mai multe pătrate.
+block.mender.description = Repară periodic blocurile din vecinătate. Menține apărările în stare bună între valuri.\nPoate folosi silicon pt un boost al razei de acțiune și al eficienței.
+block.mend-projector.description = O versiune mai bună a reparatorului. Repară periodic blocurile din vecinătate. \nPoate folosi fibră-fază pt un boost al razei de acțiune și al eficienței.
+block.overdrive-projector.description = Grăbește blocurile din apropiere.\nPoate folosi fibră-fază pt un boost al razei de acțiune și al eficienței.
+block.force-projector.description = Creează un câmp de forță hexagonal în jurul său, protejând blocurile și unitățile din interior de deteriorare.\nSe supraîncălzește dacă este prea deteriorat. Poate folosi răcitor pt a preveni supraîncălzirea pt a preveni supraîncălzirea. Fibra-fază poate fi folosită pt a crește mărimea scutului.
+block.shock-mine.description = Rănește inamicii care calcă pe ea. Aproape invizibilă pt inamic.
+block.conveyor.description = Bloc de transport al materialelor. Împinge materialele în față și le depozitează automat în blocuri. Poate fi rotită.
+block.titanium-conveyor.description = Bloc avansat de transport al materialelor. Împinge materialele mai rapid decât blocurile standard.
+block.plastanium-conveyor.description = Împingee grămezi de materiale.\nAcceptă materiale din spate, și le descarcă în 3 direcții în față.\nNecesită mai multe puncte de încărcare și descărcare pt a transporta nr maxim de materiale/secundă.
+block.junction.description = Acționează ca un pod pt două benzi care se intersectează. Util în situații în care se intersectează 2 benzi cărând diverse materiale în diferite locații.
+block.bridge-conveyor.description = Bloc avansat de transport al materialelor. Permite transportul materialelor peste orice teren sau clădire, până la 3 pătrate distanță.
+block.phase-conveyor.description = Bloc avansat de transport al materialelor. Folosește electricitate pt a teleporta materialele la o altă bandă de fază peste mai multe pătrate.
+block.sorter.description = Sortează materialele. Dacă un material se potrivește selecției, este lăsat să treacă. Altfel, materialul este transportat la stânga sau la dreapta.
+block.inverted-sorter.description = Procesează materialele ca un sortator standard, dar materialele selectate sunt transportate la stânga sau la dreapta.
+block.router.description = Acceptă materiale, apoi le distribuie în alte 3 direcții în mod egal. Util pt a împărți materialele de la o sursă către mai multe destinații.\n\n[scarlet]Nu folosi niciodată pt a introduce materiale în blocuri, căci vor fi blocate de produșii blocurilor.[]
+block.distributor.description = Un router avansat. Împarte materialele în alte 7 direcții în mod egal.
+block.overflow-gate.description = Transportă materialele doar la stânga și dreapta dacă drumul din față este blocat.
+block.underflow-gate.description = Opusul porții de revărsare. Transportă materialele în față dacă benzile din stânga și dreapta sunt blocate.
+block.mass-driver.description = Cel mai bun bloc de transport al materialelor. Adună mai multe materiale și apoi le lansează până la un alt distributor în masă pe o rază mare. Necesită electricitate pt a opera.
+block.mechanical-pump.description = O pompă ieftină care pompează puțin, dar nu consumă electricitate.
+block.rotary-pump.description = O pompă avansată. Pompează mai mult lichid dar consumă electricitate.
+block.thermal-pump.description = Cea mai bună pompă.
+block.conduit.description = Un bloc de transport al lichidelor. Împinge lichidele în față. Folosit cu pompe și alte conducte.
+block.pulse-conduit.description = Un bloc avansat de transport al lichidelor. Transportă lichidele mai rapid și stochează mai mult decât conductele standard.
+block.plated-conduit.description = Transportă lichidele lafel de rapid precum conductele cu puls, dar este mai rezistent. Nu acceptă fluide din lateral de la altceva în afară de conducte.\nCurge mai puțin.
+block.liquid-router.description = Acceptă lichide dintr-o direcție și le distribuie în alte 3 direcții în mod egal. Poate stoca o anumită cantitate de lichid. Folositor pt a distribui lichidele dintr-o sursă către mai multe destinații.
+block.liquid-tank.description = Stochează o mare cantitate de lichid. Util pt depozita lichide pt situațiile în care cererea de materiale nu e constantă sau ca extra securitate pt răcirea blocurilor vitale.
+block.liquid-junction.description = Acționează ca un pod pt două conducte care se intersectează. Util în situația în care se intersectează 2 conducte diferite ce cară divesre lichide către diverse locații.
+block.bridge-conduit.description = Un bloc avansat de transport al lichidelor. Permite transportul lichidelor peste orice tip teren sau bloc, până la 3 pătrate distanță.
+block.phase-conduit.description = Un bloc avansat de transport al lichidelor. Folosește electricitate pt a teleporta lichidele către o altă conductă de fază la o mare distanță.
+block.power-node.description = Transmite electricitate către nodurile conectate. Nodul primește electricitate din sau oferă electricitate oricăror blocuri adiacente.
+block.power-node-large.description = Un nod electric avansat cu o rază mare.
+block.surge-tower.description = Un nod electric cu o rază extrem de mare dar cu mai puține conexiuni disponibile.
+block.diode.description = Energia din baterii poate trece prin acest bloc doar într-o direcție, dar doar dacă o parte are mai puțină energie stocată.
+block.battery.description = Stochează electricitatea pt rezerve atunci când există un surplus în rețea. Oferă electricitate atunci când există un deficit.
+block.battery-large.description = Stochează mai multă electricitate decât bateria standard.
+block.combustion-generator.description = Generează electricitate arzând materiale inflamabile, precum cărbunele.
+block.thermal-generator.description = Generează electricitate atunci când este plasat în locuri calde.
+block.steam-generator.description = Un generator de combustie avansat. Mai eficient, dar necesită apă pt a genera abur.
+block.differential-generator.description = Generează mari cantități de electricitate. Utilizează diferența de temperatură dintre criofluid și piratită arzând.
+block.rtg-generator.description = Un generator simplu pe care te poți baza. Folosește căldura materialelor radioactive care se dezintegrează pt a produce încet electricitate.
+block.solar-panel.description = Oferă o cantitate mică de energie solară.
+block.solar-panel-large.description = O versiune cu mult mai eficientă a panoului solar standard.
+block.thorium-reactor.description = Generează mari cantități de electricitate din toriu. Necesită răcire constantă. Explodează violent dacă i se oferă cantități insuficiente de răcitor. Electricitatea produsă depinde de cât de plin e, cu electricitatea de bază produsă la capacitate maximă.
+block.impact-reactor.description = Un generator avansat, capabil să creeze cantități masive de electricitate la eficiență maximă. Are nevoie de o cantitate de electricitate pt a începe procesul.
+block.mechanical-drill.description = Un burghiu ieftin. Odată plasat pe blocurile corezpunzătoare, minează încet materiale. Capabil să mineze materiale de bază.
+block.pneumatic-drill.description = Un burghiu îmbunătățit, capabil să mineze titan. Minează mai rapid decât burghiul mecanic.
+block.laser-drill.description = Poate mina mai rapid prin tehnologia bazată pe laser, dar necesită electricitate. Poate mina toriu.
+block.blast-drill.description = Cel mai bun burghiu. Necesită cantități mari de electricitate.
+block.water-extractor.description = Extrage apă din pământ. Folosit în locații unde apa de suprafață nu este disponibilă.
+block.cultivator.description = Cultivă mici concentrații de spori din atmosferă în păstăi pregătite pt procesare industrială.
+block.oil-extractor.description = Folosește mari cantități de electricitate, nisip și apă pt a extrage petrol.
+block.core-shard.description = Prima versiune a capsulei nucleice. Odată distrusă, orice contact cu regiunea se pierde. Nu lăsa asta să se întâmple.
+block.core-foundation.description = A doua versiune a nucleului. Mai bine armată. Stochează mai multe resurse.
+block.core-nucleus.description = A treia și ultima versiune a capsulei nucleice. Extrem de bine armată. Stochează mari cantități de resurse.
+block.vault.description = Stochează o mare cantitate de materiale de orice tip. Un bloc descărcător poate fi folosit pt a lua obiecte din seif.
+block.container.description = Stochează o mică cantitate de materiale de orice tip. Un bloc descărcător poate fi folosit pt a lua obiecte din container.
+block.unloader.description = Descarcă materialele din orice bloc din apropiere, mai puțin cele de transport. Tipul materialului de descărcat poate fi schimbat. Click pe descărcător.
+block.launch-pad.description = Lansează grămezi de materiale fără a fi nevoie să lansezi nucleul.
+block.launch-pad-large.description = O versiune mai bună a platformei de lansare. Stochează mai multe materiale. Lansează mai frecvent.
+block.duo.description = O armă mică, ieftină. Util împotriva unităților de artilerie.
+block.scatter.description = O armă esențială anti aeronave. Aruncă bucățele de plumb, fier vechi sau metasticlă către inamici.
+block.scorch.description = Arde orice artilerie inamică din apropiere. Mai eficient la distanță mică.
+block.hail.description = O armă anti-artilerie mică, care trage la mari distanțe.
+block.wave.description = O armă medie. Trage cu lichid către inamici. Stinge focul automat când este alimentată cu apă.
+block.lancer.description = O armă anti-artilerie medie, cu laser. Se încarcă și trage cu lasere puternice de electricitate.
+block.arc.description = O armă electrică cu o rază de acțiune mică. Trage cu mici lasere de electricitate către inamici.
+block.swarmer.description = O armă medie cu rachete. Atacă atât artileria cât și navele inamice. Trage cu rachete cu radar.
+block.salvo.description = O versiune mai mare, mai avansată a armei Duo. Trage salve rapide de gloanțe către inamici.
+block.fuse.description = O armă șrapnel mare cu rază de acțiune mică. Trage trei raze de gloanțe care găuresc scuturile inamicilor din apropiere.
+block.ripple.description = O armă de artilerie extrem de puternică. Lovește grămezi de bucăți de material înspre inamici pe distanțe mari.
+block.cyclone.description = O mare armă anti-artilerie și anti-aer. Trage cu grămezi explozive de material către ddunitățile inamice.
+block.spectre.description = O armă masivă cu două țevi. Trage cu gloanțe mari care găuresc armurile țintelor aeriene și artileriei.
+block.meltdown.description = O armă cu laser masivă. Trage cu un laser continuu la inamicii din apropiere. Necesită răcitor pt a opera.
+block.repair-point.description = Repară încontinuu cea mai deteriorată unitate din vecinătate.
+block.segment.description = Deteriorează și distruge proiectilele din apropiere. Laserele nu sunt afectate.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index ea352c7087..716cf580fa 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1,4 +1,4 @@
-credits.text = Создатель [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в оф. [accent]discord-сервер Mindustry[] в канал [accent]#русский[].\n\nРедакторы и переводчики на русский язык:\n[blue]Prosta4ok_ua[green]#[yellow]6336\n[darkgray]XZ[gray]imur\n[#30FF30]Beryllium\n[tan]Felix [slate]Corvus\n[orange]Vanguard
+credits.text = Создатель [royal]Anuken[] — [sky]anukendev@gmail.com[]\n\nЕсть недоработки в переводе или хотите найти союзников для совместной игры?\nПишите в оф. [accent]discord-сервер Mindustry[] в канал [accent]#русский[].\n\nРедакторы и переводчики на русский язык:\n[blue]Prosta4ok_ua[green]#[yellow]6336\n[darkgray]XZimur[]\n[#30FF30]Beryllium\n[tan]Félix [slate]Córvus\n[orange]Vanguard\n[#a00000]The [red]Slaylord[][]
 credits = Авторы
 contributors = Переводчики и помощники
 discord = Присоединяйтесь к нашему Discord!
@@ -12,7 +12,7 @@ link.itch.io.description = Страница itch.io с загрузками иг
 link.google-play.description = Скачать для Android с Google Play
 link.f-droid.description = Скачать для Android с F-Droid
 link.wiki.description = Официальная вики
-link.feathub.description = Предложить новые возможности
+link.suggestions.description = Предложить новые возможности
 linkfail = Не удалось открыть ссылку!\nURL-адрес был скопирован в буфер обмена.
 screenshot = Скриншот сохранён в {0}
 screenshot.invalid = Карта слишком большая, возможно, не хватает памяти для скриншота.
@@ -20,6 +20,8 @@ gameover = Игра окончена
 gameover.pvp = [accent]{0}[] команда победила!
 highscore = [accent]Новый рекорд!
 copied = Скопировано.
+indev.popup = [accent]v6[] находится на стадии [accent]alpha[].\n[lightgray]Это означает следующее:[]\n[scarlet]- Кампания не завершена[]\n- Отсутствие контента\n- Большинство [scarlet]ИИ единиц[] не работает правильно\n- Множество единиц не готово\n- Всё, что вы видите, может быть изменено или удалено.\n\nСообщайте о багах и вылетах на [accent]GitHub[].
+indev.notready = Эта часть игры ещё не готова
 
 load.sound = Звуки
 load.map = Карты
@@ -31,17 +33,17 @@ load.scripts = Скрипты
 
 be.update = Доступна новая сборка Bleeding Edge:
 be.update.confirm = Загрузить её и перезапустить игру сейчас?
-be.updating = Обновляется...
+be.updating = Обновляется…
 be.ignore = Игнорировать
 be.noupdates = Обновления не найдены.
 be.check = Проверить обновления
 
 schematic = Схема
-schematic.add = Сохранить схему...
+schematic.add = Сохранить схему…
 schematics = Схемы
 schematic.replace = Схема с таким названием уже существует. Заменить её?
 schematic.exists = Схема с таким названием уже существует.
-schematic.import = Импортировать схему...
+schematic.import = Импортировать схему…
 schematic.exportfile = Экспортировать файл
 schematic.importfile = Импортировать файл
 schematic.browseworkshop = Просмотр Мастерской
@@ -53,6 +55,7 @@ schematic.saved = Схема сохранена.
 schematic.delete.confirm = Эта схема будет поджарена Испепелителем.
 schematic.rename = Переименовать схему
 schematic.info = {0}x{1}, {2} блоков
+schematic.disabled = [scarlet]Схемы отключены[]\nНа этой [accent]карте[] или [accent]сервере запрещено использование схем.
 
 stat.wave = Волн отражено:[accent] {0}
 stat.enemiesDestroyed = Врагов уничтожено:[accent] {0}
@@ -63,8 +66,7 @@ stat.delivered = Ресурсов запущено:
 stat.playtime = Время игры:[accent] {0}
 stat.rank = Финальный ранг: [accent]{0}
 
-launcheditems = [accent]Запущенные предметы
-launchinfo = [unlaunched]Нажмите на кнопку [ЗАПУСК], чтобы получить предметы, которые отмечены синим цветом.
+globalitems = [accent]Глобальные предметы
 map.delete = Вы действительно хотите удалить карту «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
 level.select = Выбор карты
@@ -114,6 +116,7 @@ mod.disable = Выкл.
 mod.content = Содержимое:
 mod.delete.error = Невозможно удалить модификацию. Возможно, файл используется.
 mod.requiresversion = [scarlet]Требуемая минимальная версия игры: [accent]{0}
+mod.outdated = [scarlet]Не совместим с V6 (нет "minGameVersion: 105")
 mod.missingdependencies = [scarlet]Не найдены родительские модификации: {0}
 mod.erroredcontent = [scarlet]Ошибки содержимого
 mod.errors = Ошибки были вызваны загружаемым содержимым.
@@ -126,9 +129,9 @@ mod.import = Импортировать модификацию
 mod.import.file = Импортировать файл
 mod.import.github = Импортировать мод с GitHub
 mod.jarwarn = [scarlet]JAR-модификации по сути не безопасны.[]\nУбедитесь, что вы импортируете этот мод из надежного источника!
-mod.item.remove = Этот предмет является частью модификации [accent]«{0}»[]. Чтобы удалить его, удалите саму модификацию.
+mod.item.remove = Этот предмет является частью модификации [accent]«{0}[accent]»[white]. Чтобы удалить его, удалите саму модификацию.
 mod.remove.confirm = Эта модификация будет удалена.
-mod.author = [lightgray]Автор:[] {0}
+mod.author = [lightgray]Автор(ы):[] {0}
 mod.missing = В этом сохранении есть следы модификации, которая отсутствует или установлена её обновлённая версия. Может произойти повреждение сохранения. Вы уверены, что хотите загрузить его?\n[lightgray]Модификации:\n{0}
 mod.preview.missing = Перед публикацией этой модификации в Мастерской, вы должны добавить изображение предпросмотра.\nРазместите изображение с именем[accent] preview.png[] в папке модификации и попробуйте снова.
 mod.folder.missing = Модификации могут быть опубликованы в Мастерской только в виде папки.\nЧтобы конвертировать любой мод в папку, просто извлеките его из архива и удалите старый архив .zip, затем перезапустите игру или перезагрузите модификации.
@@ -137,6 +140,8 @@ mod.scripts.disable = Ваше устройство не поддерживае
 about.button = Об игре
 name = Имя:
 noname = Для начала, придумайте[accent] себе имя[].
+planetmap = Карта планеты
+launchcore = Запуск ядра
 filename = Имя файла:
 unlocked = Новый контент разблокирован!
 completed = [accent]Завершено
@@ -144,6 +149,7 @@ techtree = Дерево\n технологий
 research.list = [lightgray]Исследуйте:
 research = Исследовать
 researched = [lightgray]{0} исследовано.
+research.progress = {0}% завершено
 players = Игроков: {0}
 players.single = {0} игрок
 players.search = поиск
@@ -170,7 +176,7 @@ host.info = Кнопка [accent]Открыть сервер[] запускае
 join.info = Здесь вы можете ввести [accent]IP-адрес сервера[], найти доступные [accent]локальные[] и [accent]глобальные[] серверы для подключения.\nПоддерживаются оба многопользовательских режима: LAN и WAN.\n\n[lightgray]Если вы хотите подключиться к кому-то по IP-адресу, Вам нужно будет попросить IP-адрес у самого хоста. Хост может узнать IP-адрес своего устройства через Google запрос [accent]"my ip"[].
 hostserver = Запустить многопользовательский сервер
 invitefriends = Пригласить друзей
-hostserver.mobile = Запустить\nсервер
+hostserver.mobile = Запустить сервер
 host = Открыть сервер
 hosting = [accent]Открытие сервера…
 hosts.refresh = Обновить
@@ -271,9 +277,9 @@ data.import.confirm = Импорт внешних данных сотрёт[scar
 quit.confirm = Вы уверены, что хотите выйти?
 quit.confirm.tutorial = Вы уверены, что знаете, что делаете?\nОбучение может быть повторно запущено через[accent] Настройки->Игра->Открыть обучение.[]
 loading = [accent]Загрузка…
-reloading = [accent]Перезагрузка модификаций...
+reloading = [accent]Перезагрузка модификаций…
 saving = [accent]Сохранение…
-respawn = [accent][[{0}][] до возрождения из ядра
+respawn = [accent][[{0}][] для возрождения из ядра
 cancelbuilding = [accent][[{0}][] для очистки плана
 selectschematic = [accent][[{0}][] выделить и скопировать
 pausebuilding = [accent][[{0}][] для приостановки строительства
@@ -304,7 +310,7 @@ workshop.info = Информация о предмете
 changelog = Список изменений (необязательно):
 eula = Лицензионное соглашение Steam с конечным пользователем
 missing = Этот предмет был удалён или перемещён.\n[lightgray]Публикация в Мастерской была автоматически удалена.
-publishing = [accent]Отправка...
+publishing = [accent]Отправка…
 publish.confirm = Вы уверены, что хотите опубликовать этот предмет?\n\n[lightgray]Убедитесь, что вы согласны с EULA Мастерской, иначе ваши предметы не будут отображаться!
 publish.error = Ошибка отправки предмета: {0}
 steam.error = Не удалось инициализировать сервисы Steam.\nОшибка: {0}
@@ -326,7 +332,7 @@ editor.newmap = Новая карта
 workshop = Мастерская
 waves.title = Волны
 waves.remove = Удалить
-waves.never = <никогда>
+waves.never = ∞
 waves.every = каждый
 waves.waves = волна(ы)
 waves.perspawn = за появление
@@ -340,6 +346,12 @@ waves.load = Загрузить из буфера обмена
 waves.invalid = Неверные волны в буфере обмена.
 waves.copied = Волны скопированы.
 waves.none = Враги не были определены.\nОбратите внимание, что пустые волны будут автоматически заменены обычной волной.
+
+#these are intentionally in lower case
+wavemode.counts = количество единиц
+wavemode.totals = всего единиц
+wavemode.health = всего здоровья
+
 editor.default = [lightgray]<По умолчанию>
 details = Подробности…
 edit = Редактировать…
@@ -379,7 +391,7 @@ editor.exportimage = Экспортировать изображение лан
 editor.exportimage.description = Экспортировать файл изображения, содержащего только базовую местность
 editor.loadimage = Импортировать\nизображение
 editor.saveimage = Экспортировать\nизображение
-editor.unsaved = [scarlet]У Вас есть несохранённые изменения![]\nВы уверены, что хотите выйти?
+editor.unsaved = Вы уверены, что хотите выйти?\n[scarlet]Все несохранённые изменения будут потеряны.
 editor.resizemap = Изменить размер карты
 editor.mapname = Название карты:
 editor.overwrite = [accent]Внимание!\nЭто перезапишет уже существующую карту.
@@ -456,13 +468,14 @@ mapeditor = Редактор карт
 abandon = Покинуть
 abandon.text = Эта зона и все её ресурсы будут отданы противнику.
 locked = Заблокировано
-complete = [lightgray]Выполнить:
+complete = [lightgray]Необходимо:
 requirement.wave = Достигните {0} волны в зоне {1}
 requirement.core = Уничтожьте вражеское ядро в зоне {0}
-requirement.unlock = Разблокируйте {0}
+requirement.research = Исследуйте {0}
+requirement.capture = Захватите {0}
 resume = Возобновить зону:\n[lightgray]{0}
 bestwave = [lightgray]Лучшая волна: {0}
-#TODO fix/remove this
+
 launch = < ЗАПУСК >
 launch.text = Высадка
 launch.title = Запуск успешен
@@ -472,11 +485,12 @@ launch.confirm = Это [accent]запустит[] все ресурсы в ва
 launch.skip.confirm = Если вы пропустите сейчас, то вы не сможете произвести [accent]запуск[] до более поздних волн.
 uncover = Раскрыть
 configure = Конфигурация выгрузки
-#TODO
+
 loadout = Груз
 resources = Ресурсы
 bannedblocks = Запрещённые блоки
 addall = Добавить всё
+launch.destination = Место назначения: {0}
 configure.invalid = Количество должно быть числом между 0 и {0}.
 zone.unlocked = Зона «[lightgray]{0}» теперь разблокирована.
 zone.requirement.complete = Условия для зоны «{0}» выполнены:[lightgray]\n{1}
@@ -498,6 +512,20 @@ error.io = Сетевая ошибка ввода-вывода.
 error.any = Неизвестная сетевая ошибка.
 error.bloom = Не удалось инициализировать свечение (Bloom).\nВозможно, ваше устройство не поддерживает его.
 
+weather.rain.name = Дождь
+weather.snow.name = Снегопад
+weather.sandstorm.name = Пыльная буря
+weather.sporestorm.name = Споровая буря
+
+sectors.unexplored = [lightgray]Не исследовано
+sectors.resources = Ресурсы:
+sectors.production = Производит:
+sectors.stored = Накоплено:
+sectors.resume = Продолжить
+sectors.launch = Высадка
+sectors.select = Выбор
+sectors.nonelaunch = [lightgray]нет (солнце)
+
 #NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway
 sector.groundZero.name = Отправная точка
 sector.craters.name = Кратеры
@@ -539,6 +567,8 @@ settings.graphics = Графика
 settings.cleardata = Очистить игровые данные…
 settings.clear.confirm = Вы действительно хотите очистить свои данные?\nЭто нельзя отменить!
 settings.clearall.confirm = [scarlet]ОСТОРОЖНО![]\nЭто сотрёт все данные, включая сохранения, карты, прогресс кампании и настройки управления.\nПосле того как вы нажмёте [accent][ОК][], игра уничтожит все данные и автоматически закроется.
+settings.clearsaves.confirm = Вы уверены, что хотите удалить все сохранения?
+settings.clearsaves = Удалить все сохранения
 paused = [accent]< Пауза >
 clear = Очистить
 banned = [scarlet]Запрещено
@@ -564,12 +594,16 @@ blocks.itemsmoved = Скорость перемещения
 blocks.launchtime = Интервал запусков
 blocks.shootrange = Радиус действия
 blocks.size = Размер
+blocks.displaysize = Размер дисплея
 blocks.liquidcapacity = Вместимость жидкости
 blocks.powerrange = Дальность передачи энергии
+blocks.linkrange = Дальность связи
+blocks.instructions = Инструкции
 blocks.powerconnections = Количество соединений
 blocks.poweruse = Потребляет энергии
 blocks.powerdamage = Энергия/урон
 blocks.itemcapacity = Вместимость предметов
+blocks.memorycapacity = Размер памяти
 blocks.basepowergeneration = Базовая генерация энергии
 blocks.productiontime = Время производства
 blocks.repairtime = Время полной регенерации
@@ -579,13 +613,16 @@ blocks.drilltier = Бурит
 blocks.drillspeed = Базовая скорость бурения
 blocks.boosteffect = Ускоряющий эффект
 blocks.maxunits = Максимальное количество активных единиц
-blocks.health = Здоровье
+blocks.health = Прочность
 blocks.buildtime = Время строительства
+blocks.maxconsecutive = Макс. последовательность
 blocks.buildcost = Стоимость строительства
 blocks.inaccuracy = Разброс
 blocks.shots = Выстрелы
 blocks.reload = Выстрелы/секунду
 blocks.ammo = Боеприпасы
+blocks.shieldhealth = Прочность щита
+blocks.cooldowntime = Время восстановления
 
 bar.drilltierreq = Требуется бур получше
 bar.noresources = Недостаточно ресурсов
@@ -599,7 +636,8 @@ bar.poweramount = Энергия: {0}
 bar.poweroutput = Выход энергии: {0}
 bar.items = Предметы: {0}
 bar.capacity = Вместимость: {0}
-bar.units = Единицы: {0}/{1}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[единица отключена]
 bar.liquid = Жидкости
 bar.heat = Нагрев
 bar.power = Энергия
@@ -627,12 +665,16 @@ unit.liquidunits = жидкостных единиц
 unit.powerunits = энерг. единиц
 unit.degrees = град.
 unit.seconds = сек.
+unit.minutes = мин.
 unit.persecond = /сек
+unit.perminute = /мин
 unit.timesspeed = x скорость
 unit.percent = %
+unit.shieldhealth = прочность щита
 unit.items = предметов
 unit.thousands = к
 unit.millions = М
+unit.billions = кM
 category.general = Основные
 category.power = Энергия
 category.liquids = Жидкости
@@ -647,6 +689,7 @@ setting.linear.name = Линейная фильтрация
 setting.hints.name = Подсказки
 setting.flow.name = Показывать скорость потока ресурсов
 setting.buildautopause.name = Автоматическая приостановка строительства
+setting.mapcenter.name = Центрирование карты на игроке
 setting.animatedwater.name = Анимированные жидкости
 setting.animatedshields.name = Анимированные щиты
 setting.antialias.name = Сглаживание[lightgray] (требует перезапуска)[]
@@ -714,6 +757,7 @@ category.blocks.name = Выбор блока
 command.attack = Атаковать
 command.rally = Точка сбора
 command.retreat = Отступить
+command.idle = Ждать
 placement.blockselectkeys = \n[lightgray]Клавиша: [{0},
 keybind.respawn.name = Возрождение в ядре
 keybind.control.name = Перехватить контроль над единицей
@@ -726,6 +770,7 @@ keybind.toggle_block_status.name = Отображение статусов бл
 keybind.move_x.name = Движение по оси X
 keybind.move_y.name = Движение по оси Y
 keybind.mouse_move.name = Следовать за курсором
+keybind.pan.name = Панорамирование камеры
 keybind.boost.name = Полёт/Ускорение
 keybind.schematic_select.name = Выбрать область
 keybind.schematic_menu.name = Меню схем
@@ -753,6 +798,9 @@ keybind.diagonal_placement.name = Диагональное размещение
 keybind.pick.name = Выбрать блок
 keybind.break_block.name = Разрушить блок
 keybind.deselect.name = Снять выделение
+keybind.pickupCargo.name = Взять груз
+keybind.dropCargo.name = Сбросить груз
+keybind.command.name = Командовать группой
 keybind.shoot.name = Выстрел
 keybind.zoom.name = Масштабирование
 keybind.menu.name = Меню
@@ -784,9 +832,11 @@ mode.custom = Пользовательские правила
 
 rules.infiniteresources = Бесконечные ресурсы (Игрок)
 rules.reactorexplosions = Взрывы реакторов
+rules.schematic = Схемы разрешены
 rules.wavetimer = Интервал волн
 rules.waves = Волны
 rules.attack = Режим атаки
+rules.buildai = Строительство ИИ
 rules.enemyCheat = Бесконечные ресурсы ИИ (красная команда)
 rules.blockhealthmultiplier = Множитель здоровья блоков
 rules.blockdamagemultiplier = Множитель урона блоков
@@ -808,8 +858,12 @@ rules.title.unit = Боевые единицы
 rules.title.experimental = Экспериментально
 rules.title.environment = Окружение
 rules.lighting = Освещение
+rules.fire = Огонь
+rules.explosions = Урон от взрывов блоков/единиц
 rules.ambientlight = Окружающий свет
-rules.solarpowermultiplier = Множитель солнечной энергии
+rules.weather = Погода
+rules.weather.frequency = Периодичность:
+rules.weather.duration = Длительность:
 
 content.item.name = Предметы
 content.liquid.name = Жидкости
@@ -835,9 +889,11 @@ liquid.water.name = Вода
 liquid.slag.name = Шлак
 liquid.oil.name = Нефть
 liquid.cryofluid.name = Криогенная жидкость
+
 item.explosiveness = [lightgray]Взрывоопасность: {0}%
 item.flammability = [lightgray]Воспламеняемость: {0}%
 item.radioactivity = [lightgray]Радиоактивность: {0}%
+
 unit.health = [lightgray]Целостность: {0}
 unit.speed = [lightgray]Скорость: {0}
 unit.weapon = [lightgray]Оружие: {0}
@@ -846,30 +902,67 @@ unit.minespeed = [lightgray]Скорость добычи: {0}%
 unit.minepower = [lightgray]Мощность добычи: {0}
 unit.ability = [lightgray]Способность: {0}
 unit.buildspeed = [lightgray]Скорость строительства: {0}%
+
 liquid.heatcapacity = [lightgray]Теплоёмкость: {0}
 liquid.viscosity = [lightgray]Вязкость: {0}
 liquid.temperature = [lightgray]Температура: {0}
 
+unit.dagger.name = Кинжал
+unit.mace.name = Булава
+unit.fortress.name = Крепость
+unit.nova.name = Нова
+unit.pulsar.name = Пульсар
+unit.quasar.name = Квазар
+unit.crawler.name = Ползун
+unit.atrax.name = Атракс
+unit.spiroct.name = Спайрокт
+unit.arkyid.name = Аркид
+unit.toxopid.name = Токсопид
+unit.flare.name = Вспышка
+unit.horizon.name = Горизонт
+unit.zenith.name = Зенит
+unit.antumbra.name = Затемь
+unit.eclipse.name = Затмение
+unit.mono.name = Моно
+unit.poly.name = Поли
+unit.mega.name = Мега
+unit.quad.name = Квад
+unit.oct.name = Окт
+unit.risso.name = Риссо
+unit.minke.name = Минке
+unit.bryde.name = Брайд
+unit.sei.name = Сейвал
+unit.omura.name = Омура
+unit.alpha.name = Альфа
+unit.beta.name = Бета
+unit.gamma.name = Гамма
+unit.scepter.name = Скипетр
+unit.reign.name = Власть
+# unit.vela.name = Vela
+unit.corvus.name = Ворон
+
+block.resupply-point.name = Пункт снабжения
+block.parallax.name = Параллакс
 block.cliff.name = Скала
 block.sand-boulder.name = Песчаный валун
 block.grass.name = Трава
 block.slag.name = Шлак
 block.salt.name = Соль
-block.saltrocks.name = Соляные камни
+block.salt-wall.name = Соляная стена
 block.pebbles.name = Галька
 block.tendrils.name = Споровые усики
-block.sandrocks.name = Песчаные камни
+block.sand-wall.name = Песчаная стена
 block.spore-pine.name = Споровая сосна
-block.sporerocks.name = Споровые камни
-block.rock.name = Каменный валун
-block.snowrock.name = Заснеженный валун
+block.spore-wall.name = Споровая стена
+block.boulder.name = Каменный валун
+block.snow-boulder.name = Заснеженный валун
 block.snow-pine.name = Заснеженная сосна
 block.shale.name = Сланец
 block.shale-boulder.name = Сланцевый валун
 block.moss.name = Мох
 block.shrubs.name = Кусты
 block.spore-moss.name = Споровый мох
-block.shalerocks.name = Сланцевые камни
+block.shale-wall.name = Сланцевая стена
 block.scrap-wall.name = Стена из металлолома
 block.scrap-wall-large.name = Большая стена из металлолома
 block.scrap-wall-huge.name = Огромная стена из металлолома
@@ -897,13 +990,17 @@ block.craters.name = Кратеры
 block.sand-water.name = Песок с водой
 block.darksand-water.name = Тёмный песок с водой
 block.char.name = Выжженная земля
-block.holostone.name = Голографический камень
+block.dacite.name = Дацит
+block.dacite-wall.name = Дацитовая стена
 block.ice-snow.name = Заснеженный лёд
-block.rocks.name = Камни
-block.icerocks.name = Ледяные камни
-block.snowrocks.name = Снежные камни
-block.dunerocks.name = Тёмные песчаные камни
+block.stone-wall.name = Каменная стена
+block.ice-wall.name = Ледяная стена
+block.snow-wall.name = Снежная стена
+block.dune-wall.name = Тёмная песчаная стена
 block.pine.name = Сосна
+block.dirt.name = Земля
+block.dirt-wall.name = Земляная стена
+block.mud.name = Грязь
 block.white-tree-dead.name = Мёртвое белое дерево
 block.white-tree.name = Белое дерево
 block.spore-cluster.name = Скопление спор
@@ -919,10 +1016,9 @@ block.dark-panel-4.name = Тёмная панель 4
 block.dark-panel-5.name = Тёмная панель 5
 block.dark-panel-6.name = Тёмная панель 6
 block.dark-metal.name = Тёмный металл
-block.ignarock.name = Обожжённый камень
+block.basalt.name = Базальт
 block.hotrock.name = Горячий камень
 block.magmarock.name = Магмовый камень
-block.cliffs.name = Скалы
 block.copper-wall.name = Медная стена
 block.copper-wall-large.name = Большая медная стена
 block.titanium-wall.name = Титановая стена
@@ -955,10 +1051,10 @@ block.illuminator.name = Осветитель
 block.illuminator.description = Маленький, компактный, настраиваемый источник света. Требуется энергия для работы.
 block.overflow-gate.name = Избыточный затвор
 block.underflow-gate.name = Избыточный шлюз
-block.silicon-smelter.name = Кремниевый плавильный завод
+block.silicon-smelter.name = Кремниевая плавильня
 block.phase-weaver.name = Фазовый ткач
 block.pulverizer.name = Измельчитель
-block.cryofluidmixer.name = Мешалка криогенной жидкости
+block.cryofluid-mixer.name = Мешалка криогенной жидкости
 block.melter.name = Плавильня
 block.incinerator.name = Мусоросжигатель
 block.spore-press.name = Споровый пресс
@@ -971,7 +1067,7 @@ block.diode.name = Диод
 block.battery.name = Аккумулятор
 block.battery-large.name = Большой аккумулятор
 block.combustion-generator.name = Генератор внутреннего сгорания
-block.turbine-generator.name = Паровой генератор
+block.steam-generator.name = Паровой генератор
 block.differential-generator.name = Дифференциальный генератор
 block.impact-reactor.name = Импульсный реактор
 block.mechanical-drill.name = Механический бур
@@ -1001,7 +1097,6 @@ block.blast-mixer.name = Мешалка взрывчатой смеси
 block.solar-panel.name = Солнечная панель
 block.solar-panel-large.name = Большая солнечная панель
 block.oil-extractor.name = Нефтяная вышка
-block.command-center.name = Командный центр
 block.repair-point.name = Ремонтный пункт
 block.pulse-conduit.name = Импульсный трубопровод
 block.plated-conduit.name = Укреплённый трубопровод
@@ -1034,6 +1129,7 @@ block.container.name = Контейнер
 block.launch-pad.name = Пусковая площадка
 block.launch-pad-large.name = Большая пусковая площадка
 block.segment.name = Сегмент
+block.command-center.name = Командный центр
 block.ground-factory.name = Наземная фабрика
 block.air-factory.name = Воздушная фабрика
 block.naval-factory.name = Морская фабрика
@@ -1041,11 +1137,21 @@ block.additive-reconstructor.name = Добавляющий реконструк
 block.multiplicative-reconstructor.name = Умножающий реконструктор
 block.exponential-reconstructor.name = Экспоненциальный реконструктор
 block.tetrative-reconstructor.name = Тетративный реконструктор
-block.mass-conveyor.name = Грузовой конвейер
+block.payload-conveyor.name = Грузовой конвейер
 block.payload-router.name = Разгрузочный маршрутизатор
 block.disassembler.name = Разборщик
 block.silicon-crucible.name = Кремниевый тигель
-block.large-overdrive-projector.name = Большой сверхприводный проектор
+block.overdrive-dome.name = Сверхприводный купол
+
+block.switch.name = Переключатель
+block.micro-processor.name = Микропроцессор
+block.logic-processor.name = Логический процессор
+block.hyper-processor.name = Гипер процессор
+block.logic-display.name = Логический дисплей
+block.large-logic-display.name = Большой логический дисплей
+block.memory-cell.name = Ячейка памяти
+block.memory-bank.name = Блок памяти
+
 team.blue.name = Синяя
 team.crux.name = Красная
 team.sharded.name = Оранжевая
@@ -1055,7 +1161,7 @@ team.green.name = Зелёная
 team.purple.name = Фиолетовая
 
 tutorial.next = [lightgray]<Нажмите для продолжения>
-tutorial.intro = Вы начали[scarlet] обучение по Mindustry.[]\nИспользуйте кнопки [accent][[WASD][] для передвижения.\n[accent]Покрутите колесо мыши[]для приближения или отдаления камеры.\nНачните с [accent]добычи меди[]. Приблизьтесь к ней, затем нажмите на медную жилу возле вашего ядра, чтобы сделать это.\n\n[accent]{0}/{1} меди
+tutorial.intro = Вы начали[scarlet] обучение по Mindustry.[]\nИспользуйте кнопки [accent][[WASD][] для передвижения.\n[accent]Покрутите колесо мыши[] для приближения или отдаления камеры.\nНачните с [accent]добычи меди[]. Приблизьтесь к ней, затем нажмите на медную жилу возле вашего ядра, чтобы сделать это.\n\n[accent]{0}/{1} меди
 tutorial.intro.mobile = Вы начали[scarlet] обучение по Mindustry.[]\nПроведите по экрану, чтобы двигаться.\n[accent]Сведите или разведите 2 пальца[] для изменения масштаба.\nНачните с [accent]добычи меди[]. Приблизьтесь к ней, затем нажмите на медную жилу возле Ввашего ядра, чтобы сделать это.\n\n[accent]{0}/{1} меди
 tutorial.drill = Ручная добыча не является эффективной.\n[accent]Буры[] могут добывать автоматически.\nНажмите на вкладку с изображением сверла снизу справа.\nВыберите[accent] механический бур[]. Разместите его на медной жиле нажатием.\n[accent]Нажатие по правой кнопке[] прервёт строительство.
 tutorial.drill.mobile = Ручная добыча не является эффективной.\n[accent]Буры []могут добывать автоматически.\nНажмите на вкладку с изображением сверла снизу справа.\nВыберите[accent] механический бур[].\nРазместите его на медной жиле нажатием, затем нажмите [accent] белую галку[] ниже, чтобы подтвердить построение выделенного.\nНажмите [accent] кнопку X[], чтобы отменить размещение.
@@ -1105,7 +1211,7 @@ block.kiln.description = Выплавляет песок и свинец в со
 block.plastanium-compressor.description = Производит пластан из нефти и титана.
 block.phase-weaver.description = Синтезирует фазовую ткань из радиоактивного тория и песка. Требуется огромное количество энергии для работы.
 block.alloy-smelter.description = Объединяет титан, свинец, кремний и медь для производства кинетического сплава.
-block.cryofluidmixer.description = Смешивает воду и мелкий титановый порошок в криогенную жидкость. Неотъемлемая часть при использования ториевого реактора
+block.cryofluid-mixer.description = Смешивает воду и мелкий титановый порошок в криогенную жидкость. Неотъемлемая часть при использования ториевого реактора
 block.blast-mixer.description = Раздавливает и смешивает скопления спор с пиротитом для получения взрывчатого вещества.
 block.pyratite-mixer.description = Смешивает уголь, свинец и песок в легковоспламеняющийся пиротит.
 block.melter.description = Плавит металлолом в шлак для дальнейшей обработки или использования в турелях «Волна».
@@ -1115,10 +1221,10 @@ block.pulverizer.description = Измельчает металлолом в ме
 block.coal-centrifuge.description = Отвердевает нефть в куски угля.
 block.incinerator.description = Испаряет любой лишний предмет или жидкость, которую он получает.
 block.power-void.description = Аннулирует всю энергию, введенную в него. Только песочница.
-block.power-source.description = Бесконечно выводит энергию. Только песочница.
-block.item-source.description = Бесконечно выводит предметы. Только песочница.
+block.power-source.description = Постоянно выдаёт энергию. Только песочница.
+block.item-source.description = Постоянно выдаёт предметы. Только песочница.
 block.item-void.description = Уничтожает любые предметы. Только песочница.
-block.liquid-source.description = Бесконечно выводит жидкости. Только песочница.
+block.liquid-source.description = Постоянно выдаёт жидкость. Только песочница.
 block.liquid-void.description = Уничтожает любые жидкости. Только песочница.
 block.copper-wall.description = Дешёвый защитный блок.\nПолезен для защиты ядра и турелей в первые несколько волн.
 block.copper-wall-large.description = Дешёвый защитный блок.\nПолезен для защиты ядра и турелей в первые несколько волн.\nРазмещается на нескольких плитках.
@@ -1141,16 +1247,16 @@ block.force-projector.description = Создает вокруг себя шес
 block.shock-mine.description = Наносит урон врагам, наступающим на мину. Почти невидима для врага.
 block.conveyor.description = Базовый транспортный блок. Перемещает предметы вперед и автоматически складывает их в блоки. Можно повернуть.
 block.titanium-conveyor.description = Улучшенный транспортный блок. Перемещает предметы быстрее, чем стандартные конвейеры.
-block.plastanium-conveyor.description = Транспортирует предметы пачками.\nПринимает предметы только с начального сегмента, а разгружает с последнего со всех сторон.
+block.plastanium-conveyor.description = Транспортирует предметы пачками.\nПринимает предметы только с начального сегмента, а разгружает с последнего со всех сторон.\nИмеет большую пропускную способность по сравнению с остальными логистическими блоками.
 block.junction.description = Действует как мост для двух пересекающихся конвейерных лент. Полезен в ситуациях, когда два разных конвейера перевозят разные материалы в разные места.
 block.bridge-conveyor.description = Улучшенный транспортный блок. Позволяет транспортировать предметы над 3 плитками любой местности или здания.
 block.phase-conveyor.description = Улучшенный транспортный блок. Использует энергию для телепортации предметов на подключенный фазовый конвейер над несколькими плитками.
-block.sorter.description = Сортирует предметы. Если предмет соответствует выбору, он может пройти. В противном случае предмет выводится слева и справа.
+block.sorter.description = Сортирует предметы. Если предмет соответствует выбору, он может пройти. В противном случае предмет выводится по бокам.
 block.inverted-sorter.description = Работает с предметами так же, как и стандартный сортировщик, но выводит выбранный предмет по бокам, а не прямо.
 block.router.description = Принимает предмет в одном направлении и выводит их до 3 других направлений в равной степени. Полезен для разделения материалов из одного источника на несколько целей.\n\n[scarlet]Никогда не используйте рядом с заводами и т.п., так как маршрутизатор будет забит выходными предметами.[]
 block.distributor.description = Расширенный маршрутизатор. Разделяет предметы до 7 других направлений в равной степени.
-block.overflow-gate.description = Выводит предметы влево и вправо, только если передний путь заблокирован.
-block.underflow-gate.description = Противоположность избыточного затвора. Выводит предметы вперёд только в том случае, если левый и правый пути заблокированы.
+block.overflow-gate.description = Выводит предметы по бокам, только если передний путь заблокирован.
+block.underflow-gate.description = Противоположность избыточного затвора. Выводит предметы вперёд только в том случае, если боковые пути заблокированы.
 block.mass-driver.description = Самый продвинутый транспортный блок. Собирает несколько предметов и затем стреляет ими в другую катапульту на большом расстоянии. Требуется энергия для работы.
 block.mechanical-pump.description = Дешёвый насос с низкой производительностью, но без энергопотребления.
 block.rotary-pump.description = Продвинутый насос. Качает больше жидкости, но требуют энергию.
@@ -1166,24 +1272,24 @@ block.phase-conduit.description = Расширенный блок транспо
 block.power-node.description = Передает питание на подключенные узлы. Узел будет получать питание или поставлять питание на любые соседние блоки.
 block.power-node-large.description = Усовершенствованный силовой узел с большей дальностью.
 block.surge-tower.description = Силовой узел с очень большим радиусом действия, но меньшим количеством доступных соединений.
-block.diode.description = Энергия из аккумуляторов имеет возможность перемещаться через этот блок в одну сторону, если на выходе имеется меньше энергии в запасе, чем на входе.
+block.diode.description = Накопленная энергия имеет возможность перемещаться через этот блок в одну сторону, если на выходе имеется меньше энергии в запасе, чем на входе.
 block.battery.description = Накапливает энергию как буфер во времена избытка энергии. Выводит энергию во времена дефицита.
 block.battery-large.description = Хранит гораздо больше энергии, чем обычный аккумулятор.
 block.combustion-generator.description = Вырабатывает энергию путём сжигания легковоспламеняющихся материалов, таких как уголь.
 block.thermal-generator.description = Генерирует энергию, когда находится в горячих местах.
-block.turbine-generator.description = Усовершенствованный генератор сгорания. Более эффективен, но дополнительно требует воду для выработки пара.
+block.steam-generator.description = Усовершенствованный генератор сгорания. Более эффективен, но дополнительно требует воду для выработки пара.
 block.differential-generator.description = Генерирует большое количество энергии. Использует разницу температур между криогенной жидкостью и горящим пиротитом.
 block.rtg-generator.description = Простой, надежный генератор. Использует тепло распадающихся радиоактивных соединений для производства энергии с низкой скоростью.
 block.solar-panel.description = Обеспечивает небольшое количество энергии от солнца.
 block.solar-panel-large.description = Значительно более эффективный вариант стандартной солнечной панели.
 block.thorium-reactor.description = Генерирует значительное количество энергии из тория. Требует постоянного охлаждения. Взорвётся с большой силой при недостаточном количестве охлаждающей жидкости. Выходная энергия зависит от наполненности торием, при этом базовая энергия генерируется при максимальном заполнении.
 block.impact-reactor.description = Усовершенствованный генератор, способный создавать огромное количество энергии на пике эффективности. Требуется значительное количество энергии для запуска процесса.
-block.mechanical-drill.description = Дешёвый бур. При размещении на соответствующих плитках, предметы бесконечно выводятся в медленном темпе. Способен добывать только базовые ресурсы.
+block.mechanical-drill.description = Дешёвый бур. При размещении на соответствующих плитках, предметы постоянно выдаются в медленном темпе. Способен добывать только базовые ресурсы.
 block.pneumatic-drill.description = Улучшенный бур, способный добывать титан. Добывает быстрее, чем механический бур.
-block.laser-drill.description = Позволяет сверлить еще быстрее с помощью лазерной технологии, но требует энергию. Способен добывать торий.
+block.laser-drill.description = Позволяет добывать еще быстрее с помощью лазерной технологии, но требует энергию. Способен добывать торий.
 block.blast-drill.description = Самый продвинутый бур. Требует большое количество энергии.
 block.water-extractor.description = Выкачивает подземные воды. Используется в местах, где нет поверхностных вод.
-block.cultivator.description = Выращивает крошечные концентрации спор в атмосфере в готовые к использованию споры.
+block.cultivator.description = Выращивает крошечные концентрации спор из атмосферы в готовые к использованию споры.
 block.oil-extractor.description = Использует большое количество энергии, песка и воды для бурения, добывая нефть.
 block.core-shard.description = Первая итерация капсулы ядра. После уничтожения, весь контакт с регионом теряется. Не позволяйте этому случиться.
 block.core-foundation.description = Вторая версия ядра. Лучше бронировано. Хранит больше ресурсов.
@@ -1194,19 +1300,18 @@ block.unloader.description = Выгружает предметы из любог
 block.launch-pad.description = Запускает партии предметов без необходимости запуска ядра.
 block.launch-pad-large.description = Улучшенная версия пусковой площадки. Хранит больше предметов. Запускается чаще.
 block.duo.description = Маленькая, дешёвая турель. Полезна против наземных юнитов.
-block.scatter.description = Основная противовоздушная турель. Распыляет куски свинца, металлолома или метастекла на вражеские подразделения.
+block.scatter.description = Основная противовоздушная турель. Выстреливает куски свинца, металлолома или метастекла на вражеские подразделения.
 block.scorch.description = Сжигает любых наземных врагов рядом с ним. Высокоэффективен на близком расстоянии.
 block.hail.description = Маленькая дальнобойная артиллерийская турель.
-block.wave.description = Турель среднего размера. Стреляет потоками жидкости по врагам. Автоматически тушит пожары при подаче воды.
+block.wave.description = Турель среднего размера. Выпускает поток жидкости по врагам. Автоматически тушит пожары при подаче воды.
 block.lancer.description = Лазерная турель среднего размера. Заряжает и стреляет мощными лучами энергии по наземным целям.
 block.arc.description = Небольшая электрическая турель ближнего радиуса действия. Выстреливает дуги электричества по врагам.
 block.swarmer.description = Ракетная турель среднего размера. Атакует как воздушных, так и наземных врагов. Запускает самонаводящиеся ракеты.
 block.salvo.description = Большая, более продвинутая версия двойной турели. Выпускает быстрые залпы из пуль по врагу.
-block.fuse.description = Большая шрапнельная турель ближнего радиуса действия. Стреляет тремя проникающими выстрелами по ближайшим врагам.
+block.fuse.description = Большая шрапнельная турель ближнего радиуса действия. Стреляет тремя проникающими зарядами по ближайшим врагам.
 block.ripple.description = Очень мощная артиллерийская турель. Стреляет скоплениями снарядов по врагам на большие расстояния.
 block.cyclone.description = Большая турель, которая может вести огонь по воздушным и наземным целям. Стреляет разрывными снарядами по ближайшим врагам.
-block.spectre.description = Массивная двуствольная пушка. Стреляет крупными бронебойными пулями по воздушным и наземным целям.
+block.spectre.description = Массивная двуствольная пушка. Стреляет крупными бронебойными снарядами по воздушным и наземным целям.
 block.meltdown.description = Массивная лазерная пушка. Заряжает и стреляет постоянным лазерным лучом в ближайших врагов. Требуется охлаждающая жидкость для работы.
-block.command-center.description = Командует перемещениями боевых единиц по всей карте.\nУказывает подразделениям [accent]собираться[] вокруг командного центра, [accent]атаковать[] вражеское ядро или [accent]отступать[] к ядру/фабрике. Если вражеское ядро отсутствует, единицы будут патрулировать при команде [accent]атаки[].
 block.repair-point.description = Непрерывно лечит ближайшую поврежденную боевую единицу или мех в своём радиусе.
-block.segment.description = Повреждает и разрушает приходящие снаряды. Не взаимодействует с лазерными лучами.
+block.segment.description = Повреждает и разрушает приближающиеся снаряды. Не взаимодействует с лазерными лучами.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 225cc63a90..0d29e6a89e 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1,4 +1,3 @@
-
 credits.text = Skapad av [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Medverkande
 contributors = Översättare och medarbetare
@@ -13,7 +12,7 @@ link.itch.io.description = itch.io med nedladdningar
 link.google-play.description = Mindustry på Google Play
 link.f-droid.description = F-Droid katalog listning
 link.wiki.description = Officiell wiki-sida för Mindustry
-link.feathub.description = Föreslå nya funktioner
+link.suggestions.description = Föreslå nya funktioner
 linkfail = Kunde inte öppna länken!\nLänken har kopierats till ditt urklipp.
 screenshot = Skärmdump har sparats till {0}
 screenshot.invalid = Karta för stor, potentiellt inte tillräckligt minne för skärmdump.
@@ -21,6 +20,8 @@ gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]Nytt rekord!
 copied = Kopierad.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Ljud
 load.map = Kartor
@@ -64,8 +65,7 @@ stat.delivered = Resources Launched:
 stat.playtime = Tid Spelat:[accent] {0}
 stat.rank = Slutgiltiga Rank: [accent]{0}
 
-launcheditems = [accent]Launched Items
-launchinfo = [unlaunched][[LAUNCH] your core to obtain the items indicated in blue.
+globalitems = [accent]Global Items
 map.delete = Är du säker på att du vill ta bort mappen "[accent]{0}[]"?
 level.highscore = High Score: [accent]{0}
 level.select = Nivåval
@@ -107,6 +107,7 @@ mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Mod Folder
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
@@ -114,6 +115,7 @@ 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.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -125,6 +127,7 @@ mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
 mod.import.file = Import File
 mod.import.github = Import GitHub Mod
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = This mod will be deleted.
 mod.author = [lightgray]Author:[] {0}
@@ -136,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Om
 name = Namn:
 noname = Välj ett[accent] namn[] först.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Filnamn:
 unlocked = Nytt innehåll upplåst!
 completed = [accent]Avklarad
@@ -143,6 +148,7 @@ techtree = Teknologiträd
 research.list = [lightgray]Forskning:
 research = Forskning
 researched = [lightgray]{0} framforskat.
+research.progress = {0}% complete
 players = {0} spelare online
 players.single = {0} spelare online
 players.search = search
@@ -225,7 +231,6 @@ save.new = Ny sparfil
 save.overwrite = Are you sure you want to overwrite\nthis save slot?
 overwrite = Skriv över
 save.none = Inga sparfiler hittade!
-saveload = [accent]Sparar...
 savefail = Kunde inte spara spelet!
 save.delete.confirm = Är du säker att du vill radera den här sparfilen?
 save.delete = Radera
@@ -273,6 +278,7 @@ quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial c
 loading = [accent]Läser in...
 reloading = [accent]Reloading Mods...
 saving = [accent]Sparar...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
@@ -329,8 +335,9 @@ waves.never = <aldrig>
 waves.every = var
 waves.waves = våg(or)
 waves.perspawn = per spawn
+waves.shields = shields/wave
 waves.to = till
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Förhandsvisning
 waves.edit = Ändra...
 waves.copy = Kopiera till Urklipp
@@ -338,6 +345,11 @@ waves.load = Läs från Urklipp
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Vågor kopierade.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Redigera...
@@ -457,10 +469,12 @@ locked = Låst
 complete = [lightgray]Nå:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
-requirement.unlock = Unlock {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Resume Zone:\n[lightgray]{0}
 bestwave = [lightgray]Best Wave: {0}
 launch = < LAUNCH >
+launch.text = Launch
 launch.title = Launch Successful
 launch.next = [lightgray]next opportunity at wave {0}
 launch.unable2 = [scarlet]Unable to LAUNCH.[]
@@ -468,13 +482,14 @@ launch.confirm = This will launch all resources in your core.\nYou will not be a
 launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = Add All
-configure.locked = [lightgray]Unlock configuring loadout: {0}.
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = [lightgray]Resources Detected:
 zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
@@ -493,35 +508,43 @@ error.io = Network I/O error.
 error.any = Okänt nätverksfel.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
-zone.groundZero.name = Ground Zero
-zone.desertWastes.name = Desert Wastes
-zone.craters.name = Kratrar
-zone.frozenForest.name = Frusen Skog
-zone.ruinousShores.name = Ruinous Shores
-zone.stainedMountains.name = Stained Mountains
-zone.desolateRift.name = Desolate Rift
-zone.nuclearComplex.name = Nuclear Production Complex
-zone.overgrowth.name = Överväxt
-zone.tarFields.name = Tjärfält
-zone.saltFlats.name = Salt Flats
-zone.impact0078.name = Impact 0078
-zone.crags.name = Crags
-zone.fungalPass.name = Fungal Pass
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
-zone.frozenForest.description = Even here, closer to mountains, the spores have spread. The fridgid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
-zone.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
-zone.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
-zone.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
-zone.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
-zone.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
-zone.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
-zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
-zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
-zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Språk
 settings.data = Game Data
@@ -535,9 +558,12 @@ settings.graphics = Grafik
 settings.cleardata = Rensa Data...
 settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone!
 settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< Pausat >
 clear = Clear
 banned = [scarlet]Banned
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Ja
 no = Nej
 info.title = Info
@@ -559,8 +585,11 @@ blocks.itemsmoved = Move Speed
 blocks.launchtime = Time Between Launches
 blocks.shootrange = Range
 blocks.size = Storlek
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Liquid Capacity
 blocks.powerrange = Power Range
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
@@ -576,13 +605,18 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Health
 blocks.buildtime = Build Time
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Build Cost
 blocks.inaccuracy = Inaccuracy
 blocks.shots = Skott
 blocks.reload = Shots/Second
 blocks.ammo = Ammunition
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Bättre Borr Krävs
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Effektivitet: {0}%
@@ -592,11 +626,12 @@ bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Föremål: {0}
 bar.capacity = Capacity: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Vätska
 bar.heat = Hetta
 bar.power = Power
 bar.progress = Build Progress
-bar.spawned = Units: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -620,12 +655,16 @@ unit.liquidunits = liquid units
 unit.powerunits = power units
 unit.degrees = grader
 unit.seconds = sekunder
+unit.minutes = mins
 unit.persecond = /sek
+unit.perminute = /min
 unit.timesspeed = x hastighet
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = föremål
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Allmänt
 category.power = Energi
 category.liquids = Vätskor
@@ -640,6 +679,7 @@ setting.linear.name = Linear Filtering
 setting.hints.name = Hints
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animerat Vatten
 setting.animatedshields.name = Animerade Sköldar
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
@@ -664,7 +704,6 @@ setting.effects.name = Visa Effekter
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Save Interval
 setting.seconds = {0} Sekunder
@@ -673,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullskärm
 setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
 setting.fps.name = Show FPS
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixellera[lightgray] (disables animations)
 setting.minimap.name = Visa Minikarta
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Musikvolym
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Stäng Av Musik
 setting.sfxvol.name = Ljudeffektvolym
@@ -701,10 +743,14 @@ keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only
 category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
+category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Clear Building
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
@@ -714,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Dash
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -741,6 +788,9 @@ keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Shoot
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -775,34 +825,34 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Vågtimer
 rules.waves = Vågor
 rules.attack = Attack Mode
+rules.buildai = AI Building
 rules.enemyCheat = Infinite AI (Red Team) Resources
-rules.unitdrops = Unit Drops
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Player Health Multiplier
-rules.playerdamagemultiplier = Player Damage Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
-rules.respawntime = Respawn Time:[lightgray] (sec)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves wait for enemies
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
-rules.respawns = Max respawns per wave
-rules.limitedRespawns = Limit Respawns
+rules.unitammo = Units Require Ammo
 rules.title.waves = Vågor
-rules.title.respawns = Respawns
 rules.title.resourcesbuilding = Resources & Building
-rules.title.player = Spelare
 rules.title.enemy = Fiender
 rules.title.unit = Units
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Föremål
 content.liquid.name = Vätskor
@@ -828,10 +878,11 @@ liquid.water.name = Vatten
 liquid.slag.name = Slag
 liquid.oil.name = Olja
 liquid.cryofluid.name = Cryofluid
-item.corestorable = [lightgray]Storable in Core: {0}
+
 item.explosiveness = [lightgray]Explosiveness: {0}%
 item.flammability = [lightgray]Flammability: {0}%
 item.radioactivity = [lightgray]Radioactivity: {0}%
+
 unit.health = [lightgray]Health: {0}
 unit.speed = [lightgray]Fart: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -840,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viskositet: {0}
 liquid.temperature = [lightgray]Temperatur: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sandbumling
 block.grass.name = Gräs
 block.slag.name = Slag
 block.salt.name = Salt
-block.saltrocks.name = Saltstenar
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pebbles
 block.tendrils.name = Tendrils
-block.sandrocks.name = Sandstenar
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spore Pine
-block.sporerocks.name = Spore Rocks
-block.rock.name = Sten
-block.snowrock.name = Snow Rock
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Mossa
 block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
-block.shalerocks.name = Shale Rocks
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -891,13 +979,17 @@ block.craters.name = Kratrar
 block.sand-water.name = Sandvatten
 block.darksand-water.name = Mörksandvatten
 block.char.name = Char
-block.holostone.name = Holosten
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Issnö
-block.rocks.name = Stenar
-block.icerocks.name = Isstenar
-block.snowrocks.name = Snöstenar
-block.dunerocks.name = Dynstenar
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Tall
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Vitt Dött Träd
 block.white-tree.name = Vitt Träd
 block.spore-cluster.name = Spore Cluster
@@ -913,10 +1005,9 @@ block.dark-panel-4.name = Mörk Panel 4
 block.dark-panel-5.name = Mörk Panel 5
 block.dark-panel-6.name = Mörk Panel 6
 block.dark-metal.name = Mörk Metall
-block.ignarock.name = Ignasten
+block.basalt.name = Basalt
 block.hotrock.name = Het Sten
 block.magmarock.name = Magmasten
-block.cliffs.name = Klippor
 block.copper-wall.name = Kopparvägg
 block.copper-wall-large.name = Stor Kopparvägg
 block.titanium-wall.name = Titanvägg
@@ -952,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Kiselsmältare
 block.phase-weaver.name = Phase Weaver
 block.pulverizer.name = Pulveriserare
-block.cryofluidmixer.name = Cryofluid Mixer
+block.cryofluid-mixer.name = Cryofluid Mixer
 block.melter.name = Smältare
 block.incinerator.name = Förbrännare
 block.spore-press.name = Spore Press
@@ -965,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Batteri
 block.battery-large.name = Stort Batteri
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Ånggenerator
+block.steam-generator.name = Ånggenerator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mekanisk Borr
@@ -995,17 +1086,6 @@ block.blast-mixer.name = Blast Mixer
 block.solar-panel.name = Solpanel
 block.solar-panel-large.name = Stor Solpanel
 block.oil-extractor.name = Oljeextraktor
-block.command-center.name = Kommandocenter
-block.draug-factory.name = Draug Miner Drone Factory
-block.spirit-factory.name = Spirit Repair Drone Factory
-block.phantom-factory.name = Phantom Builder Drone Factory
-block.wraith-factory.name = Wraith Fighter Factory
-block.ghoul-factory.name = Ghoul Bomber Factory
-block.dagger-factory.name = Dagger Mech Factory
-block.crawler-factory.name = Crawler Mech Factory
-block.titan-factory.name = Titan Mech Factory
-block.fortress-factory.name = Fortress Mech Factory
-block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Repairationspunkt
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
@@ -1037,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = blåa
 team.crux.name = röda
 team.sharded.name = orangea
@@ -1044,21 +1147,7 @@ team.orange.name = orangea
 team.derelict.name = derelicta
 team.green.name = gröna
 team.purple.name = lila
-unit.spirit.name = Spirit Repair Drone
-unit.draug.name = Draug Miner Drone
-unit.phantom.name = Phantom Builder Drone
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
-unit.wraith.name = Wraith Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradikator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tryck för att fortsätta>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1101,17 +1190,7 @@ liquid.water.description = The most useful liquid. Commonly used for cooling mac
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = A liquid used in advanced material production. Can be converted into coal as fuel, or sprayed and set on fire as a weapon.
 liquid.cryofluid.description = An inert, non-corrosive liquid created from water and titanium. Has extremely high heat capacity. Extensively used as coolant.
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
-unit.spirit.description = A modified draug drone, designed for repair instead of mining. Automatically fixes any damaged blocks in the area.
-unit.phantom.description = An advanced drone unit. Follows users. Assists in block construction.
-unit.dagger.description = The most basic ground mech. Cheap to produce. Overwhelming when used in swarms.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
-unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets. Equipped with two miniature Scorch-class flamethrowers.
-unit.fortress.description = A heavy artillery mech. Equipped with two modified Hail-type cannons for long-range assault on enemy structures and units.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
-unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critical infrastructure.
-unit.revenant.description = A heavy, hovering missile array.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
@@ -1120,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function.
 block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy.
-block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
+block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
 block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets.
@@ -1186,7 +1265,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.
@@ -1222,15 +1301,5 @@ block.ripple.description = An extremely poweful artillery turret. Shoots cluster
 block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to patrol, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produces Spirit structural repair drones.
-block.phantom-factory.description = Produces advanced construction drones.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
-block.ghoul-factory.description = Produces heavy carpet bombers.
-block.revenant-factory.description = Produces heavy missile-based units.
-block.dagger-factory.description = Produces basic ground units.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produces advanced, armored ground units.
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 495623da38..6a89ac29ca 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io page with PC downloads
 link.google-play.description = Google Play store listing
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Official Mindustry wiki
-link.feathub.description = Suggest new features
+link.suggestions.description = Suggest new features
 linkfail = ไม่สามารถเปิดลิ้งค์ได้\nคัดลอก URL ลงในคลิปบอร์ดแล้ว
 screenshot = Screenshot บันทึกที่ {0}
 screenshot.invalid = แมพใหญ่เกินไป, หน่วยความจำอาจจะไม่พอสำหรับ screenshot.
@@ -20,6 +20,8 @@ gameover = Game Over
 gameover.pvp = ทีมที่ชนะคือทีม[accent] {0}[]!
 highscore = [accent]คะแนนสูงสุดใหม่!
 copied = คัดลอกแล้ว.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = เสียง
 load.map = แมพ
@@ -40,6 +42,7 @@ schematic = แผนผัง
 schematic.add = กำลังบันทึกแผนผัง...
 schematics = แผนผัง
 schematic.replace = มีแผนผังที่ใช้ชื่อนี้แล้ว. แทนที่เลยไหม?
+schematic.exists = A schematic by that name already exists.
 schematic.import = นำเข้าแผนผัง...
 schematic.exportfile = ส่งออกไฟล์
 schematic.importfile = นำเข้าไฟล์
@@ -59,15 +62,14 @@ stat.built = จำนวนสิ่งก่อสร้างที่สร
 stat.destroyed = จำนวนสิ่งก่อสร้างของศัตรูที่ทำลายไปได้:[accent] {0}
 stat.deconstructed = จำนวนสิ่งก่อสร้างที่ถูกทำลายไป:[accent] {0}
 stat.delivered = ทรัพยากรที่ส่งไปได้:
+stat.playtime = Time Played:[accent] {0}
 stat.rank = ระดับ: [accent]{0}
 
-launcheditems = [accent]ไอเท็มที่ส่งไปได้
-launchinfo = [unlaunched][[ส่ง] แกนกลางของคุณเพื่อที่จะรับไอเท็มที่ไฮไลท์สีน้ำเงิน
+globalitems = [accent]Global Items
 map.delete = คุณแน่ใจหรือว่าจะลบแมพชื่อ "[accent]{0}[]"?
 level.highscore = คะแนนสูงสุด: [accent]{0}
 level.select = เลือกด่าน
 level.mode = เกมโหมด:
-showagain = ไม่แสดงอีกในครั้งต่อไป
 coreattack = < แกนกลางกำลังถูกโจมตี! >
 nearpoint = [[ [scarlet]ออกจากดรอปพอยท์ด่วน IMMEDIATELY[] ]\nการทำลายล้างกำลังใกล้เข้ามา
 database = ฐานข้อมูหลัง
@@ -105,6 +107,7 @@ mods.guide = คู่มือการทำมอด
 mods.report = รายงานบัค
 mods.openfolder = เปิดมอดโฟลเดอร์
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]เปิดใช้งาน
 mod.disabled = [scarlet]ปิดใช้งาน
@@ -112,6 +115,7 @@ mod.disable = ปิดใช้งาน
 mod.content = Content:
 mod.delete.error = ไม่สามารถลบมอดได้. ไฟล์อาจอยู่ในระหว่างการใช้งาน.
 mod.requiresversion = [scarlet]Requires min game version: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]dependencies หาย: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -123,6 +127,7 @@ mod.reloadrequired = [scarlet]จำเป็นต้องรีโหลด
 mod.import = นำเข้ามอด
 mod.import.file = Import File
 mod.import.github = นำเข้ามอดจาก Github
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = มอดนี้จะถูกลบ
 mod.author = [lightgray]ผู้สร้าง:[] {0}
@@ -134,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = เกี่ยวกับ
 name = ชื่อ:
 noname = ใส่ชื่อ[accent] ผู้เล่น[] ก่อน.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = ชื่อไฟล์:
 unlocked = content ใหม่ปลดล็อค!
 completed = [accent]สำเร็จ
@@ -141,6 +148,7 @@ techtree = ความคืบหน้าในการวิจัย
 research.list = [lightgray]วิจัย:
 research = วิจัย
 researched = [lightgray]{0} วิจัยแล้ว.
+research.progress = {0}% complete
 players = {0} ผู้เล่น
 players.single = {0} ผู้เล่น
 players.search = search
@@ -223,7 +231,6 @@ save.new = เซฟใหม่
 save.overwrite = คุณแใจหรือว่าจะเซฟทับ\nเซฟนี้?
 overwrite = เขียนทับ
 save.none = ไม่พบเซฟ!
-saveload = กำลังเซฟ...
 savefail = เซฟเกมผิดพลาด!
 save.delete.confirm = คุณแน่ใจหรือว่าจะลบเซฟนี้?
 save.delete = ลบ
@@ -271,6 +278,7 @@ quit.confirm.tutorial = คุณแน่ใจหรือว่าคุณ
 loading = [accent]กำลังโหลด...
 reloading = [accent]กำลังรีโหลดมอด...
 saving = [accent]กำลังเซฟ...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][]เพื่อเคลียแผน
 selectschematic = [accent][[{0}][]เพื่อเลือกและคัดลอก
 pausebuilding = [accent][[{0}][]เพื่อหยุดการสร้างชั่วคราว
@@ -327,8 +335,9 @@ waves.never = <never>
 waves.every = ทุกๆ
 waves.waves = wave(s)
 waves.perspawn = ต่อสปาวน์
+waves.shields = shields/wave
 waves.to = to
-waves.boss = บอส
+waves.guardian = Guardian
 waves.preview = พรีวิว
 waves.edit = แก้ไข...
 waves.copy = คัดลอกไปยังคลิปบอร์ด
@@ -336,6 +345,11 @@ waves.load = โหลดจากคลิปบอร์ด
 waves.invalid = waves ในคลิปบอร์ดไม่ถูกต้อง
 waves.copied = คัดลอก Waves แล้ว
 waves.none = ไม่ได้กำหนดศัตรู\nwave layouts เปล่าจะถูกแทนที่โดย layout ค่าเริ่มต้นของเกม
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<ค่าเริ่่มต้น>
 details = รสยละเอียด...
 edit = แก้ไข...
@@ -455,10 +469,12 @@ locked = ล็อค
 complete = [lightgray]สำเร็จ:
 requirement.wave = ถึง Wave ที่ {0} ใน {1}
 requirement.core = ทำลาย Core ของศัตรูใน {0}
-requirement.unlock = ปลดล็อค {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = เล่นต่อในโซน:\n[lightgray]{0}
 bestwave = [lightgray]Wave สูงสุด: {0}
 launch = < ส่ง >
+launch.text = Launch
 launch.title = ส่งเรียบร้อย
 launch.next = [lightgray]โอกาสครั้งหน้าที่ wave {0}
 launch.unable2 = [scarlet]ไม่สามารถส่งได้[]
@@ -466,13 +482,14 @@ launch.confirm = นี่จะส่งทรัพยากรทั้งห
 launch.skip.confirm = ถ้าคุณข้ามตอนนี้, คุณจะไม่สามารถส่งจนกว่าจะถึง waves ต่อๆไป
 uncover = เปิดเผย
 configure = ตั้งค่า Loadout
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = เพิ่มทั้งหมด
-configure.locked = [lightgray]ปลดล็อคการตั้งค่า loadout: {0}.
+launch.destination = Destination: {0}
 configure.invalid = จำนวนต้อยู่ระหว่าง 0 ถึง {0}.
 zone.unlocked = [lightgray]{0} ปลดล็อคแล้ว
 zone.requirement.complete = ข้อเรียกร้องสำหรับ {0} สำเร็จแล้ว:[lightgray]\n{1}
-zone.config.unlocked = Loadout ปลดล็อคแล้ว:[lightgray]\n{0}
 zone.resources = [lightgray]ทรัพยากรที่พบ:
 zone.objective = [lightgray]เป้าหมาย: [accent]{0}
 zone.objective.survival = เอาชีวิตรอด
@@ -491,35 +508,43 @@ error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = ไม่สามารถเริ่มต้น bloom ได้\nอุปกรณ์ของคุณอาจไม่รองรับ
 
-zone.groundZero.name = Ground Zero
-zone.desertWastes.name = Desert Wastes
-zone.craters.name = The Craters
-zone.frozenForest.name = Frozen Forest
-zone.ruinousShores.name = Ruinous Shores
-zone.stainedMountains.name = Stained Mountains
-zone.desolateRift.name = Desolate Rift
-zone.nuclearComplex.name = Nuclear Production Complex
-zone.overgrowth.name = Overgrowth
-zone.tarFields.name = Tar Fields
-zone.saltFlats.name = Salt Flats
-zone.impact0078.name = Impact 0078
-zone.crags.name = Crags
-zone.fungalPass.name = Fungal Pass
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = ตำแหน่งเริ่มต้นที่ดีที่สุด ภัยคุกคามจากศัตรูน้อย ทรัพยากรก็น้อยเช่นกัน\nรวบรวมตะกั่วและทองแดงให้ได้มากที่สุดเท่าที่จะทำได้\nแล้วเดินหน้าต่อ
-zone.frozenForest.description = แม้แต่ที่นี่อยู่ใกล้กับภูเขา สปอร์ก็สามารถแพร่มาถึงได้. อุณภูมิที่เยือกเย็นไม่สามารถจำกัดวงของมันได้ตลอดไป.\n\nเริ่มลองใช้พลังงาน สร้างเครื่องกำเนิดไฟฟ้าเผาไหม้ เรียนรู้ที่จะใช้ menders.
-zone.desertWastes.description = ของเสียพวกนี้กินบริเวณกว้าง คาดการณ์ไม่ได้ และมีสิ่งก่อสร้างที่ถูกถอดทิ้งอยู่\nมีถ่านหินอยู่ในบริเวณนี้. นำมันไปเผาเพื่อเปลี่ยนเป็นพลังงานหรือนำไปสังเคราะห์เป็นกราไฟต์\n\n[lightgray]ตำแหน่ง landing ไม่สามารถการันตีได้
-zone.saltFlats.description = ภายนอกเขตทะเลทรายเป็นที่ตั้งของ Salt Flats. พบทรัพยากรในบริเวณนี้ค่อนข้างน้อย\n\nศัตรูสร้างที่เก็บทรัพยากรไว้ที่นี่. กำจัด core ของพวกมัน. อย่าให้มีอะไรเหลือ
-zone.craters.description = น้ำถูกเก็บสะสมในปล่องผู้เขาไฟนี้, เป็นสิ่งที่ตกทอดมาจากสงครามเก่า บุกเบิกพื้นที่ เก็บทราย เผากระจกเมต้า. ปั๊มน้ำมาใช้หล่อเย็นป้อมปืนและเครื่องขุด
-zone.ruinousShores.description = อยู่ถัดไปจาก the wastes, คือเส้นชายทะเล. เมื่อก่อนนั้น, สถานที่นี้เป็นที่ตั้งของแนวป้องกันชายฝั่ง. ร่องรอยของมันหลงเหลือไม่มาก. เหลือแค่สิ่งก่อสร้างป้องกันพื้นฐานเท่านั้นที่ปราศจากอัตราย, อย่างอื่นทุกอย่างกลายเป็นเศษเหล็กทั้งหมด.\nขยายออกไปข้างนอกต่อไป ค้นพบกับเทศโนโลยีอีกครั้ง.
-zone.stainedMountains.description = ถัดเข้าไปบนพื้นดิน จะพบกับภูเขาจำนวนหนึ่ง, ซึ่งยังคงบริสุทธิ์จากสปอร์\nขุดไทเทเนียมที่อุดมสมบูรณ์ในบริเวณนี้. เรียนรู้ที่จะใช้มัน.\n\nศัตรูที่นี่จะมามากขึ้น. อย่าให้พวกมันส่งยูนิตที่แข็งแกร่งที่สุด
-zone.overgrowth.description = พื้นที่รก, ใกล้กับแหล่งที่มาของสปอร์.\nศัตรูได้ตั้งหน้าด่านที่นี่ สร้างยูนิตไททัน. ทำลายมัน เรียกคืนในสิ่งที่เราสูญเสียไป.
-zone.tarFields.description = ภายนอกเขตของพื้นที่ผลิตน้ำมัน, อยู่ระหว่าภูเขาและทะเลทราย. หนึ่งในพื้นที่ที่มีบ่อน้ำมันดิบที่ใช้งานได้ \nถึงแม้ว่าจะถูกทิ้งร้าง, พื้นที่นี้ยังคงมีกำลังพลของศัตรูอยู่ใกล้ๆ. อย่าประเมิณพวกมันต่ำไป.\n\n[lightgray]วิจัยเทคโนโลยีแปรรูปน้ำมันถ้าเป็นไปได้
-zone.desolateRift.description = พื้นที่ที่อันตรายมาก เต็มไปด้วยทรัพยากร แต่มีพื้นที่น้อย. ความเสี่ยงวิบัตสูง. ออกไปให้เร็วที่สุด. อย่าให้ถูกหลอกจากช่วงเวลาที่ห่างกันมากในแต่ละการโจมตีของศัตรู
-zone.nuclearComplex.description = โรงงานขุดและแปรรูปทอเรี่ยมเก่า, เหลือแค่ซากปรักหักพัง.\n[lightgray]วิจัยทอเรียมและการใช้งานที่มากมายของมัน.\n\nศัตรูที่นี่มาในจำนวนที่เยอะ คอยสอดส่องเพื่อหาจังหวะโจมตี
-zone.fungalPass.description = พื้นที่ขั้นกลางระหว่างภูเขาสูงและ spore-ridden lands ที่ต่ำลงมา. ฐานทัพลาดตระเวนของศัตรูตั้งอยู่ที่นี่.\nทำลายมันซะ.\nใช้ยูนิต Dagger และ Crawler. ทำลาย core ทั้งสอง.
-zone.impact0078.description = <ใส่คำบรรยายที่นี่>
-zone.crags.description = <ใส่คำบรรยายที่นี่>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = ภาษา
 settings.data = ข้อมูลเกม
@@ -533,9 +558,12 @@ settings.graphics = กราฟิก
 settings.cleardata = เคลียร์ข้อมูลเกม...
 settings.clear.confirm = คุณแน่ใจหรือว่าจะเคลียร์ข้อมูลเกม?\nสิ่งที่ทำไปแล้วจะไม่สามารถย้อนกลับได้!
 settings.clearall.confirm = [scarlet]คำเตือน![]\nการกระทำนี้จะลบข้อมูลทั้งหมด นั้นรวมไปถึงเซฟ, แมพ, สิ่งที่ปลดล็อคแล้วและ keybinds.\nเมื่อคุณกด 'โอเค' เกมจะลบข้อมูลทุกอย่างและออกโดยอัตโนมัติ
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< หยุดชั่วคราว >
 clear = เคลียร์
 banned = [scarlet]แบน
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = ใช่
 no = ไม่
 info.title = ข้อมูล
@@ -557,8 +585,11 @@ blocks.itemsmoved = ความเร็วเคลื่อนที่
 blocks.launchtime = เวลาระหว่างการส่ง
 blocks.shootrange = ระยะยิง
 blocks.size = ขนาด
+blocks.displaysize = Display Size
 blocks.liquidcapacity = จุของเหลว
 blocks.powerrange = ระยะพลังงาน
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = จำนวนการเชื่อมต่อสูงสุด
 blocks.poweruse = ใช้พลังงาน
 blocks.powerdamage = หน่วยพลังงาน/ดาเมจ
@@ -574,13 +605,18 @@ blocks.boosteffect = แอฟเฟ็คของบูสต์
 blocks.maxunits = จำนวนยูนิตสูงสุด
 blocks.health = เลือด
 blocks.buildtime = เวลาในการสร้าง
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = ใช้
 blocks.inaccuracy = ความคลาดเคลื่อน
 blocks.shots = นัด
 blocks.reload = นัด/วินาที
 blocks.ammo = กระสุน
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = จำเป็นต้องใช้เครื่องขุดที่ดีกว่า
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = ความเร็วขุด: {0}/s
 bar.pumpspeed = ความเร็วปั้ม: {0}/s
 bar.efficiency = ประสิทธิภาพ: {0}%
@@ -590,11 +626,12 @@ bar.poweramount = พลังงาน: {0}
 bar.poweroutput = พลังงานออก: {0}
 bar.items = ไอเท็ม: {0}
 bar.capacity = ความจุ: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = ของเหลว
 bar.heat = ความร้อน
 bar.power = พลังงาน
 bar.progress = ความคืบหน้าในการสร้าง
-bar.spawned = จำนวนยูนิตทั้งหมด: {0}/{1}
 bar.input = นำเข้า
 bar.output = ส่งออก
 
@@ -618,12 +655,16 @@ unit.liquidunits = หน่วยของเหลว
 unit.powerunits = หน่วยพลังงาน
 unit.degrees = องศา
 unit.seconds = วินาที
+unit.minutes = mins
 unit.persecond = /วินาที
+unit.perminute = /min
 unit.timesspeed = เท่าเร็วขึ้น
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = ไอเท็ม
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = ทั่วไป
 category.power = พลังงาน
 category.liquids = ของเหลว
@@ -638,6 +679,7 @@ setting.linear.name = การกรองเชิงเส้น
 setting.hints.name = คำแนะนำ
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = หยุดสร้างชั่วคราวแบบอัตโนมัติ
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = แอนิเมชั่นน้ำ
 setting.animatedshields.name = แอนิเมชั่นเกราะ
 setting.antialias.name = Antialias[lightgray] (จำเป็นต้องรีสตาร์ท)[]
@@ -662,7 +704,6 @@ setting.effects.name = แสดงเอฟเฟ็ค
 setting.destroyedblocks.name = แสดงบล็อคที่ถูกทำลาย
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = ความไวของตัวควบคุม
 setting.saveinterval.name = ระยะห่าวระหว่างเซฟ
 setting.seconds = {0} วินาที
@@ -671,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = เต็มจอ
 setting.borderlesswindow.name = วินโดว์แบบไร้ขอบ[lightgray] (อาจจะต้องรีตาร์ท)
 setting.fps.name = แสดง FPS และ Ping
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate[lightgray] (ปิดใช้งานแอนิเมชั่น)
 setting.minimap.name = แสดงมินิแมพ
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = แสดงตำแหน่งของผู้เล่น
 setting.musicvol.name = ระดับเสียงเพลง
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = ระดับเสียงล้อมรอบ
 setting.mutemusic.name = ปิดเพลง
 setting.sfxvol.name = ระดับเสียง SFX
@@ -699,10 +743,14 @@ keybinds.mobile = [scarlet]การตั้งค่าปุ่มส่ว
 category.general.name = ทั่วไป
 category.view.name = วิว
 category.multiplayer.name = ผู้เล่นหลายคน
+category.blocks.name = Block Select
 command.attack = โจมตี
 command.rally = ชุมนุม
 command.retreat = ถอยกลับ
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = เคลียร์สิ่งก็สร้าง
 keybind.press = กดปุ่มใดก็ได้...
 keybind.press.axis = กดแกนหรือปุ่มใดก็ได้...
@@ -712,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = เคลื่อนที่ในแกน x
 keybind.move_y.name = เคลี่อนที่ในแกน y
 keybind.mouse_move.name = ตามเม้าส์
-keybind.dash.name = พุ่ง
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = เลือกภูมิภาค
 keybind.schematic_menu.name = เมนู Schematic
 keybind.schematic_flip_x.name = กลับ Schematic ในแกน X
@@ -739,6 +788,9 @@ keybind.diagonal_placement.name = วางเป็นแนวทแยง
 keybind.pick.name = เลือกบล็อค
 keybind.break_block.name = ทุบบล็อค
 keybind.deselect.name = ยกเลิกการเบือก
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = ยิง
 keybind.zoom.name = ซูม
 keybind.menu.name = เมนู
@@ -773,33 +825,34 @@ rules.reactorexplosions = การระเบิดของ
 rules.wavetimer = ตัวนับเวลาปล่อยคลื่น(รอบ)
 rules.waves = คลื่น(รอบ)
 rules.attack = โหมดการโจมตี
+rules.buildai = AI Building
 rules.enemyCheat = AI (ทีมสีแดง) มีทรัพยากรไม่จำกัด
-rules.unitdrops = ยูนิตดรอป
+rules.blockhealthmultiplier = พหุคูณเลือดของบล็อค
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = พหุคูณความเร็วในการสร้างยูนิต
 rules.unithealthmultiplier = พหุคูณเลือดของยูนิต
-rules.blockhealthmultiplier = พหุคูณเลือดของบล็อค
-rules.playerhealthmultiplier = พหุคูณเลือดของผู้เล่น
-rules.playerdamagemultiplier = พหุคูณพลังโจมตีของผู้เล่น
 rules.unitdamagemultiplier = พหุคูณพลังโจมตีของยูนิต
 rules.enemycorebuildradius = รัศมีห้ามสร้างบริเวณแกนกลางของศัตรู:[lightgray] (ช่อง)
-rules.respawntime = ความเร็วในการเกิดใหม่:[lightgray] (วินาที)
 rules.wavespacing = ระยะเวลาระหว่างคลื่น(รอบ):[lightgray] (วินาที)
 rules.buildcostmultiplier = พหุคูณจำนวนทรัพยากรที่ใช้ในการสร้าง
 rules.buildspeedmultiplier = พหุคูณความเร็วในการสร้าง
+rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = คลื่น(รอบ)รอศัตรู
 rules.dropzoneradius = รัศมีจุดเกิดของศัตรู:[lightgray] (ช่อง)
-rules.respawns = เกิดใหม่สูงสุดต่อคลื่น(รอบ)
-rules.limitedRespawns = จำกัดการเกิดใหม่
+rules.unitammo = Units Require Ammo
 rules.title.waves = คลื่น(รอบ)
-rules.title.respawns = เกิดใหม่
 rules.title.resourcesbuilding = ทรัพยากรและสิ่งก่อสร้าง
-rules.title.player = ผู้เล่น
 rules.title.enemy = ศัตรู
 rules.title.unit = ยูนิต
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = ไอเท็ม
 content.liquid.name = ของเหลว
@@ -825,9 +878,11 @@ liquid.water.name = น้ำ
 liquid.slag.name = เศษแร่
 liquid.oil.name = น้ำมัน
 liquid.cryofluid.name = โครโรฟิวล์
+
 item.explosiveness = [lightgray]ค่าการระเบิด: {0}%
 item.flammability = [lightgray]ความไวต่อไฟ: {0}%
 item.radioactivity = [lightgray]ค่ากัมมันตภาพรังสี: {0}%
+
 unit.health = [lightgray]เลือด: {0}
 unit.speed = [lightgray]ความเร็ว: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -836,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]ความจุความร้อน: {0}
 liquid.viscosity = [lightgray]ความหนืด: {0}
 liquid.temperature = [lightgray]อุณหภูมิ: {0}
 
+unit.dagger.name = แด็กเกอร์
+unit.mace.name = Mace
+unit.fortress.name = ฟอร์เทรส
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = ครอว์เลอร์
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = ก้อนหินทราย
 block.grass.name = หญ้า
 block.slag.name = Slag
 block.salt.name = เกลือ
-block.saltrocks.name = หินเกลือ
+block.salt-wall.name = Salt Wall
 block.pebbles.name = ก้อนกรวด
 block.tendrils.name = ไม้เลื้อย
-block.sandrocks.name = หินทราย
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = ต้นสนสปอร์
-block.sporerocks.name = หินสปอร์
-block.rock.name = หิน
-block.snowrock.name = ก้อนหิมะ
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = ต้นสนที่คลุมหิมะ
 block.shale.name = หินดินดาน
 block.shale-boulder.name = ก้อนหินดินดาน
 block.moss.name = ตะไคร่น้ำ
 block.shrubs.name = พุ่มไม้
 block.spore-moss.name = พุ่มไม้สปอร์
-block.shalerocks.name = หิน
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = กำแพงเศษเหล็ก
 block.scrap-wall-large.name = กำแพงเศษเหล็กขนาดใหญ่
 block.scrap-wall-huge.name = กำแพงเศษเหล็กขนาดใหญ่มาก
@@ -887,13 +979,17 @@ block.craters.name = หลุมอุกกาบาต
 block.sand-water.name = น้ำบนทราย
 block.darksand-water.name = น้ำบนทรายดำ
 block.char.name = ถ่าน
-block.holostone.name = หินโฮโล
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = น้ำแข็งหิมะ
-block.rocks.name = หิน
-block.icerocks.name = หินน้ำแข็ง
-block.snowrocks.name = หินหิมะ
-block.dunerocks.name = หินเนินทราย
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = ต้นสน
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = ต้นไม้ขาวที่ตายแล้ว
 block.white-tree.name = ต้มไม้ขาว
 block.spore-cluster.name = กลุ่มสปอร์
@@ -909,10 +1005,9 @@ block.dark-panel-4.name = แผ่นดำ 4
 block.dark-panel-5.name = แผ่นดำ 5
 block.dark-panel-6.name = แผ่นดำ 6
 block.dark-metal.name = เหล็กดำ
-block.ignarock.name = หินอิกน่า
+block.basalt.name = Basalt
 block.hotrock.name = หินร้อน
 block.magmarock.name = หินแมกม่า
-block.cliffs.name = หน้าผา
 block.copper-wall.name = กำแพงทองแดง
 block.copper-wall-large.name = กำแพงทองแดงขนาดใหญ่
 block.titanium-wall.name = กำแพงไทเทเนี่ยม
@@ -944,10 +1039,11 @@ block.message.name = ตัวเก็บข้อความ
 block.illuminator.name = Illuminator
 block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 block.overflow-gate.name = ประตูระบายไอเทม
+block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = เตาเผาซิลิกอน
 block.phase-weaver.name = เครื่องทอใยเฟส
 block.pulverizer.name = เครื่องบด
-block.cryofluidmixer.name = เครื่องผสมสารหล่อเย็น
+block.cryofluid-mixer.name = เครื่องผสมสารหล่อเย็น
 block.melter.name = เตาหลอม
 block.incinerator.name = เตาเผาขยะ
 block.spore-press.name = เครื่องอัดสปอร์
@@ -960,7 +1056,7 @@ block.diode.name = ไดโอดแบตเตอรี่
 block.battery.name = แบตเตอรี่
 block.battery-large.name = แบตเตอรี่ขนาดใหญ่
 block.combustion-generator.name = เครื่องกำเนิดไฟฟ้าโดยการสันดาป
-block.turbine-generator.name = เครื่องกำเนิดไฟฟ้าไอน้ำ
+block.steam-generator.name = เครื่องกำเนิดไฟฟ้าไอน้ำ
 block.differential-generator.name = เครื่องกำเนิดไฟฟ้าดิฟเฟอเร่นเตอร์
 block.impact-reactor.name = เตาปฏิกรณ์อัดกระแทก
 block.mechanical-drill.name = เครื่องขุดเชิงกล
@@ -990,17 +1086,6 @@ block.blast-mixer.name = เครื่องผสมสารระเบิ
 block.solar-panel.name = แผงโซลาร์
 block.solar-panel-large.name = แผงโซลาร์ขนาดใหญ่
 block.oil-extractor.name = เครื่องสกัดน้ำมัน
-block.command-center.name = ศูนย์สั่งการ
-block.draug-factory.name = โรงงานผลิตโดรนขุดเจาะดรอก
-block.spirit-factory.name = โรงงานผลิตโดรนซ่อมแซมสปิริต
-block.phantom-factory.name = โรงงานผลิตโดรนก่อสร้างแฟนทอม
-block.wraith-factory.name = โรงงานผลิตยานต่อต้านอากาศยานเวรธ
-block.ghoul-factory.name = โรงงานผลิตยานทิ้งระเบิดกูล
-block.dagger-factory.name = โรงงานผลิตหุ่นรบแด็กเกอร์
-block.crawler-factory.name = โรงงานผลิตหุ่นรบครอว์เลอร์
-block.titan-factory.name = โรงงานผลิตหุ่นรบไททัน
-block.fortress-factory.name = โรงงานผลิตหุ่นรบฟอร์เทรส
-block.revenant-factory.name = โรงงานผลิตยานต่อต้านอากาศยานเรเวแนนท์
 block.repair-point.name = จุดซ่อมแซม
 block.pulse-conduit.name = ท่อน้ำพัลซ์
 block.plated-conduit.name = ท่อน้ำเสริมเกราะ
@@ -1032,6 +1117,29 @@ block.meltdown.name = เมลท์ดาวน์
 block.container.name = ตู้เก็บของ
 block.launch-pad.name = ฐานส่งของ
 block.launch-pad-large.name = ฐานส่งของขนาดใหญ่
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = น้ำเงิน
 team.crux.name = แดง
 team.sharded.name = ส้ม
@@ -1039,21 +1147,7 @@ team.orange.name = ส้ม
 team.derelict.name = derelict
 team.green.name = เขียว
 team.purple.name = ม่วง
-unit.spirit.name = โดรนซ่อมแซมสปิริต
-unit.draug.name = โดรนขุดเจาะดรอค
-unit.phantom.name = โดรนก่อสร้างแฟนทอม
-unit.dagger.name = แด็กเกอร์
-unit.crawler.name = ครอว์เลอร์
-unit.titan.name = ไททัน
-unit.ghoul.name = ยานทิ้งระเบิดกูล
-unit.wraith.name = ยานต่อต้านอากาศยานเวรธ
-unit.fortress.name = ฟอร์เทรส
-unit.revenant.name = เรเวแนนท์
-unit.eruptor.name = เอรัปเตอร์
-unit.chaos-array.name = เคออสอาเรย์
-unit.eradicator.name = อีเรดิเคเตอร์
-unit.lich.name = ลิค
-unit.reaper.name = ริปเปอร์
+
 tutorial.next = [lightgray]<กดเพื่อดำเนินการต่อ>
 tutorial.intro = คุณได้เข้าสู่[scarlet] บทฝึกสอนของ Mindustry.[]\nใช้[accent] [[WASD][] เพื่อเคลื่อนที่.\n[accent]กด [] ค้างระหว่างกลิ้งลูกกลิ้งเม้าส์[] เพื่อซูมเข้าและออก.\nเริ่มด้วยการ[accent] ขุดทองแดง[]. เคลื่อนที่ไปใกล้มัน, แล้วกดที่สายแร่ทองแดงใกล้ๆกับแกนกลางของคุณ\n\n[accent]ทองแดง {0}/{1} ชิ้น
 tutorial.intro.mobile = คุณได้เข้าสู่[scarlet] บทฝึกสอนของ Mindustry.[]\nเลื่อนหน้าจอเพื่อเคลื่อนที่.\n[accent]ขยับสองนิ้วพร้อมกัน []เพื่อซูมเข้าและออก.\nเริ่มด้วยการ[accent] ขุดทองแดง[]. เคลื่อนที่ไปใกล้มัน, แล้วกดที่สายแร่ทองแดงใกล้ๆกับแกนกลางของคุณ\n\n[accent]ทองแดง {0}/{1} ชิ้น
@@ -1096,17 +1190,7 @@ liquid.water.description = ของเหลวที่มีประโย
 liquid.slag.description = โลหะชนิดต่างๆซึ่งหลอมรวมกัน. สามารถนำไปแยกโลหะที่จำเป็นหรือเป็นอาวุธพ่นใส่ศัตรู.
 liquid.oil.description = ของเหลวใช้ในการผลิตวัสดุขั้นสูง. สามารถแปลงเเป็นถ่านหินเพือใช้เป็นเชื้อเพลิง หรือเป็นอาวุธเพื่อพ่นใส่ศัตรูแล้วจึงจุดไฟ.
 liquid.cryofluid.description = ของเหลวเฉื่อยและไม่กัดกร่อน ผลิตจากน้ำและไทเทเนี่ยม. มีสมบัติการถ่ายเทความร้อนสูง. ใช้อย่างแพร่หลายในการหล่อเย็น.
-unit.draug.description = โดรนขุดเจาะดั้งเดิม. ผลิตง่าย. ขยายได้. ขุดทองแดงและตะกั่วโดยอัตโนมัติในบริเวณใกล้เคียง. ส่งทรัพยากรที่ขุดได้ไปยัง core ที่ใกล้ที่สุด.
-unit.spirit.description = โดรนดราคจ์ที่ถูกปรับแต่ง, ออกแบบมาเพื่อการซ่อมแซมแทนการขุดเจาะ. ซ่อมแซมบล็อคที่โดนดาเมจโดยอัตโนมัติในบริเวณนั้น
-unit.phantom.description = โดรนขั้นสูง. ติดตามผู้ใช้. ช่วยสร้างบล็อค.
-unit.dagger.description = เม็คภาคพื้นดินพื้นฐานที่สุด. ผลิตง่าย. ทำลายล้างดีถ้าใช้เป็นฝูง.
-unit.crawler.description = ยูนิตภาคพื้นดินประกอบด้วยเฟรมเปลือยและระเบิดขั้นรุนแรงติดด้านบน. ระเบิดเมื่อแตะต้องกับศัตรู.
-unit.titan.description = ยูนิตเสริมเกราะภาคพื้นดินขั้นสูง. โจมตีทั้งภาคพื้นดินและอากาศ. มีปืนไฟระดับสคอร์ชติดตั้งอยู่.
-unit.fortress.description = เม็คปืนใหญ่. มีปืนใหญ่ดัดแปลงประเภทเฮแอลติดจั้งอยู่ 2 กระบอกสำหรับการโจมตีสิ่งก่อสร้างและยูนิตของศัตรูจากระยะไกล.
-unit.eruptor.description = เม็คหนักออกแบบมาเพื่อทำลายสิ่งก่อสร้าง. พ่นกากแร่ใส่แนวป้องกันของศัตรู, หลอมเหลวพวกมันและจุดสารระเหยให้ติดไฟ.
-unit.wraith.description = ยูนิตอินเตอร์เซ็ปเตอร์แนว hit-and-run (จู่โจมแล้วหนี) ที่เร็ว. เล็งเป้าที่เครื่องกำเนิดไฟฟ้าทุกชนิด.
-unit.ghoul.description = ยานทิ้งระเบิดปูพร่มหนัก (carpet bomber). ทะลวงผ่านสิ่งก่อสร้างศัตรู, เล็งเป้าที่จุดวิกฤตของสิ่งก่อสร้าง.
-unit.revenant.description = ยานหนักยิงขีปนาวุธ.
+
 block.message.description = เก็บข้อความ. ใช้สื่อสารกับพันธมิตร.
 block.graphite-press.description = อัดก้อนถ่านหินให้เป็นแผ่นกราไฟต์บริสุทธิ์.
 block.multi-press.description = เครื่องอัดกราไฟต์ที่ได้รับการอัปเกรด. ใช้น้ำและพลังงานในการแปรรูปถ่านหินให้เร็วและมีประสิทธิภาพมากขึ้น.
@@ -1115,7 +1199,7 @@ block.kiln.description = เผาทรายและตะกั่วเป
 block.plastanium-compressor.description = ผลิตพลาสตาเนี่ยมจากน้ำมันและไทเทเนี่ยม.
 block.phase-weaver.description = สังเคราะห์ใยเฟสจากทอเรี่ยมที่มีรังสีและทราย. จำเป็นต้องใช้พลังงานจำนวนมากจึงจะทำงานง.
 block.alloy-smelter.description = ผสมไทเทเนี่ยม, ตะกั่ว, ซิลิก้อนและทองแดงเพื่อที่จะผลิตเซิร์จอัลลอย.
-block.cryofluidmixer.description = ผสมน้ำและผงไทเทเนี่ยมบริสุทธิ์เป็นไครโยฟลูอิด. สำคัญสำหรับเตาปฏิกรณ์ทอเรี่ยม.
+block.cryofluid-mixer.description = ผสมน้ำและผงไทเทเนี่ยมบริสุทธิ์เป็นไครโยฟลูอิด. สำคัญสำหรับเตาปฏิกรณ์ทอเรี่ยม.
 block.blast-mixer.description = บอและผสมสปอร์กับไพไรต์เพื่อผลิตสารประกอบระเบิด.
 block.pyratite-mixer.description = ผสมถ่านหิน, ตะกั่วและทรายเข้าด้วยกันเป็นไฟไรต์ที่ติดไฟได้ง่าย.
 block.melter.description = หลอมเศษเหล็กเป็กกากแร่เพื่อใช้สำหรับกระบวนการต่อไปหรือใช้ในป้อมปืนเวฟ.
@@ -1181,7 +1265,7 @@ block.battery.description = เก็บพลังงานเป็นบั
 block.battery-large.description = เก็บพลังงานได้เยอะกว่าแบตเตอรี่ธรรมดา.
 block.combustion-generator.description = ผลิตพลังงานโดยการวัสดุติดไฟ เช่นถ่านหิน.
 block.thermal-generator.description = ผลิตพลังงานเมื่อวานในที่ร้อน (บนหินร้อนหรือหินแม็คม่า)
-block.turbine-generator.description = เครื่องกำเนิดไฟฟ้าเผาไหม้ขั้นสูง. ประสิทธิภาพสูงกว่า แต่ต้องใช้น้ำด้วยเพื่อผลิตไอน้ำ.
+block.steam-generator.description = เครื่องกำเนิดไฟฟ้าเผาไหม้ขั้นสูง. ประสิทธิภาพสูงกว่า แต่ต้องใช้น้ำด้วยเพื่อผลิตไอน้ำ.
 block.differential-generator.description = ผลิตไฟฟ้าจำนวนมาก. ใช้ความต่างของอุณหภูมิระหว่างไครโยฟลูอิดและไพไรต์ที่กำลังไหม้.
 block.rtg-generator.description = เครื่องกำเนิดไฟฟ้าที่ใช้ง่ายและไว้ใจได้. ใช้ความร้อนจากการสลายของสารกัมมัตภาพรังสีเพื่อใช้ผลิตพลังงานอย่างช้าๆ.
 block.solar-panel.description = ให้พลังงานจากแสงอาทิตย์จำนวนน้อย.
@@ -1217,15 +1301,5 @@ block.ripple.description = ป้อมปืนใหญ่ที่มีพ
 block.cyclone.description = ป้อมปืนต่อต้านอากาศยานและต่อต้านภาคพื้นดิน. ยิงกระจุของกระสุนระเบิดใส่ยูนิตศัตรู.
 block.spectre.description = ปืนใหญ่ลำกล้องคูขนาดยักษ์. ยิงกระสุนเจาะเกราะใส่ศัตรูทั้งบนอากาศและภาดพื้นดิน.
 block.meltdown.description = ปืนใหญ่เลเซอร์ขนาดยักษ์. ชาร์จแล้วยิงลำแสงเลเซอร์ใส่ศัตรูที่อยู่ใกล้. จำเป็นต้องใช้สารหล่อเย็น.
-block.command-center.description = สั่งการยูนิตพันธมิตรทั่วทั้งแมพ.\nสามารถสั่งให้ยูนิตมาชุมนุม, โจมตี core ศัตรู หรือถอยทีพกลับ core/โรงงาน. ถ้าไม่มี core ของศัตรูอยู่บริเวณนั้น, ยูนิตจะลาดตระเวนด้วยตัวเองหากได้รับคำสั่งให้โจมตี.
-block.draug-factory.description = ผลิตโดรนขุดเจาะดราคจ์.
-block.spirit-factory.description = ผลิตโดรนซ่อมแซมสปิริต.
-block.phantom-factory.description = ผลิตโดรนก่อสร้างขั้นสูง.
-block.wraith-factory.description = ผลิตยูนิตเร็ว โจมตีแบบ hit-and-run (จู่โจมแล้วหนี)
-block.ghoul-factory.description = ผลิตยานทิ้งระเบิดแบบโหดๆ (heavy carpet bomber)
-block.revenant-factory.description = ผลิตยูนิตที่ใช้ขีปนาวุธเป็นหลัก.
-block.dagger-factory.description = ผลิตยูนิตภาคพื้นดินพื้นฐาน.
-block.crawler-factory.description = ผลิตยูนิตที่ระเบิดตัวเอง.
-block.titan-factory.description = ผลิตยูนิตภาคพื้นดินเสริมเกราะขั้นสูง.
-block.fortress-factory.description = ผลิตยูนิตที่ถึกและติดปืนใหญ่.
 block.repair-point.description = ซ่อมแซมยูนิตที่อยู่ในรัศมีอย่างต่อเนื่อง.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 6ed24b1fc5..edfae05b29 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -12,7 +12,7 @@ link.itch.io.description = Bilgisayar ve Site versiyonunun bulundugu Site
 link.google-play.description = Google Play magaza sayfasi
 link.f-droid.description = F-Droid catalogue listing
 link.wiki.description = Orjinal Mindustry Bilgilendirme Sayfasi
-link.feathub.description = Suggest new features
+link.suggestions.description = Suggest new features
 linkfail = Link Acilamadi!\nLink sizin icin kopyalandi.
 screenshot = Screenshot saved to {0}
 screenshot.invalid = Map too large, potentially not enough memory for screenshot.
@@ -20,6 +20,8 @@ gameover = Cekirdegin yok edildi.
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]Yeni Yuksek skor!
 copied = Copied.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Sounds
 load.map = Maps
@@ -63,8 +65,7 @@ stat.delivered = Resources Launched:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Final Rank: [accent]{0}
 
-launcheditems = [accent]Launched Items
-launchinfo = [unlaunched][[LAUNCH] your core to obtain the items indicated in blue.
+globalitems = [accent]Global Items
 map.delete = Su haritayi silmek istediginden emin misin? "[accent]{0}[]"?
 level.highscore = Yuksek Skor: [accent]{0}
 level.select = Seviye secimi
@@ -106,6 +107,7 @@ mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Mod Folder
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
@@ -113,6 +115,7 @@ 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.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
 mod.import.file = Import File
 mod.import.github = Import GitHub Mod
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = This mod will be deleted.
 mod.author = [lightgray]Author:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Hakkinda
 name = isim:
 noname = Pick a[accent] player name[] first.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = File Name:
 unlocked = Yeni yapi acildi!!
 completed = [accent]Completed
@@ -142,6 +148,7 @@ techtree = Tech Tree
 research.list = [lightgray]Research:
 research = Research
 researched = [lightgray]{0} researched.
+research.progress = {0}% complete
 players = {0} oyuncu cevrimici
 players.single = {0} oyuncu cevrimici
 players.search = search
@@ -224,7 +231,6 @@ save.new = Yeni Kayit Dosyasi
 save.overwrite = Bu oyunun uzerinden\ngecmek istedigine emin\nmisin?
 overwrite = uzerinden gec
 save.none = Kayitli oyun bulunamadi
-saveload = [accent]Kaydediliyor...
 savefail = Kaydedilemedi!
 save.delete.confirm = Bu Kayiti silmek istedigine emin misin?
 save.delete = Sil
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial c
 loading = [accent]Yukleniyor...
 reloading = [accent]Reloading Mods...
 saving = [accent]Kaydediliyor...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][] to clear plan
 selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
@@ -328,8 +335,9 @@ waves.never = <never>
 waves.every = every
 waves.waves = wave(s)
 waves.perspawn = per spawn
+waves.shields = shields/wave
 waves.to = to
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Preview
 waves.edit = Edit...
 waves.copy = Copy to Clipboard
@@ -337,6 +345,11 @@ waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
@@ -456,10 +469,12 @@ locked = Locked
 complete = [lightgray]Complete:
 requirement.wave = Reach Wave {0} in {1}
 requirement.core = Destroy Enemy Core in {0}
-requirement.unlock = Unlock {0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Resume Zone:\n[lightgray]{0}
 bestwave = [lightgray]Best: {0}
 launch = Launch
+launch.text = Launch
 launch.title = Launch Successful
 launch.next = [lightgray]next opportunity at wave {0}
 launch.unable2 = [scarlet]Unable to LAUNCH.[]
@@ -467,13 +482,14 @@ launch.confirm = This will launch all resources in your core.\nYou will not be a
 launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = Add All
-configure.locked = [lightgray]Reach wave {0}\nto configure loadout.
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = Resources Detected:
 zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
@@ -492,35 +508,43 @@ error.io = Network I/O error.
 error.any = Unkown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
-zone.groundZero.name = Ground Zero
-zone.desertWastes.name = Desert Wastes
-zone.craters.name = The Craters
-zone.frozenForest.name = Frozen Forest
-zone.ruinousShores.name = Ruinous Shores
-zone.stainedMountains.name = Stained Mountains
-zone.desolateRift.name = Desolate Rift
-zone.nuclearComplex.name = Nuclear Production Complex
-zone.overgrowth.name = Overgrowth
-zone.tarFields.name = Tar Fields
-zone.saltFlats.name = Salt Flats
-zone.impact0078.name = Impact 0078
-zone.crags.name = Crags
-zone.fungalPass.name = Fungal Pass
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
-zone.frozenForest.description = Even here, closer to mountains, the spores have spread. The fridgid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
-zone.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
-zone.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
-zone.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
-zone.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
-zone.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
-zone.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build dagger units. Destroy it. Reclaim that which was lost.
-zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
-zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
-zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Dil
 settings.data = Game Data
@@ -534,9 +558,12 @@ settings.graphics = Grafikler
 settings.cleardata = Clear Game Data...
 settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone!
 settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = Duraklatildi
 clear = Clear
 banned = [scarlet]Banned
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Evet
 no = Hayir
 info.title = [accent]Bilgi
@@ -558,8 +585,11 @@ blocks.itemsmoved = Move Speed
 blocks.launchtime = Time Between Launches
 blocks.shootrange = Menzil
 blocks.size = Buyukluk
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Sivi kapasitesi
 blocks.powerrange = Menzil
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Guc kullanimi
 blocks.powerdamage = Power/Damage
@@ -575,13 +605,18 @@ blocks.boosteffect = Boost Effect
 blocks.maxunits = Max Active Units
 blocks.health = Can
 blocks.buildtime = Build Time
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = Build Cost
 blocks.inaccuracy = sekme
 blocks.shots = vuruslar
 blocks.reload = Yeniden doldurma
 blocks.ammo = Ammo
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Better Drill Required
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
 bar.progress = Build Progress
-bar.spawned = Units: {0}/{1}
 bar.input = Input
 bar.output = Output
 
@@ -619,12 +655,16 @@ unit.liquidunits = Litre
 unit.powerunits = Volt
 unit.degrees = derece
 unit.seconds = saniye
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x speed
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = esya
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = General
 category.power = Guc
 category.liquids = sivilar
@@ -639,6 +679,7 @@ setting.linear.name = Linear Filtering
 setting.hints.name = Hints
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = Auto-Pause Building
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animated Water
 setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
@@ -663,7 +704,6 @@ setting.effects.name = Efekleri goster
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Kumanda hassasligi
 setting.saveinterval.name = Otomatik kaydetme suresi
 setting.seconds = {0} Saniye
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Tam ekran
 setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
 setting.fps.name = FPS'i goster
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate [lightgray](may decrease performance)
 setting.minimap.name = Haritayi goster
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Ses yuksekligi
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Sesi kapat
 setting.sfxvol.name = Ses seviyesi
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only
 category.general.name = General
 category.view.name = Goster
 category.multiplayer.name = Cok oyunculu
+category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Clear Building
 keybind.press = Bir tusa bas...
 keybind.press.axis = Bir yone cevir yada tusa bas...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Sol/Sag hareket
 keybind.move_y.name = Yukari/asagi hareket
 keybind.mouse_move.name = Follow Mouse
-keybind.dash.name = Kos
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
 keybind.schematic_flip_x.name = Flip Schematic X
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.deselect.name = Eldeki yapiyi birak
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Sik
 keybind.zoom.name = Yaklas
 keybind.menu.name = Menu
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reactor Explosions
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
+rules.buildai = AI Building
 rules.enemyCheat = Infinite AI Resources
-rules.unitdrops = Unit Drops
+rules.blockhealthmultiplier = Block Health Multiplier
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
-rules.blockhealthmultiplier = Block Health Multiplier
-rules.playerhealthmultiplier = Player Health Multiplier
-rules.playerdamagemultiplier = Player Damage Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
-rules.respawntime = Respawn Time:[lightgray] (sec)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Waves wait for enemies
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
-rules.respawns = Max respawns per wave
-rules.limitedRespawns = Limit Respawns
+rules.unitammo = Units Require Ammo
 rules.title.waves = Waves
-rules.title.respawns = Respawns
 rules.title.resourcesbuilding = Resources & Building
-rules.title.player = Players
 rules.title.enemy = Enemies
 rules.title.unit = Units
 rules.title.experimental = Experimental
+rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Esyalar
 content.liquid.name = Sivilar
@@ -827,10 +878,11 @@ liquid.water.name = Su
 liquid.slag.name = Slag
 liquid.oil.name = Benzin
 liquid.cryofluid.name = kriyo sivisi
-item.corestorable = [lightgray]Storable in Core: {0}
+
 item.explosiveness = [lightgray]Patlayicilik: {0}
 item.flammability = [lightgray]Yanbilirlik: {0}
 item.radioactivity = [lightgray]Radyoaktivite: {0}
+
 unit.health = [lightgray]Can: {0}
 unit.speed = [lightgray]hiz: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]isinma kapasitesi: {0}
 liquid.viscosity = [lightgray]Yari sivilik: {0}
 liquid.temperature = [lightgray]isi: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
 block.grass.name = Grass
 block.slag.name = Slag
 block.salt.name = Salt
-block.saltrocks.name = Salt Rocks
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pebbles
 block.tendrils.name = Tendrils
-block.sandrocks.name = Sand Rocks
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spore Pine
-block.sporerocks.name = Spore Rocks
-block.rock.name = Rock
-block.snowrock.name = Snow Rock
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
 block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
-block.shalerocks.name = Shale Rocks
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -890,13 +979,17 @@ block.craters.name = Craters
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ice Snow
-block.rocks.name = Rocks
-block.icerocks.name = Ice rocks
-block.snowrocks.name = Snow Rocks
-block.dunerocks.name = Dune Rocks
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pine
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Dark Panel 4
 block.dark-panel-5.name = Dark Panel 5
 block.dark-panel-6.name = Dark Panel 6
 block.dark-metal.name = Dark Metal
-block.ignarock.name = Igna Rock
+block.basalt.name = Basalt
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
-block.cliffs.name = Cliffs
 block.copper-wall.name = bakir duvar
 block.copper-wall-large.name = buyuk bakir duvar
 block.titanium-wall.name = Titanium Wall
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silikon eritici
 block.phase-weaver.name = Dokumaci
 block.pulverizer.name = pulvarizor
-block.cryofluidmixer.name = Cryosivisi karistiricisi
+block.cryofluid-mixer.name = Cryosivisi karistiricisi
 block.melter.name = eritici
 block.incinerator.name = isi firini
 block.spore-press.name = Spore Press
@@ -964,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = batarya
 block.battery-large.name = buyuk batarya
 block.combustion-generator.name = sicaklik jenaratoru
-block.turbine-generator.name = termal jenaratoru
+block.steam-generator.name = termal jenaratoru
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mekanikal Kazici
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Patlayici karistiricisi
 block.solar-panel.name = gunes paneli
 block.solar-panel-large.name = genis gunes paneli
 block.oil-extractor.name = benzin ayirici
-block.command-center.name = Command Center
-block.draug-factory.name = Draug Miner Drone Factory
-block.spirit-factory.name = Spirit Drone Factory
-block.phantom-factory.name = Phantom Drone Factory
-block.wraith-factory.name = Wraith Fighter Factory
-block.ghoul-factory.name = Ghoul Bomber Factory
-block.dagger-factory.name = Dagger Mech Factory
-block.crawler-factory.name = Crawler Mech Factory
-block.titan-factory.name = Titan Mech Factory
-block.fortress-factory.name = Fortress Mech Factory
-block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = tamirci
 block.pulse-conduit.name = Pulse borusu
 block.plated-conduit.name = Plated Conduit
@@ -1036,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = blue
 team.crux.name = red
 team.sharded.name = orange
@@ -1043,21 +1147,7 @@ team.orange.name = orange
 team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
-unit.spirit.name = Spirit Drone
-unit.draug.name = Draug Miner Drone
-unit.phantom.name = Phantom Drone
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
-unit.wraith.name = Wraith Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1100,17 +1190,7 @@ liquid.water.description = Commonly used for cooling machines and waste processi
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.
 liquid.cryofluid.description = The most efficient liquid for cooling things down.
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
-unit.spirit.description = The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks.
-unit.phantom.description = An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone.
-unit.dagger.description = basit bir zemin uniti
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
-unit.titan.description = havaya sikabilen, gelismis bir unit
-unit.fortress.description = A heavy artillery ground unit.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = A fast, hit-and-run interceptor unit.
-unit.ghoul.description = A heavy carpet bomber. Uses blast compound or pyratite as ammo.
-unit.revenant.description = A heavy, hovering missile array.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
@@ -1119,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into metaglass. Requires small amo
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
 block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand.
 block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
-block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
+block.cryofluid-mixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
 block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound.
 block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
 block.melter.description = Heats up stone to very high temperatures to obtain lava.
@@ -1185,7 +1265,7 @@ block.battery.description = Stores power whenever there is an abundance and prov
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning oil or flammable materials.
 block.thermal-generator.description = Generates a large amount of power from lava.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.steam-generator.description = More efficient than a combustion generator, but requires additional water.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
 block.solar-panel.description = Provides a small amount of power from the sun.
@@ -1221,15 +1301,5 @@ block.ripple.description = A large artillery turret which fires several shots si
 block.cyclone.description = A large rapid fire turret.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
-block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to patrol, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
-block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
-block.ghoul-factory.description = Produces heavy carpet bombers.
-block.revenant-factory.description = Produces heavy laser ground units.
-block.dagger-factory.description = Produces basic ground units.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produces advanced, armored ground units.
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 4feb8c3ce8..1fd6a6618e 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io sayfası
 link.google-play.description = Google Play mağaza sayfası
 link.f-droid.description = F-Droid kataloğu
 link.wiki.description = Resmi Mindustry wikisi
-link.feathub.description = Yeni özellikler öner
+link.suggestions.description = Yeni özellikler öner
 linkfail = Link açılamadı!\nURL kopyalandı.
 screenshot = Ekran görüntüsü {0} konumuna kaydedildi
 screenshot.invalid = Harita çok büyük, muhtemelen ekran görüntüsü için yeterli bellek yok.
@@ -20,6 +20,8 @@ gameover = Kaybettin
 gameover.pvp = [accent] {0}[] Takımı kazandı!
 highscore = [accent]Yeni rekor!
 copied = Panoya Kopyalandı.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Sesler
 load.map = Haritalar
@@ -63,8 +65,7 @@ stat.delivered = Gönderilen Kaynaklar:
 stat.playtime = Time Played:[accent] {0}
 stat.rank = Rütbe: [accent]{0}
 
-launcheditems = [accent]Gönderilen Kaynaklar
-launchinfo = Mavi ile belirtilen materyallerden edinmek için [unlaunched][[KALKIŞ] yapın.
+globalitems = [accent]Global Items
 map.delete = "[accent]{0}[]" haritasını silmek istediğine emin misin?
 level.highscore = Rekor: [accent]{0}
 level.select = Seviye Seçimi
@@ -106,6 +107,7 @@ mods.guide = Mod Rehberi
 mods.report = Hata bildir
 mods.openfolder = Mod klasörünü aç
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Etkin
 mod.disabled = [scarlet]Devre Dışı
@@ -113,6 +115,7 @@ mod.disable = Devre Dışı Bırak
 mod.content = Content:
 mod.delete.error = Mod silinemiyor. Dosya kullanımda olabilir.
 mod.requiresversion = [scarlet]Gereken en düşük oun versiyonu: [accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Bu modun çalışması için gereken modlar: {0}
 mod.erroredcontent = [scarlet]İçerik hatası.
 mod.errors = İçerik yüklenirken bir hata oluştu.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]Yeniden Yükleme Gerekli
 mod.import = Mod İçeri Aktar
 mod.import.file = Import File
 mod.import.github = GitHub Modu İçeri Aktar 
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = Bu eşya[accent] '{0}'[] modunun bir parçası. Kaldırmak için modu silebilirsiniz.
 mod.remove.confirm = Bu mod silinecek.
 mod.author = [lightgray]Yayıncı:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = Hakkında
 name = İsim:
 noname = Bir[accent] kullanıcı adı[] seçmelisin.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = Dosya Adı:
 unlocked = Yeni içerik açıldı!
 completed = [accent]Tamamlandı
@@ -142,6 +148,7 @@ techtree = Teknoloji Ağacı
 research.list = [lightgray]Araştırmalar:
 research = Araştır
 researched = [lightgray]{0} Araştırıldı.
+research.progress = {0}% complete
 players = {0} çevrimiçi oyuncu
 players.single = {0} çevrimiçi oyuncu
 players.search = search
@@ -224,7 +231,6 @@ save.new = Yeni kayıt
 save.overwrite = Bu kaydın üstüne yazmak istediğine\nemin misin?
 overwrite = Üstüne yaz
 save.none = Kayıt bulunamadı!
-saveload = Kaydediliyor...
 savefail = Oyun kaydedilemedi!
 save.delete.confirm = Bu kaydı silmek istediğine emin misin?
 save.delete = Sil
@@ -272,6 +278,7 @@ quit.confirm.tutorial = Ne yaptığınıza emin misiniz?\nÖğreticiyi [accent]
 loading = [accent]Yükleniyor...
 reloading = [accent]Modlar Yeniden Yükleniyor...
 saving = [accent]Kayıt ediliyor...
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = Planı temizlemek için [accent][[{0}][]
 selectschematic = Seçmek ve kopyalamak için [accent][[{0}][]
 pausebuilding = İnşaatı durdurmak için [accent][[{0}][]
@@ -328,8 +335,9 @@ waves.never = <asla>
 waves.every = her
 waves.waves = dalga(lar)
 waves.perspawn = doğma noktası başına
+waves.shields = shields/wave
 waves.to = doğru
-waves.boss = Boss
+waves.guardian = Guardian
 waves.preview = Önizleme
 waves.edit = Düzenle...
 waves.copy = Panodan kopyala
@@ -337,6 +345,11 @@ waves.load = Panodan yükle
 waves.invalid = Panoda geçersiz dalga sayısı var.
 waves.copied = Dalgalar kopyalandı.
 waves.none = Düşman bulunamadı.\nBoş dalga düzenlerin otomatik olarak varsayılan düzenle değiştirileceğini unutmayın
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<Varsayılan>
 details = Detaylar...
 edit = Düzenle...
@@ -456,10 +469,12 @@ locked = Kilitli
 complete = [lightgray]Ulaş:
 requirement.wave = Bölge {1}'de Dalga {0}
 requirement.core = {0}`da Düşman Çekirdeği Yok Et
-requirement.unlock = {0}'I Aç
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Bölgeye Devam Et:\n[lightgray]{0}
 bestwave = [lightgray]En İyi Dalga: {0}
 launch = < KALKIŞ >
+launch.text = Launch
 launch.title = Kalkış Başarılı
 launch.next = [lightgray]Bir sonraki imkan {0}. dalgada olacak.
 launch.unable2 = [scarlet]KALKIŞ mümkün değil.[]
@@ -467,13 +482,14 @@ launch.confirm = Bu işlem çekirdeğinizdeki bütün kaynakları yollayacak.\nB
 launch.skip.confirm = Eğer şimdi geçerseniz, 
 uncover = Aç
 configure = Ekipmanı Yapılandır
+loadout = Loadout
+resources = Resources 
 bannedblocks = Yasaklı Bloklar
 addall = Hepsini Ekle
-configure.locked = [lightgray]Ekipman Yapılandırmayı Aç: Dalga {0}.
+launch.destination = Destination: {0}
 configure.invalid = Miktar 0 ve {0} arasında bir sayı olmalı.
 zone.unlocked = [lightgray]{0} kilidi açıldı.
 zone.requirement.complete = {0}. dalgaya ulaşıldı:\n{1} bölge şartları karşılandı.
-zone.config.unlocked = [lightgray]{0}:\nEkipman yapılandırma açıldı.
 zone.resources = [lightgray]Tespit Edilen Kaynaklar:
 zone.objective = [lightgray]Hedef: [accent]{0}
 zone.objective.survival = Hayatta Kal
@@ -492,35 +508,43 @@ error.io = Ağ I/O hatası.
 error.any = Bilinmeyen ağ hatası.
 error.bloom = Kamaşma başlatılamadı.\nCihazınız bu özelliği desteklemiyor olabilir.
 
-zone.groundZero.name = Sıfır Noktası
-zone.desertWastes.name = Çöl Harabeleri
-zone.craters.name = Kraterler
-zone.frozenForest.name = Donmuş Orman
-zone.ruinousShores.name = Harap Kıyılar
-zone.stainedMountains.name = Lekeli Dağlar
-zone.desolateRift.name = Çorak Yarık
-zone.nuclearComplex.name = Nükleer Üretüm Kompleksi
-zone.overgrowth.name = Aşırı Büyüme
-zone.tarFields.name = Katran Sahaları
-zone.saltFlats.name = Tuz Düzlükleri
-zone.impact0078.name = Çarpışma 0078
-zone.crags.name = Kayalıklar
-zone.fungalPass.name = Mantar Geçidi
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = Yeniden başlamak için ideal bölge. Düşük düşman tehlikesi ve az miktarda kaynak mevcut.\nMümkün oldukça çok bakır ve kurşun topla.\nİlerle.
-zone.frozenForest.description = Burada, dağlara yakın bölgelerde bile, sporlar etrafa yayıldı. Dondurucu soğuk onları sonsuza dek durduramaz.\n\nEnerji kullanmaya başla. Termik jeneratörler inşa et. Tamircileri kullanmayı öğren.
-zone.desertWastes.description = Bu harabeler gemiş, öngörülemez, ve sektör yapılarının kalıntılarıyla kesişmekte.\nBölgede kömür mevcut, onu enerji için yak veya ondan grafit üret.\n\n[lightgray]Burada iniş bölgesi garanti edilemez.
-zone.saltFlats.description = Çölün dış tarafında Tuz Düzlükleri yer alıyor. Burada az miktarda kaynak mevcut.\n\nDüşman burada bir kaynak depolama kompleksi kurdu. Onların çekirdeklerini yık. Ortada çalışan hiçbir şey bırakma.
-zone.craters.description = Eski savaşların bir anıtı olan bu kratere su dolmuş. Alanı yeniden ele geçir. Kum topla ve metacam üret. Taret ve matkapları soğutmak için su pompala.
-zone.ruinousShores.description = Kıyı çizgisi harabelerin ötesinde bulunuyor. Bir zamanlar bu bölge bir sahil güvenlik noktasına ev sahipliği yapıyordu. Ondan geriye fazla bir şey kalmadı. Sadece en temel savunma yapıları ayakta, ama diğer her şey hurdaya dönmüş.\nDışarı geniilemeye devam et ve teknolojiyi yeniden keşfet.
-zone.stainedMountains.description = Daha uzaklarda dağlar uzanıyor, daha sporlar tarafından istilaya uğramamışlar.Alandaki serbest titanyumu çıkart ve kullanmasını öğren.\n\nDüşman varlığı burada daha fazla. Onların daha güçlü birimlerini göndermelerine izin verme.
-zone.overgrowth.description = Bu bölge sporların kaynağına daha yakın ve bölgede aşırı büyüme görülmekte.\nDüşmanlar burada bir sınır üssü kurmuş. Titan birimleri inşa et ve bu üssü yok et. Kaybettiklerimizi geri al.
-zone.tarFields.description = Dağlar ve çöl arasında kalan bir petrol işleme merkezinin dış kısmı. Kullanılabilen katran rezervlerine sahip az sayıdaki bölgeden biri.\nTerk edilmiş olduğu halde, bu alanda tehlikeli düşman güçleri mevcut. Onları hafife alma.\n\n[lightgray]Mümkünse petrol işleme teknolojisini araştır.
-zone.desolateRift.description = Aşırı derecede tehlikeli bir bölge. Bolca kaynak mevcut ama alan dar. Yok edilme riski çok yüksek. Bu bölgeyi mümkün oldukça kısa sürede terk et. Düşman saldırıları arasındaki uzun aralıklar tarafından aldanma.
-zone.nuclearComplex.description = Önceleri toryum üretme ve işleme ile görevli bir tesis. Şu anda yıkılmış durumda.\n[lightgray]Toryumu ve toryumun birçok işlevini araştır.\n\nBu bölgede çok sayıda düşman mevzilenmiş durumda ve saldırıları durmaksızın gözlemekteler.
-zone.fungalPass.description = Dağlar ve sporlarla dolu aşağı bölgeler arasında bir geçiş bölgesi. Burada küçük düşman keşif üssü bulundu.\nBu üssü yok et.\nDagger ve Crawler birimleei kullan ve bölgedeki iki çekirdeği yık.
-zone.impact0078.description = <insert description here>
-zone.crags.description = <insert description here>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Dil
 settings.data = Oyun Verisi
@@ -534,9 +558,12 @@ settings.graphics = Grafikler
 settings.cleardata = Oyun Verisini Sil...
 settings.clear.confirm = Verileri silmek istediğinizden emin misiniz?\nBu işlemi geri alamazsınız!
 settings.clearall.confirm = [scarlet]Uyarı![]\nBu işlem kayıtlar, haritalar açılan bloklar ve tuş atamaları dahil bütün verileri silecektir.\n"ok" tuşuna bastığınızda bütün verileriniz silinecek ve oyun kapanacaktır.
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]<Durduruldu>
 clear = Temizle
 banned = [scarlet]Yasaklı
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Evet
 no = Hayır
 info.title = Bilgi
@@ -558,8 +585,11 @@ blocks.itemsmoved = Hareket Hızı
 blocks.launchtime = Fırlatmalar Arasındaki Süre
 blocks.shootrange = Menzil
 blocks.size = Boyut
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Sıvı Kapasitesi
 blocks.powerrange = Enerji Menzili
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Bağlantı sayısı
 blocks.poweruse = Enerji Kullanımı
 blocks.powerdamage = Enerji/Hasar
@@ -575,13 +605,18 @@ blocks.boosteffect = Hızlandırma Efekti
 blocks.maxunits = Maksimum Aktif Birim
 blocks.health = Can
 blocks.buildtime = İnşaat Süresi
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = İnşaat Fiyatı
 blocks.inaccuracy = İskalama Oranı
 blocks.shots = Atışlar
 blocks.reload = Atışlar/Sn
 blocks.ammo = Mermi
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Daha İyi Matkap Gerekli
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Matkap Hızı: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Verim: {0}%
@@ -591,11 +626,12 @@ bar.poweramount = Enerji: {0}
 bar.poweroutput = Enerji Üretimi: {0}
 bar.items = Eşyalar: {0}
 bar.capacity = Kapasite: {0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Sıvı
 bar.heat = Isı
 bar.power = Enerji
 bar.progress = Build Progress
-bar.spawned = Birimler: {0}/{1}
 bar.input = Girdi
 bar.output = Çıktı
 
@@ -619,12 +655,16 @@ unit.liquidunits = sıvı birimi
 unit.powerunits = enerji birimi
 unit.degrees = derece
 unit.seconds = saniye
+unit.minutes = mins
 unit.persecond = /sn
+unit.perminute = /min
 unit.timesspeed = x hız
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = eşya
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = Genel
 category.power = Enerji
 category.liquids = Sıvılar
@@ -639,6 +679,7 @@ setting.linear.name = Lineer Filtreleme
 setting.hints.name = İpuçları
 setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
 setting.buildautopause.name = İnşa etmeyi otomatik olarak durdur
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = Animasyonlu Su
 setting.animatedshields.name = Animasyonlu Kalkanlar
 setting.antialias.name = Düzgğnleştirme[lightgray] (yeniden açmak gerekebilir)[]
@@ -663,7 +704,6 @@ setting.effects.name = Efektleri Görüntüle
 setting.destroyedblocks.name = Kırılmış Blokları Göster
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Konveyör Yol Bulma
-setting.coreselect.name = Şemalarda Çekirdeğe izin ver
 setting.sensitivity.name = Kontrolcü Hassasiyeti
 setting.saveinterval.name = Kayıt Aralığı
 setting.seconds = {0} Saniye
@@ -672,12 +712,15 @@ setting.milliseconds = {0} milisaniye
 setting.fullscreen.name = Tam Ekran
 setting.borderlesswindow.name = Kenarsız Pencere[lightgray] (yeniden açmak gerekebilir)
 setting.fps.name = FPS Göster
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = Blok seçim tüşlarını göster
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelleştir[lightgray] (animasyonları kapatır)
 setting.minimap.name = Haritayı Göster
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Oyuncu Noktasını Göster
 setting.musicvol.name = Müzik
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = Çevresel Ses
 setting.mutemusic.name = Müziği Kapat
 setting.sfxvol.name = Oyun Sesi
@@ -700,10 +743,14 @@ keybinds.mobile = [scarlet]Buradaki çoğu tuş ataması mobilde geçerli değil
 category.general.name = Genel
 category.view.name = Görünüm
 category.multiplayer.name = Çok Oyunculu
+category.blocks.name = Block Select
 command.attack = Saldır
 command.rally = Toplan
 command.retreat = Geri Çekil
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Tuş: [{0},
+keybind.respawn.name = Respawn
+keybind.control.name = Control Unit
 keybind.clear_building.name = Binayı Temizle
 keybind.press = Bir tuşa basın...
 keybind.press.axis = Bir tuşa ya da yöne basın...
@@ -713,7 +760,8 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = x Ekseninde Hareket
 keybind.move_y.name = y Ekseninde Hareket
 keybind.mouse_move.name = Fareyi Takip Et
-keybind.dash.name = Sıçrama
+keybind.pan.name = Pan View
+keybind.boost.name = Boost
 keybind.schematic_select.name = Bölge Seç
 keybind.schematic_menu.name = Şema Menüsü
 keybind.schematic_flip_x.name = Şemayı X ekseninde Döndür
@@ -740,6 +788,9 @@ keybind.diagonal_placement.name = Çapraz Yerleştirme
 keybind.pick.name = Blok Seç
 keybind.break_block.name = Blok Kır
 keybind.deselect.name = Seçimleri Kaldır
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Ateş Et
 keybind.zoom.name = Yakınlaştırma/Uzaklaştırma
 keybind.menu.name = Menü
@@ -774,34 +825,34 @@ rules.reactorexplosions = Reaktör Patlamaları
 rules.wavetimer = Dalga Zamanlayıcısı
 rules.waves = Dalgalar
 rules.attack = Saldırı Modu
+rules.buildai = AI Building
 rules.enemyCheat = Sonsuz AI (Kırmızı Takım) Kaynakları
-rules.unitdrops = Unit Drops
+rules.blockhealthmultiplier = Blok Canı Çarpanı
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = Birim Üretim Hızı Çarpanı
 rules.unithealthmultiplier = Birim Canı Çarpanı
-rules.blockhealthmultiplier = Blok Canı Çarpanı
-rules.playerhealthmultiplier = Oyuncu Canı Çarpanı
-rules.playerdamagemultiplier = Oyuncu Hasarı Çarpanı
 rules.unitdamagemultiplier = Birim Hasarı Çapanı
 rules.enemycorebuildradius = Düşman Çekirdeği İnşa Yasağı Yarıçapı:[lightgray] (kare)
-rules.respawntime = Yeniden Doğma Süresi:[lightgray] (sec)
 rules.wavespacing = Dalga Aralığı:[lightgray] (sec)
 rules.buildcostmultiplier = İnşa ücreti Çarpanı
 rules.buildspeedmultiplier = İnşa Hızı Çarpanı
 rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
 rules.waitForWaveToEnd = Dalgalar Düşmanı Bekler
 rules.dropzoneradius = İniş Noktası Yarıçapı:[lightgray] (kare)
-rules.respawns = Dalga Başına Maksimum Tekrar Canlanmalar
-rules.limitedRespawns = Tekrar Canlanma Limiti
+rules.unitammo = Units Require Ammo
 rules.title.waves = Dalgalar
-rules.title.respawns = Tekrar Canlanmalar
 rules.title.resourcesbuilding = Kaynaklar & İnşa
-rules.title.player = Oyuncular
 rules.title.enemy = Düşmanlar
 rules.title.unit = Birlikler
 rules.title.experimental = Deneysel
+rules.title.environment = Environment
 rules.lighting = Işıklandırma
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ortam Işığı
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Eşyalar
 content.liquid.name = Sıvılar
@@ -827,10 +878,11 @@ liquid.water.name = Su
 liquid.slag.name = Cüruf
 liquid.oil.name = Petrol
 liquid.cryofluid.name = Kriyosıvı
-item.corestorable = [lightgray]Çekirdekte depolanabilir mi?: {0}
+
 item.explosiveness = [lightgray]Patlama: {0}%
 item.flammability = [lightgray]Yanıcılık: {0}%
 item.radioactivity = [lightgray]Radyoaktivite: {0}%
+
 unit.health = [lightgray]Can: {0}
 unit.speed = [lightgray]Hız: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -839,30 +891,67 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Isı Kapasitesi: {0}
 liquid.viscosity = [lightgray]Vizkosite: {0}
 liquid.temperature = [lightgray]Sıcaklık: {0}
 
+unit.dagger.name = Dagger
+unit.mace.name = Mace
+unit.fortress.name = Fortress
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = Crawler
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Kum Kaya Parçaları
 block.grass.name = Çimen
 block.slag.name = Slag
 block.salt.name = Tuz
-block.saltrocks.name = Tuz Taşları
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Çakıl Taşları
 block.tendrils.name = Tendriller
-block.sandrocks.name = Kum Kayaları
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spor Çamı
-block.sporerocks.name = Spor Kayaları
-block.rock.name = Kaya
-block.snowrock.name = Karlı Kaya
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Karlı Çam
 block.shale.name = Şist
 block.shale-boulder.name = Şist Kayası
 block.moss.name = Yosun
 block.shrubs.name = Çalılık
 block.spore-moss.name = Liken
-block.shalerocks.name = Şist Kayaları
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Hurda Duvar
 block.scrap-wall-large.name = Büyük Hurda Duvar
 block.scrap-wall-huge.name = Dev Hurda Duvar
@@ -890,13 +979,17 @@ block.craters.name = Krater
 block.sand-water.name = Kumlu Su
 block.darksand-water.name = Kara Kumlu Su
 block.char.name = Kömür
-block.holostone.name = Holotaş
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Buzlu Kar
-block.rocks.name = Duvar
-block.icerocks.name = Buz Duvarı
-block.snowrocks.name = Kar Duvarı
-block.dunerocks.name = Çöl Duvarı
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Çam
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = Ölü Beyaz Ağaç
 block.white-tree.name = Beyaz Ağaç
 block.spore-cluster.name = Spor Kümesi
@@ -912,10 +1005,9 @@ block.dark-panel-4.name = Kara Panel 4
 block.dark-panel-5.name = Kara Panel 5
 block.dark-panel-6.name = Kara Panel 6
 block.dark-metal.name = Kara Metal
-block.ignarock.name = Eriyik Kaya
+block.basalt.name = Basalt
 block.hotrock.name = Sıcak Kaya
 block.magmarock.name = Magma Kayası
-block.cliffs.name = Uçurumlar
 block.copper-wall.name = Bakır Duvar
 block.copper-wall-large.name = Büyük Bakır Duvar
 block.titanium-wall.name = Titanyum Duvar
@@ -951,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silikon Fırını 
 block.phase-weaver.name = Faz Örücü
 block.pulverizer.name = Pulverizatör
-block.cryofluidmixer.name = Kriyosıvı Mikseri
+block.cryofluid-mixer.name = Kriyosıvı Mikseri
 block.melter.name = Eritici
 block.incinerator.name = Yakıcı
 block.spore-press.name = Spor Presi
@@ -964,7 +1056,7 @@ block.diode.name = Battery Diode
 block.battery.name = Batarya
 block.battery-large.name = Büyük Batarya
 block.combustion-generator.name = Termik Jeneratör
-block.turbine-generator.name = Buhar Jeneratörü
+block.steam-generator.name = Buhar Jeneratörü
 block.differential-generator.name = Diferansiyel Jeneratörü
 block.impact-reactor.name = Patlama Reaktörü
 block.mechanical-drill.name = Mekanik Matkap
@@ -994,17 +1086,6 @@ block.blast-mixer.name = Patlayıcı Bileşik Mikseri
 block.solar-panel.name = Güneş Paneli
 block.solar-panel-large.name = Büyük Güneş Paneli
 block.oil-extractor.name = Petrol Çıkarıcı
-block.command-center.name = Komuta Merkezi
-block.draug-factory.name = Draug Maden Dronu Fabrikası
-block.spirit-factory.name = Spirit Tamir Dronu Fabrikası
-block.phantom-factory.name = Phantom İnşaat Dronu Fabrikası
-block.wraith-factory.name = Wraith Avcı Uçağı Fabrikası
-block.ghoul-factory.name = Ghoul Bombardıman Uçağı Fabrikası
-block.dagger-factory.name = Dagger Robot Fabrikası
-block.crawler-factory.name = Crawler Robot Fabrikası
-block.titan-factory.name = Titan Robot Fabrikası
-block.fortress-factory.name = Fortress Robot Fabrikası
-block.revenant-factory.name = Revenant Savaşçı Fabrikası
 block.repair-point.name = Tamir Noktası
 block.pulse-conduit.name = Dalga Borusu
 block.plated-conduit.name = Plated Conduit
@@ -1036,6 +1117,29 @@ block.meltdown.name = Meltdown
 block.container.name = Konteyner
 block.launch-pad.name = Kalkış Pisti
 block.launch-pad-large.name = Büyük Kalkış Pisti
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = mavi
 team.crux.name = kırmızı
 team.sharded.name = turuncu
@@ -1043,21 +1147,7 @@ team.orange.name = turuncu
 team.derelict.name = derelict
 team.green.name = yeşil
 team.purple.name = mor
-unit.spirit.name = Spirit Tamir Dronu
-unit.draug.name = Draug Maden Dronu
-unit.phantom.name = Phantom İnşaat Dronu
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bombardıman Uçağı
-unit.wraith.name = Wraith Avcı Uçağı
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Devam etmek için dokunun.>
 tutorial.intro = [scarlet]Mindustry öğreticisine hoş geldiniz.[]\n[accent]Bakır kazarak[] başlayın. Bunu yapmak için merkezinize yakın bir bakır madenine dokunun.\n\n[accent]{0}/{1} bakır
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1100,17 +1190,7 @@ liquid.water.description = En kullanışlı sıvı. Makineleri soğutmak ve atı
 liquid.slag.description = Çeşitli tipte erimiş metallerin birbirine karışımı. Bileşenlerine ayrılabilir veya düşmanlara silah olarak püskürtülebilir.
 liquid.oil.description = İleri seviye malzeme üretiminde kullanılan bir sıvıdır. Yakıt olarak kömür haline getirilebilir veya püskürtülüp ateşe verilerek bir silah olarak kullanılabilir.
 liquid.cryofluid.description = Su ve titanyumdan oluşturulan inaktif bir sıvı. Son derece yüksek ısı kapasitesine sahiptir. Soğutucu olarak yaygın olarak kullanılır.
-unit.draug.description = İlkel bir maden dronu. Üretmesi ucuzdur ve gözden çıkarılabilirler. Etrafındaki bakır ve kurşunu kazar ve en yakın çekirdeğe taşır.
-unit.spirit.description = Madencilik yerine yapısal onarım için tasarlanmış, modifiye bir draug dronu. Belirli bir alan içindeki hasarlı blokları tamir eder.
-unit.phantom.description = Gelişmiş bir dron. Kullanıcıyı/Kullanıcıları takip eder ve blok inşaatında yardım eder.
-unit.dagger.description = En basit yer birimi. Üretimi ucuzdur, sürüler halinde kullanıldığında etkilidir.
-unit.crawler.description = Dış kısmı soyulup üstüne yüksek güçlü patlayıcılar bağlanmış bir yer birimi. Sağlam değildir ve düşmanlara temas halinde patlar.
-unit.titan.description = Gelişmiş, zırhlı bir yer birimi. Hem hava hem kara hedeflerine saldırır. İki adet minyatür Scorch tipi alev püskürtücü ile donatılmıştır.
-unit.fortress.description = Ağır bir topçu robotu. Düşman binalarına ve birimlerine uzaktan saldırmak için iki modifiye edilmiş Hail tipi havan topu ile donatılmıştır.
-unit.eruptor.description = Yapıları yıkmak için tasarlanmış ağır bir robot. Düşman tahkimatlarına cüruf püskürterek onları eritir ve hassas materyalleri ateşe verir.
-unit.wraith.description = Hızlı bir vur kaç avcı uçağı. Jeneratörleri hedef alır.
-unit.ghoul.description = Ağır bir halı bombardıman birimi. Diğer düşman yapılarından yardırıp ilerleyerek kritik altyapıyı hedef alır.
-unit.revenant.description = Ağır bir uçan roket bataryası.
+
 block.message.description = Bir mesajı saklar. Müttefikler arasındaki haberleşmede kullanılır.
 block.graphite-press.description = Kömür parçalarını sıkıştırıp saf grafit tabakaları üretir.
 block.multi-press.description = Grafit presinin yükseltilmiş versiyonu. Kömürün hızlı ve verimli bir şekilde işlenmesi için su ve enerji kullanır.
@@ -1119,7 +1199,7 @@ block.kiln.description = Kum ve kurşunu eritir ve metacam olarak bilinen malzem
 block.plastanium-compressor.description = Petrol ve titanyumdan plastanyum üretir.
 block.phase-weaver.description = Kum ve radyoaktif toryumdan faz örgüsü üretir. Çalışması için çok miktarda enerji gerekir.
 block.alloy-smelter.description = Akı alaşımı üretmek için titanyum, kurşun, silikon ve bakırı birleştirir.
-block.cryofluidmixer.description = Su ve titanyum tozunu karıştırıp kriyosıvı üretir. Toryum reaktörü kullanımı için gereklidir.
+block.cryofluid-mixer.description = Su ve titanyum tozunu karıştırıp kriyosıvı üretir. Toryum reaktörü kullanımı için gereklidir.
 block.blast-mixer.description = Patlayıcı bileşen üretmek için spor kapsüllerini pirratit ile ezer ve karıştırır.
 block.pyratite-mixer.description = Kömür, kurşun ve kumu karıştırıp oldukça yanıcı olan pirratit üretir.
 block.melter.description = Wave taretlerinde kullanılması veya daha çok işlemesi için hurdayı eritip cürufa çevirir.
@@ -1185,7 +1265,7 @@ block.battery.description = Enerji fazlasını yedek olarak saklar. Enerji açı
 block.battery-large.description = Sıradan bataryadan çok daha fazla enerji depolar.
 block.combustion-generator.description = Kömür gibi yanıcı materyalleri yakarak enerji üretir.
 block.thermal-generator.description = Sıcak bölgelere konulduğunda enerji üretir.
-block.turbine-generator.description = Daha gelişmiş bir termik jeneratör. Daha verimlidir, ama buhar üretebilmek için suya ihtiyaç duyar.
+block.steam-generator.description = Daha gelişmiş bir termik jeneratör. Daha verimlidir, ama buhar üretebilmek için suya ihtiyaç duyar.
 block.differential-generator.description = Çok miktarda enerji üretir. Kriyosıvı ve yanan pirratit arasındaki sıcaklık farkından yararlanır.
 block.rtg-generator.description = Basit, güvenilir bir reaktör. Bozunan radyoaktif materyallerin ısısını kullanır.
 block.solar-panel.description = Güneşten küçük miktarda enerji üretir.
@@ -1221,15 +1301,5 @@ block.ripple.description = Çok güçlü bir havan tareti. Uzak mesafedeki düş
 block.cyclone.description = Büyük bir anti hava ve anti kara tareti. Yakınındaki düşmanlara patlayıcı uçaksavar mermi kümeleri atar.
 block.spectre.description = Dev bir çift namlulu top. Hava ve kara birimlerine iri, zırh delici mermiler atar.
 block.meltdown.description = Dev bir lazer topu. Yüklenip yakındaki düşmanlara uzun süreli lazer ışınları yollar. Çalışması için soğutucu gerekir.
-block.command-center.description = Haritadaki müttefik birimlere komutlar
-block.draug-factory.description = Draug maden dronları üretir.
-block.spirit-factory.description = Spirit yapısal onarım dronları üretir.
-block.phantom-factory.description = Gelişimiş inşaat dronları üretir.
-block.wraith-factory.description = Hızlı vur kaç birimleri üretir.
-block.ghoul-factory.description = Ağır halı bombardıman birimleri üretir.
-block.revenant-factory.description = Ağır roketatar birimleri üretir.
-block.dagger-factory.description = Temel yer birimleri üretir.
-block.crawler-factory.description = Kendini yok eden sürü birimleri üretir
-block.titan-factory.description = Gelişmiş, zırhlı yer birimleri üretir.
-block.fortress-factory.description = Ağır topçu birimleri üretir.
 block.repair-point.description = Kendisine en yakın hasarlı birimi tamir eder.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 165eb3a965..df5bfc1db1 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -12,14 +12,16 @@ link.itch.io.description = Завантажити гру з Itch.io (окрім
 link.google-play.description = Завантажити для Android з Google Play
 link.f-droid.description = Завантажити для Android з F-Droid
 link.wiki.description = Офіційна ігрова Wiki
-link.feathub.description = Запропонувати нові функції
-linkfail = Не вдалося відкрити посилання!\nURL-адреса скопійована в буфер обміну.
+link.suggestions.description = Запропонувати нові функції
+linkfail = Не вдалося перейти за посиланням!\nURL-адреса скопійована в буфер обміну.
 screenshot = Зняток мапи збережено до {0}
 screenshot.invalid = Мапа занадто велика, тому, мабуть, не вистачає пам’яті для знятку мапи.
 gameover = Гра завершена
 gameover.pvp = [accent]{0}[] команда перемогла!
 highscore = [accent]Новий рекорд!
 copied = Скопійовано.
+indev.popup = Наразі [accent]6.0[] знаходиться у стадії [accent]альфа[].\n[lightgray]Це означає наступне:[]\n- Не вистачає наповнення гри;\n- Більшість [scarlet]ШІ бойових одиниць[] не працює належним чином;\n- Багато одиниць [scarlet]відсутні[] або незавершені;\n- Кампанія повністю не є завершеною;\n- Усе, що ви бачите, може змінитися або видалитися.\n\nПовідомляйте про вади або збої на [accent]Github[], а про помилки в перекладі в Discord.
+indev.notready = Ця частина гри ще не готова
 
 load.sound = Звуки
 load.map = Мапи
@@ -39,8 +41,8 @@ be.check = Перевірити на наявність оновлень
 schematic = Схема
 schematic.add = Зберегти схему…
 schematics = Схеми
-schematic.replace = Схема з такою назвою вже існує. Замінити її?
-schematic.exists = Схема з такою назвою вже існує.
+schematic.replace = Схема з такою назвою вже є. Замінити її?
+schematic.exists = Схема з такою назвою вже є.
 schematic.import = Імпортувати схему…
 schematic.exportfile = Експортувати файл
 schematic.importfile = Імпортувати файл
@@ -50,7 +52,7 @@ schematic.copy.import = Імпортувати з клавіатури
 schematic.shareworkshop = Поширити в Майстерню
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Обернути схему
 schematic.saved = Схема збережена.
-schematic.delete.confirm = Ця схема буде повністю випалена Викорінювачем.
+schematic.delete.confirm = Ви справді хочете видалити цю схему?
 schematic.rename = Перейменувати схему
 schematic.info = {0}x{1}, {2} блоків
 
@@ -63,13 +65,12 @@ stat.delivered = Ресурсів запущено:
 stat.playtime = Час у грі:[accent] {0}
 stat.rank = Фінальний рахунок:[accent] {0}
 
-launcheditems = [accent]Запущені предмети
-launchinfo = [unlaunched]Натисніть на кнопку [[ЗАПУСК], щоб ваше ядро отримало предмети, які виділені синім кольором.
+globalitems = [accent]Глобальні предмети
 map.delete = Ви впевнені, що хочете видалити мапу «[accent]{0}[]»?
 level.highscore = Рекорд: [accent]{0}
 level.select = Вибір мапи
 level.mode = Режим гри:
-coreattack = < Ядро знаходиться під атакою! >
+coreattack = < Ядро перебуває під атакою! >
 nearpoint = [[ [scarlet]ЗАЛИШТЕ ЗОНУ ВИСАДКИ НЕГАЙНО[] ]\nанігіляція неминуча
 database = База даних ядра
 savegame = Зберегти гру
@@ -78,7 +79,7 @@ joingame = Мережева гра
 customgame = Користувацька гра
 newgame = Нова гра
 none = <нічого>
-minimap = Міні-мапа
+minimap = Мінімапа
 position = Місцезнаходження
 close = Закрити
 website = Вебсайт
@@ -98,14 +99,15 @@ committingchanges = Здійснення змін
 done = Зроблено
 feature.unsupported = Ваш пристрій не підтримує цю функцію
 
-mods.alphainfo = Майте на увазі, що модифікації знаходяться в альфі, і [scarlet]можуть бути дуже глючними[].\nПовідомте про будь-які проблеми, які ви знайдете до Mindustry Github або Discord.
+mods.alphainfo = Майте на увазі, що модифікації перебувають в альфі, і [scarlet]можуть бути дуже несправними[].\nПовідомте про будь-які проблеми, які ви знайдете до Mindustry Github або Discord.
 mods.alpha = [accent](Альфа)
 mods = Модифікації
 mods.none = [lightgray]Модифікацій не знайдено!
-mods.guide = Посібник з модифікацій
+mods.guide = Посібник із модифікацій
 mods.report = Повідомити про ваду
 mods.openfolder = Відкрити теку
 mods.reload = Перезавантажити
+mods.reloadexit = Гра зараз закриється, щоби перезавантажити модифікації
 mod.display = [gray]Модифікація:[orange] {0}
 mod.enabled = [lightgray]Увімкнено
 mod.disabled = [scarlet]Вимкнено
@@ -113,28 +115,32 @@ mod.disable = Вимкнути
 mod.content = Зміст:
 mod.delete.error = Неможливо видалити модифікацію. Файл, можливо, використовується.
 mod.requiresversion = [scarlet]Необхідна мінімальна версія гри: [accent]{0}
+mod.outdated = [scarlet]Не сумісна з V6 (немає мінімальної версі гри (англ. min-game-version): 105)
 mod.missingdependencies = [scarlet]Відсутні залежності: {0}
-mod.erroredcontent = [scarlet]Помилки при завантаженні
+mod.erroredcontent = [scarlet]Помилки під час завантаження
 mod.errors = Виникли помилки під час завантаження змісту.
 mod.noerrorplay = [scarlet]Ви маєте модифікації з помилками.[] Або вимкніть проблемні модифікації, або виправте їх.
 mod.nowdisabled = [scarlet]Модифікації «{0}» не вистачає залежних модифікацій:[accent] {1}\n[lightgray]Ці модифікації потрібно завантажити спочатку.\nЦя модифікація буде автоматично вимкнена.
 mod.enable = Увімкнути
-mod.requiresrestart = А тепер гра закриється, щоб застосувати зміни модифікацій.
+mod.requiresrestart = А тепер гра закриється, щоби застосувати зміни модифікацій.
 mod.reloadrequired = [scarlet]Потрібно перезавантаження
 mod.import = Імпортувати модифікацію
 mod.import.file = Імпортувати файл
 mod.import.github = Імпортувати з GitHub
-mod.item.remove = Цей предмет є частиною модифікації [accent] «{0}»[]. Щоб видалити його, видаліть цю модифікацію.
+mod.jarwarn = [scarlet]JAR-модифікації за своєю суттю небезпечні.[]\nПереконайтеся, що ви імпортуєте цю модифікацію з надійного джерела!
+mod.item.remove = Цей предмет є частиною модифікації [accent] «{0}»[]. Щоби видалити його, видаліть цю модифікацію.
 mod.remove.confirm = Цю модифікацію буде видалено.
 mod.author = [lightgray]Автор:[] {0}
 mod.missing = Це збереження містить модифікації, які ви нещодавно оновили або більше не встановлювали. Збереження може зіпсуватися. Ви впевнені, що хочете завантажити його?\n[lightgray]Модифікації:\n{0}
-mod.preview.missing = До публікації цієї модифікації в Майстерні, ви повинні додати зображення попереднього перегляду.\nПомістіть зображення з назвою [accent] preview.png[] у теку з модифікаціями та спробуйте знову.
-mod.folder.missing = Тільки модифікації у формі теці можуть бути опубліковані в Майстерні.\nЩоб перетворити будь-яку модифікацію у теку, просто розархівуйте цей файл у теку та видаліть старий архів, і потім перезапустіть гру або перезавантажте ваші модифікації.
+mod.preview.missing = До публікації цієї модифікації в Майстерні, ви мусите додати зображення попереднього перегляду.\nПомістіть зображення з назвою [accent] preview.png[] у теку з модифікаціями та спробуйте знову.
+mod.folder.missing = Тільки модифікації у формі теці можуть бути опубліковані в Майстерні.\nЩоб перетворити будь-яку модифікацію в теку, просто розархівуйте цей файл у теку та видаліть старий архів, і потім перезапустіть гру або перезавантажте ваші модифікації.
 mod.scripts.disable = Ваш пристрій не підтримує модифікації зі скриптами. Вимкніть модифікацію для запуску гри.
 
 about.button = Про гру
 name = Ім’я:
 noname = Спочатку придумайте[accent] собі ім’я[].
+planetmap = Планетна мапа
+launchcore = Запустити ядро
 filename = Назва файлу:
 unlocked = Доступний новий вміст!
 completed = [accent]Завершено
@@ -142,33 +148,34 @@ techtree = Дерево технологій
 research.list = [lightgray]Дослідження:
 research = Дослідження
 researched = [lightgray]{0} досліджено.
+research.progress = {0}% завершено
 players = Гравців: {0}
 players.single = {0} гравець на сервері
 players.search = пошук
 players.notfound = [gray]гравців не знайдено
 server.closing = [accent]Закриття сервера…
-server.kicked.kick = Ви були вигнані з сервера!
+server.kicked.kick = Ви були вигнані із сервера!
 server.kicked.whitelist = Ви не в білому списку сервера.
-server.kicked.serverClose = Сервер закрито.
+server.kicked.serverClose = Сервер зачинено.
 server.kicked.vote = Вас було вигнано із сервера за допомогою голосування. Прощавайте.
 server.kicked.clientOutdated = Застарілий клієнт! Оновіть свою гру!
 server.kicked.serverOutdated = Застарілий сервер! Попрохайте адміністратора сервера оновити сервер/гру!
 server.kicked.banned = Ви заблоковані на цьому сервері.
-server.kicked.typeMismatch = Цей сервер не сумісний з вашим типом збірки.
+server.kicked.typeMismatch = Цей сервер не сумісний із вашим типом збірки.
 server.kicked.playerLimit = Цей сервер — заповнений. Дочекайтесь вільного місця.
 server.kicked.recentKick = Нещодавно вас вигнали.\nПочекайте трохи перед наступним під’єднанням.
-server.kicked.nameInUse = На цьому сервері вже є хтось з таким ім’ям.
+server.kicked.nameInUse = На цьому сервері вже є хтось із таким ім’ям.
 server.kicked.nameEmpty = Ваше ім’я має містити принаймні один символ або цифру.
 server.kicked.idInUse = Ви вже на цьому сервері! Під’єднанням двох облікових записів не дозволяється.
 server.kicked.customClient = Цей сервер не підтримує користувацькі збірки. Завантажте офіційну версію.
 server.kicked.gameover = Гру завершено!
 server.kicked.serverRestarting = Сервер перезавантажується
 server.versions = Ваша версія:[accent] {0}[]\nВерсія на сервері:[accent] {1}[]
-host.info = Кнопка [accent]Сервер[] розміщує сервер на порті [scarlet]6567[].  \nКористувачі, які знаходяться у тій же [lightgray]WiFi або локальній мережах[], повинні побачити ваш сервер у своєму списку серверів.\n\nЯкщо ви хочете, щоб люди могли приєднуватися з будь-якої точки планети через IP, то потрібно зробити[accent] переадресація порту[].\n\n[lightgray]Примітка. Якщо у вас виникли проблеми з приєднанням до вашої локальної гри, переконайтеся, що ви дозволили Mindustry доступ до вашої локальної мережі в налаштуваннях брандмауера. Зауважте, що публічні мережі іноді не дозволяють виявити сервер.
+host.info = Кнопка [accent]Сервер[] розміщує сервер на порті [scarlet]6567[].  \nКористувачі, які перебувають в тій же [lightgray]WiFi або локальній мережах[], мають побачити ваш сервер у своєму списку серверів.\n\nЯкщо ви хочете, щоби люди могли приєднуватися з будь-якої точки планети через IP, то потрібно зробити[accent] переадресація порту[].\n\n[lightgray]Примітка. Якщо у вас виникли проблеми з приєднанням до вашої локальної гри, переконайтеся, що ви надали Mindustry доступ до вашої локальної мережі в налаштуваннях брандмауера. Зауважте, що публічні мережі іноді не дають змогу виявити сервер.
 join.info = Тут ви можете ввести [accent]IP сервера[] для під’єднання або знайти сервери у [accent]локальній[] чи [accent]глобальній мережі[] для приєднання до них.\nПідтримується локальна мережа(LAN) і широкосмугова мережа(WAN).\n\n[lightgray] Примітка. Це не є автоматичним глобальним списком серверів; якщо ви хочете приєднатися до когось через IP, вам доведеться попросити власника сервера дати свій ip.
 hostserver = Запустити багатокористувацький сервер
 invitefriends = Запросити друзів
-hostserver.mobile = Запустити\nсервер
+hostserver.mobile = Запустити сервер
 host = Запустити
 hosting = [accent]Відкриття сервера…
 hosts.refresh = Оновити
@@ -224,7 +231,6 @@ save.new = Нове збереження
 save.overwrite = Ви дійсно хочете перезаписати це місце збереження?
 overwrite = Перезаписати
 save.none = Збережень не знайдено!
-saveload = [accent]Збереження…
 savefail = Не вдалося зберегти гру!
 save.delete.confirm = Ви дійсно хочете видалити це збереження?
 save.delete = Видалити
@@ -258,24 +264,25 @@ ok = Гаразд
 open = Відкрити
 customize = Налаштувати правила
 cancel = Скасувати
-openlink = Відкрити посилання
+openlink = Перейти за посиланням
 copylink = Скопіювати посилання
 back = Назад
 data.export = Вивантажити дані
 data.import = Завантажити дані
-data.openfolder = Відкрити теку з даними
+data.openfolder = Відчинити теку з даними
 data.exported = Дані вивантажено.
 data.invalid = Це не дійсні ігрові дані.
-data.import.confirm = Вивантаження зовнішніх даних перезапише[scarlet] ВСІ[] ваші поточні ігрові дані.\n[accent]Це неможливо скасувати![]\n\nЩойно дані імпортуються, гра негайно закриється.
+data.import.confirm = Вивантаження зовнішніх даних перезапише[scarlet] ВСІ[] ваші поточні ігрові дані.\n[accent]Це неможливо скасувати![]\n\nЯк тільки дані імпортуються, гра негайно закриється.
 quit.confirm = Ви дійсно хочете вийти?
 quit.confirm.tutorial = Ви впевнені, що знаєте що робите?\nНавчання можна пройти наново[accent] Налаштування->Гра->Пройти навчання ще раз.[]
 loading = [accent]Завантаження…
 reloading = [accent]Перезавантаження модифікацій…
 saving = [accent]Збереження…
+respawn = [accent][[{0}][], щоби відродитися в ядрі
 cancelbuilding = [accent][[{0}][], щоб очистити план
-selectschematic = [accent][[{0}][], щоб вибрати та скопіювати
-pausebuilding = [accent][[{0}][], щоб призупинити будування
-resumebuilding = [scarlet][[{0}][], щоб продовжити будування
+selectschematic = [accent][[{0}][], щоби вибрати та скопіювати
+pausebuilding = [accent][[{0}][], щоби призупинити будування
+resumebuilding = [scarlet][[{0}][], щоби продовжити будування
 wave = [accent]Хвиля {0}
 wave.waiting = [lightgray]Наступна хвиля\nчерез {0}
 wave.waveInProgress = [lightgray]Хвиля триває
@@ -291,11 +298,11 @@ builtin = Вбудована
 map.delete.confirm = Ви дійсно хочете видалити цю мапу? Цю дію неможливо буде скасувати!
 map.random = [accent]Випадкова мапа
 map.nospawn = Ця мапа не має жодного ядра для появи гравця! Додайте [accent]помаранчеве[] ядро до цієї мапи в редакторі.
-map.nospawn.pvp = У цієї мапи немає ворожих ядер, в яких гравець може з’явитися! Додайте [scarlet]не помаранчеве[] ядро до цієї мапи в редакторі.
-map.nospawn.attack = У цієї мапи немає ворожих ядер, в яких гравець може з’явитися! Додайте [scarlet]червоне[] ядро до цієї мапи в редакторі.
+map.nospawn.pvp = У цієї мапи немає ворожих ядер, у яких гравець може з’явитися! Додайте [scarlet]не помаранчеве[] ядро до цієї мапи в редакторі.
+map.nospawn.attack = У цієї мапи немає ворожих ядер, у яких гравець може з’явитися! Додайте [scarlet]червоне[] ядро до цієї мапи в редакторі.
 map.invalid = Помилка завантаження мапи: пошкоджений або невірний файл мапи.
 workshop.update = Оновити предмет
-workshop.error = Помилка при отриманні інформації з Майстерні: {0}
+workshop.error = Помилка під час отримання інформації з Майстерні: {0}
 map.publish.confirm = Ви дійсно хочете опублікувати цю мапу?\n\n[lightgray]Спершу переконайтеся, що ви згодні з Ліцензійною угодою Steam, або ваші мапи не з’являться!
 workshop.menu = Виберіть, що ви хочете зробити з цим предметом.
 workshop.info = Інформація про предмет
@@ -304,7 +311,7 @@ eula = Ліцензійна угода Steam
 missing = Цей предмет було видалено або переміщено.\n[lightgray]Список Майстерні тепер автоматично від’єднано.
 publishing = [accent]Публікація…
 publish.confirm = Ви дійсно хочете опублікувати це?\n\n[lightgray]Переконайтеся, що ви спочатку погоджуєтеся з EULA Майстерні, або ваші предмети не з’являться!
-publish.error = Виникла помилка при публікації предмета: {0}
+publish.error = Виникла помилка під час публікації предмета: {0}
 steam.error = Не вдалося ініціалізувати сервіси Steam.\nПомилка: {0}
 
 editor.brush = Пензлик
@@ -314,11 +321,11 @@ editor.oregen.info = Генерація руд:
 editor.mapinfo = Інформація про мапу
 editor.author = Автор:
 editor.description = Опис:
-editor.nodescription = Мапа повинна мати щонайменше 4 символи для публікації.
+editor.nodescription = Мапа мусить мати щонайменше 4 символи для публікації.
 editor.waves = Хвилі:
 editor.rules = Правила:
 editor.generation = Генерація:
-editor.ingame = Редагувати у грі
+editor.ingame = Редагувати в грі
 editor.publish.workshop = Опублікувати в Майстерні Steam
 editor.newmap = Нова мапа
 workshop = Майстерня
@@ -328,15 +335,21 @@ waves.never = <ніколи>
 waves.every = кожен
 waves.waves = хвиля(і)
 waves.perspawn = за появу
+waves.shields = щитів за хвилю
 waves.to = до
-waves.boss = Бос
+waves.guardian = Вартовий
 waves.preview = Попередній перегляд
 waves.edit = Редагувати…
 waves.copy = Копіювати в буфер обміну
 waves.load = Завантажити з буфера обміну
-waves.invalid = Недійсні хвилі у буфері обміну.
+waves.invalid = Недійсні хвилі в буфері обміну.
 waves.copied = Хвилі скопійовані.
 waves.none = Противники не були встановлені.\nЗазначимо, що пусті хвилі будуть автоматично замінені звичайною хвилею.
+
+wavemode.counts = кількість
+wavemode.totals = усього
+wavemode.health = здоров’я
+
 editor.default = [lightgray]<За замовчуванням>
 details = Подробиці…
 edit = Редагувати…
@@ -346,11 +359,11 @@ editor.removeunit = Видалити бойову одиницю
 editor.teams = Команди
 editor.errorload = Помилка завантаження зображення.
 editor.errorsave = Помилка збереження зображення.
-editor.errorimage = Це зображення, а не мапа.\n\nЯкщо ви хочете імпортувати застарілу мапу, то використовуйте кнопку «Імпортувати застарілу мапу» у редакторі.
+editor.errorimage = Це зображення, а не мапа.\n\nЯкщо ви хочете імпортувати застарілу мапу, то використовуйте кнопку «Імпортувати застарілу мапу» в редакторі.
 editor.errorlegacy = Ця мапа занадто стара і використовує попередній формат мапи, який більше не підтримується.
 editor.errornot = Це не мапа.
 editor.errorheader = Цей файл мапи недійсний або пошкоджений.
-editor.errorname = Мапа не має назви. Може Ви намагаєтеся завантажити збереження?
+editor.errorname = Мапа не має назви. Може, ви намагаєтеся завантажити збереження?
 editor.update = Оновити
 editor.randomize = Випадково
 editor.apply = Застосувати
@@ -361,7 +374,7 @@ editor.savemap = Зберегти мапу
 editor.saved = Збережено!
 editor.save.noname = Ваша мапа не має назви! Установіть його в «Інформація про мапу».
 editor.save.overwrite = Ваша мапа перезаписує вбудовану мапу! Виберіть іншу назву в «Інформація про мапу».
-editor.import.exists = [scarlet]Неможливо імпортувати:[] вбудована мапа з назвою «{0}» вже існує!
+editor.import.exists = [scarlet]Неможливо імпортувати:[] вбудована мапа з назвою «{0}» вже є!
 editor.import = Імпорт…
 editor.importmap = Імпортувати мапу
 editor.importmap.description = Імпортувати вже наявну мапу
@@ -376,12 +389,12 @@ editor.exportimage = Експорт зображення місцевості
 editor.exportimage.description = Експортувати файл зображення, що містить лише основний рельєф місцевості
 editor.loadimage = Завантажити\nзображення
 editor.saveimage = Зберегти\nзображення
-editor.unsaved = [scarlet]У вас є незбережені зміни![]\nВи впевнені, що хочете вийти?
+editor.unsaved = Ви впевнені, що хочете вийти?\n[scarlet]Незбережені зміни буде втрачено назавжди![]
 editor.resizemap = Змінити розмір мапи
 editor.mapname = Назва мапи:
 editor.overwrite = [accent]Попередження!\nЦе перезаписує наявну мапу.
-editor.overwrite.confirm = [scarlet]Попередження![] Мапа з такою назвою вже існує. Ви впевнені, що хочете переписати її?\n«[accent]{0}[]»
-editor.exists = Мапа з такою назвою вже існує.
+editor.overwrite.confirm = [scarlet]Попередження![] Мапа з такою назвою вже є. Ви впевнені, що хочете переписати її?\n«[accent]{0}[]»
+editor.exists = Мапа з такою назвою вже є.
 editor.selectmap = Виберіть мапу для завантаження:
 
 toolmode.replace = Замінити
@@ -394,7 +407,7 @@ toolmode.square = Прямокутник
 toolmode.square.description = Прямокутна кисть.
 toolmode.eraseores = Видалення руд
 toolmode.eraseores.description = Видалити тільки руди.
-toolmode.fillteams = Змінити блок в команді
+toolmode.fillteams = Змінити блок у команді
 toolmode.fillteams.description = Змінює належність\nблоків до команди.
 toolmode.drawteams = Змінити команду блока
 toolmode.drawteams.description = Змінює належність\nблока до команди.
@@ -443,7 +456,7 @@ load = Завантажити
 save = Зберегти
 fps = FPS: {0}
 ping = Затримка: {0} мс
-language.restart = Будь ласка, перезапустіть свою гру, щоб налаштування мови набули чинності.
+language.restart = Будь ласка, перезапустіть свою гру, щоби налаштування мови набули чинності.
 settings = Налаштування
 tutorial = Навчання
 tutorial.retake = Пройти навчання ще раз
@@ -453,27 +466,30 @@ mapeditor = Редактор мап
 abandon = Покинути
 abandon.text = Ця зона і всі її ресурси будуть утрачені.
 locked = Заблоковано
-complete = [lightgray]Досягнута:
+complete = [lightgray]Необхідно:
 requirement.wave = Досягніть хвилі {0} у зоні «{1}»
-requirement.core = Знищте вороже ядро у зоні «{0}»
-requirement.unlock = Розблокуйте {0}
+requirement.core = Знищте вороже ядро в зоні «{0}»
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = Відновити зону:\n[lightgray]{0}
 bestwave = [lightgray]Найкраща хвиля: {0}
 launch = < ЗАПУСК >
+launch.text = Запуск
 launch.title = Запуск вдалий
 launch.next = [lightgray]наступна можливість буде на {0}-тій хвилі
 launch.unable2 = [scarlet]ЗАПУСК неможливий.[]
-launch.confirm = Це видалить всі ресурси у вашому ядрі.\nВи не зможете повернутися до цієї бази.
+launch.confirm = Це видалить усі ресурси у вашому ядрі.\nВи не зможете повернутися до цієї бази.
 launch.skip.confirm = Якщо ви пропустите зараз, ви не зможете не запускати до більш пізніх хвиль.
 uncover = Розкрити
 configure = Налаштувати вивантаження
+loadout = Вивантаження
+resources = Ресурси 
 bannedblocks = Заборонені блоки
 addall = Додати все
-configure.locked = [lightgray]Розблокування вивантаження ресурсів: {0}.
-configure.invalid = Кількість повинна бути числом між 0 та {0}.
+launch.destination = Destination: {0}
+configure.invalid = Кількість має бути числом між 0 та {0}.
 zone.unlocked = Зона «[lightgray]{0}» тепер розблокована.
 zone.requirement.complete = Вимоги до зони «{0}» виконані:[lightgray]\n{1}
-zone.config.unlocked = Вивантаження розблоковано:[lightgray]\n{0}
 zone.resources = [lightgray]Виявлені ресурси:
 zone.objective = [lightgray]Мета: [accent]{0}
 zone.objective.survival = вижити
@@ -484,7 +500,7 @@ boss.health = Здоров’я босу
 connectfail = [crimson]Помилка з’єднання:\n\n[accent]{0}
 error.unreachable = Сервер не є доступним.\nЧи правильно написана адреса?
 error.invalidaddress = Некоректна адреса.
-error.timedout = Час очікування вийшов!\nПереконайтеся, що адреса коректна і що власник сервера налаштував переадресацію порту!
+error.timedout = Час очікування вийшов!\nПереконайтеся, що адреса коректна й що власник сервера налаштував переадресацію порту!
 error.mismatch = Помилка пакету:\nможлива невідповідність версії клієнта/сервера.\nПереконайтеся, що у вас та у власника сервера встановлена остання версія Mindustry!
 error.alreadyconnected = Ви вже під’єдналися.
 error.mapnotfound = Файл мапи не знайдено!
@@ -492,35 +508,43 @@ error.io = Мережева помилка введення-виведення.
 error.any = Невідома мережева помилка
 error.bloom = Не вдалося ініціалізувати світіння.\nВаш пристрій, мабуть, не підтримує це.
 
-zone.groundZero.name = Відправний пункт
-zone.desertWastes.name = Пустельні відходи
-zone.craters.name = Кратери
-zone.frozenForest.name = Крижаний ліс
-zone.ruinousShores.name = Зруйновані береги
-zone.stainedMountains.name = Забруднені гори
-zone.desolateRift.name = Спустошена ущелина
-zone.nuclearComplex.name = Ядерний виробничий комплекс
-zone.overgrowth.name = Зарості
-zone.tarFields.name = Дьогтьові поля
-zone.saltFlats.name = Соляні рівнини
-zone.impact0078.name = Імпульс 0078
-zone.crags.name = Скелі
-zone.fungalPass.name = Грибний перевал
+weather.rain.name = Дощ
+weather.snow.name = Сніг
+weather.sandstorm.name = Піщана буря
+weather.sporestorm.name = Спорова буря
 
-zone.groundZero.description = Оптимальне місце для повторних ігор. Низька ворожа загроза. Мало ресурсів.\nЗбирайте якомога більше свинцю та міді.\nНе затримуйтесь і йдіть далі.
-zone.frozenForest.description = Спори поширилися навіть тут, ближче до гір. Холодна температура не може стримувати їх завжди.\n\nЗважтесь створити енергію. Побудуйте генератори внутрішнього згорання. Навчіться користуватися регенераторами.
-zone.desertWastes.description = Ці відходи є величезними, непередбачуваними й перетинаються з занедбаними секторальними структурами.\nВугілля присутнє в регіоні. Спаліть його для енергії або синтезуйте у графіт.\n\n[lightgray]Є декілька варіантів для місць посадок.
-zone.saltFlats.description = На околицях пустелі лежать Соляні рівнини. У цьому місці можна знайти небагато ресурсів.\n\nСаме тут противники спорудили комплекс сховищ ресурсів. Викорініть їхнє ядро. Не залишайте нічого цінного.
-zone.craters.description = У цьому кратері накопичилася вода, пережиток старих воєн. Відновіть місцевість. Зберіть пісок. Виплавте метаскло. Качайте воду, щоб охолодити турелі та бури.
-zone.ruinousShores.description = Саме берегова лінія є минулим цих відходів. Колись у цьому місці розташувався береговий оборонний масив. Проте залишилося не так багато чого. Тільки основні оборонні споруди залишилися неушкодженими, а все інше перетворилося на брухт.\nПродовжуйте експансію назовні. Повторно розкрийте технології.
-zone.stainedMountains.description = Якщо йти далі у вглиб материка, то можна побачити гори, які ще не заражені спорами.\nВидобудьте надлишковий титан у цій місцевості. Дізнайтеся, як використовувати його.\n\nНа жаль, тут більше противників ніж в інших місцевостях. Не дайте їм часу надіслати свої найсильніші одиниці.
-zone.overgrowth.description = Ближче до джерела спор є територія, що заросла.\nНе дивуйтеся, що противник встановив тут свій форпост. Побудуйте бойові одиниці під кодовою назвою «Титан». Зруйнуйте її. Поверніть те, що колись належало нам.
-zone.tarFields.description = Між горами та пустелею простягається окраїна зони видобутку нафти. Це один з небагатьох районів із корисними для використання запасами смоли.\nНе зважаючи на те, що територія покинута, вона має поблизу небезпечні сили противника. Не варто їх недооцінювати.\n\n[lightgray]Якщо можливо, дослідіть технологію перероблювання нафти.
-zone.desolateRift.description = Надзвичайно небезпечна зона. Багато ресурсів, але мало місця. Високий ризик знищення. Евакуюватися потрібно якомога швидше. Не розслабляйтеся між ворожими атаками та знайдіть ахіллесову п’яту супротивника.
-zone.nuclearComplex.description = Колишній об’єкт для виробництва та перероблювання торію було зведено до руїн.\n[lightgray]Дослідіть торій та його нескінченну кількість застосувань.\n\n Противник, який постійно шукає нападників, присутній тут у великій кількості, тому не баріться з евакуацією.
-zone.fungalPass.description = Перехідна зона між високими та низькими горами, земля яких вкрита спорами. Тут знаходиться невелика розвідувальна база противника.\nЗруйнуйте її.\nВикористовуйте одиниці з кодовими назвами «Кинджал» і «Камікадзе». Позбудьтесь двох ядер.
-zone.impact0078.description = <вставити опис тут>
-zone.crags.description = <вставити опис тут>
+sectors.unexplored = [lightgray]Не досліджено
+sectors.resources = Ресурси:
+sectors.production = Виробництво:
+sectors.stored = Зберігає:
+sectors.resume = Продовжити
+sectors.launch = Запуск
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Відправний пункт
+sector.craters.name = Кратери
+sector.frozenForest.name = Крижаний ліс
+sector.ruinousShores.name = Зруйновані береги
+sector.stainedMountains.name = Плямисті гори
+sector.desolateRift.name = Спустошена ущелина
+sector.nuclearComplex.name = Ядерний виробничий комплекс
+sector.overgrowth.name = Зарості
+sector.tarFields.name = Дьогтьові поля
+sector.saltFlats.name = Соляні рівнини
+sector.fungalPass.name = Грибний перевал
+
+sector.groundZero.description = Оптимальне місце для повторних ігор. Низька ворожа загроза. Мало ресурсів.\nЗбирайте якомога більше свинцю та міді.\nНе затримуйтесь і йдіть далі.
+sector.frozenForest.description = Спори поширилися навіть тут, ближче до гір. Холодна температура не може стримувати їх завжди.\n\nЗважтесь створити енергію. Побудуйте генератори внутрішнього згорання. Навчіться користуватися регенераторами.
+sector.saltFlats.description = На околицях пустелі лежать Соляні рівнини. У цьому місці можна знайти небагато ресурсів.\n\nСаме тут противники спорудили комплекс сховищ ресурсів. Викорініть їхнє ядро. Не залишайте нічого цінного.
+sector.craters.description = У цьому кратері накопичилася вода, пережиток старих воєн. Відновіть місцевість. Зберіть пісок. Виплавте метаскло. Качайте воду, щоб охолодити турелі та бури.
+sector.ruinousShores.description = Саме берегова лінія є минулим цих відходів. Колись у цьому місці розташувався береговий оборонний масив. Проте залишилося не так багато чого. Тільки основні оборонні споруди залишилися неушкодженими, а все інше перетворилося на брухт.\nПродовжуйте експансію назовні. Повторно розкрийте технології.
+sector.stainedMountains.description = Якщо йти далі у вглиб материка, то можна побачити гори, які ще не заражені спорами.\nВидобудьте надлишковий титан у цій місцевості. Дізнайтеся, як використовувати його.\n\nНа жаль, тут більше противників ніж в інших місцевостях. Не дайте їм часу надіслати свої найсильніші одиниці.
+sector.overgrowth.description = Ближче до джерела спор є територія, що заросла.\nНе дивуйтеся, що противник встановив тут свій форпост. Побудуйте бойові одиниці під кодовою назвою «Титан». Зруйнуйте її. Поверніть те, що колись належало нам.
+sector.tarFields.description = Між горами та пустелею простягається окраїна зони видобутку нафти. Це один із небагатьох районів із корисними для використання запасами смоли.\nНе зважаючи на те, що територія покинута, вона має поблизу небезпечні сили противника. Не варто їх недооцінювати.\n\n[lightgray]Якщо можливо, дослідіть технологію перероблювання нафти.
+sector.desolateRift.description = Надзвичайно небезпечна зона. Багато ресурсів, але мало місця. Високий ризик знищення. Евакуюватися потрібно якомога швидше. Не розслабляйтеся між ворожими атаками та знайдіть ахіллесову п’яту супротивника.
+sector.nuclearComplex.description = Колишній об’єкт для виробництва та перероблювання торію було зведено до руїн.\n[lightgray]Дослідіть торій та його нескінченну кількість застосувань.\n\n Противник, який постійно шукає нападників, присутній тут у великій кількості, тому не баріться з евакуацією.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Мова
 settings.data = Ігрові дані
@@ -533,10 +557,13 @@ settings.sound = Звук
 settings.graphics = Графіка
 settings.cleardata = Очистити дані…
 settings.clear.confirm = Ви дійсно хочете очистити ці дані?\nЦю дію не можна скасувати!
-settings.clearall.confirm = [scarlet]УВАГА![]\nЦе очистить усі дані, включаючи збереження, мапи, розблоковане та налаштування керування.\nПісля натискання «Гаразд» гра видалить усі дані та автоматично закриється.
+settings.clearall.confirm = [scarlet]УВАГА![]\nЦе очистить усі дані, включно із збереженнями, мапами, розблокованим та налаштуваннями керування.\nПісля натискання «Гаразд» гра видалить усі дані та автоматично закриється.
+settings.clearsaves.confirm = Ви справді хочете видалити всі ваші збереження?
+settings.clearsaves = Очистити збереження
 paused = [accent]< Пауза>
 clear = Очистити
 banned = [scarlet]Заблоковано
+unplaceable.sectorcaptured = [scarlet]Вимагає захопленого сектору
 yes = Так
 no = Ні
 info.title = Інформація
@@ -558,8 +585,11 @@ blocks.itemsmoved = Швидкість переміщення
 blocks.launchtime = Час між запусками
 blocks.shootrange = Радіус дії
 blocks.size = Розмір
+blocks.displaysize = Розмір дисплею
 blocks.liquidcapacity = Рідинна місткість
-blocks.powerrange = Діапазон передачі енергії
+blocks.powerrange = Радіус передачі енергії
+blocks.linkrange = Радіус з’єднання
+blocks.instructions = Інструкції
 blocks.powerconnections = Максимальна кількість з’єднань
 blocks.poweruse = Енергії використовує
 blocks.powerdamage = Енергії за од. шкоди
@@ -575,13 +605,18 @@ blocks.boosteffect = Прискорювальний ефект
 blocks.maxunits = Максимальна кількість активних одиниць
 blocks.health = Здоров’я
 blocks.buildtime = Час будування
+blocks.maxconsecutive = Максимальна послідовність
 blocks.buildcost = Вартість будування
 blocks.inaccuracy = Розкид
 blocks.shots = Постріли
 blocks.reload = Постріли/секунду
 blocks.ammo = Боєприпаси
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Потребується кращий бур
+bar.noresources = Бракує ресурсів
+bar.corereq = Необхідне основне ядро
 bar.drillspeed = Швидкість буріння: {0} за с.
 bar.pumpspeed = Швидкість викачування: {0} за с.
 bar.efficiency = Ефективність: {0}%
@@ -591,7 +626,8 @@ bar.poweramount = Енергія: {0}
 bar.poweroutput = Вихідна енергія: {0}
 bar.items = Предмети: {0}
 bar.capacity = Місткість: {0}
-bar.units = Бойові одиниці: {0}/{1}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[одиниця вимкнена]
 bar.liquid = Рідина
 bar.heat = Нагрівання
 bar.power = Енергія
@@ -619,12 +655,16 @@ unit.liquidunits = одиниць рідини
 unit.powerunits = одиниць енергії
 unit.degrees = град.
 unit.seconds = с
+unit.minutes = хв
 unit.persecond = за секунду
+unit.perminute = за хвилину
 unit.timesspeed = x швидкість
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = предм.
 unit.thousands = тис
 unit.millions = млн
+unit.billions = млрд
 category.general = Загальне
 category.power = Енергія
 category.liquids = Рідини
@@ -634,17 +674,18 @@ category.shooting = Стрільба
 category.optional = Додаткові поліпшення
 setting.landscape.name = Тільки альбомний (горизонтальний) режим
 setting.shadows.name = Тіні
-setting.blockreplace.name = Пропозиції щодо автоматичної заміни блоків
+setting.blockreplace.name = Пропонування щодо автоматичної заміни блоків
 setting.linear.name = Лінійна фільтрація
 setting.hints.name = Підказки
 setting.flow.name = Показувати темп швидкості ресурсів
 setting.buildautopause.name = Автоматичне призупинення будування
+setting.mapcenter.name = Автоматичне центрування мапи на гравця
 setting.animatedwater.name = Анімаційні рідини
 setting.animatedshields.name = Анімаційні щити
 setting.antialias.name = Згладжування[lightgray] (потребує перезапуску)[]
 setting.playerindicators.name = Позначки гравців
 setting.indicators.name = Позначки противників
-setting.autotarget.name = Авто-стрільба
+setting.autotarget.name = Автострільба
 setting.keyboard.name = Миш+Керування з клавіатури
 setting.touchscreen.name = Керування сенсорним екраном
 setting.fpscap.name = Максимальний FPS
@@ -663,7 +704,6 @@ setting.effects.name = Ефекти
 setting.destroyedblocks.name = Показувати зруйновані блоки
 setting.blockstatus.name = Показувати стан блоку
 setting.conveyorpathfinding.name = Пошук шляху для встановлення конвеєрів
-setting.coreselect.name = Дозволити схематичні ядра
 setting.sensitivity.name = Чутливість контролера
 setting.saveinterval.name = Інтервал збереження
 setting.seconds = {0} секунд
@@ -672,14 +712,16 @@ setting.milliseconds = {0} мілісекунд
 setting.fullscreen.name = Повноекранний режим
 setting.borderlesswindow.name = Вікно без полів[lightgray] (може потребувати перезапуску)
 setting.fps.name = Показувати FPS і затримку до сервера
+setting.smoothcamera.name = Гладка камера
 setting.blockselectkeys.name = Показувати клавіші вибору блока
 setting.vsync.name = Вертикальна синхронізація
 setting.pixelate.name = Пікселізація
 setting.minimap.name = Показувати мінімапу
+setting.coreitems.name = Показувати предмети в ядрі (дороблюється)
 setting.position.name = Показувати координати гравця
 setting.musicvol.name = Гучність музики
 setting.atmosphere.name = Показувати планетарну атмосферу
-setting.ambientvol.name = Звуки навколишнього середовища
+setting.ambientvol.name = Звуки довкілля
 setting.mutemusic.name = Заглушити музику
 setting.sfxvol.name = Гучність звукових ефектів
 setting.mutesound.name = Заглушити звук
@@ -691,7 +733,7 @@ setting.chatopacity.name = Непрозорість чату
 setting.lasersopacity.name = Непрозорість лазерів енергопостачання
 setting.bridgeopacity.name = Непрозорість мостів
 setting.playerchat.name = Показувати хмару чата над гравцями
-public.confirm = Ви хочете зробити цю гру загальнодоступною?\n[accent]Будь-хто може приєднатися до вашої гри.\n[lightgray]Це можна змінити у Налаштування->Гра->Загальнодоступність гри.
+public.confirm = Ви хочете зробити цю гру загальнодоступною?\n[accent]Будь-хто може приєднатися до вашої гри.\n[lightgray]Це можна змінити в Налаштування->Гра->Загальнодоступність гри.
 public.beta = Зауважте, що в бета-версії гри ви не можете робити публічні ігри.
 uiscale.reset = Масштаб користувацького інтерфейсу було змінено.\nНатисніть «Гаразд» для підтвердження цього масштабу.\n[scarlet]Повернення налаштувань і вихід через[accent] {0}[] секунд…
 uiscale.cancel = Скасувати & Вийти
@@ -701,10 +743,14 @@ keybinds.mobile = [scarlet]Більшість прив’язаних клаві
 category.general.name = Загальне
 category.view.name = Перегляд
 category.multiplayer.name = Мережева гра
+category.blocks.name = Вибір блока
 command.attack = Атака
 command.rally = Точка збору
 command.retreat = Відступити
+command.idle = Бездіяти
 placement.blockselectkeys = \n[lightgray]Ключ: [{0},
+keybind.respawn.name = Відродження
+keybind.control.name = Контролювання одиниці
 keybind.clear_building.name = Очистити план будування
 keybind.press = Натисніть клавішу…
 keybind.press.axis = Натисніть клавішу…
@@ -713,7 +759,8 @@ keybind.toggle_power_lines.name = Показувати лазери енерго
 keybind.toggle_block_status.name = Показувати стан блоків
 keybind.move_x.name = Рух по осі X
 keybind.move_y.name = Рух по осі Y
-keybind.mouse_move.name = Слідкувати за мишею
+keybind.mouse_move.name = Рухатися за мишею
+keybind.pan.name = Політ камери за мишею
 keybind.boost.name = Прискорення
 keybind.schematic_select.name = Вибрати ділянку
 keybind.schematic_menu.name = Меню схем
@@ -741,12 +788,15 @@ keybind.diagonal_placement.name = Діагональне розміщення
 keybind.pick.name = Вибрати блок
 keybind.break_block.name = Зламати блок
 keybind.deselect.name = Скасувати
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Постріл
 keybind.zoom.name = Наблизити
 keybind.menu.name = Меню
 keybind.pause.name = Пауза
 keybind.pause_building.name = Призупинити/Продовжити будування
-keybind.minimap.name = Міні-мапа
+keybind.minimap.name = Мінімапа
 keybind.chat.name = Чат
 keybind.player_list.name = Список гравців
 keybind.console.name = Консоль
@@ -757,10 +807,10 @@ keybind.chat_history_prev.name = Попередня історія чату
 keybind.chat_history_next.name = Наступна історія чату
 keybind.chat_scroll.name = Прокрутка чату
 keybind.drop_unit.name = Скинути бойову одиницю
-keybind.zoom_minimap.name = Збільшити міні-мапу
+keybind.zoom_minimap.name = Збільшити мінімапу
 mode.help.title = Опис режимів гри
 mode.survival.name = Виживання
-mode.survival.description = Звичайний режим. В цьому режимі треба самим видобувати ресурси та хвилі йдуть автоматично.\n[gray]Потребуються точки появи противників для гри.
+mode.survival.description = Звичайний режим. У цьому режимі треба самим видобувати ресурси та хвилі йдуть автоматично.\n[gray]Потребуються точки появи противників для гри.
 mode.sandbox.name = Пісочниця
 mode.sandbox.description = Нескінченні ресурси та хвилі йдуть за вашим бажанням.
 mode.editor.name = Редактор
@@ -775,34 +825,34 @@ rules.reactorexplosions = Вибухи реактора
 rules.wavetimer = Таймер для хвиль
 rules.waves = Хвилі
 rules.attack = Режим атаки
+rules.buildai = Будування ШІ
 rules.enemyCheat = Нескінченні ресурси для червоної команди ШІ
-rules.unitdrops = Випадіння ресурсів з бойових одиниць
+rules.blockhealthmultiplier = Множник здоров’я блоків
+rules.blockdamagemultiplier = Множник шкоди блоків
 rules.unitbuildspeedmultiplier = Множник швидкості виробництва бойових одиниць
 rules.unithealthmultiplier = Множник здоров’я бойових одиниць
-rules.blockhealthmultiplier = Множник здоров’я блоків
-rules.playerhealthmultiplier = Множник здоров’я гравця
-rules.playerdamagemultiplier = Множник шкоди гравця
 rules.unitdamagemultiplier = Множник шкоди бойових одиниць
-rules.enemycorebuildradius = Радіус захисту для ворожого ядра:[lightgray] (плитки)
-rules.respawntime = Час відродження:[lightgray] (секунди)
+rules.enemycorebuildradius = Радіус оборони для ворожого ядра:[lightgray] (плитки)
 rules.wavespacing = Інтервал хвиль:[lightgray] (секунди)
 rules.buildcostmultiplier = Множник затрат на будування
 rules.buildspeedmultiplier = Множник швидкості будування
-rules.deconstructrefundmultiplier = Множник відшкодування при демонтажі
+rules.deconstructrefundmultiplier = Множник відшкодування у разі демонтажу
 rules.waitForWaveToEnd = Хвилі чекають на завершення попередньої
 rules.dropzoneradius = Радіус зони висадки:[lightgray] (у плитках)
-rules.respawns = Максимальна кількість відроджень за хвилю
-rules.limitedRespawns = Обмеження відроджень
+rules.unitammo = Бойові одиниці потребують боєприпасів
 rules.title.waves = Хвилі
-rules.title.respawns = Відродження
-rules.title.resourcesbuilding = Ресурси & будування
-rules.title.player = Гравці
+rules.title.resourcesbuilding = Ресурси й будування
 rules.title.enemy = Противники
 rules.title.unit = Бойові одиниці
 rules.title.experimental = Експериментальне
+rules.title.environment = Середовище
 rules.lighting = Світлотінь
+rules.fire = Вогонь
+rules.explosions = Шкода від вибухів блоків і одиниць
 rules.ambientlight = Навколишнє світло
-rules.solarpowermultiplier = Множник сонячної енергії
+rules.weather = Погода
+rules.weather.frequency = Повторюваність:
+rules.weather.duration = Тривалість:
 
 content.item.name = Предмети
 content.liquid.name = Рідини
@@ -828,10 +878,11 @@ liquid.water.name = Вода
 liquid.slag.name = Шлак
 liquid.oil.name = Нафта
 liquid.cryofluid.name = Кріогенна рідина
-item.corestorable = [lightgray]Зберігання в ядрі: {0}
+
 item.explosiveness = [lightgray]Вибухонебезпечність: {0} %
 item.flammability = [lightgray]Вогненебезпечність: {0} %
 item.radioactivity = [lightgray]Радіоактивність: {0} %
+
 unit.health = [lightgray]Здоров’я: {0}
 unit.speed = [lightgray]Швидкість: {0}
 unit.weapon = [lightgray]Зброя: {0}
@@ -840,30 +891,67 @@ unit.minespeed = [lightgray]Швидкість видобутку: {0} %
 unit.minepower = [lightgray]Потужність видобутку: {0}
 unit.ability = [lightgray]Здібність: {0}
 unit.buildspeed = [lightgray]Швидкість будування: {0} %
+
 liquid.heatcapacity = [lightgray]Теплоємність: {0}
 liquid.viscosity = [lightgray]В’язкість: {0}
 liquid.temperature = [lightgray]Температура: {0}
 
+unit.dagger.name = Кинджал
+unit.mace.name = Булава
+unit.fortress.name = Фортеця
+unit.nova.name = Нова
+unit.pulsar.name = Пульсар
+unit.quasar.name = Квазар
+unit.crawler.name = Плазун
+unit.atrax.name = Атракс
+unit.spiroct.name = Павучник
+unit.arkyid.name = Аркиїд
+unit.toxopid.name = Отруйник
+unit.flare.name = Фальшфеєр
+unit.horizon.name = Горизонт
+unit.zenith.name = Зеніт
+unit.antumbra.name = Тіньовик
+unit.eclipse.name = Затьмарник
+unit.mono.name = Єдинак
+unit.poly.name = Багацько
+unit.mega.name = Мега
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Грампус
+unit.minke.name = Смугач малий
+unit.bryde.name = Смугач Брайда
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Альфа
+unit.beta.name = Бета
+unit.gamma.name = Гамма
+unit.scepter.name = Верховна влада
+unit.reign.name = Верховний Порядок
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Пункт постачання
+block.parallax.name = Паралакс
 block.cliff.name = Скеля
 block.sand-boulder.name = Пісочний валун
 block.grass.name = Трава
 block.slag.name = Шлак
 block.salt.name = Сіль
-block.saltrocks.name = Соляні камені
+block.salt-wall.name = Соляна стіна
 block.pebbles.name = Галька
 block.tendrils.name = Щупальця
-block.sandrocks.name = Піщані скелі
+block.sand-wall.name = Піскова стіна
 block.spore-pine.name = Спорова сосна
-block.sporerocks.name = Спорові камені
-block.rock.name = Камінь
-block.snowrock.name = Сніжний камінь
+block.spore-wall.name = Спорова стіна
+block.boulder.name = Брила
+block.snow-boulder.name = Снігова брила
 block.snow-pine.name = Сніжні сосни
 block.shale.name = Сланець
 block.shale-boulder.name = Сланцевий валун
 block.moss.name = Мох
 block.shrubs.name = Кущі
 block.spore-moss.name = Споровий мох
-block.shalerocks.name = Сланцеві породи
+block.shale-wall.name = Сланцева стіна
 block.scrap-wall.name = Стіна з брухту
 block.scrap-wall-large.name = Велика стіна з брухту
 block.scrap-wall-huge.name = Величезна стіна з брухту
@@ -888,16 +976,20 @@ block.darksand.name = Темний пісок
 block.ice.name = Лід
 block.snow.name = Сніг
 block.craters.name = Кратери
-block.sand-water.name = Пісок з водою
-block.darksand-water.name = Темний пісок з водою
+block.sand-water.name = Пісок із водою
+block.darksand-water.name = Темний пісок із водою
 block.char.name = Випалена земля
-block.holostone.name = Голографічний камінь
+block.dacite.name = Дацит
+block.dacite-wall.name = Дацитова стіна
 block.ice-snow.name = Крижаний сніг
-block.rocks.name = Камені
-block.icerocks.name = Крижані камені
-block.snowrocks.name = Снігові камені
-block.dunerocks.name = Піщані камені
+block.stone-wall.name = Кам’яна стіна
+block.ice-wall.name = Крижана стіна
+block.snow-wall.name = Снігова стіна
+block.dune-wall.name = Дюнова стіна
 block.pine.name = Сосна
+block.dirt.name = Ґрунт
+block.dirt-wall.name = Ґрунтова стіна
+block.mud.name = Mud
 block.white-tree-dead.name = Мертве біле дерево
 block.white-tree.name = Біле дерево
 block.spore-cluster.name = Скупчення спор
@@ -913,10 +1005,9 @@ block.dark-panel-4.name = Темна панель 4
 block.dark-panel-5.name = Темна панель 5
 block.dark-panel-6.name = Темна панель 6
 block.dark-metal.name = Темний метал
-block.ignarock.name = Магматичні гірські породи
+block.basalt.name = Базальт
 block.hotrock.name = Гарячий камінь
 block.magmarock.name = Магмовий камінь
-block.cliffs.name = Скелі
 block.copper-wall.name = Мідна стіна
 block.copper-wall-large.name = Велика мідна стіна
 block.titanium-wall.name = Титанова стіна
@@ -938,7 +1029,7 @@ block.conveyor.name = Конвеєр
 block.titanium-conveyor.name = Титановий конвеєр
 block.plastanium-conveyor.name = Пластанієвий конвеєр
 block.armored-conveyor.name = Броньований конвеєр
-block.armored-conveyor.description = Переміщує предмети з тією ж швидкістю, що і титанові конвеєри, але має більше міцності. Не приймає введення з боків ні з чого, крім інших конвеєрних стрічок.
+block.armored-conveyor.description = Переміщує предмети з тією ж швидкістю, що й титанові конвеєри, але має більше міцності. Не приймає введення з боків ні з чого, крім інших конвеєрних стрічок.
 block.junction.name = Перехрестя
 block.router.name = Маршрутизатор
 block.distributor.name = Розподілювач
@@ -952,7 +1043,7 @@ block.underflow-gate.name = Недостатній затвор
 block.silicon-smelter.name = Кремнієвий плавильний завод
 block.phase-weaver.name = Фазовий ткач
 block.pulverizer.name = Подрібнювач
-block.cryofluidmixer.name = Змішувач кріогенної рідини
+block.cryofluid-mixer.name = Змішувач кріогенної рідини
 block.melter.name = Плавильня
 block.incinerator.name = Сміттєспалювальний завод
 block.spore-press.name = Споровий прес
@@ -965,7 +1056,7 @@ block.diode.name = Діод
 block.battery.name = Акумулятор
 block.battery-large.name = Великий акумулятор
 block.combustion-generator.name = Генератор згорання
-block.turbine-generator.name = Паровий генератор
+block.steam-generator.name = Паровий генератор
 block.differential-generator.name = Диференційний генератор
 block.impact-reactor.name = Імпульсний реактор
 block.mechanical-drill.name = Механічний бур
@@ -995,17 +1086,6 @@ block.blast-mixer.name = Змішувач вибухонебезпечного 
 block.solar-panel.name = Сонячна панель
 block.solar-panel-large.name = Велика сонячна панель
 block.oil-extractor.name = Екстрактор нафти
-block.command-center.name = Командний центр
-block.draug-factory.name = Завод дронів «Драугр»
-block.spirit-factory.name = Завод дронів-ремонтників «Привид»
-block.phantom-factory.name = Завод дронів-будівників «Фантом»
-block.wraith-factory.name = Завод винищувачів «Примара»
-block.ghoul-factory.name = Завод бомбардувальників-винищувачів «Ґуль»
-block.dagger-factory.name = Завод мехів «Кинджал»
-block.crawler-factory.name = Завод мехів «Камікадзе»
-block.titan-factory.name = Завод мехів «Титан»
-block.fortress-factory.name = Завод мехів «Фортеця»
-block.revenant-factory.name = Завод бомбардувальників «Потойбічний вбивця»
 block.repair-point.name = Ремонтний пункт
 block.pulse-conduit.name = Імпульсний трубопровід
 block.plated-conduit.name = Зміцнений трубопровід
@@ -1037,6 +1117,29 @@ block.meltdown.name = Розплавлювач
 block.container.name = Сховище
 block.launch-pad.name = Стартовий майданчик
 block.launch-pad-large.name = Великий стартовий майданчик
+block.segment.name = Сегмент
+block.command-center.name = Командний центр
+block.ground-factory.name = Наземний завод
+block.air-factory.name = Повітряний завод
+block.naval-factory.name = Морський завод
+block.additive-reconstructor.name = Додавальний реконструктор
+block.multiplicative-reconstructor.name = Примножувальний реконструктор
+block.exponential-reconstructor.name = Експоненційний реконструктор
+block.tetrative-reconstructor.name = Тетративний реконструктор
+block.payload-conveyor.name = Вантажний конвеєр
+block.payload-router.name = Розвантажувальний маршрутизатор
+block.disassembler.name = Розбирач
+block.silicon-crucible.name = Кремнієвий тигель
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Перемикач
+block.micro-processor.name = Мікропроцесор
+block.logic-processor.name = Логічний процесор
+block.hyper-processor.name = Гіперпроцесор
+block.logic-display.name = Логічний дисплей
+block.large-logic-display.name = Великий логічний дисплей
+block.memory-cell.name = Комірка пам’яті
+
 team.blue.name = Синя
 team.crux.name = Червона
 team.sharded.name = Помаранчева
@@ -1044,55 +1147,41 @@ team.orange.name = Помаранчева
 team.derelict.name = Залишена
 team.green.name = Зелена
 team.purple.name = Фіолетова
-unit.spirit.name = Ремонтний дрон «Привид»
-unit.draug.name = Добувний дрон «Драугр»
-unit.phantom.name = Будівельний дрон «Фантом»
-unit.dagger.name = Кинджал
-unit.crawler.name = Камікадзе
-unit.titan.name = Титан
-unit.ghoul.name = Ґуль
-unit.wraith.name = Примара
-unit.fortress.name = Фортеця
-unit.revenant.name = Потойбічний убивця
-unit.eruptor.name = Вивергатель
-unit.chaos-array.name = Масив хаосу
-unit.eradicator.name = Викорінювач
-unit.lich.name = Ліч
-unit.reaper.name = Жнець
+
 tutorial.next = [lightgray]<Натисніть для продовження>
-tutorial.intro = Ви розпочали[scarlet] навчання по Mindustry.[]\nВикористовуйте[accent] [[WASD][] для руху.\n[accent]Прокручуйте миш[] для приближення і віддалення.\nРозпочніть з [accent]видобування міді[]. Наблизьтесь до мідної жили біля вашого ядра, а потім натисніть на неї, щоб розпочати видобуток.\n\n[accent]{0}/{1} міді
-tutorial.intro.mobile = Ви розпочали[scarlet] навчання по Mindustry.[]\nПроведіть по екрану для руху.\n[accent] Зведіть або розведіть 2 пальця[] для приближення і віддалення відповідно.\nРозпочніть з [accent]видобування міді[]. Наблизьтесь до мідної жили біля вашого ядра, а потім натисніть на неї, щоб розпочати видобуток.\n\n[accent]{0}/{1} міді
-tutorial.drill = Добування вручну не є ефективним.\n[accent]Бури[] можуть видобувати автоматично.\nНатисніть на вкладку із зображенням свердла праворуч знизу.\n\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням.\nВи також можете вибрати бур, натиснувши [accent][[2][], а потім швидко натиснувши [accent][[1][], незалежно від відкритої вкладки.\n[accent]Натисніть ПКМ[], щоб зупинити будування.
-tutorial.drill.mobile = Добування вручну не є ефективним.\n[accent]Бури[] можуть видобувати автоматично.\nНатисніть на вкладку із зображенням свердла праворуч знизу.\nВиберіть[accent] механічний бур[].\nРозмістіть його на мідній жилі натисканням, потім натисніть на [accent]галочку[] нижче, щоб підтвердити розміщення.\nНатисніть [accent]кнопку X[], щоб скасувати розміщення.
+tutorial.intro = Ви розпочали[scarlet] навчання з Mindustry.[]\nВикористовуйте[accent] [[WASD][] для руху.\n[accent]Прокручуйте миш[] для приближення і віддалення.\nРозпочніть з [accent]видобування міді[]. Наблизьтесь до мідної жили біля вашого ядра, а потім натисніть на неї, щоби розпочати видобуток.\n\n[accent]{0}/{1} міді
+tutorial.intro.mobile = Ви розпочали[scarlet] навчання з Mindustry.[]\nПроведіть по екрану для руху.\n[accent] Зведіть або розведіть 2 пальця[] для приближення і віддалення відповідно.\nРозпочніть з [accent]видобування міді[]. Наблизьтесь до мідної жили біля вашого ядра, а потім натисніть на неї, щоби розпочати видобуток.\n\n[accent]{0}/{1} міді
+tutorial.drill = Добування вручну не є ефективним.\n[accent]Бури[] можуть видобувати автоматично.\nНатисніть на вкладку із зображенням свердла праворуч знизу.\n\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням.\nВи також можете вибрати бур, натиснувши [accent][[2][], а потім швидко натиснувши [accent][[1][], незалежно від розгорнутої вкладки.\n[accent]Натисніть ПКМ[], щоби зупинити будування.
+tutorial.drill.mobile = Добування вручну не є ефективним.\n[accent]Бури[] можуть видобувати автоматично.\nНатисніть на вкладку із зображенням свердла праворуч знизу.\nВиберіть[accent] механічний бур[].\nРозмістіть його на мідній жилі натисканням, потім натисніть на [accent]галочку[] нижче, щоби підтвердити розміщення.\nНатисніть [accent]кнопку X[], щоби скасувати розміщення.
 tutorial.blockinfo = Кожний блок має різні характеристики. Кожний бур може видобувати тільки певні руди.\nЩоб переглянути інформацію та характеристики блока,[accent] натисніть на кнопку «?», коли ви вибрали блок у меню будування.[]\n\n[accent]Перегляньте характеристику Механічного бура негайно.[]
-tutorial.conveyor = [accent]Конвеєри[] використовуються для транспортування предметів до ядра.\nПобудуйте лінію конвеєрів від бура до ядра.\n[accent]Утримуйте миш для розміщення у лінію.[]\nУтримуйте[accent] CTRL[] під час вибору лінії для розміщення по діагоналі.\nПрокручуйте, щоб обертати блоки до їх установлення.\n[accent]Розмістіть 2 конвеєри у лінію, а потім доставте предмет в ядро.
-tutorial.conveyor.mobile = [accent]Конвеєри[] використовуються для транспортування предметів до ядра.\nПобудуйте лінію конвеєрів від бура до ядра.\n[accent] Розмістить у лінію, утримуючи палець кілька секунд[] і тягніть у напрямку, який Ви обрали.\n\n[accent]Розмістіть 2 конвеєри у лінію, а потім доставте предмет в ядро.
-tutorial.turret = Щойно предмет потрапить до ядра, він може бути використаний у будівництві.\nМайте на увазі, не всі предмети придатні для будівництва.\nПредмети що не використовуються у будівництві, такі як[accent] вугілля[] чи[accent] брухт[], не можуть потрапити до ядра.\nОборонні споруди повинні бути побудовані для відбиття[lightgray] противників[].\nПобудуйте[accent] башту «Подвійна»[] біля вашої бази.
-tutorial.drillturret = «Подвійна» потребує [accent]мідні боєприпаси[] для стрільби.\nРозмістіть бур біля башти.\nПроведіть конвеєри до башти, щоб заповнити її боєприпасами.\n\n [accent]Доставлено боєприпасів: 0/1
+tutorial.conveyor = [accent]Конвеєри[] використовуються для транспортування предметів до ядра.\nПобудуйте лінію конвеєрів від бура до ядра.\n[accent]Утримуйте миш для розміщення в лінію.[]\nУтримуйте[accent] CTRL[] під час вибору лінії для розміщення по діагоналі.\nПрокручуйте, щоб обертати блоки до їх установлення.\n[accent]Розмістіть 2 конвеєри в лінію, а потім доставте предмет у ядро.
+tutorial.conveyor.mobile = [accent]Конвеєри[] використовуються для транспортування предметів до ядра.\nПобудуйте лінію конвеєрів від бура до ядра.\n[accent] Розмістить у лінію, утримуючи палець кілька секунд[] і тягніть у напрямку, який Ви обрали.\n\n[accent]Розмістіть 2 конвеєри в лінію, а потім доставте предмет у ядро.
+tutorial.turret = Щойно предмет потрапить до ядра, він може бути використаний у будівництві.\nМайте на увазі, не всі предмети придатні для будівництва.\nПредмети що не використовуються в будівництві, такі як[accent] вугілля[] чи[accent] брухт[], не можуть потрапити до ядра.\nОборонні споруди мають бути побудовані для відбиття[lightgray] противників[].\nПобудуйте[accent] башту «Подвійна»[] біля вашої бази.
+tutorial.drillturret = «Подвійна» потребує [accent]мідні боєприпаси[] для стрільби.\nРозмістіть бур біля башти.\nПроведіть конвеєри до башти, щоби заповнити її боєприпасами.\n\n [accent]Доставлено боєприпасів: 0/1
 tutorial.pause = Під час гри ви можете[accent] поставити на паузу.[]\nВи можете зробити чергу на будування під час паузи.\n\n [accent]Натисніть пробіл для паузи.
 tutorial.pause.mobile = Під час гри ви можете[accent] поставити на паузу.[]\nВи можете зробити чергу на будування під час паузи.\n\n[accent]Натисніть кнопку вгорі ліворуч для паузи.
 tutorial.unpause = Призупиніть гру, натиснувши на пробіл.
-tutorial.unpause.mobile = Тепер натисніть туди ще раз, щоб зняти паузу.
-tutorial.breaking = Блоки часто треба знищувати.\n[accent]Утримуючи ПКМ[] ви знищите всі виділені блоки.[]\n\n[accent]Необхідно знищити всі стіни з брухту ліворуч від вашого ядра використовуючи видалення у зоні.
-tutorial.breaking.mobile = Блоки часто треба знищувати.\n[accent]Виберіть режим руйнування[], потім натисніть на блок, щоб зламати його.\nЗнищте область, утримуючи палець протягом декількох секунд [] і потягнувши в потрібному напрямку.\nНатисніть кнопку галочки, щоб підтвердити руйнування.\n\n[accent]Необхідно знищити всі стіни з брухту ліворуч від вашого ядра використовуючи видалення у зоні.
+tutorial.unpause.mobile = Тепер натисніть туди ще раз, щоби зняти паузу.
+tutorial.breaking = Блоки часто треба знищувати.\n[accent]Утримуючи ПКМ[] ви знищите всі виділені блоки.[]\n\n[accent]Необхідно знищити всі стіни з брухту ліворуч від вашого ядра використовуючи видалення в зоні.
+tutorial.breaking.mobile = Блоки часто треба знищувати.\n[accent]Виберіть режим руйнування[], потім натисніть на блок, щоби зламати його.\nВидаліть ділянку, утримуючи палець упродовж декількох секунд [] і потягнувши в потрібному напрямку.\nНатисніть кнопку галочки, щоби підтвердити руйнування.\n\n[accent]Необхідно знищити всі стіни з брухту ліворуч від вашого ядра використовуючи видалення в зоні.
 tutorial.withdraw = У деяких ситуаціях потрібно брати предмети безпосередньо з блоків.\nЩоб зробити це, [accent]натисніть на блок[] з предметами, і потім [accent]натисніть на предмет[] в інвентарі.\nМожна вилучити кілька предметів [accent]натискаючи та утримуючи[].\n\n [accent]Вилучіть трохи міді з ядра.[]
 tutorial.deposit = Покладіть предмети в блок, перетягнувши з вашого корабля в потрібний блок.\n\n[accent]Покладіть мідь назад у ядро.[]
-tutorial.waves = [lightgray]Противник[] з’явився.\n\nЗахистіть ядро від двох хвиль.[accent] Натисніть ЛКМ[], щоб стріляти.\nПобудуйте більше башт і бурів. Добудьте більше міді.
+tutorial.waves = [lightgray]Противник[] з’явився.\n\nЗахистіть ядро від двох хвиль.[accent] Натисніть ЛКМ[], щоби стріляти.\nПобудуйте більше башт і бурів. Добудьте більше міді.
 tutorial.waves.mobile = [lightgray]Противник[] з’явився.\n\nЗахистіть ядро від двох хвиль. Ваш корабель буде автоматично атакувати противників.\nПобудуйте більше башт і бурів. Добудьте більше міді.
 tutorial.launch = Як тільки ви досягнете певної хвилі, ви зможете[accent] запустити ядро[], залишивши свою базу позаду, та [accent]отримати всі ресурси у вашому ядрі.[]\nЦі отримані ресурси можуть бути використані для дослідження нових технологій.\n\n[accent]Натисніть кнопку запуску.
 
 item.copper.description = Початковий будівельний матеріал. Широко використовується у всіх типах блоків.
-item.lead.description = Основний початковий матеріал. Широко застосовується в електроніці та у транспортуванні рідин.
+item.lead.description = Основний початковий матеріал. Широко застосовується в електроніці та в транспортуванні рідин.
 item.metaglass.description = Дуже жорсткий склад скла. Широко застосовується для розподілу та зберігання рідини.
 item.graphite.description = Мінералізований вуглець, що використовується для боєприпасів та як електричний компонент.
-item.sand.description = Поширений матеріал, який широко використовується при виплавці, як при сплавленні, так і в якості відходів.
+item.sand.description = Поширений матеріал, який широко використовується у виплавці, як під час сплавлення, так і в якості відходів.
 item.coal.description = Скам’янілі рослинні речовини, що утворилися задовго до посіву. Широко використовується для виробництва пального та ресурсів.
 item.titanium.description = Рідкісний надлегкий метал, який широко використовується для транспортування рідини, бурів і літаків.
 item.thorium.description = Щільний радіоактивний метал, що використовується в якості конструкційної опори та ядерного палива.
 item.scrap.description = Залишки старих споруд та підрозділів. Містить мікроелементи багатьох різних металів.
 item.silicon.description = Надзвичайно корисний напівпровідник. Має застосування в сонячних батареях, складній електроніці та боєприпасах для башт.
 item.plastanium.description = Легкий пластичний матеріал, що використовується в сучасних літальних апаратах та у фрагментованих боєприпасах.
-item.phase-fabric.description = Майже невагома речовина, що застосовується в передовій електроніці та у технології самовідновлення.
+item.phase-fabric.description = Майже невагома речовина, що застосовується в передовій електроніці та в технології самовідновлення.
 item.surge-alloy.description = Удосконалений сплав з унікальними електричними властивостями.
 item.spore-pod.description = Струмок синтетичних спор, синтезований з атмосферних концентрацій для промислових цілей. Використовується для перетворення на нафту, вибухівку та паливо.
 item.blast-compound.description = Нестабільна сполука, яка використовується в бомбах і вибухівках. Синтезується зі спорових стручків та інших летких речовин. Використовувати як паливо не рекомендується.
@@ -1100,65 +1189,55 @@ item.pyratite.description = Надзвичайно легкозаймиста р
 liquid.water.description = Найкорисніша рідина. Зазвичай використовується для охолодження машин та перероблювання відходів.
 liquid.slag.description = Різні види розплавленого металу змішуються між собою. Може бути відокремлений від складових корисних копалин або розпорошений на ворожі частини як зброя.
 liquid.oil.description = Рідина, яка використовується у виробництві сучасних матеріалів. Може бути перетворена у вугілля в якості палива або використана як куля.
-liquid.cryofluid.description = Інертна рідина, що створена з води та титану. Володіє надзвичайно високою пропускною спроможністю. Широко використовується в якості рідини, що охолоджує.
-unit.draug.description = Примітивний дрон, який добуває ресурси. Дешевий у виробництві. Одноразовий. Автоматично видобуває мідь і свинець поблизу. Доставляє видобуті ресурси до найближчого ядра.
-unit.spirit.description = Модифікований «Драугр», призначений для ремонту замість добування ресурсів. Автоматично відновлює будь-які пошкоджені блоки.
-unit.phantom.description = Удосконалений безпілотник. Йде за користувачами. Допомагає в будуванні блоків. Перебудовує зруйновані блоки.
-unit.dagger.description = Початкова бойова одиниця. Дешевий у виробництві. Нездоланні при використанні в натовпі.
-unit.crawler.description = Наземна одиниця, що складається зі стертої рами з високими вибуховими речовинами, які прив’язані зверху. Не особливо міцний. Вибухає при контакті з противниками.
-unit.titan.description = Удосконалений броньована наземна одиниця. Нападає як на наземні, так і повітряні цілі. Оснащений двома мініатюрними вогнеметами класу «Випалювач».
-unit.fortress.description = Важкий артилерійний мех. Оснащений двома модифікованими гарматами типу «Град» для дальнього нападу на ворожі структури та підрозділи.
-unit.eruptor.description = Важкий мех, що призначений для знесення конструкцій. Вистрілює потік шлаку у ворожі укріплення, розплавляє їх і підпалює леткі речовини.
-unit.wraith.description = Швидкий перехоплювач, який використовує тактику «атакуй і втікай». Пріоритет — генератори енергії.
-unit.ghoul.description = Важкий килимовий бомбардувальник. Пробиває ворожі структури, орієнтуючись на важливу інфраструктуру.
-unit.revenant.description = Важкий ракетний масив.
+liquid.cryofluid.description = Інертна рідина, що створена з води та титану. Має здатність надзвичайно високою пропускною спроможністю. Широко використовується в якості рідини, що охолоджує.
+
 block.message.description = Зберігає повідомлення. Використовується для комунікації між союзниками.
 block.graphite-press.description = Стискає шматки вугілля в чисті аркуші графіту.
 block.multi-press.description = Модернізована версія графітового преса. Використовує воду та енергію для швидкого та ефективного перероблювання вугілля.
-block.silicon-smelter.description = Змішує пісок з чистим вугіллям. Виробляє кремній.
+block.silicon-smelter.description = Змішує пісок із чистим вугіллям. Виробляє кремній.
 block.kiln.description = Виплавляє пісок та свинець у сполуку, відому як метаскло. Для запуску потрібна невелика кількість енергії.
-block.plastanium-compressor.description = Виробляє пластаній з нафти та титану.
+block.plastanium-compressor.description = Виробляє пластаній із нафти та титану.
 block.phase-weaver.description = Синтезує фазову тканину з радіоактивного торію та піску. Для роботи потрібна велика кількість енергії.
 block.alloy-smelter.description = Поєднує титан, свинець, кремній і мідь для отримання кінетичного сплаву.
-block.cryofluidmixer.description = Змішує воду і дрібний порошок титану в кріогенну рідину. Основне використання у торієвому реактору.
-block.blast-mixer.description = Подрібнює і змішує скупчення спор з піротитом для отримання вибухової суміші.
+block.cryofluid-mixer.description = Змішує воду і дрібний порошок титану в кріогенну рідину. Основне використання в торієвому реактору.
+block.blast-mixer.description = Подрібнює і змішує скупчення спор із піротитом для отримання вибухової суміші.
 block.pyratite-mixer.description = Змішує вугілля, свинець та пісок у легкозаймистий піротит.
-block.melter.description = Розплавляє брухт у шлак для подальшого перероблювання, або використання у баштах «Хвиля».
+block.melter.description = Розплавляє брухт у шлак для подальшого перероблювання, або використання в баштах «Хвиля».
 block.separator.description = Відокремлює шлак на його мінеральні компоненти. Виводить охолоджені матеріали.
 block.spore-press.description = Стискає спорові стручки під сильним тиском для синтезу нафти.
 block.pulverizer.description = Подрібнює брухт у дрібний пісок.
-block.coal-centrifuge.description = Нафта перетворюється у шматки вугілля.
+block.coal-centrifuge.description = Нафта перетворюється в шматки вугілля.
 block.incinerator.description = Випаровує будь-який зайвий предмет або рідину, які він отримує.
 block.power-void.description = Знищує будь-яку енергію, до якої він під’єднаний. Тільки пісочниця.
-block.power-source.description = Нескінченно виводить енергію. Тільки пісочниця.
-block.item-source.description = Нескінченно виводить предмети. Тільки пісочниця.
+block.power-source.description = Постійно створює енергію. Тільки пісочниця.
+block.item-source.description = Постійно створює предмети. Тільки пісочниця.
 block.item-void.description = Знищує будь-які предмети. Тільки пісочниця.
-block.liquid-source.description = Нескінченно виводить рідини. Тільки пісочниця.
+block.liquid-source.description = Постійно створює рідини. Тільки пісочниця.
 block.liquid-void.description = Видаляє будь-які рідини. Тільки пісочниця.
-block.copper-wall.description = Дешевий захисний блок.\nКорисний для захисту ядра та башт у перші кілька хвиль.
-block.copper-wall-large.description = Дешевий захисний блок.\nКорисний для захисту ядра та башт у перші кілька хвиль.\nЗаймає декілька плиток.
-block.titanium-wall.description = Відносно сильний захисний блок.\nЗабезпечує помірний захист від противників.
-block.titanium-wall-large.description = Відносно сильний захисний блок.\nЗабезпечує помірний захист від противників.\nЗаймає декілька плиток.
-block.plastanium-wall.description = Особливий тип стіни, який поглинає електричні дуги й блокує автоматичні з’єднання енергетичних вузлів.
-block.plastanium-wall-large.description = Особливий тип стіни, який поглинає електричні дуги й блокує автоматичні з’єднання енергетичних вузлів.\nЗаймає декілька плиток.
-block.thorium-wall.description = Сильний захисний блок.\nГідний захист від противників.
-block.thorium-wall-large.description = Сильний захисний блок.\nГідний захист від противників.\nЗаймає декілька плиток.
-block.phase-wall.description = Стіна має покриття спеціальним складом, що відбиває світло і який базується на фазовій тканині. Відхиляє більшість куль при ударі.
-block.phase-wall-large.description = Стіна має покриття спеціальним складом, що відбиває світло і який базується на фазовій тканині. Відхиляє більшість куль при ударі.\nЗаймає декілька плиток.
-block.surge-wall.description = Надзвичайно міцний захисний блок.\nЗбільшує заряд при контакті з кулями, вивільняючи його випадковим чином.
-block.surge-wall-large.description = Надзвичайно міцний захисний блок.\nЗбільшує заряд при контакті з кулями, вивільняючи його випадковим чином.\nЗаймає декілька плиток.
-block.door.description = Невеликі двері. Можна відкрити або закрити, натиснувши.
-block.door-large.description = Великі двері. Можна відкрити та закрити, натиснувши.\nЗаймає декілька плиток.
-block.mender.description = Періодично ремонтує блоки у його радіусі дії. Захищає башти та стіни.\nЗа бажанням, можна використати кремній для підвищення дальності та ефективності.
-block.mend-projector.description = Покращена версія «Регенератора». Періодично ремонтує блоки у його радіусі дії.\nЗа бажанням, можна використати фазову тканину для підвищення дальності та ефективності.
+block.copper-wall.description = Дешевий оборонний блок.\nКорисний для оборони ядра та башт у перші кілька хвиль.
+block.copper-wall-large.description = Дешевий оборонний блок.\nКорисний для оборони ядра та башт у перші кілька хвиль.\nЗаймає декілька плиток.
+block.titanium-wall.description = Порівняно сильний оборонний блок.\nЗабезпечує помірний оборони від противників.
+block.titanium-wall-large.description = Порівняно сильний оборонний блок.\nЗабезпечує помірний оборони від противників.\nЗаймає декілька плиток.
+block.plastanium-wall.description = Особливий тип стіни, який поглинає електричні дуги і блокує автоматичні з’єднання енергетичних вузлів.
+block.plastanium-wall-large.description = Особливий тип стіни, який поглинає електричні дуги і блокує автоматичні з’єднання енергетичних вузлів.\nЗаймає декілька плиток.
+block.thorium-wall.description = Сильний оборонний блок.\nГарна оборона від противників.
+block.thorium-wall-large.description = Сильний оборонний блок.\nГарна оборона від противників.\nЗаймає декілька плиток.
+block.phase-wall.description = Стіна має покриття спеціальним складом, що відбиває світло і який базується на фазовій тканині. Здебільшого відбиває кулі у разі удару.
+block.phase-wall-large.description = Стіна має покриття спеціальним складом, що відбиває світло і який базується на фазовій тканині. Здебільшого відбиває кулі у разі удару.\nЗаймає декілька плиток.
+block.surge-wall.description = Надзвичайно міцний оборонний блок.\nЗбільшує заряд, якщо контактуватиме з кулями, вивільняючи його випадковим чином.
+block.surge-wall-large.description = Надзвичайно міцний оборонний блок.\nЗбільшує заряд, якщо контактуватиме з кулями, вивільняючи його випадковим чином.\nЗаймає декілька плиток.
+block.door.description = Невеликі двері. Можна відчинити або зачинити, натиснувши на них.
+block.door-large.description = Великі двері. Можна відчинити та зачинити, натиснувши на них.\nЗаймає декілька плиток.
+block.mender.description = Періодично ремонтує блоки в його радіусі дії. Боронить башти та стіни.\nЗа бажанням, можна використати кремній для підвищення дальності та ефективності.
+block.mend-projector.description = Покращена версія «Регенератора». Періодично ремонтує блоки в його радіусі дії.\nЗа бажанням, можна використати фазову тканину для підвищення дальності та ефективності.
 block.overdrive-projector.description = Збільшує швидкість найближчих будівель.\nЗа бажанням, можна використати фазову тканину для підвищення дальності та ефективності.
-block.force-projector.description = Створює навколо себе шестикутне силове поле, захищаючи будівлі та блоки всередині від пошкоджень.\nПерегрівається, якщо завдано занадто великої шкоди. За бажанням, можна використати теплоносій для запобігання перегріву. Для збільшення розміру щита можна використовувати фазову тканину.
+block.force-projector.description = Створює навколо себе шестикутне силове поле, боронячи будівлі та блоки всередині від пошкоджень.\nПерегрівається, якщо завдано занадто великої шкоди. За бажанням, можна використати теплоносій для запобігання перегріву. Для збільшення розміру щита можна використовувати фазову тканину.
 block.shock-mine.description = Наносить шкоду противникам, коли вони наступають на міну. Майже невидима для противника.
 block.conveyor.description = Базовий транспортний блок. Переміщує елементи вперед і автоматично перетворює їх у блоки. Можна обертати.
 block.titanium-conveyor.description = Покращений блок транспорту елементів. Переміщує предмети швидше, ніж звичайні конвеєри.
-block.plastanium-conveyor.description = Переміщує предмети партіями.\nПриймає елементи на задній частині та вивантажує їх у трьох напрямках спереду.
+block.plastanium-conveyor.description = Переміщує предмети партіями.\nПриймає елементи на задній частині та вивантажує їх у трьох напрямках спереду.\nПотребує кілька точок завантаження та розвантаження для максимальної пропускної здатності.
 block.junction.description = Діє як міст для двох перехресних конвеєрних стрічок. Корисно в ситуаціях, коли два різних конвеєри перевозять різні матеріали в різні місця.
-block.bridge-conveyor.description = Покращений блок транспорту елементів. Дозволяє транспортувати предмети до 3-ох плиток з будь-якої місцевості чи будівлі.
+block.bridge-conveyor.description = Покращений блок транспорту елементів. Дає змогу транспортувати предмети до 3-ох плиток із будь-якої місцевості чи будівлі.
 block.phase-conveyor.description = Покращений блок транспорту елементів. Використовує енергію для телепортування елементів на під’єднаний фазовий конвеєр через кілька плиток.
 block.sorter.description = Сортує предмети. Якщо елемент відповідає вибраному, його можна передати. В іншому випадку елемент виводиться зліва та/чи справа.
 block.inverted-sorter.description = Обробляє елементи, як звичайний сортувальник, але виводить обрані елементи на сторони.
@@ -1167,35 +1246,35 @@ block.distributor.description = Поліпшений маршрутизатор.
 block.overflow-gate.description = Вивантажує лише вліво та/або вправо, якщо передній шлях заблокований.
 block.underflow-gate.description = Повна протилежність надмірному затвору. Виводить предмет прямо, якщо лівий та/або правий шлях заблоковано.
 block.mass-driver.description = Найкращий блок для транспортування предметів. Збирає кілька предметів, а потім вистрілює їх до іншої електромагнітної катапульти на велику відстань. Для роботи потребує енергія.
-block.mechanical-pump.description = Дешевий насос з повільним виходом, але не потребує енергоспоживання.
+block.mechanical-pump.description = Дешевий насос із повільним виходом, але не потребує енергоспоживання.
 block.rotary-pump.description = Удосконалений насос. Насоси більше викачують, але потребують енергію.
 block.thermal-pump.description = Найкращий насос.
 block.conduit.description = Основний блок транспортування рідини. Пересуває рідини вперед. Застосовується спільно з насосами та іншими трубопроводами.
-block.pulse-conduit.description = Удосконалений блок транспортування рідини. Швидше транспортує і більше зберігає рідини, ніж стандартні трубопроводи.
-block.plated-conduit.description = Переміщує рідини з тією ж швидкістю, що й імпульсні трубопроводи, але має більше міцності. Не приймає рідин з боків окрім інших трубопроводів.\nПротікає менше.
+block.pulse-conduit.description = Удосконалений блок транспортування рідини. Швидше транспортує й більше зберігає рідини, ніж стандартні трубопроводи.
+block.plated-conduit.description = Переміщує рідини з тією ж швидкістю, що й імпульсні трубопроводи, але має більше міцності. Не приймає рідин із боків окрім інших трубопроводів.\nПротікає менше.
 block.liquid-router.description = Приймає рідини з одного напрямку та виводить їх до трьох інших напрямків порівну. Також можна зберігати певну кількість рідини. Корисно для розщеплення рідин від одного джерела до кількох мішеней.
-block.liquid-tank.description = Зберігає велику кількість рідини. Використовуйте для створення буферів у ситуаціях з непостійним попитом на матеріали або як гарантію охолодження життєво важливих блоків.
+block.liquid-tank.description = Зберігає велику кількість рідини. Використовуйте для створення буферів у ситуаціях із непостійним попитом на матеріали або як гарантію охолодження життєво важливих блоків.
 block.liquid-junction.description = Діє як міст для двох каналів, що перетинаються. Корисно в ситуаціях, коли два різні трубопроводи транспортують різні рідини в різні місця.
-block.bridge-conduit.description = Удосконалений блок транспортування рідини. Дозволяє транспортувати рідину до 3 плиток будь-якої місцевості чи будівлі.
+block.bridge-conduit.description = Удосконалений блок транспортування рідини. Надає можливість транспортувати рідину до 3 плиток будь-якої місцевості чи будівлі.
 block.phase-conduit.description = Удосконалений блок транспортування рідини. Використовує енергію для транспортування рідин до приєднаного фазового каналу через декілька плиток.
 block.power-node.description = Передає живлення на приєднані вузли. Вузол буде отримувати живлення від будь-яких сусідніх блоків або подавати живлення до них.
 block.power-node-large.description = Поліпшений вузол живлення з більшим радіусом дії.
 block.surge-tower.description = Вузол живлення з меншою кількістю доступних з’єднань і з найбільшим радіусом дії.
 block.diode.description = Живлення акумулятора може протікати через цей блок лише в одному напрямку, але лише в тому випадку, якщо інша сторона має менше енергії.
-block.battery.description = Зберігає енергію як буфер в часи надлишкової енергії. Виводить енергію у періоди дефіциту.
+block.battery.description = Зберігає енергію як буфер у часи надлишкової енергії. Виводить енергію в періоди дефіциту.
 block.battery-large.description = Зберігає набагато більше енергії, ніж звичайний акумулятор.
 block.combustion-generator.description = Виробляє енергію, спалюючи легкозаймисті матеріали, такі як вугілля.
-block.thermal-generator.description = Генерує енергію при розміщенні в спекотних місцях.
-block.turbine-generator.description = Удосконалений генератор згоряння. Більш ефективний, але потребує додаткової води для отримання пари.
-block.differential-generator.description = Удосконалений генератор згоряння. Використовує різницю температур між кріогенною рідиною і піротитом, що горить.
+block.thermal-generator.description = Генерує енергію у разі розміщення в спекотних місцях.
+block.steam-generator.description = Удосконалений генератор згоряння. Більш ефективний, але потребує додаткової води для отримання пари.
+block.differential-generator.description = Удосконалений генератор згоряння. Використовує різницю температур між кріогенною рідиною й піротитом, що горить.
 block.rtg-generator.description = Простий і надійний генератор. Використовує тепло радіоактивних сполук, які розкладаються, для отримання енергії з повільною швидкістю.
 block.solar-panel.description = Забезпечує невелику кількість енергії від сонця.
-block.solar-panel-large.description = Значно ефективніша версія стандартної сонячної панелі.
+block.solar-panel-large.description = Значно ефективніша ніж стандартна сонячна панель.
 block.thorium-reactor.description = Виробляє значну кількість енергії з торію. Вимагає постійного охолодження. Сильно вибухне, якщо подаватиметься недостатня кількість теплоносія. Вихідна потужність залежить від заповненості, базова потужність генерується на повній місткості.
-block.impact-reactor.description = Удосконалений генератор, здатний створювати величезну кількість енергії при максимальній ефективності. Для запуску процесу потрібно значні обсяги енергії.
-block.mechanical-drill.description = Недорогий бур. Якщо розмістити на доречних плитках, то буде виводити предмети повільним темпом нескінченно. Придатний лише для базових ресурсів.
-block.pneumatic-drill.description = Поліпшений бур, здатний добувати титан. Видобуває швидше, ніж механічний бур.
-block.laser-drill.description = Дозволяє виконувати буріння ще швидше за допомогою лазерної технології, але вимагає енергії. Придатний до видобутку торію.
+block.impact-reactor.description = Удосконалений генератор, здатний створювати величезну кількість енергії за максимальною ефективності. Для запуску процесу потрібно значні обсяги енергії.
+block.mechanical-drill.description = Недорогий бур. Якщо розмістити на доречних плитках, то виводитиме предмети постійно, але повільно. Придатний лише для базових ресурсів.
+block.pneumatic-drill.description = Поліпшений бур, здатний видобувати титан. Видобуває швидше, ніж механічний бур.
+block.laser-drill.description = Дає змогу виконувати буріння ще швидше за допомогою лазерної технології, але вимагає енергії. Придатний до видобутку торію.
 block.blast-drill.description = Найкращий бур. Потрібна велика кількість енергії.
 block.water-extractor.description = Видобуває підземні води. Використовується в місцях, де немає поверхневої води.
 block.cultivator.description = Культивує невеликі концентрації спор в атмосфері на готові до промисловості стручки.
@@ -1206,15 +1285,15 @@ block.core-nucleus.description = Третя й остання версія ка
 block.vault.description = Зберігає велику кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів зі сховища.
 block.container.description = Зберігає малу кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів зі сховища.
 block.unloader.description = Вивантажує предмети з блока, який не переміщує предмети, на конвеєр або безпосередньо в сусідній блок. Тип предмета для завантаження можна змінити, натиснувши на блок.
-block.launch-pad.description = Запускає партії предметів без необхідності запуску ядра. Стартовий майданчик дозволяє вам запускати ресурси кожні n секунд без необхідності завершувати гру. Просто подайте у нього ресурси та забезпечте енергією.
+block.launch-pad.description = Запускає партії предметів без необхідності запуску ядра. Стартовий майданчик надає можливість вам запускати ресурси кожні n секунд без необхідності завершувати гру. Просто подайте в нього ресурси та забезпечте енергією.
 block.launch-pad-large.description = Поліпшена версія стартового майданчика. Зберігає більше предметів. Запускається частіше.
-block.duo.description = Мала і дешева башта. Корисна проти наземних одиниць.
-block.scatter.description = Основна протиповітряна башта. Розпилює грудочки свинцю, брухту чи метаскла у противників.
+block.duo.description = Мала й дешева башта. Корисна проти наземних одиниць.
+block.scatter.description = Основна протиповітряна башта. Вистрілює грудочки свинцю, брухту чи метаскла в противників.
 block.scorch.description = Підпалює будь-яких наземних противників поблизу. Високоефективна на близькій відстані.
 block.hail.description = Невелика артилерійська башта з далеким радіусом дії.
-block.wave.description = Башта середнього розміру. Стріляє потоками рідини в противників. Автоматично гасить пожежі при постачанні води.
+block.wave.description = Башта середнього розміру. Випускає потоками рідини в противників. Автоматично гасить пожежі при постачанні води.
 block.lancer.description = Лазерна башта середнього розміру, яка атакує наземних противників. Заряджає і вистрілює потужні пучки енергії.
-block.arc.description = Невелика електрична башта з малим радіусом дії. Стріляє дугами електрики у противників.
+block.arc.description = Невелика електрична башта з малим радіусом дії. Стріляє дугами електрики в противників.
 block.swarmer.description = Ракетна башта середнього розміру. Атакує як повітряних, так і наземних противників. Запускає ракети, які летять у противників самостійно.
 block.salvo.description = Більш велика, вдосконалена версія башти «Подвійна». Вистрілює швидкий залп куль у противника.
 block.fuse.description = Велика енергетична башта з малим радіусом дії. Стріляє трьома пронизливими променями на найближчих противників.
@@ -1222,15 +1301,5 @@ block.ripple.description = Надзвичайно потужна артилер
 block.cyclone.description = Велика протиповітряна та протиназемна башта. Підпалює вибухонебезпечними грудками скупчення противників.
 block.spectre.description = Масивна двоствольна гармата. Стріляє великими бронебійними кулями в повітряні та наземні цілі.
 block.meltdown.description = Масивна лазерна гармата. Заряджає і стріляє лазерним променем у найближчих противників. Для роботи потрібен теплоносій.
-block.command-center.description = Наказує бойовим одиницям пересуватися по всій мапі.\nНаявні команди: патрулювання, атакувати вороже ядро, відступити до ядра/заводу. Якщо ворожого ядра немає, то бойові одиниці будуть патрулювати за замовчуванням при застосуванні команди «атакувати».
-block.draug-factory.description = Виробляє дронів, які видобувають ресурси.
-block.spirit-factory.description = Виробляє дронів, які ремонтують блоки.
-block.phantom-factory.description = Виробляє дронів, які допомагають у будівництві.
-block.wraith-factory.description = Виробляє швидких перехоплювачів, які використовують тактику «стріляй і біжи».
-block.ghoul-factory.description = Виробляє важкі килимові бомбардувальники.
-block.revenant-factory.description = Виробляє важкі ракетні одиниці.
-block.dagger-factory.description = Виробляє базові наземні одиниці.
-block.crawler-factory.description = Виробляє швидкі одиниці, які вибухають при контакті з противником.
-block.titan-factory.description = Виробляє поліпшені наземні одиниці.
-block.fortress-factory.description = Виробляє важкі артилерійні наземні одиниці.
 block.repair-point.description = Безперервно ремонтує найближчу пошкоджену бойову одиницю.
+block.segment.description = Пошкоджує та руйнує вхідні снаряди. Окрім лазерних.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index eb8d52478c..506a29aa99 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io 上的 PC 版下载
 link.google-play.description = Google Play 页面
 link.f-droid.description = F-Droid 页面
 link.wiki.description = Mindustry 官方 Wiki
-link.feathub.description = 提出新特性的建议
+link.suggestions.description = 提出新特性的建议
 linkfail = 打开链接失败！\n网址已复制到您的剪贴板。
 screenshot = 屏幕截图已保存到 {0}
 screenshot.invalid = 地图太大，可能没有足够的内存用于截图。
@@ -20,6 +20,8 @@ gameover = 游戏结束
 gameover.pvp = [accent] {0}[]队获胜！
 highscore = [accent]新纪录！
 copied = 已复制。
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = 音乐加载中
 load.map = 地图加载中
@@ -63,8 +65,7 @@ stat.delivered = 装运资源：
 stat.playtime = 游玩时间：[accent] {0}
 stat.rank = 最终评级：[accent]{0}
 
-launcheditems = [accent]装运的资源
-launchinfo = [unlaunched]发射你的核心后，你将获得用蓝字标识的资源。
+globalitems = [accent]Global Items
 map.delete = 确定要删除“[accent]{0}[]”地图吗？
 level.highscore = 最高分：[accent]{0}
 level.select = 选择关卡
@@ -106,6 +107,7 @@ mods.guide = 模组制作教程
 mods.report = 报告 Bug
 mods.openfolder = 打开模组文件夹
 mods.reload = 重载
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]模组：[orange] {0}
 mod.enabled = [lightgray]已启用
 mod.disabled = [scarlet]已禁用
@@ -113,6 +115,7 @@ mod.disable = 禁用
 mod.content = 内容：
 mod.delete.error = 无法删除模组。可能文件被占用。
 mod.requiresversion = [scarlet]所需的游戏版本：[accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]缺少前置模组：{0}
 mod.erroredcontent = [scarlet]内容错误
 mod.errors = 读取内容时发生错误.
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]需要重启
 mod.import = 导入模组
 mod.import.file = 导入文件
 mod.import.github = 从 GitHub 导入模组
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = 这个物品是[accent] '{0}'[]模组的一部分. 删除物品需要先卸载此模组.
 mod.remove.confirm = 此模组将被删除。
 mod.author = [lightgray]作者：[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = 你的设备不支持含有脚本的模组。必须禁用
 about.button = 关于
 name = 名字：
 noname = 先取一个[accent]玩家名[]。
+planetmap = Planet Map
+launchcore = Launch Core
 filename = 文件名：
 unlocked = 解锁了新内容！
 completed = [accent]己研究
@@ -142,6 +148,7 @@ techtree = 科技树
 research.list = [lightgray]研究：
 research = 研究
 researched = [lightgray]{0}己研究。
+research.progress = {0}% complete
 players = {0} 位玩家在线
 players.single = {0} 位玩家在线
 players.search = search
@@ -224,7 +231,6 @@ save.new = 新存档
 save.overwrite = 你确定你要覆盖这个存档吗？
 overwrite = 覆盖
 save.none = 没有找到存档！
-saveload = [accent]正在保存…
 savefail = 保存失败！
 save.delete.confirm = 你确定你要删除这个存档吗？
 save.delete = 删除
@@ -272,6 +278,7 @@ quit.confirm.tutorial = 确定要跳过教程？\n您可以通过[accent]设置-
 loading = [accent]加载中…
 reloading = [accent]重载模组中…
 saving = [accent]保存中…
+respawn = [accent][[{0}][] to respawn in core
 cancelbuilding = [accent][[{0}][]来清除规划
 selectschematic = [accent][[{0}][]来选择复制
 pausebuilding = [accent][[{0}][]来暂停建造
@@ -328,8 +335,9 @@ waves.never = < 无限 >
 waves.every = 每
 waves.waves = 波
 waves.perspawn = 每次生成
+waves.shields = shields/wave
 waves.to = 至
-waves.boss = BOSS
+waves.guardian = Guardian
 waves.preview = 预览
 waves.edit = 编辑…
 waves.copy = 复制到剪贴板
@@ -337,6 +345,11 @@ waves.load = 从剪贴板读取
 waves.invalid = 剪贴板中的波次信息无效。
 waves.copied = 波次信息已复制。
 waves.none = 没有定义敌人。\n请注意，这将自动替换为默认的敌人列表。
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]<默认>
 details = 详情…
 edit = 编辑…
@@ -456,10 +469,12 @@ locked = 已锁定
 complete = [lightgray]完成：
 requirement.wave = {1}中的第{0}波次
 requirement.core = 在{0}中摧毁敌方核心
-requirement.unlock = 解锁{0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = 暂停：\n[lightgray]{0}
 bestwave = [lightgray]最高波次：{0}
 launch = < 发射 >
+launch.text = Launch
 launch.title = 发射成功
 launch.next = [lightgray]下个发射窗口在第{0}波
 launch.unable2 = [scarlet]无法发射[]
@@ -467,13 +482,14 @@ launch.confirm = 您将装载并发射核心中的所有资源。\n此地图将
 launch.skip.confirm = 如果现在跳过，在下一个发射窗口到来前，您都无法发射。
 uncover = 解锁
 configure = 设定装运的数量
+loadout = Loadout
+resources = Resources 
 bannedblocks = 禁用建筑
 addall = 添加所有
-configure.locked = [lightgray]完成{0}\n解锁装运配置。
+launch.destination = Destination: {0}
 configure.invalid = 数量必须是0到{0}之间的数字。
 zone.unlocked = [lightgray]{0} 已解锁。
 zone.requirement.complete = 完成{0}。\n已达成解锁{1}的要求。
-zone.config.unlocked = 资源装运已解锁：[lightgray]\n{0}
 zone.resources = 地图中的资源：
 zone.objective = [lightgray]目标：[accent]{0}
 zone.objective.survival = 生存
@@ -492,35 +508,43 @@ error.io = 网络 I/O 错误。
 error.any = 未知网络错误。
 error.bloom = 未能初始化特效。\n您的设备可能不支持。
 
-zone.groundZero.name = 零号地区
-zone.desertWastes.name = 荒芜沙漠
-zone.craters.name = 陨石带
-zone.frozenForest.name = 冰冻森林
-zone.ruinousShores.name = 遗迹海岸
-zone.stainedMountains.name = 绵延群山
-zone.desolateRift.name = 荒芜裂谷
-zone.nuclearComplex.name = 核裂阵
-zone.overgrowth.name = 增生区
-zone.tarFields.name = 油田
-zone.saltFlats.name = 盐碱荒滩
-zone.impact0078.name = 0078号冲击
-zone.crags.name = 悬崖
-zone.fungalPass.name = 真菌通道
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = 踏上旅程的最佳位置。这儿的敌人威胁很小，但资源也少。\n尽可能多的收集铅和铜。\n出发吧！
-zone.frozenForest.description = 即使是靠近山脉的这里，孢子也已经扩散。他们不能长期停留在寒冷的温度中。\n\n开始运用电力。建造火力发电机并学会使用修理者。
-zone.desertWastes.description = 这里的废料规模庞大、难以预测，并与废弃的结构交织在一起。\n此地区有煤矿存在，点燃它以获取动力，或者将其合成为石墨。\n\n[lightgray]无法保证此着陆位置。
-zone.saltFlats.description = 在沙漠的郊区有盐滩。在这个地方几乎找不到资源。\n\n敌人在这里建立了一个资源存储区。摧毁他们的核心。不要留下任何东西。
-zone.craters.description = 水在这个火山口积聚，这是旧战争的遗迹。夺下该区域。收集沙子来冶炼玻璃。用水泵抽水来加速炮塔和钻头。
-zone.ruinousShores.description = 穿过荒地，就是海岸线。这个地方曾经建造了一个海岸防御线。但现在所剩无几，只有最基本的防御结构仍然毫发无损，其他一切都被摧毁了。\n继续向外扩展。继续研究科技。
-zone.stainedMountains.description = 在更远的内陆地区是山脉，但这里没有被孢子污染。\n这一地区分布着丰富的钛，学习如何使用它。\n\n这里的敌人势力更大，不要给他们时间派出最强的部队。
-zone.overgrowth.description = 这个地区靠近孢子的来源，因此生长过度。\n敌人在这里建立了一个前哨站。建造尖刀单位来摧毁它并找回丢失的东西。
-zone.tarFields.description = 产油区边缘，位于山脉和沙漠之间。它少数几个有石油储量的地区之一。\n尽管被废弃，这附近仍有一些危险的敌方单位。不要低估他们。\n\n[lightgray]如果可能，研究石油加工技术。
-zone.desolateRift.description = 非常危险的区域。这儿的资源丰富但空间很小。敌人十分危险。尽快离开，不要被敌人的攻击间隔太长所愚弄。
-zone.nuclearComplex.description = 以前生产和加工钍的设施已变成废墟。\n[lightgray]研究钍及其多种用途。\n\n敌人在这里大量存在，不断消灭入侵者。
-zone.fungalPass.description = 介于高山和低矮孢子丛生的土地之间的过渡地带。这里有一个小型的敌方侦察基地。\n侦察它。\n使用尖刀和爬行者单位来摧毁两个核心。
-zone.impact0078.description = <描述空缺>
-zone.crags.description = <描述空缺>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = 语言
 settings.data = 游戏数据
@@ -534,9 +558,12 @@ settings.graphics = 图像
 settings.cleardata = 清除游戏数据…
 settings.clear.confirm = 您确定要清除此数据？\n此操作无法撤销！
 settings.clearall.confirm = [scarlet]警告！[]\n这将清除所有数据，包括存档、地图、解锁和按键绑定。\n按「是」后，游戏将删除所有数据并自动退出。
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]< 暂停 >
 clear = 清除
 banned = [scarlet]已禁止
+unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = 是
 no = 否
 info.title = [accent]详情
@@ -558,8 +585,11 @@ blocks.itemsmoved = 移动速度
 blocks.launchtime = 发射间隔时间
 blocks.shootrange = 范围
 blocks.size = 尺寸
+blocks.displaysize = Display Size
 blocks.liquidcapacity = 液体容量
 blocks.powerrange = 能量范围
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = 最多连接
 blocks.poweruse = 使用能量
 blocks.powerdamage = 功率/损伤
@@ -575,13 +605,18 @@ blocks.boosteffect = 增强效果
 blocks.maxunits = 最大单位数量
 blocks.health = 生命值
 blocks.buildtime = 建造时间
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = 建造花费
 blocks.inaccuracy = 误差
 blocks.shots = 发射数
 blocks.reload = 每秒发射数
 blocks.ammo = 弹药
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = 需要更好的钻头
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = 挖掘速度：{0}/秒
 bar.pumpspeed = 泵压速度：{0}/秒
 bar.efficiency = 效率：{0}%
@@ -591,11 +626,12 @@ bar.poweramount = 能量：{0}
 bar.poweroutput = 能量输出：{0}
 bar.items = 物品：{0}
 bar.capacity = 容量：{0}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = 液体
 bar.heat = 热量
 bar.power = 电力
 bar.progress = 制造进度
-bar.spawned = 单位数量：{0}/{1}
 bar.input = 输入
 bar.output = 输出
 
@@ -619,12 +655,16 @@ unit.liquidunits = 液体
 unit.powerunits = 能量
 unit.degrees = 度
 unit.seconds = 秒
+unit.minutes = mins
 unit.persecond = /秒
+unit.perminute = /min
 unit.timesspeed = 倍 速度
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = 物品
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = 普通
 category.power = 能量
 category.liquids = 液体
@@ -639,6 +679,7 @@ setting.linear.name = 抗锯齿
 setting.hints.name = 提示
 setting.flow.name = 显示资源传送速度[scarlet] (实验性）
 setting.buildautopause.name = 自动暂停建造
+setting.mapcenter.name = 地图自动居中
 setting.animatedwater.name = 流动的水
 setting.animatedshields.name = 动态画面
 setting.antialias.name = 抗锯齿
@@ -663,7 +704,6 @@ setting.effects.name = 显示效果
 setting.destroyedblocks.name = 显示摧毁的建筑
 setting.blockstatus.name = 显示方块状态
 setting.conveyorpathfinding.name = 传送带自动寻路
-setting.coreselect.name = 允许蓝图包含核心
 setting.sensitivity.name = 控制器灵敏度
 setting.saveinterval.name = 自动保存间隔
 setting.seconds = {0} 秒
@@ -672,12 +712,15 @@ setting.milliseconds = {0} 毫秒
 setting.fullscreen.name = 全屏
 setting.borderlesswindow.name = 无边界窗口[lightgray]（可能需要重启）
 setting.fps.name = 显示 FPS 和网络延迟
+setting.smoothcamera.name = 镜头平滑
 setting.blockselectkeys.name = 显示建筑选择按键
 setting.vsync.name = 垂直同步
 setting.pixelate.name = 像素画面 [lightgray]（禁用动画）
 setting.minimap.name = 显示小地图
+setting.coreitems.name = 显示核心 (开发中)
 setting.position.name = 显示玩家坐标
 setting.musicvol.name = 音乐音量
+setting.atmosphere.name = Show Planet Atmosphere
 setting.ambientvol.name = 环境音量
 setting.mutemusic.name = 无音乐
 setting.sfxvol.name = 音效音量
@@ -690,9 +733,6 @@ setting.chatopacity.name = 聊天界面不透明度
 setting.lasersopacity.name = 能量激光不透明度
 setting.bridgeopacity.name = 桥梁不透明度
 setting.playerchat.name = 显示玩家聊天气泡
-setting.mapcenter.name = 地图自动居中
-setting.coreitems.name = 显示核心 (开发中)
-setting.smoothcamera.name = 镜头平滑
 public.confirm = 确定使您的游戏公开可见？\n[accent]其他人将可以加入到您的游戏。\n[lightgray]您之后可以在 设置->游戏->游戏公开可见 更改。
 public.beta = 请注意，测试版的游戏不能公开可见。
 uiscale.reset = UI 缩放比例已更改。\n按下“确定”来执行缩放比例的更改。\n[accent]{0}[]秒后[scarlet]将自动退出并还原设置。
@@ -703,10 +743,14 @@ keybinds.mobile = [scarlet]这里的大多数按键绑定在移动设备上都
 category.general.name = 常规
 category.view.name = 视图
 category.multiplayer.name = 多人
+category.blocks.name = Block Select
 command.attack = 攻击
 command.rally = 集合
 command.retreat = 撤退
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]按键：[{0},
+keybind.respawn.name = 重生
+keybind.control.name = Control Unit
 keybind.clear_building.name = 清除建筑
 keybind.press = 请按一个键…
 keybind.press.axis = 请按一个轴或键…
@@ -716,7 +760,8 @@ keybind.toggle_block_status.name = 显隐方块状态
 keybind.move_x.name = 水平移动
 keybind.move_y.name = 竖直移动
 keybind.mouse_move.name = 跟随鼠标
-keybind.dash.name = 冲刺
+keybind.pan.name = Pan View
+keybind.boost.name = 推送
 keybind.schematic_select.name = 选择区域
 keybind.schematic_menu.name = 蓝图目录
 keybind.schematic_flip_x.name = 水平翻转
@@ -743,6 +788,9 @@ keybind.diagonal_placement.name = 斜线建造
 keybind.pick.name = 选择建筑
 keybind.break_block.name = 破坏建筑
 keybind.deselect.name = 取消选择
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = 射击
 keybind.zoom.name = 缩放
 keybind.menu.name = 菜单
@@ -760,8 +808,6 @@ keybind.chat_history_next.name = 聊天记录向后
 keybind.chat_scroll.name = 聊天记录滚动
 keybind.drop_unit.name = 松开单位
 keybind.zoom_minimap.name = 小地图缩放
-keybind.boost.name = 推送
-keybind.respawn.name = 重生
 mode.help.title = 模式说明
 mode.survival.name = 生存
 mode.survival.description = 正常的游戏模式，有限的资源，自动的波次。\n[gray]需要击退周期性出现的敌人。
@@ -779,34 +825,34 @@ rules.reactorexplosions = 反应堆爆炸
 rules.wavetimer = 波次计时器
 rules.waves = 波次
 rules.attack = 攻击模式
+rules.buildai = AI Building
 rules.enemyCheat = 敌人（红队）无限资源
-rules.unitdrops = 敌人出生点
+rules.blockhealthmultiplier = 建筑生命倍数
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = 单位生产速度倍数
 rules.unithealthmultiplier = 单位生命倍数
-rules.blockhealthmultiplier = 建筑生命倍数
-rules.playerhealthmultiplier = 玩家生命倍数
-rules.playerdamagemultiplier = 玩家伤害倍数
 rules.unitdamagemultiplier = 单位伤害倍数
 rules.enemycorebuildradius = 敌对核心非建设区半径：[lightgray]（格）
-rules.respawntime = 重生时间：[lightgray]（秒）
 rules.wavespacing = 波次间隔时间：[lightgray]（秒）
 rules.buildcostmultiplier = 建设花费倍数
 rules.buildspeedmultiplier = 建设时间倍数
 rules.deconstructrefundmultiplier = 拆除返还倍数
 rules.waitForWaveToEnd = 等待敌人时间
 rules.dropzoneradius = 敌人出生点禁区大小：[lightgray]（格）
-rules.respawns = 每波最大重生次数
-rules.limitedRespawns = 重生限制次数
+rules.unitammo = Units Require Ammo
 rules.title.waves = 波次
-rules.title.respawns = 重生
 rules.title.resourcesbuilding = 资源和建造
-rules.title.player = 玩家
 rules.title.enemy = 敌人
 rules.title.unit = 单位
 rules.title.experimental = 实验性
+rules.title.environment = Environment
 rules.lighting = 光照
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = 环境光
-rules.solarpowermultiplier = 太阳能发电倍数
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = 物品
 content.liquid.name = 液体
@@ -832,10 +878,11 @@ liquid.water.name = 水
 liquid.slag.name = 矿渣
 liquid.oil.name = 石油
 liquid.cryofluid.name = 冷冻液
-item.corestorable = [lightgray]核心可存储性：{0}
+
 item.explosiveness = [lightgray]爆炸性：{0}%
 item.flammability = [lightgray]易燃性：{0}%
 item.radioactivity = [lightgray]放射性：{0}%
+
 unit.health = [lightgray]生命值：{0}
 unit.speed = [lightgray]速度：{0}
 unit.weapon = [lightgray]武器{0}
@@ -844,30 +891,67 @@ unit.minespeed = [lightgray]采矿速度：{0}%
 unit.minepower = [lightgray]采矿力量：{0}
 unit.ability = [lightgray]能力：{0}
 unit.buildspeed = [lightgray]建造速度：{0}%
+
 liquid.heatcapacity = [lightgray]热容量：{0}
 liquid.viscosity = [lightgray]粘度：{0}
 liquid.temperature = [lightgray]温度：{0}
 
+unit.dagger.name = 尖刀
+unit.mace.name = Mace
+unit.fortress.name = 堡垒
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = 爬行者
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = 悬崖
 block.sand-boulder.name = 沙砂巨石
 block.grass.name = 草地
 block.slag.name = 矿渣
 block.salt.name = 盐碱地
-block.saltrocks.name = 盐碱岩石
+block.salt-wall.name = Salt Wall
 block.pebbles.name = 鹅卵石
 block.tendrils.name = 卷须
-block.sandrocks.name = 沙岩块
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = 孢子树
-block.sporerocks.name = 孢子岩石
-block.rock.name = 岩石
-block.snowrock.name = 雪岩石
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = 雪树
 block.shale.name = 页岩地
 block.shale-boulder.name = 页岩巨石
 block.moss.name = 苔藓地
 block.shrubs.name = 灌木丛
 block.spore-moss.name = 孢子苔藓地
-block.shalerocks.name = 页岩岩石
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = 废墙
 block.scrap-wall-large.name = 大型废墙
 block.scrap-wall-huge.name = 巨型废墙
@@ -895,13 +979,17 @@ block.craters.name = 陨石坑
 block.sand-water.name = 沙 水
 block.darksand-water.name = 暗沙 水
 block.char.name = 焦土
-block.holostone.name = 霍洛石头
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = 冰雪地
-block.rocks.name = 岩石
-block.icerocks.name = 冰岩石
-block.snowrocks.name = 雪岩石
-block.dunerocks.name = 沙丘岩石
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = 松树
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = 枯萎的白树
 block.white-tree.name = 白树
 block.spore-cluster.name = 孢子簇
@@ -917,10 +1005,9 @@ block.dark-panel-4.name = 暗面板4
 block.dark-panel-5.name = 暗面板5
 block.dark-panel-6.name = 暗面板6
 block.dark-metal.name = 暗金属
-block.ignarock.name = 伊格纳石头
+block.basalt.name = Basalt
 block.hotrock.name = 热石头
 block.magmarock.name = 岩浆石头
-block.cliffs.name = 悬崖
 block.copper-wall.name = 铜墙
 block.copper-wall-large.name = 大型铜墙
 block.titanium-wall.name = 钛墙
@@ -956,7 +1043,7 @@ block.underflow-gate.name = 反向溢流门
 block.silicon-smelter.name = 硅冶炼厂
 block.phase-weaver.name = 相织物编织器
 block.pulverizer.name = 粉碎机
-block.cryofluidmixer.name = 冷冻液混合器
+block.cryofluid-mixer.name = 冷冻液混合器
 block.melter.name = 熔炉
 block.incinerator.name = 焚化炉
 block.spore-press.name = 孢子压缩机
@@ -969,7 +1056,7 @@ block.diode.name = 二极管
 block.battery.name = 电池
 block.battery-large.name = 大型电池
 block.combustion-generator.name = 火力发电机
-block.turbine-generator.name = 涡轮发电机
+block.steam-generator.name = 涡轮发电机
 block.differential-generator.name = 温差发电机
 block.impact-reactor.name = 冲击反应堆
 block.mechanical-drill.name = 机械钻头
@@ -999,17 +1086,6 @@ block.blast-mixer.name = 爆炸混合器
 block.solar-panel.name = 太阳能板
 block.solar-panel-large.name = 大型太阳能板
 block.oil-extractor.name = 石油钻井
-block.command-center.name = 指挥中心
-block.draug-factory.name = 德鲁格采矿机工厂
-block.spirit-factory.name = 神魂修理机工厂
-block.phantom-factory.name = 奔腾建造机工厂
-block.wraith-factory.name = 死灵战机工厂
-block.ghoul-factory.name = 食尸鬼轰炸机工厂
-block.dagger-factory.name = 尖刀机甲工厂
-block.crawler-factory.name = 爬行者机甲工厂
-block.titan-factory.name = 泰坦机甲工厂
-block.fortress-factory.name = 堡垒机甲工厂
-block.revenant-factory.name = 亡魂战机工厂
 block.repair-point.name = 维修点
 block.pulse-conduit.name = 脉冲导管
 block.plated-conduit.name = 电镀导管
@@ -1041,6 +1117,29 @@ block.meltdown.name = 熔毁
 block.container.name = 容器
 block.launch-pad.name = 发射台
 block.launch-pad-large.name = 大型发射台
+block.segment.name = 分割机
+block.command-center.name = Command Center
+block.ground-factory.name = 地面工厂
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = 蓝
 team.crux.name = 红
 team.sharded.name = 黄
@@ -1048,21 +1147,7 @@ team.orange.name = 橙
 team.derelict.name = 灰
 team.green.name = 绿
 team.purple.name = 紫
-unit.spirit.name = 神魂修理机
-unit.draug.name = 德鲁格采矿机
-unit.phantom.name = 奔腾建造机
-unit.dagger.name = 尖刀
-unit.crawler.name = 爬行者
-unit.titan.name = 泰坦
-unit.ghoul.name = 食尸鬼轰炸机
-unit.wraith.name = 死灵战机
-unit.fortress.name = 堡垒
-unit.revenant.name = 亡魂
-unit.eruptor.name = 暴君
-unit.chaos-array.name = 混沌者
-unit.eradicator.name = 根除者
-unit.lich.name = 巫妖
-unit.reaper.name = 死神
+
 tutorial.next = [lightgray]<点击以继续>
 tutorial.intro = 您已进入[scarlet] Mindustry 教程[]。[]\n使用[accent][[WASD][]键移动机甲和视角。\n[accent]按住[[Ctrl]并转动鼠标滚轮[]缩放视野。\n让我们从[accent]采集铜矿[]开始。先移动到铜矿旁边，然后点按矿脉附近散落的矿物。\n\n[accent]{0}/{1} 铜
 tutorial.intro.mobile = 您已进入[scarlet] Mindustry 教程[]。\n在屏幕上滑动来继续。\n[accent]双指捏合[] 来缩小和放大。\n让我们从[accent]采集铜矿[]开始。先移动到铜矿旁边，然后点按矿脉附近散落的矿物。\n\n[accent]铜 {0}/{1}
@@ -1105,17 +1190,7 @@ liquid.water.description = 最有用的液体。常用于冷却机器和废物
 liquid.slag.description = 各种不同类型的熔融金属混合在一起的液体。可以被分解成其矿物成分，或作为武器喷向敌方单位。
 liquid.oil.description = 用于先进材料生产的液体。可以转换成煤作为燃料，或作为武器喷射和放火。
 liquid.cryofluid.description = 一种由水和钛制成的惰性、无腐蚀性的液体。具有极高的热容量。广泛用作冷却剂。
-unit.draug.description = 一种原始的采矿机。生产成本低，消耗品。在附近自动开采铜和铅。将开采的资源输送到最近的核心。
-unit.spirit.description = 采矿机的改进版本，用于维修而不是采矿。自动修复该区域中任何损坏的建筑。
-unit.phantom.description = 一种先进的无人机。跟随玩家并协助建造。
-unit.dagger.description = 一种最基本的地面机甲。生产成本低。集群使用时比较有用。
-unit.crawler.description = 一种地面机甲，由一个框架和绑在上面的烈性炸药组成。不是特别耐用。与敌人接触后爆炸。
-unit.titan.description = 一种先进的地面装甲部队。攻击地面和空中目标。配备两个微型灼烧级火焰喷射器。
-unit.fortress.description = 一种重型炮兵机甲。装备两门改进型冰雹炮，用于对敌军建筑物和部队进行远程攻击。
-unit.eruptor.description = 一种用来拆除建筑物的重型机甲。在敌人的防御工事上发射矿渣，将它们熔化并点燃挥发物。
-unit.wraith.description = 一种快速、一击即退的拦截器机甲。目标是发电机。
-unit.ghoul.description = 一种重型地毯式轰炸机。瞄准关键的基础设施来击溃敌人的基地。
-unit.revenant.description = 一种发射导弹的重型飞行机甲。
+
 block.message.description = 保存一条文字信息。用于队友之间进行交流。
 block.graphite-press.description = 将煤块压缩成纯石墨片材料。
 block.multi-press.description = 石墨压缩机的升级版。利用水和电力快速高效地处理煤炭。
@@ -1124,7 +1199,7 @@ block.kiln.description = 将铅和沙子熔炼成钢化玻璃，需要少量电
 block.plastanium-compressor.description = 用石油和钛生产塑钢。
 block.phase-weaver.description = 用放射性钍和大量沙子生产相织物。
 block.alloy-smelter.description = 用钛、铅、硅和铜生产巨浪合金。
-block.cryofluidmixer.description = 将水和细的钛粉混成冷却液。钍反应堆的必备之物。
+block.cryofluid-mixer.description = 将水和细的钛粉混成冷却液。钍反应堆的必备之物。
 block.blast-mixer.description = 用油料将硫转化为不易燃但更具爆炸性的爆炸化合物。
 block.pyratite-mixer.description = 将煤、铅和沙子混合成高度易燃的硫。
 block.melter.description = 将废料熔化成矿渣，以便进一步加工或用于炮塔弹药。
@@ -1190,7 +1265,7 @@ block.battery.description = 存储能量作为缓冲，在发电量不足时提
 block.battery-large.description = 比普通电池容量更大。
 block.combustion-generator.description = 燃烧煤等材料发电。
 block.thermal-generator.description = 放置在炽热的地形上能够发电。
-block.turbine-generator.description = 先进的火力发电机，效率更高，但需要水来产生蒸汽。
+block.steam-generator.description = 先进的火力发电机，效率更高，但需要水来产生蒸汽。
 block.differential-generator.description = 利用低温流体与燃烧的硫之间的温差产生大量能量。
 block.rtg-generator.description = 一种简单可靠的发电机。利用放射性化合物的衰变产生的热量，以缓慢的速度产生能量。
 block.solar-panel.description = 普通太阳能板，提供少量电力。
@@ -1226,18 +1301,5 @@ block.ripple.description = 大型远程炮台，非常强力，向远处的敌
 block.cyclone.description = 大型炮塔，对空对地，发射在敌人周围引爆的爆炸物。
 block.spectre.description = 超大型炮塔，对空对地，一次射出两颗强大的穿甲弹药。
 block.meltdown.description = 超大型激光炮塔，充能之后持续发射光束，需要冷却剂。
-block.command-center.description = 在地图上向联盟单位发出移动命令。\n使部队攻击一个敌人核心，或者撤退到指挥中心。当没有敌人核心时，得到攻击命令的部队默认向最近的敌人出现的地方集结。
-block.draug-factory.description = 生产德鲁格釆矿机。
-block.spirit-factory.description = 生产魂灵修理机。
-block.phantom-factory.description = 生产幻影建造机。
-block.wraith-factory.description = 生产快速截击机。
-block.ghoul-factory.description = 生产重型地毯轰炸机。
-block.revenant-factory.description = 生产重型导弹部队。
-block.dagger-factory.description = 生产基本地面单位。
-block.crawler-factory.description = 生产快速自毁单元。
-block.titan-factory.description = 生产先进的装甲地面单位。
-block.fortress-factory.description = 生产重型地面火炮部队。
 block.repair-point.description = 持续治疗其附近伤势最重的单位。
 block.segment.description = 对行进中的导弹进行破坏和摧毁, 除激光以外.
-block.segment.name = 分割机
-block.ground-factory.name = 地面工厂
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 2ba467f171..85efa9a527 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -12,7 +12,7 @@ link.itch.io.description = itch.io 電腦版下載網頁
 link.google-play.description = Google Play 商店頁面
 link.f-droid.description = F-Droid 目錄頁面
 link.wiki.description = 官方 Mindustry 維基
-link.feathub.description = 建議新功能
+link.suggestions.description = 建議新功能
 linkfail = 無法打開連結！\n我們已將該網址複製到您的剪貼簿。
 screenshot = 截圖保存到{0}
 screenshot.invalid = 地圖太大了，可能沒有足夠的內存用於截圖。
@@ -20,6 +20,8 @@ gameover = 遊戲結束
 gameover.pvp = [accent]{0}[]隊獲勝！
 highscore = [accent]新的高分紀錄!
 copied = 已複製。
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = 音效載入中
 load.map = 地圖載入中
@@ -63,8 +65,7 @@ stat.delivered = 發射的核心資源：
 stat.playtime = 遊玩時間：[accent] {0}
 stat.rank = 最終排名：[accent]{0}
 
-launcheditems = [accent]已發射的物品
-launchinfo = [unlaunched][[發射]核心以獲得藍字部分的物品。
+globalitems = [accent]Global Items
 map.delete = 確認要刪除「[accent]{0}[]」地圖嗎？
 level.highscore = 最高分：[accent]{0}
 level.select = 選擇關卡
@@ -106,6 +107,7 @@ mods.guide = 模組指南
 mods.report = 回報錯誤
 mods.openfolder = 開啟模組資料夾
 mods.reload = 重新載入
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]模組：[orange]{0}
 mod.enabled = [lightgray]已啟用
 mod.disabled = [scarlet]已禁用
@@ -113,6 +115,7 @@ mod.disable = 禁用
 mod.content = 內容：
 mod.delete.error = 無法刪除模組，檔案可能在使用中。
 mod.requiresversion = [scarlet]最低遊戲版本要求：[accent]{0}
+mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]缺少必須項目: {0}
 mod.erroredcontent = [scarlet]內容錯誤
 mod.errors = 載入內容時發生錯誤
@@ -124,6 +127,7 @@ mod.reloadrequired = [scarlet]需要重新載入
 mod.import = 匯入模組
 mod.import.file = 匯入檔案
 mod.import.github = 匯入GitHub模組
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = 此物品是[accent] '{0}'[]模組的一部份。解除安裝模組以移除此物品。
 mod.remove.confirm = 該模組將被刪除。
 mod.author = [lightgray]作者:[] {0}
@@ -135,6 +139,8 @@ mod.scripts.disable = 您的設備不支持包含指令檔的模組。您必須
 about.button = 關於
 name = 名稱：
 noname = 請先選擇一個[accent]玩家名稱[]。
+planetmap = Planet Map
+launchcore = Launch Core
 filename = 檔案名稱︰
 unlocked = 已解鎖新內容！
 completed = [accent]完成
@@ -142,6 +148,7 @@ techtree = 科技樹
 research.list = [lightgray]研究︰
 research = 研究
 researched = [lightgray]{0}研究完成。
+research.progress = {0}% complete
 players = {0}個線上玩家
 players.single = {0}個線上玩家
 players.search = 搜尋
@@ -224,7 +231,6 @@ save.new = 新存檔
 save.overwrite = 您確定要覆蓋存檔嗎？
 overwrite = 覆蓋
 save.none = 找不到存檔！
-saveload = [accent]存檔中...
 savefail = 存檔失敗！
 save.delete.confirm = 您確定要刪除這個存檔嗎？
 save.delete = 刪除
@@ -339,6 +345,11 @@ waves.load = 從剪貼板加載
 waves.invalid = 剪貼板中的波次無效。
 waves.copied = 波次已被複製。
 waves.none = 無自定義敵人.\n請注意，空佈局將自動替換為預設佈局。
+
+wavemode.counts = counts
+wavemode.totals = totals
+wavemode.health = health
+
 editor.default = [lightgray]〈默認〉
 details = 詳情...
 edit = 編輯...
@@ -458,10 +469,12 @@ locked = 鎖定
 complete = [lightgray]完成：
 requirement.wave = 在{1}到達第{0}波
 requirement.core = 在{0}摧毀敵人核心
-requirement.unlock = 解鎖{0}
+requirement.research = Research {0}
+requirement.capture = Capture {0}
 resume = 繼續區域：\n[lightgray]{0}
 bestwave = [lightgray]最高波次：{0}
 launch = < 發射 >
+launch.text = Launch
 launch.title = 發射成功
 launch.next = [lightgray]下次的機會於波次{0}
 launch.unable2 = [scarlet]無法發射核心。[]
@@ -469,13 +482,14 @@ launch.confirm = 這將發射核心中的所有資源。\n你將無法返回這
 launch.skip.confirm = 如果您現在跳過，您將無法發射核心直到下一次的可發射波數。
 uncover = 探索
 configure = 配置裝載
+loadout = Loadout
+resources = Resources 
 bannedblocks = 禁用方塊
 addall = 全部加入
-configure.locked = [lightgray]解鎖配置裝載: {0}。
+launch.destination = Destination: {0}
 configure.invalid = 數值必須介於 0 到 {0}。
 zone.unlocked = [lightgray]{0}已解鎖。
 zone.requirement.complete = 到達波次{0}：\n滿足{1}區域要求。
-zone.config.unlocked = 加載解鎖:[lightgray]\n{0}
 zone.resources = [lightgray]檢測到的資源：
 zone.objective = [lightgray]目標: [accent]{0}
 zone.objective.survival = 生存
@@ -494,35 +508,43 @@ error.io = 網絡輸出入錯誤。
 error.any = 未知網絡錯誤。
 error.bloom = 初始化特效失敗.\n您的設備可能不支援它
 
-zone.groundZero.name = 零號地區
-zone.desertWastes.name = 沙漠荒原
-zone.craters.name = 隕石坑
-zone.frozenForest.name = 冰凍森林
-zone.ruinousShores.name = 廢墟海岸
-zone.stainedMountains.name = 汙染山脈
-zone.desolateRift.name = 荒涼裂谷
-zone.nuclearComplex.name = 核生產綜合體
-zone.overgrowth.name = 蔓生
-zone.tarFields.name = 焦油田
-zone.saltFlats.name = 鹽沼
-zone.impact0078.name = 衝擊 0078
-zone.crags.name = 岩壁
-zone.fungalPass.name = 真菌隘口
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
 
-zone.groundZero.description = 再次開始的最佳位置。敵人威脅度低。資源少。\n盡可能的收集更多的鉛和銅。\n繼續前進。
-zone.frozenForest.description = 即使這裡更靠近山脈，孢子也已經擴散到這裡了。嚴寒的溫度不可能永遠禁錮它們。\n\n開始進入能源的世界。建造燃燒發電機。學會使用修理方塊。
-zone.desertWastes.description = 這些荒原規模巨大，難以預測，並且與廢棄的結構交錯在一起。\n此地區存在著煤炭。燃燒它以獲得能源或合成石墨。\n\n[lightgray]無法保證此地圖的著陸位置。
-zone.saltFlats.description = 鹽沼毗連著沙漠。在這裡幾乎找不到多少資源\n\n敵人在這裡建立了一個資源儲存複合體。剷除敵人的核心。別留下任何東西。
-zone.craters.description = 這個殞坑中心積蓄著水。這是一場舊戰爭的遺跡。奪回該地區。收集沙子。燒製玻璃。抽水來冷卻砲塔和鑽頭。
-zone.ruinousShores.description = 穿過荒地，就是海岸線。這個地點曾經駐紮了海防陣線。現在它們已經所剩無幾。只有最基本的防禦結構沒有被破壞，其他的一切都成了殘骸。\n繼續向外擴張。重新發現那些科技。
-zone.stainedMountains.description = 內陸的更深處是群山，還未被孢子所污染。\n提取在該區域蘊藏豐富的鈦，並學習如何使用它們。\n\n這裡存在著更為強大的敵人。不要給他們時間派出最強的部隊。
-zone.overgrowth.description = 這個地區更靠近孢子的來源，已經蔓生過度了。\n敵人在這裡建立了哨所。建立泰坦機甲。破壞它，並取回失落的事物。
-zone.tarFields.description = 位於山脈和沙漠之間的產油區外緣是少數幾個有可用焦油儲量的地區之一。\n雖然被遺棄了，該地區附近還是有著一些危險的敵人。不要低估它們。\n\n[lightgray]如果可能的話，研究原油加工技術。
-zone.desolateRift.description = 一個非常危險的區域。資源豐富，但空間很小。毀滅的風險很高。請盡快離開。不要被敵人攻擊之間的漫長間隔所欺騙。
-zone.nuclearComplex.description = 以前生產和加工釷的設施已變成廢墟。\n[lightgray]研究釷及其多種用途。\n\n此處的敵人數量眾多，不斷的偵查入侵者。
-zone.fungalPass.description = 高山與被孢子纏繞的低地之間的過渡區域。一個小的敵人偵察基地位於這裡。\n破壞它。\n使用匕首機甲和爬行機甲單位來摧毀兩個核心。
-zone.impact0078.description = <在此處輸入說明>
-zone.crags.description = <在此輸入說明>
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
+
+sector.groundZero.name = Ground Zero
+sector.craters.name = The Craters
+sector.frozenForest.name = Frozen Forest
+sector.ruinousShores.name = Ruinous Shores
+sector.stainedMountains.name = Stained Mountains
+sector.desolateRift.name = Desolate Rift
+sector.nuclearComplex.name = Nuclear Production Complex
+sector.overgrowth.name = Overgrowth
+sector.tarFields.name = Tar Fields
+sector.saltFlats.name = Salt Flats
+sector.fungalPass.name = Fungal Pass
+
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = 語言
 settings.data = 遊戲數據
@@ -536,6 +558,8 @@ settings.graphics = 圖形
 settings.cleardata = 清除遊戲數據...
 settings.clear.confirm = 您確定要清除數據嗎?\n此操作無法撤回！
 settings.clearall.confirm = [scarlet]警告！[]\n這將清除所有數據，包括存檔、地圖、解鎖和熱鍵綁定。\n按「是」後，遊戲將刪除所有數據並自動退出。
+settings.clearsaves.confirm = Are you sure you want to clear all your saves?
+settings.clearsaves = Clear Saves
 paused = [accent]〈已暫停〉
 clear = 清除
 banned = [scarlet]已被封禁
@@ -561,8 +585,11 @@ blocks.itemsmoved = 移動速度
 blocks.launchtime = 發射間隔
 blocks.shootrange = 範圍
 blocks.size = 尺寸
+blocks.displaysize = Display Size
 blocks.liquidcapacity = 液體容量
 blocks.powerrange = 輸出範圍
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = 最大連接數
 blocks.poweruse = 能量使用
 blocks.powerdamage = 能量/傷害
@@ -578,13 +605,18 @@ blocks.boosteffect = 提升效應
 blocks.maxunits = 最大活躍單位
 blocks.health = 耐久度
 blocks.buildtime = 建設時間
+blocks.maxconsecutive = Max Consecutive
 blocks.buildcost = 建造成本
 blocks.inaccuracy = 誤差
 blocks.shots = 射擊數
 blocks.reload = 射擊次數/秒
 blocks.ammo = 彈藥
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = 需要更好的鑽頭
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = 鑽頭速度：{0}/秒
 bar.pumpspeed = 液體泵送速度：{0}/s
 bar.efficiency = 效率：{0}%
@@ -594,7 +626,8 @@ bar.poweramount = 能量：{0}
 bar.poweroutput = 能量輸出：{0}
 bar.items = 物品：{0}
 bar.capacity = 容量: {0}
-bar.units = 單位: {0}/{1}
+bar.unitcap = {0} {1}/{2}
+bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = 液體
 bar.heat = 熱
 bar.power = 能量
@@ -622,12 +655,16 @@ unit.liquidunits = 液體單位
 unit.powerunits = 能量單位
 unit.degrees = 度
 unit.seconds = 秒
+unit.minutes = mins
 unit.persecond = /秒
+unit.perminute = /min
 unit.timesspeed = ×速度
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = 物品
 unit.thousands = k
 unit.millions = mil
+unit.billions = b
 category.general = 一般
 category.power = 能量
 category.liquids = 液體
@@ -642,6 +679,7 @@ setting.linear.name = 線性過濾
 setting.hints.name = 提示
 setting.flow.name = 顯示資源輸送速度[scarlet]
 setting.buildautopause.name = 自動暫停建築
+setting.mapcenter.name = Auto Center Map To Player
 setting.animatedwater.name = 液體動畫
 setting.animatedshields.name = 護盾動畫
 setting.antialias.name = 消除鋸齒[lightgray]（需要重啟遊戲）[]
@@ -666,7 +704,6 @@ setting.effects.name = 顯示特效
 setting.destroyedblocks.name = 顯示被破壞的方塊
 setting.blockstatus.name = 顯示方塊狀態
 setting.conveyorpathfinding.name = 自動輸送帶放置規劃
-setting.coreselect.name = 允許藍圖包含核心
 setting.sensitivity.name = 控制器靈敏度
 setting.saveinterval.name = 自動存檔間隔
 setting.seconds = {0}秒
@@ -675,10 +712,12 @@ setting.milliseconds = {0}毫秒
 setting.fullscreen.name = 全螢幕
 setting.borderlesswindow.name = 無邊框窗口[lightgray]（可能需要重啟遊戲）
 setting.fps.name = 顯示FPS與Ping
+setting.smoothcamera.name = Smooth Camera
 setting.blockselectkeys.name = 顯示方塊選擇快捷鍵
 setting.vsync.name = 垂直同步
 setting.pixelate.name = 像素化
 setting.minimap.name = 顯示小地圖
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = 顯示玩家位置
 setting.musicvol.name = 音樂音量
 setting.atmosphere.name = 顯示星球大氣層
@@ -704,9 +743,11 @@ keybinds.mobile = [scarlet]此處的大多數快捷鍵在移動設備上均不
 category.general.name = 一般
 category.view.name = 查看
 category.multiplayer.name = 多人
+category.blocks.name = Block Select
 command.attack = 攻擊
 command.rally = 集結
 command.retreat = 撤退
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]按鍵：[{0},
 keybind.respawn.name = 重生
 keybind.control.name = 控制單位
@@ -719,6 +760,7 @@ keybind.toggle_block_status.name = 開啟方塊狀態顯示
 keybind.move_x.name = 水平移動
 keybind.move_y.name = 垂直移動
 keybind.mouse_move.name = 跟隨滑鼠
+keybind.pan.name = Pan View
 keybind.boost.name = 噴射
 keybind.schematic_select.name = 選擇區域
 keybind.schematic_menu.name = 藍圖目錄
@@ -746,6 +788,9 @@ keybind.diagonal_placement.name = 對角線放置
 keybind.pick.name = 選擇方塊
 keybind.break_block.name = 移除方塊
 keybind.deselect.name = 取消選取
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = 射擊
 keybind.zoom.name = 縮放
 keybind.menu.name = 主選單
@@ -780,35 +825,34 @@ rules.reactorexplosions = 反應爐爆炸
 rules.wavetimer = 波次時間
 rules.waves = 波次
 rules.attack = 攻擊模式
+rules.buildai = AI Building
 rules.enemyCheat = 電腦無限資源
-rules.unitdrops = 單位掉落物
+rules.blockhealthmultiplier = 建築物耐久度倍數
+rules.blockdamagemultiplier = Block Damage Multiplier
 rules.unitbuildspeedmultiplier = 單位建設速度倍數
 rules.unithealthmultiplier = 單位生命值倍數
-rules.blockhealthmultiplier = 建築物耐久度倍數
-rules.playerhealthmultiplier = 玩家生命值倍數
-rules.playerdamagemultiplier = 玩家傷害倍數
 rules.unitdamagemultiplier = 單位傷害倍數
 rules.enemycorebuildradius = 敵人核心禁止建設半徑︰[lightgray]（格）
-rules.respawntime = 重生時間︰[lightgray]（秒）
 rules.wavespacing = 波次間距︰[lightgray]（秒）
 rules.buildcostmultiplier = 建設成本倍數
 rules.buildspeedmultiplier = 建設速度倍數
 rules.deconstructrefundmultiplier = 拆除資源返還比例
 rules.waitForWaveToEnd = 等待所有敵人毀滅才開始下一波次
 rules.dropzoneradius = 空降區半徑:[lightgray]（格）
-rules.respawns = 每波次最多重生次數
-rules.limitedRespawns = 限制重生
+rules.unitammo = Units Require Ammo
 rules.title.waves = 波次
-rules.title.respawns = 重生
 rules.title.resourcesbuilding = 資源與建築
-rules.title.player = 玩家
 rules.title.enemy = 敵人
 rules.title.unit = 單位
 rules.title.experimental = 實驗中
 rules.title.environment = 環境
 rules.lighting = 光照
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = 環境光照
-rules.solarpowermultiplier = 太陽能倍數
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = 物品
 content.liquid.name = 液體
@@ -834,10 +878,11 @@ liquid.water.name = 水
 liquid.slag.name = 熔渣
 liquid.oil.name = 原油
 liquid.cryofluid.name = 冷凍液
-item.corestorable = [lightgray]核心可儲存: {0}
+
 item.explosiveness = [lightgray]爆炸性：{0}%
 item.flammability = [lightgray]易燃性：{0}%
 item.radioactivity = [lightgray]放射性：{0}%
+
 unit.health = [lightgray]生命值：{0}
 unit.speed = [lightgray]速度：{0}
 unit.weapon = [lightgray]武器: {0}
@@ -846,30 +891,67 @@ unit.minespeed = [lightgray]採礦速度: {0}%
 unit.minepower = [lightgray]採礦能力: {0}
 unit.ability = [lightgray]能力: {0}
 unit.buildspeed = [lightgray]建造速度: {0}%
+
 liquid.heatcapacity = [lightgray]熱容量：{0}
 liquid.viscosity = [lightgray]粘性：{0}
 liquid.temperature = [lightgray]溫度：{0}
 
+unit.dagger.name = 匕首機甲
+unit.mace.name = Mace
+unit.fortress.name = 要塞
+unit.nova.name = Nova
+unit.pulsar.name = Pulsar
+unit.quasar.name = Quasar
+unit.crawler.name = 爬行機甲
+unit.atrax.name = Atrax
+unit.spiroct.name = Spiroct
+unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
+unit.flare.name = Flare
+unit.horizon.name = Horizon
+unit.zenith.name = Zenith
+unit.antumbra.name = Antumbra
+unit.eclipse.name = Eclipse
+unit.mono.name = Mono
+unit.poly.name = Poly
+unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
+unit.risso.name = Risso
+unit.minke.name = Minke
+unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
+unit.alpha.name = Alpha
+unit.beta.name = Beta
+unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
+
+block.resupply-point.name = Resupply Point
+block.parallax.name = Parallax
 block.cliff.name = 峭壁
 block.sand-boulder.name = 沙礫
 block.grass.name = 草
 block.slag.name = 熔渣
 block.salt.name = 鹽
-block.saltrocks.name = 鹽岩
+block.salt-wall.name = Salt Wall
 block.pebbles.name = 卵石
 block.tendrils.name = 卷鬚
-block.sandrocks.name = 沙岩
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = 孢子松
-block.sporerocks.name = 孢子岩
-block.rock.name = 岩石
-block.snowrock.name = 雪巖
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = 雪松
 block.shale.name = 頁岩
 block.shale-boulder.name = 頁岩巨石
 block.moss.name = 苔蘚
 block.shrubs.name = 灌木
 block.spore-moss.name = 孢子苔蘚
-block.shalerocks.name = 頁岩岩石
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = 廢牆
 block.scrap-wall-large.name = 大型廢牆
 block.scrap-wall-huge.name = 巨型廢牆
@@ -897,13 +979,17 @@ block.craters.name = 隕石坑
 block.sand-water.name = 沙水
 block.darksand-water.name = 黑沙水
 block.char.name = 燒焦
-block.holostone.name = 霍洛石頭
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = 冰雪
-block.rocks.name = 岩石
-block.icerocks.name = 冰岩
-block.snowrocks.name = 雪巖
-block.dunerocks.name = 沙丘岩
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = 松樹
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = 枯萎白樹
 block.white-tree.name = 白樹
 block.spore-cluster.name = 孢子簇
@@ -919,10 +1005,9 @@ block.dark-panel-4.name = 黑面板 4
 block.dark-panel-5.name = 黑面板 5
 block.dark-panel-6.name = 黑面板 6
 block.dark-metal.name = 黑金屬
-block.ignarock.name = 火成岩
+block.basalt.name = Basalt
 block.hotrock.name = 熱岩
 block.magmarock.name = 岩漿岩
-block.cliffs.name = 懸崖
 block.copper-wall.name = 銅牆
 block.copper-wall-large.name = 大型銅牆
 block.titanium-wall.name = 鈦牆
@@ -958,7 +1043,7 @@ block.underflow-gate.name = 反向溢流器
 block.silicon-smelter.name = 煉矽廠
 block.phase-weaver.name = 相織布編織器
 block.pulverizer.name = 粉碎機
-block.cryofluidmixer.name = 冷凍液混合器
+block.cryofluid-mixer.name = 冷凍液混合器
 block.melter.name = 熔爐
 block.incinerator.name = 焚化爐
 block.spore-press.name = 孢子壓縮機
@@ -971,7 +1056,7 @@ block.diode.name = 二極體
 block.battery.name = 電池
 block.battery-large.name = 大型電池
 block.combustion-generator.name = 燃燒發電機
-block.turbine-generator.name = 渦輪發電機
+block.steam-generator.name = 渦輪發電機
 block.differential-generator.name = 差動發電機
 block.impact-reactor.name = 衝擊反應堆
 block.mechanical-drill.name = 機械鑽頭
@@ -1001,17 +1086,6 @@ block.blast-mixer.name = 爆炸混合器
 block.solar-panel.name = 太陽能板
 block.solar-panel-large.name = 大型太陽能板
 block.oil-extractor.name = 原油鑽井
-block.command-center.name = 指揮中心
-block.draug-factory.name = 殭屍採礦機工廠
-block.spirit-factory.name = 幽靈無人機工廠
-block.phantom-factory.name = 幻影無人機工廠
-block.wraith-factory.name = 怨靈戰鬥機工廠
-block.ghoul-factory.name = 食屍鬼轟炸機工廠
-block.dagger-factory.name = 匕首機甲工廠
-block.crawler-factory.name = 爬行機甲工廠
-block.titan-factory.name = 泰坦機甲工廠
-block.fortress-factory.name = 要塞機甲工廠
-block.revenant-factory.name = 復仇鬼戰鬥機工廠
 block.repair-point.name = 維修點
 block.pulse-conduit.name = 脈衝管線
 block.plated-conduit.name = 裝甲管線
@@ -1043,6 +1117,29 @@ block.meltdown.name = 熔毀砲
 block.container.name = 容器
 block.launch-pad.name = 小型發射台
 block.launch-pad-large.name = 大型發射台
+block.segment.name = Segment
+block.command-center.name = Command Center
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.payload-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.overdrive-dome.name = Overdrive Dome
+
+block.switch.name = Switch
+block.micro-processor.name = Micro Processor
+block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
+block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
+block.memory-cell.name = Memory Cell
+
 team.blue.name = 藍
 team.crux.name = 紅
 team.sharded.name = 黃
@@ -1050,21 +1147,7 @@ team.orange.name = 橘
 team.derelict.name = 灰
 team.green.name = 綠
 team.purple.name = 紫
-unit.spirit.name = 幽靈無人機
-unit.draug.name = 殭屍採礦無人機
-unit.phantom.name = 幻影無人機
-unit.dagger.name = 匕首機甲
-unit.crawler.name = 爬行機甲
-unit.titan.name = 泰坦
-unit.ghoul.name = 食屍鬼轟炸機
-unit.wraith.name = 怨靈戰鬥機
-unit.fortress.name = 要塞
-unit.revenant.name = 復仇鬼
-unit.eruptor.name = 噴發者
-unit.chaos-array.name = 混沌陣列
-unit.eradicator.name = 殲滅者
-unit.lich.name = 巫妖
-unit.reaper.name = 收掠者
+
 tutorial.next = [lightgray]<按下以繼續>
 tutorial.intro = 您已進入[scarlet] Mindustry 教學。[]\n使用[[WASD鍵]來移動.\n滾動滾輪來放大縮小畫面.\n從[accent]開採銅礦[]開始吧靠近它，然後在靠近核心的位置點擊銅礦。\n\n[accent]{0}/{1}銅礦
 tutorial.intro.mobile = 您已進入[scarlet] Mindustry 教學。[]\n滑動螢幕即可移動。\n[accent]用兩指捏[]來縮放畫面。\n從[accent]開採銅礦[]開始吧。靠近它，然後在靠近核心的位置點擊銅礦。\n\n[accent]{0}/{1}銅礦
@@ -1107,17 +1190,7 @@ liquid.water.description = 最有用的液體。常用於冷卻機器和廢物
 liquid.slag.description = 各種不同類型的熔融金屬混合在一起的液體。可以被分解成其所組成之礦物，或作為武器向敵方單位噴灑。
 liquid.oil.description = 用於進階材料製造的液體。可以轉化為煤炭作為燃料或噴灑向敵方單位後點燃作為武器。
 liquid.cryofluid.description = 一種安定，無腐蝕性的液體，用水及鈦混合成。具有很高的比熱。廣泛的用作冷卻劑。
-unit.draug.description = 原始的採礦無人機。生產便宜。消耗品。自動在附近開採銅和鉛。將開採的資源送入最接近的核心。
-unit.spirit.description = 改造的殭屍採礦無人機，設計來修復而非採礦。會自動修理整個區域內的受損方塊。
-unit.phantom.description = 一種高級的無人機。跟隨玩家，並輔助建造及重建被摧毀的建築。
-unit.dagger.description = 一種基本的地面單位。成群使用時具有壓倒性威力。
-unit.crawler.description = 一種地面單位，由精簡的機架組成，頂部綁有炸藥。不特別耐打。與敵人接觸時爆炸。
-unit.titan.description = 一種高級的具有裝甲的地面單位。配備兩具迷你的焦土級火焰發射器。攻擊地面單位和空中單位。
-unit.fortress.description = 一種具有重型大砲的地面單位。配備兩具冰雹型的大砲，用於對敵方建築和單位的長距離攻擊。
-unit.eruptor.description = 設計用於拆除建築物的重型機械。向敵人的防禦工事發射一道熔渣，融化它們，並點燃周圍可燃物。
-unit.wraith.description = 一種快速、打帶跑的攔截機。針對發電機進行打擊。
-unit.ghoul.description = 一種重型的鋪蓋性轟炸機。摧毀敵方建築，並針對重要基礎設施進行打擊。
-unit.revenant.description = 重型的盤旋導彈陣列。
+
 block.message.description = 儲存一條訊息。用於盟友之間的溝通。
 block.graphite-press.description = 將煤炭壓縮成石墨。
 block.multi-press.description = 石墨壓縮機的升級版。利用水和電力快速高效地處理煤炭。
@@ -1126,7 +1199,7 @@ block.kiln.description = 將沙子和鉛熔煉成鋼化玻璃。需要少量能
 block.plastanium-compressor.description = 將原油和鈦壓縮製造塑鋼。
 block.phase-weaver.description = 使用放射性的釷和大量的沙子生產相織布。需要巨量能量。
 block.alloy-smelter.description = 使用鈦、鉛、矽和銅以生產波動合金。	
-block.cryofluidmixer.description = 混合水和研磨的鈦粉製造冷卻效率更高的冷凍液。對釷反應堆是必要的。
+block.cryofluid-mixer.description = 混合水和研磨的鈦粉製造冷卻效率更高的冷凍液。對釷反應堆是必要的。
 block.blast-mixer.description = 混合胞子碎塊將火焰彈變成比較不易燃但更具爆炸性的爆炸混合物。
 block.pyratite-mixer.description = 混合煤、鉛和沙子混合成為易燃的火焰彈。
 block.melter.description = 將廢料加熱到很高的溫度產生熔渣，用於進一步製程或波浪炮。
@@ -1192,7 +1265,7 @@ block.battery.description = 有能量剩餘時存儲電力並在能量短缺時
 block.battery-large.description = 比普通電池存儲更多的能量。
 block.combustion-generator.description = 透過燃燒原油或可燃物品以產生能量。
 block.thermal-generator.description = 放置在熱的位置時會產生能量。
-block.turbine-generator.description = 比燃燒發電機更有效率，但需要水才能運作。
+block.steam-generator.description = 比燃燒發電機更有效率，但需要水才能運作。
 block.differential-generator.description = 利用冷卻液和燃燒火焰彈之間的溫差產生大量的能量。
 block.rtg-generator.description = 一種簡單、可靠的發電機，使用放射性化合物衰變所產生的熱產生少量能量。不需要冷卻，但產生的能量比釷反應堆少。
 block.solar-panel.description = 透過太陽產生少量的能量。
@@ -1228,15 +1301,5 @@ block.ripple.description = 極為強大的迫擊炮塔。一次向敵人發射
 block.cyclone.description = 一種對空和對地的大型砲塔。向附近單位發射爆裂性的碎塊。
 block.spectre.description = 一種雙炮管的巨型砲塔。向空中及地面敵人發射大型的穿甲彈。
 block.meltdown.description = 一種巨型激光砲塔。充能並發射持續性的激光光束。需要冷卻液以運作。
-block.command-center.description = 向地圖上的盟軍發出移動命令。\n使單位巡邏，攻擊敵人的核心或撤退到核心/工廠。當沒有敵人核心時，部隊將默認在攻擊命令下進行巡邏。
-block.draug-factory.description = 生產殭屍採礦無人機。
-block.spirit-factory.description = 生產幽靈無人機，用於修復方塊。
-block.phantom-factory.description = 生產高級的建造無人機。
-block.wraith-factory.description = 生產快速、打帶跑的攔截機單位。
-block.ghoul-factory.description = 生產重型鋪蓋轟炸機。
-block.revenant-factory.description = 生產重型飛行導彈單位。
-block.dagger-factory.description = 生產基本地面單位。
-block.crawler-factory.description = 生產快速的自爆部隊。
-block.titan-factory.description = 生產具有裝甲的高級地面單位。
-block.fortress-factory.description = 生產重型火砲地面單位。
 block.repair-point.description = 持續治療附近最近的受損單位。
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
diff --git a/core/assets/contributors b/core/assets/contributors
index ee8b77ddb9..69de5a3d8e 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -89,3 +89,9 @@ Daniel Dusek
 DeltaNedas
 GioIacca9
 SnakkiZXZ
+sk7725
+The Slaylord
+ThePlayerA
+YellOw139
+PetrGasparik
+LeoDog896
diff --git a/core/assets/fonts/font.ttf b/core/assets/fonts/font.ttf
deleted file mode 100644
index 915f1dfe54..0000000000
Binary files a/core/assets/fonts/font.ttf and /dev/null differ
diff --git a/core/assets/fonts/font.woff b/core/assets/fonts/font.woff
new file mode 100644
index 0000000000..4d8ed4b9f7
Binary files /dev/null and b/core/assets/fonts/font.woff differ
diff --git a/core/assets/fonts/icon.ttf b/core/assets/fonts/icon.ttf
index 0cde9685b5..4b61658e65 100644
Binary files a/core/assets/fonts/icon.ttf and b/core/assets/fonts/icon.ttf differ
diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 4a667ccd7d..b07514ea1b 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -21,15 +21,8 @@
 63723=ice|block-ice-medium
 63722=ice-snow|block-ice-snow-medium
 63721=cliffs|block-cliffs-medium
-63720=rocks|block-rocks-medium
-63719=sporerocks|block-sporerocks-medium
 63718=rock|block-rock-medium
 63717=snowrock|block-snowrock-medium
-63716=icerocks|block-icerocks-medium
-63715=snowrocks|block-snowrocks-medium
-63714=dunerocks|block-dunerocks-medium
-63713=sandrocks|block-sandrocks-medium
-63712=saltrocks|block-saltrocks-medium
 63711=spore-pine|block-spore-pine-medium
 63710=snow-pine|block-snow-pine-medium
 63709=pine|block-pine-medium
@@ -38,7 +31,6 @@
 63706=white-tree|block-white-tree-medium
 63705=spore-cluster|block-spore-cluster-medium
 63704=shale|block-shale-medium
-63703=shalerocks|block-shalerocks-medium
 63702=shale-boulder|block-shale-boulder-medium
 63701=sand-boulder|block-sand-boulder-medium
 63700=moss|block-moss-medium
@@ -70,7 +62,7 @@
 63674=plastanium-compressor|block-plastanium-compressor-medium
 63673=phase-weaver|block-phase-weaver-medium
 63672=alloy-smelter|block-alloy-smelter-medium
-63671=cryofluidmixer|block-cryofluidmixer-medium
+63671=cryofluid-mixer|block-cryofluid-mixer-medium
 63670=blast-mixer|block-blast-mixer-medium
 63669=pyratite-mixer|block-pyratite-mixer-medium
 63668=melter|block-melter-medium
@@ -134,7 +126,7 @@
 63610=battery-large|block-battery-large-medium
 63609=combustion-generator|block-combustion-generator-medium
 63608=thermal-generator|block-thermal-generator-medium
-63607=turbine-generator|block-turbine-generator-medium
+63607=steam-generator|block-steam-generator-medium
 63606=differential-generator|block-differential-generator-medium
 63605=rtg-generator|block-rtg-generator-medium
 63604=solar-panel|block-solar-panel-medium
@@ -278,3 +270,46 @@
 63466=beta|unit-beta-medium
 63465=gamma|unit-gamma-medium
 63464=block|unit-block-medium
+63463=risso|unit-risso-medium
+63462=overdrive-dome|block-overdrive-dome-medium
+63461=logic-processor|block-logic-processor-medium
+63460=micro-processor|block-micro-processor-medium
+63459=logic-display|block-logic-display-medium
+63458=switch|block-switch-medium
+63457=memory-cell|block-memory-cell-medium
+63456=payload-conveyor|block-payload-conveyor-medium
+63455=hyper-processor|block-hyper-processor-medium
+63454=toxopid|unit-toxopid-medium
+63453=vestige|unit-vestige-medium
+63452=cataclyst|unit-cataclyst-medium
+63451=scepter|unit-scepter-medium
+63450=reign|unit-reign-medium
+63449=dirt|block-dirt-medium
+63448=dirtwall|block-dirtwall-medium
+63447=stone-wall|block-stone-wall-medium
+63446=spore-wall|block-spore-wall-medium
+63445=ice-wall|block-ice-wall-medium
+63444=snow-wall|block-snow-wall-medium
+63443=dune-wall|block-dune-wall-medium
+63442=sand-wall|block-sand-wall-medium
+63441=salt-wall|block-salt-wall-medium
+63440=shale-wall|block-shale-wall-medium
+63439=dirt-wall|block-dirt-wall-medium
+63438=holostone-wall|block-holostone-wall-medium
+63437=basalt|block-basalt-medium
+63436=dacite|block-dacite-medium
+63435=boulder|block-boulder-medium
+63434=snow-boulder|block-snow-boulder-medium
+63433=dacite-wall|block-dacite-wall-medium
+63432=dacite-boulder|block-dacite-boulder-medium
+63431=large-logic-display|block-large-logic-display-medium
+63430=omura|unit-omura-medium
+63429=mud|block-mud-medium
+63428=sei|unit-sei-medium
+63427=quad|unit-quad-medium
+63426=oct|unit-oct-medium
+63425=vela|unit-vela-medium
+63424=corvus|unit-corvus-medium
+63423=memory-bank|block-memory-bank-medium
+63422=foreshadow|block-foreshadow-medium
+63421=tsunami|block-tsunami-medium
diff --git a/core/assets/maps/craters.msav b/core/assets/maps/craters.msav
index c0bd73e09b..b879701ae6 100644
Binary files a/core/assets/maps/craters.msav and b/core/assets/maps/craters.msav differ
diff --git a/core/assets/maps/desolateRift.msav b/core/assets/maps/desolateRift.msav
index d140c9e5ba..ca3181301a 100644
Binary files a/core/assets/maps/desolateRift.msav and b/core/assets/maps/desolateRift.msav differ
diff --git a/core/assets/maps/frozenForest.msav b/core/assets/maps/frozenForest.msav
index 431b4ce947..a2a1f52354 100644
Binary files a/core/assets/maps/frozenForest.msav and b/core/assets/maps/frozenForest.msav differ
diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav
index f5403ec8c3..c154c2e4db 100644
Binary files a/core/assets/maps/fungalPass.msav and b/core/assets/maps/fungalPass.msav differ
diff --git a/core/assets/maps/groundZero.msav b/core/assets/maps/groundZero.msav
index da07ea1925..1f1500439b 100644
Binary files a/core/assets/maps/groundZero.msav and b/core/assets/maps/groundZero.msav differ
diff --git a/core/assets/maps/nuclearComplex.msav b/core/assets/maps/nuclearComplex.msav
index 4ce3e3484e..fe8b36e26a 100644
Binary files a/core/assets/maps/nuclearComplex.msav and b/core/assets/maps/nuclearComplex.msav differ
diff --git a/core/assets/maps/overgrowth.msav b/core/assets/maps/overgrowth.msav
index 56dddd5bae..b65b8e4818 100644
Binary files a/core/assets/maps/overgrowth.msav and b/core/assets/maps/overgrowth.msav differ
diff --git a/core/assets/maps/ruinousShores.msav b/core/assets/maps/ruinousShores.msav
index 9d8708c6f0..a0ef267a99 100644
Binary files a/core/assets/maps/ruinousShores.msav and b/core/assets/maps/ruinousShores.msav differ
diff --git a/core/assets/maps/saltFlats.msav b/core/assets/maps/saltFlats.msav
index 83debe54dd..9a70ba342a 100644
Binary files a/core/assets/maps/saltFlats.msav and b/core/assets/maps/saltFlats.msav differ
diff --git a/core/assets/maps/stainedMountains.msav b/core/assets/maps/stainedMountains.msav
index 07d2d6ad81..c627b0917e 100644
Binary files a/core/assets/maps/stainedMountains.msav and b/core/assets/maps/stainedMountains.msav differ
diff --git a/core/assets/maps/tarFields.msav b/core/assets/maps/tarFields.msav
index e4a99d71bf..06eaed164d 100644
Binary files a/core/assets/maps/tarFields.msav and b/core/assets/maps/tarFields.msav differ
diff --git a/core/assets/music/game4.ogg b/core/assets/music/game4.ogg
index 5b9dbe5ee4..051c414540 100644
Binary files a/core/assets/music/game4.ogg and b/core/assets/music/game4.ogg differ
diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat
deleted file mode 100644
index e8220fa481..0000000000
Binary files a/core/assets/planets/TODO.dat and /dev/null differ
diff --git a/core/assets/planets/colors.png b/core/assets/planets/colors.png
deleted file mode 100644
index 5efd5d38e0..0000000000
Binary files a/core/assets/planets/colors.png and /dev/null differ
diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js
index f1e2a04b61..c6d7be846b 100755
--- a/core/assets/scripts/base.js
+++ b/core/assets/scripts/base.js
@@ -1,10 +1,13 @@
+"use strict";
+
 const log = function(context, obj){
     Vars.mods.getScripts().log(context, String(obj))
 }
 
-const onEvent = function(event, handler){
-    Vars.mods.getScripts().onEvent(event, handler)
-}
+const readString = path => Vars.mods.getScripts().readString(path)
+const readBytes = path => Vars.mods.getScripts().readBytes(path)
+const loadMusic = path => Vars.mods.getScripts().loadMusic(path)
+const loadSound = path => Vars.mods.getScripts().loadSound(path)
 
 var scriptName = "base.js"
 var modName = "none"
@@ -19,5 +22,15 @@ const extend = function(classType, params){
     return new JavaAdapter(classType, params)
 }
 
+//these are not sctrictly necessary, but are kept for edge cases
+const run = method => new java.lang.Runnable(){run: method}
+const boolf = method => new Boolf(){get: method}
+const boolp = method => new Boolp(){get: method}
+const floatf = method => new Floatf(){get: method}
+const floatp = method => new Floatp(){get: method}
+const cons = method => new Cons(){get: method}
+const prov = method => new Prov(){get: method}
+const func = method => new Func(){get: method}
+
 const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
 Call = Packages.mindustry.gen.Call
diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js
index 5d2f80aec7..81a07f2bef 100755
--- a/core/assets/scripts/global.js
+++ b/core/assets/scripts/global.js
@@ -1,12 +1,15 @@
 //Generated class. Do not modify.
 
+"use strict";
+
 const log = function(context, obj){
     Vars.mods.getScripts().log(context, String(obj))
 }
 
-const onEvent = function(event, handler){
-    Vars.mods.getScripts().onEvent(event, handler)
-}
+const readString = path => Vars.mods.getScripts().readString(path)
+const readBytes = path => Vars.mods.getScripts().readBytes(path)
+const loadMusic = path => Vars.mods.getScripts().loadMusic(path)
+const loadSound = path => Vars.mods.getScripts().loadSound(path)
 
 var scriptName = "base.js"
 var modName = "none"
@@ -21,76 +24,90 @@ const extend = function(classType, params){
     return new JavaAdapter(classType, params)
 }
 
+//these are not sctrictly necessary, but are kept for edge cases
+const run = method => new java.lang.Runnable(){run: method}
+const boolf = method => new Boolf(){get: method}
+const boolp = method => new Boolp(){get: method}
+const floatf = method => new Floatf(){get: method}
+const floatp = method => new Floatp(){get: method}
+const cons = method => new Cons(){get: method}
+const prov = method => new Prov(){get: method}
+const func = method => new Func(){get: method}
+
 const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
 Call = Packages.mindustry.gen.Call
 
-importPackage(Packages.mindustry.world.blocks.power)
-importPackage(Packages.mindustry.game)
-importPackage(Packages.arc.scene)
-importPackage(Packages.mindustry.maps.filters)
-importPackage(Packages.mindustry.gen)
-importPackage(Packages.arc.struct)
-importPackage(Packages.mindustry.world.meta)
+importPackage(Packages.arc)
 importPackage(Packages.arc.func)
-importPackage(Packages.arc.math)
-importPackage(Packages.mindustry.type)
-importPackage(Packages.mindustry.world.blocks.environment)
-importPackage(Packages.arc.scene.actions)
-importPackage(Packages.arc.math.geom)
-importPackage(Packages.mindustry.world.consumers)
-importPackage(Packages.mindustry.graphics)
 importPackage(Packages.arc.graphics)
-importPackage(Packages.mindustry.world.blocks.units)
-importPackage(Packages.mindustry.world.blocks.distribution)
-importPackage(Packages.mindustry.world.blocks)
-importPackage(Packages.mindustry.ui)
-importPackage(Packages.mindustry.core)
+importPackage(Packages.arc.graphics.g2d)
+importPackage(Packages.arc.graphics.gl)
+importPackage(Packages.arc.math)
+importPackage(Packages.arc.math.geom)
+importPackage(Packages.arc.scene)
+importPackage(Packages.arc.scene.actions)
+importPackage(Packages.arc.scene.event)
+importPackage(Packages.arc.scene.style)
 importPackage(Packages.arc.scene.ui)
 importPackage(Packages.arc.scene.ui.layout)
-importPackage(Packages.mindustry.entities.comp)
-importPackage(Packages.mindustry.ui.fragments)
-importPackage(Packages.mindustry.entities)
-importPackage(Packages.mindustry.ai.formations)
 importPackage(Packages.arc.scene.utils)
-importPackage(Packages.mindustry.world.blocks.campaign)
-importPackage(Packages.mindustry.content)
-importPackage(Packages.mindustry.world.blocks.storage)
-importPackage(Packages.mindustry.world.meta.values)
-importPackage(Packages.mindustry.world)
-importPackage(Packages.mindustry.world.blocks.experimental)
-importPackage(Packages.arc.scene.event)
-importPackage(Packages.mindustry.graphics.g3d)
-importPackage(Packages.mindustry.ui.dialogs)
-importPackage(Packages.mindustry.world.blocks.defense)
-importPackage(Packages.mindustry.maps)
-importPackage(Packages.mindustry.world.blocks.legacy)
-importPackage(Packages.mindustry.ctype)
-importPackage(Packages.mindustry.world.blocks.defense.turrets)
-importPackage(Packages.mindustry.world.draw)
-importPackage(Packages.mindustry.editor)
-importPackage(Packages.mindustry.entities.bullet)
-importPackage(Packages.mindustry.logic)
-importPackage(Packages.arc.scene.style)
-importPackage(Packages.mindustry.audio)
-importPackage(Packages.mindustry.entities.units)
-importPackage(Packages.mindustry.world.blocks.production)
-importPackage(Packages.mindustry.ai.formations.patterns)
-importPackage(Packages.mindustry.input)
+importPackage(Packages.arc.struct)
 importPackage(Packages.arc.util)
-importPackage(Packages.mindustry.world.blocks.sandbox)
-importPackage(Packages.mindustry.ai)
-importPackage(Packages.mindustry.async)
-importPackage(Packages.mindustry.world.blocks.liquid)
-importPackage(Packages.arc)
-importPackage(Packages.mindustry.ai.types)
-importPackage(Packages.mindustry.world.modules)
-importPackage(Packages.arc.graphics.g2d)
-importPackage(Packages.mindustry.ui.layout)
-importPackage(Packages.mindustry.maps.generators)
-importPackage(Packages.mindustry.world.blocks.payloads)
-importPackage(Packages.mindustry.world.producers)
 importPackage(Packages.mindustry)
+importPackage(Packages.mindustry.ai)
+importPackage(Packages.mindustry.ai.formations)
+importPackage(Packages.mindustry.ai.formations.patterns)
+importPackage(Packages.mindustry.ai.types)
+importPackage(Packages.mindustry.async)
+importPackage(Packages.mindustry.audio)
+importPackage(Packages.mindustry.content)
+importPackage(Packages.mindustry.core)
+importPackage(Packages.mindustry.ctype)
+importPackage(Packages.mindustry.editor)
+importPackage(Packages.mindustry.entities)
+importPackage(Packages.mindustry.entities.abilities)
+importPackage(Packages.mindustry.entities.bullet)
+importPackage(Packages.mindustry.entities.comp)
+importPackage(Packages.mindustry.entities.units)
+importPackage(Packages.mindustry.game)
+importPackage(Packages.mindustry.gen)
+importPackage(Packages.mindustry.graphics)
+importPackage(Packages.mindustry.graphics.g3d)
+importPackage(Packages.mindustry.input)
+importPackage(Packages.mindustry.io)
+importPackage(Packages.mindustry.logic)
+importPackage(Packages.mindustry.maps)
+importPackage(Packages.mindustry.maps.filters)
+importPackage(Packages.mindustry.maps.generators)
 importPackage(Packages.mindustry.maps.planet)
+importPackage(Packages.mindustry.net)
+importPackage(Packages.mindustry.type)
+importPackage(Packages.mindustry.ui)
+importPackage(Packages.mindustry.ui.dialogs)
+importPackage(Packages.mindustry.ui.fragments)
+importPackage(Packages.mindustry.ui.layout)
+importPackage(Packages.mindustry.world)
+importPackage(Packages.mindustry.world.blocks)
+importPackage(Packages.mindustry.world.blocks.campaign)
+importPackage(Packages.mindustry.world.blocks.defense)
+importPackage(Packages.mindustry.world.blocks.defense.turrets)
+importPackage(Packages.mindustry.world.blocks.distribution)
+importPackage(Packages.mindustry.world.blocks.environment)
+importPackage(Packages.mindustry.world.blocks.experimental)
+importPackage(Packages.mindustry.world.blocks.legacy)
+importPackage(Packages.mindustry.world.blocks.liquid)
+importPackage(Packages.mindustry.world.blocks.logic)
+importPackage(Packages.mindustry.world.blocks.payloads)
+importPackage(Packages.mindustry.world.blocks.power)
+importPackage(Packages.mindustry.world.blocks.production)
+importPackage(Packages.mindustry.world.blocks.sandbox)
+importPackage(Packages.mindustry.world.blocks.storage)
+importPackage(Packages.mindustry.world.blocks.units)
+importPackage(Packages.mindustry.world.consumers)
+importPackage(Packages.mindustry.world.draw)
+importPackage(Packages.mindustry.world.meta)
+importPackage(Packages.mindustry.world.meta.values)
+importPackage(Packages.mindustry.world.modules)
 const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent
 const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent
 const PlayerUnbanEvent = Packages.mindustry.game.EventType.PlayerUnbanEvent
@@ -100,6 +117,7 @@ const PlayerConnect = Packages.mindustry.game.EventType.PlayerConnect
 const PlayerJoin = Packages.mindustry.game.EventType.PlayerJoin
 const UnitChangeEvent = Packages.mindustry.game.EventType.UnitChangeEvent
 const UnitCreateEvent = Packages.mindustry.game.EventType.UnitCreateEvent
+const UnitDrownEvent = Packages.mindustry.game.EventType.UnitDrownEvent
 const UnitDestroyEvent = Packages.mindustry.game.EventType.UnitDestroyEvent
 const BlockDestroyEvent = Packages.mindustry.game.EventType.BlockDestroyEvent
 const BuildSelectEvent = Packages.mindustry.game.EventType.BuildSelectEvent
@@ -108,24 +126,25 @@ const BlockBuildBeginEvent = Packages.mindustry.game.EventType.BlockBuildBeginEv
 const ResearchEvent = Packages.mindustry.game.EventType.ResearchEvent
 const UnlockEvent = Packages.mindustry.game.EventType.UnlockEvent
 const StateChangeEvent = Packages.mindustry.game.EventType.StateChangeEvent
-const BuildinghangeEvent = Packages.mindustry.game.EventType.BuildinghangeEvent
+const TileChangeEvent = Packages.mindustry.game.EventType.TileChangeEvent
 const GameOverEvent = Packages.mindustry.game.EventType.GameOverEvent
-const TapConfigEvent = Packages.mindustry.game.EventType.TapConfigEvent
 const TapEvent = Packages.mindustry.game.EventType.TapEvent
+const ConfigEvent = Packages.mindustry.game.EventType.ConfigEvent
 const DepositEvent = Packages.mindustry.game.EventType.DepositEvent
 const WithdrawEvent = Packages.mindustry.game.EventType.WithdrawEvent
 const SectorCaptureEvent = Packages.mindustry.game.EventType.SectorCaptureEvent
-const ZoneConfigureCompleteEvent = Packages.mindustry.game.EventType.ZoneConfigureCompleteEvent
-const ZoneRequireCompleteEvent = Packages.mindustry.game.EventType.ZoneRequireCompleteEvent
 const PlayerChatEvent = Packages.mindustry.game.EventType.PlayerChatEvent
+const ClientPreConnectEvent = Packages.mindustry.game.EventType.ClientPreConnectEvent
 const CommandIssueEvent = Packages.mindustry.game.EventType.CommandIssueEvent
 const LaunchItemEvent = Packages.mindustry.game.EventType.LaunchItemEvent
+const SectorLoseEvent = Packages.mindustry.game.EventType.SectorLoseEvent
 const WorldLoadEvent = Packages.mindustry.game.EventType.WorldLoadEvent
 const ClientLoadEvent = Packages.mindustry.game.EventType.ClientLoadEvent
 const BlockInfoEvent = Packages.mindustry.game.EventType.BlockInfoEvent
 const CoreItemDeliverEvent = Packages.mindustry.game.EventType.CoreItemDeliverEvent
 const TurretAmmoDeliverEvent = Packages.mindustry.game.EventType.TurretAmmoDeliverEvent
 const LineConfirmEvent = Packages.mindustry.game.EventType.LineConfirmEvent
+const TurnEvent = Packages.mindustry.game.EventType.TurnEvent
 const WaveEvent = Packages.mindustry.game.EventType.WaveEvent
 const ResetEvent = Packages.mindustry.game.EventType.ResetEvent
 const PlayEvent = Packages.mindustry.game.EventType.PlayEvent
@@ -136,7 +155,6 @@ const SaveLoadEvent = Packages.mindustry.game.EventType.SaveLoadEvent
 const MapPublishEvent = Packages.mindustry.game.EventType.MapPublishEvent
 const MapMakeEvent = Packages.mindustry.game.EventType.MapMakeEvent
 const ResizeEvent = Packages.mindustry.game.EventType.ResizeEvent
-const LaunchEvent = Packages.mindustry.game.EventType.LaunchEvent
 const LoseEvent = Packages.mindustry.game.EventType.LoseEvent
 const WinEvent = Packages.mindustry.game.EventType.WinEvent
 const Trigger = Packages.mindustry.game.EventType.Trigger
diff --git a/core/assets/shaders/mud.frag b/core/assets/shaders/mud.frag
new file mode 100644
index 0000000000..3858cdec63
--- /dev/null
+++ b/core/assets/shaders/mud.frag
@@ -0,0 +1,29 @@
+#define HIGHP
+
+#define NSCALE 180.0 / 2.0
+
+uniform sampler2D u_texture;
+uniform sampler2D u_noise;
+
+uniform vec2 u_campos;
+uniform vec2 u_resolution;
+uniform float u_time;
+
+varying vec2 v_texCoords;
+
+void main(){
+    vec2 c = v_texCoords.xy;
+    vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);
+
+    float btime = u_time / 70000.0;
+    float noise = sin((texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8)).r + texture2D(u_noise, (coords) / NSCALE + vec2(abs(sin(btime)) * 1.1) * vec2(-0.8, -1.0)).r) / 2.0);
+    vec4 color = texture2D(u_texture, c);
+
+    if(noise > 0.54 && noise < 0.68){
+        color.rgb *= 1.4;
+    }else if(!(noise > 0.40 && noise < 0.54)){
+        color.rgb *= 1.2;
+    }
+
+    gl_FragColor = color;
+}
diff --git a/core/assets/shaders/slag.frag b/core/assets/shaders/slag.frag
index 2dae9dc45c..f904d48dbf 100755
--- a/core/assets/shaders/slag.frag
+++ b/core/assets/shaders/slag.frag
@@ -22,12 +22,10 @@ void main(){
     float noise = (texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8)).r + texture2D(u_noise, (coords) / NSCALE + vec2(btime * 1.1) * vec2(0.8, -1.0)).r) / 2.0;
     vec4 color = texture2D(u_texture, c);
 
-    if(color.a > 0.1){
-        if(noise > 0.6){
-            color.rgb = S2;
-        }else if (noise > 0.54){
-            color.rgb = S1;
-        }
+    if(noise > 0.6){
+        color.rgb = S2;
+    }else if (noise > 0.54){
+        color.rgb = S1;
     }
 
     gl_FragColor = color;
diff --git a/core/assets/shaders/tar.frag b/core/assets/shaders/tar.frag
index 39b0c27492..ea2a3b3f1d 100644
--- a/core/assets/shaders/tar.frag
+++ b/core/assets/shaders/tar.frag
@@ -20,7 +20,7 @@ void main(){
     vec4 color = texture2D(u_texture, c);
 
     if(!(noise > 0.54 && noise < 0.58)){
-        color.rgb *= 0.6;
+        color.rgb *= vec3(0.6, 0.6, 0.7);
     }
 
     gl_FragColor = color;
diff --git a/core/assets/sounds/press.ogg b/core/assets/sounds/press.ogg
index 419cd38847..7085dc00a0 100644
Binary files a/core/assets/sounds/press.ogg and b/core/assets/sounds/press.ogg differ
diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png
index 83b560b3de..ccbd6ed7e2 100644
Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ
diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas
index 20384f5ad5..13e8478d73 100644
--- a/core/assets/sprites/fallback/sprites.atlas
+++ b/core/assets/sprites/fallback/sprites.atlas
@@ -6,6437 +6,7570 @@ filter: nearest,nearest
 repeat: none
 white-tree
   rotate: false
-  xy: 323, 1720
+  xy: 1127, 1273
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 white-tree-dead
   rotate: false
-  xy: 645, 1720
+  xy: 1127, 951
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
-core-nucleus
+white-tree-dead-shadow
   rotate: false
-  xy: 1873, 364
-  size: 160, 160
-  orig: 160, 160
+  xy: 403, 843
+  size: 353, 348
+  orig: 353, 348
   offset: 0, 0
   index: -1
-exponential-reconstructor
+white-tree-shadow
   rotate: false
-  xy: 323, 204
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-exponential-reconstructor-top
-  rotate: false
-  xy: 549, 204
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-factory-in-7
-  rotate: false
-  xy: 775, 10
-  size: 224, 224
-  orig: 224, 224
+  xy: 403, 843
+  size: 353, 348
+  orig: 353, 348
   offset: 0, 0
   index: -1
 factory-in-9
   rotate: false
-  xy: 323, 1140
+  xy: 1015, 371
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
-factory-out-7
-  rotate: false
-  xy: 1001, 462
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
 factory-out-9
   rotate: false
-  xy: 613, 1140
+  xy: 725, 81
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 tetrative-reconstructor
   rotate: false
-  xy: 1193, 1172
+  xy: 1015, 81
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 tetrative-reconstructor-top
   rotate: false
-  xy: 1483, 1172
+  xy: 1338, 515
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
-circle-shadow
-  rotate: false
-  xy: 323, 1
-  size: 201, 201
-  orig: 201, 201
-  offset: 0, 0
-  index: -1
-antumbra-wreck0
-  rotate: false
-  xy: 1437, 446
-  size: 216, 240
-  orig: 216, 240
-  offset: 0, 0
-  index: -1
-antumbra-wreck1
-  rotate: false
-  xy: 1655, 446
-  size: 216, 240
-  orig: 216, 240
-  offset: 0, 0
-  index: -1
-antumbra-wreck2
-  rotate: false
-  xy: 1437, 204
-  size: 216, 240
-  orig: 216, 240
-  offset: 0, 0
-  index: -1
-block-core-nucleus-full
-  rotate: false
-  xy: 1837, 1492
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-block-exponential-reconstructor-full
-  rotate: false
-  xy: 839, 688
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-block-multiplicative-reconstructor-full
-  rotate: false
-  xy: 1873, 526
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
 block-tetrative-reconstructor-full
   rotate: false
-  xy: 967, 1752
+  xy: 1449, 1385
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
-cracks-6-0
-  rotate: false
-  xy: 526, 10
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-1
-  rotate: false
-  xy: 1001, 26
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-2
-  rotate: false
-  xy: 1195, 26
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-3
-  rotate: false
-  xy: 1837, 1848
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-4
-  rotate: false
-  xy: 1837, 1654
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-5
-  rotate: false
-  xy: 1389, 10
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-6
-  rotate: false
-  xy: 1583, 10
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-7
-  rotate: false
-  xy: 1777, 10
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-7-0
-  rotate: false
-  xy: 323, 656
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-1
-  rotate: false
-  xy: 549, 656
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-2
-  rotate: false
-  xy: 1065, 688
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-3
-  rotate: false
-  xy: 1291, 688
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-4
-  rotate: false
-  xy: 775, 462
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-5
-  rotate: false
-  xy: 323, 430
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-6
-  rotate: false
-  xy: 549, 430
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-7
-  rotate: false
-  xy: 775, 236
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-8-0
-  rotate: false
-  xy: 1773, 1204
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-1
-  rotate: false
-  xy: 1773, 946
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-2
-  rotate: false
-  xy: 903, 914
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-3
-  rotate: false
-  xy: 323, 882
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-4
-  rotate: false
-  xy: 581, 882
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-5
-  rotate: false
-  xy: 1161, 914
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-6
-  rotate: false
-  xy: 1419, 914
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-7
-  rotate: false
-  xy: 1677, 688
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
 cracks-9-0
   rotate: false
-  xy: 1257, 1752
+  xy: 1449, 1095
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 cracks-9-1
   rotate: false
-  xy: 1547, 1752
+  xy: 1449, 805
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 cracks-9-2
   rotate: false
-  xy: 967, 1462
+  xy: 1739, 1385
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 cracks-9-3
   rotate: false
-  xy: 323, 1430
+  xy: 1739, 1095
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 cracks-9-4
   rotate: false
-  xy: 613, 1430
+  xy: 1739, 805
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 cracks-9-5
   rotate: false
-  xy: 1257, 1462
+  xy: 758, 661
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 cracks-9-6
   rotate: false
-  xy: 1547, 1462
+  xy: 1048, 661
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 cracks-9-7
   rotate: false
-  xy: 903, 1172
+  xy: 725, 371
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
+eclipse-outline
+  rotate: false
+  xy: 1, 67
+  size: 320, 320
+  orig: 320, 320
+  offset: 0, 0
+  index: -1
 eclipse-wreck0
   rotate: false
-  xy: 1, 1076
+  xy: 403, 521
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 eclipse-wreck1
   rotate: false
-  xy: 1, 754
+  xy: 1529, 1675
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 eclipse-wreck2
   rotate: false
-  xy: 1, 432
+  xy: 403, 199
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
-unit-antumbra-full
+oct-outline
   rotate: false
-  xy: 1655, 204
-  size: 216, 240
-  orig: 216, 240
+  xy: 403, 1595
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+oct-wreck0
+  rotate: false
+  xy: 1, 791
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+oct-wreck1
+  rotate: false
+  xy: 403, 1193
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+oct-wreck2
+  rotate: false
+  xy: 805, 1595
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+omura-outline
+  rotate: false
+  xy: 1587, 1
+  size: 280, 400
+  orig: 280, 400
   offset: 0, 0
   index: -1
 unit-eclipse-full
   rotate: false
-  xy: 1, 110
+  xy: 805, 951
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
-circle
+unit-oct-full
   rotate: false
-  xy: 1227, 485
-  size: 201, 201
-  orig: 201, 201
-  offset: 0, 0
-  index: -1
-antumbra
-  rotate: false
-  xy: 1001, 220
-  size: 216, 240
-  orig: 216, 240
-  offset: 0, 0
-  index: -1
-antumbra-cell
-  rotate: false
-  xy: 1219, 220
-  size: 216, 240
-  orig: 216, 240
+  xy: 1, 389
+  size: 400, 400
+  orig: 400, 400
   offset: 0, 0
   index: -1
 eclipse
   rotate: false
-  xy: 1, 1720
+  xy: 805, 1273
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 eclipse-cell
   rotate: false
-  xy: 1, 1398
+  xy: 1207, 1675
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
+oct
+  rotate: false
+  xy: 1, 1595
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+oct-cell
+  rotate: false
+  xy: 1, 1193
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+omura
+  rotate: false
+  xy: 1305, 113
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+omura-cell
+  rotate: false
+  xy: 1628, 403
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
 
 sprites2.png
 size: 2048,2048
 format: rgba8888
 filter: nearest,nearest
 repeat: none
-core-silo
+large-logic-display
   rotate: false
-  xy: 487, 1887
-  size: 160, 160
-  orig: 160, 160
+  xy: 1567, 102
+  size: 192, 192
+  orig: 192, 192
   offset: 0, 0
   index: -1
-data-processor
+exponential-reconstructor
   rotate: false
-  xy: 1569, 947
-  size: 96, 96
-  orig: 96, 96
+  xy: 767, 1071
+  size: 224, 224
+  orig: 224, 224
   offset: 0, 0
   index: -1
-data-processor-2
+exponential-reconstructor-top
   rotate: false
-  xy: 1167, 521
-  size: 64, 64
-  orig: 64, 64
+  xy: 993, 1313
+  size: 224, 224
+  orig: 224, 224
   offset: 0, 0
   index: -1
-data-processor-top
+factory-in-7
   rotate: false
-  xy: 1667, 947
-  size: 96, 96
-  orig: 96, 96
+  xy: 993, 1087
+  size: 224, 224
+  orig: 224, 224
   offset: 0, 0
   index: -1
+factory-out-7
+  rotate: false
+  xy: 1219, 1313
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+circle-shadow
+  rotate: false
+  xy: 1620, 684
+  size: 201, 201
+  orig: 201, 201
+  offset: 0, 0
+  index: -1
+antumbra-outline
+  rotate: false
+  xy: 719, 143
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+antumbra-wreck0
+  rotate: false
+  xy: 941, 385
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+antumbra-wreck1
+  rotate: false
+  xy: 937, 143
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+antumbra-wreck2
+  rotate: false
+  xy: 1667, 1313
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+block-exponential-reconstructor-full
+  rotate: false
+  xy: 1823, 1797
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+corvus-outline
+  rotate: false
+  xy: 933, 1
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-wreck0
+  rotate: false
+  xy: 993, 945
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-wreck1
+  rotate: false
+  xy: 985, 803
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-wreck2
+  rotate: false
+  xy: 969, 661
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+cracks-6-0
+  rotate: false
+  xy: 1367, 494
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-1
+  rotate: false
+  xy: 1561, 490
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-2
+  rotate: false
+  xy: 1755, 490
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-3
+  rotate: false
+  xy: 1823, 693
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-4
+  rotate: false
+  xy: 1373, 296
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-5
+  rotate: false
+  xy: 1567, 296
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-6
+  rotate: false
+  xy: 1761, 296
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-7
+  rotate: false
+  xy: 1373, 102
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-7-0
+  rotate: false
+  xy: 1823, 1571
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-1
+  rotate: false
+  xy: 807, 1539
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-2
+  rotate: false
+  xy: 1033, 1539
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-3
+  rotate: false
+  xy: 541, 1297
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-4
+  rotate: false
+  xy: 541, 1071
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-5
+  rotate: false
+  xy: 1259, 1539
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-6
+  rotate: false
+  xy: 1485, 1555
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-7
+  rotate: false
+  xy: 767, 1297
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-8-0
+  rotate: false
+  xy: 565, 1765
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-1
+  rotate: false
+  xy: 1, 559
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-2
+  rotate: false
+  xy: 283, 1297
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-3
+  rotate: false
+  xy: 823, 1765
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-4
+  rotate: false
+  xy: 1, 301
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-5
+  rotate: false
+  xy: 283, 1039
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-6
+  rotate: false
+  xy: 1081, 1765
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-7
+  rotate: false
+  xy: 1, 43
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+omura-wreck0
+  rotate: false
+  xy: 1, 1621
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+omura-wreck1
+  rotate: false
+  xy: 1, 1219
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+omura-wreck2
+  rotate: false
+  xy: 283, 1621
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+quad-outline
+  rotate: false
+  xy: 541, 849
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quad-wreck0
+  rotate: false
+  xy: 763, 849
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quad-wreck1
+  rotate: false
+  xy: 525, 627
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quad-wreck2
+  rotate: false
+  xy: 747, 627
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+reign-outline
+  rotate: false
+  xy: 1661, 1171
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+reign-wreck0
+  rotate: false
+  xy: 1441, 1033
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+reign-wreck1
+  rotate: false
+  xy: 1657, 1029
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+reign-wreck2
+  rotate: false
+  xy: 1219, 949
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+sei-outline
+  rotate: false
+  xy: 283, 797
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+sei-wreck0
+  rotate: false
+  xy: 259, 555
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+sei-wreck1
+  rotate: false
+  xy: 259, 313
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+sei-wreck2
+  rotate: false
+  xy: 259, 71
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+toxopid-cannon-outline
+  rotate: false
+  xy: 1209, 727
+  size: 206, 220
+  orig: 206, 220
+  offset: 0, 0
+  index: -1
+toxopid-leg-base
+  rotate: false
+  xy: 283, 1555
+  size: 270, 64
+  orig: 270, 64
+  offset: 0, 0
+  index: -1
+unit-antumbra-full
+  rotate: false
+  xy: 1155, 143
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+unit-corvus-full
+  rotate: false
+  xy: 1435, 891
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+unit-omura-full
+  rotate: false
+  xy: 1, 817
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+unit-quad-full
+  rotate: false
+  xy: 501, 405
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+unit-reign-full
+  rotate: false
+  xy: 1651, 887
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+unit-sei-full
+  rotate: false
+  xy: 565, 1523
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+circle
+  rotate: false
+  xy: 1417, 688
+  size: 201, 201
+  orig: 201, 201
+  offset: 0, 0
+  index: -1
+antumbra
+  rotate: false
+  xy: 501, 163
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+antumbra-cell
+  rotate: false
+  xy: 723, 385
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+corvus
+  rotate: false
+  xy: 501, 21
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-cell
+  rotate: false
+  xy: 717, 1
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-weapon-heat
+  rotate: false
+  xy: 1149, 1
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+quad
+  rotate: false
+  xy: 1219, 1091
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quad-cell
+  rotate: false
+  xy: 1445, 1317
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+reign
+  rotate: false
+  xy: 1445, 1175
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+sei
+  rotate: false
+  xy: 1339, 1781
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+sei-cell
+  rotate: false
+  xy: 1581, 1781
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+toxopid-cannon
+  rotate: false
+  xy: 1159, 439
+  size: 206, 220
+  orig: 206, 220
+  offset: 0, 0
+  index: -1
+omura-cannon
+  rotate: false
+  xy: 1761, 17
+  size: 192, 277
+  orig: 192, 277
+  offset: 0, 0
+  index: -1
+
+sprites3.png
+size: 2048,2048
+format: rgba8888
+filter: nearest,nearest
+repeat: none
 launch-pad
   rotate: false
-  xy: 1785, 849
+  xy: 813, 99
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launch-pad-large
   rotate: false
-  xy: 1561, 1355
+  xy: 725, 1041
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 launch-pad-light
   rotate: false
-  xy: 1883, 849
+  xy: 813, 1
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-launchpod
-  rotate: false
-  xy: 1975, 1750
-  size: 66, 64
-  orig: 66, 64
-  offset: 0, 0
-  index: -1
 force-projector
   rotate: false
-  xy: 99, 857
+  xy: 1527, 1221
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 force-projector-top
   rotate: false
-  xy: 197, 857
+  xy: 1625, 1193
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-large-overdrive-projector
+overdrive-dome
   rotate: false
-  xy: 1197, 849
+  xy: 1589, 1095
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-large-overdrive-projector-top
+overdrive-dome-top
   rotate: false
-  xy: 1295, 849
+  xy: 1687, 1095
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-mend-projector
-  rotate: false
-  xy: 397, 463
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mend-projector-top
-  rotate: false
-  xy: 677, 463
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mender
-  rotate: false
-  xy: 909, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-mender-top
-  rotate: false
-  xy: 943, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-overdrive-projector
-  rotate: false
-  xy: 1, 462
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-overdrive-projector-top
-  rotate: false
-  xy: 545, 461
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-shock-mine
-  rotate: false
-  xy: 205, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 block-loader
   rotate: false
-  xy: 1283, 1045
+  xy: 1267, 529
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-unloader
   rotate: false
-  xy: 981, 1041
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-bridge-arrow
-  rotate: false
-  xy: 939, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-bridge-conveyor
-  rotate: false
-  xy: 1109, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-bridge-conveyor-bridge
-  rotate: false
-  xy: 1143, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-bridge-conveyor-end
-  rotate: false
-  xy: 1177, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-center
-  rotate: false
-  xy: 1211, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-0-0
-  rotate: false
-  xy: 1739, 172
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-armored-conveyor-full
-  rotate: false
-  xy: 1739, 172
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-0-1
-  rotate: false
-  xy: 785, 156
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-0-2
-  rotate: false
-  xy: 701, 153
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-0-3
-  rotate: false
-  xy: 819, 153
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-1-0
-  rotate: false
-  xy: 1549, 152
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-1-1
-  rotate: false
-  xy: 1583, 152
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-1-2
-  rotate: false
-  xy: 1617, 152
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-1-3
-  rotate: false
-  xy: 1773, 152
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-2-0
-  rotate: false
-  xy: 451, 151
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-2-1
-  rotate: false
-  xy: 853, 149
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-2-2
-  rotate: false
-  xy: 887, 149
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-2-3
-  rotate: false
-  xy: 535, 148
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-3-0
-  rotate: false
-  xy: 735, 148
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-3-1
-  rotate: false
-  xy: 1, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-3-2
-  rotate: false
-  xy: 35, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-3-3
-  rotate: false
-  xy: 69, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-4-0
-  rotate: false
-  xy: 103, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-4-1
-  rotate: false
-  xy: 137, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-4-2
-  rotate: false
-  xy: 171, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-armored-conveyor-4-3
-  rotate: false
-  xy: 205, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-0-1
-  rotate: false
-  xy: 603, 105
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-0-2
-  rotate: false
-  xy: 1719, 104
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-0-3
-  rotate: false
-  xy: 1449, 103
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-1-0
-  rotate: false
-  xy: 1635, 96
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-1-1
-  rotate: false
-  xy: 1669, 96
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-1-2
-  rotate: false
-  xy: 753, 88
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-1-3
-  rotate: false
-  xy: 1483, 87
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-2-0
-  rotate: false
-  xy: 1807, 87
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-2-1
-  rotate: false
-  xy: 1841, 87
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-2-2
-  rotate: false
-  xy: 1875, 87
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-2-3
-  rotate: false
-  xy: 671, 85
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-3-0
-  rotate: false
-  xy: 787, 85
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-3-1
-  rotate: false
-  xy: 1517, 84
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-3-2
-  rotate: false
-  xy: 1551, 84
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-3-3
-  rotate: false
-  xy: 1585, 84
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-4-0
-  rotate: false
-  xy: 1753, 84
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-4-1
-  rotate: false
-  xy: 443, 83
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-4-2
-  rotate: false
-  xy: 821, 81
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-4-3
-  rotate: false
-  xy: 855, 81
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plastanium-conveyor
-  rotate: false
-  xy: 1351, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plastanium-conveyor-0
-  rotate: false
-  xy: 1385, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plastanium-conveyor-1
-  rotate: false
-  xy: 1889, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plastanium-conveyor-2
-  rotate: false
-  xy: 1923, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plastanium-conveyor-edge
-  rotate: false
-  xy: 1957, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plastanium-conveyor-stack
-  rotate: false
-  xy: 1991, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-0-1
-  rotate: false
-  xy: 1215, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-0-2
-  rotate: false
-  xy: 1249, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-0-3
-  rotate: false
-  xy: 1283, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-1-0
-  rotate: false
-  xy: 1317, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-1-1
-  rotate: false
-  xy: 1351, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-1-2
-  rotate: false
-  xy: 1385, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-1-3
-  rotate: false
-  xy: 1873, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-2-0
-  rotate: false
-  xy: 1907, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-2-1
-  rotate: false
-  xy: 1941, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-2-2
-  rotate: false
-  xy: 1975, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-2-3
-  rotate: false
-  xy: 2009, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-3-0
-  rotate: false
-  xy: 477, 9
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-3-1
-  rotate: false
-  xy: 545, 3
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-3-2
-  rotate: false
-  xy: 579, 3
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-3-3
-  rotate: false
-  xy: 1671, 2
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-4-0
-  rotate: false
-  xy: 1419, 1
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cross
-  rotate: false
-  xy: 239, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-distributor
-  rotate: false
-  xy: 1233, 521
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-inverted-sorter
-  rotate: false
-  xy: 991, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-junction
-  rotate: false
-  xy: 443, 49
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-mass-conveyor
-  rotate: false
-  xy: 491, 837
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mass-conveyor-edge
-  rotate: false
-  xy: 985, 833
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mass-conveyor-top
-  rotate: false
-  xy: 1083, 833
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-payload-router-top
-  rotate: false
-  xy: 1083, 833
+  xy: 1231, 235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mass-driver-base
   rotate: false
-  xy: 99, 759
+  xy: 1009, 5
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-overflow-gate
+payload-conveyor
   rotate: false
-  xy: 1011, 45
-  size: 32, 32
-  orig: 32, 32
+  xy: 1785, 1095
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-conveyor-edge
+  rotate: false
+  xy: 1589, 997
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-conveyor-top
+  rotate: false
+  xy: 1687, 997
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-router-top
+  rotate: false
+  xy: 1687, 997
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
 payload-router
   rotate: false
-  xy: 1475, 751
+  xy: 1785, 997
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 payload-router-edge
   rotate: false
-  xy: 1573, 751
+  xy: 1883, 1095
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 payload-router-over
   rotate: false
-  xy: 1671, 751
+  xy: 1883, 997
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-phase-conveyor
-  rotate: false
-  xy: 1181, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-conveyor-arrow
-  rotate: false
-  xy: 1215, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-conveyor-bridge
-  rotate: false
-  xy: 1249, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-conveyor-end
-  rotate: false
-  xy: 1283, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-router
-  rotate: false
-  xy: 443, 15
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sorter
-  rotate: false
-  xy: 273, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 blast-drill
   rotate: false
-  xy: 1311, 1615
+  xy: 335, 1233
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-drill-rim
   rotate: false
-  xy: 1441, 1615
+  xy: 335, 1103
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-drill-rotator
   rotate: false
-  xy: 1571, 1615
+  xy: 465, 1233
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-drill-top
   rotate: false
-  xy: 1701, 1615
+  xy: 335, 973
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-drill-top
-  rotate: false
-  xy: 1431, 521
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-liquid
-  rotate: false
-  xy: 1431, 521
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 laser-drill
   rotate: false
-  xy: 1393, 849
+  xy: 1491, 1025
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 laser-drill-rim
   rotate: false
-  xy: 1491, 849
+  xy: 813, 295
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 laser-drill-rotator
   rotate: false
-  xy: 1589, 849
+  xy: 911, 295
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 laser-drill-top
   rotate: false
-  xy: 1687, 849
+  xy: 813, 197
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-mechanical-drill
-  rotate: false
-  xy: 199, 463
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mechanical-drill-rotator
-  rotate: false
-  xy: 265, 463
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mechanical-drill-top
-  rotate: false
-  xy: 331, 463
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 oil-extractor
   rotate: false
-  xy: 393, 759
+  xy: 1205, 137
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-liquid
   rotate: false
-  xy: 1181, 751
+  xy: 1205, 39
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-rotator
   rotate: false
-  xy: 1279, 751
+  xy: 1303, 137
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-top
   rotate: false
-  xy: 1377, 751
+  xy: 1303, 39
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-pneumatic-drill
-  rotate: false
-  xy: 1419, 455
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-pneumatic-drill-rotator
-  rotate: false
-  xy: 1485, 455
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-pneumatic-drill-top
-  rotate: false
-  xy: 1551, 455
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-water-extractor
-  rotate: false
-  xy: 133, 331
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-water-extractor-liquid
-  rotate: false
-  xy: 199, 331
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-water-extractor-rotator
-  rotate: false
-  xy: 265, 331
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-water-extractor-top
-  rotate: false
-  xy: 331, 331
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-border
-  rotate: false
-  xy: 375, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-middle
-  rotate: false
-  xy: 1685, 130
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-select
-  rotate: false
-  xy: 103, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-liquid
-  rotate: false
-  xy: 1909, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-message
-  rotate: false
-  xy: 977, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 place-arrow
   rotate: false
-  xy: 1769, 751
+  xy: 1919, 1193
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-bridge-conduit
-  rotate: false
-  xy: 973, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-bridge-conduit-arrow
-  rotate: false
-  xy: 1007, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-bridge-conveyor-arrow
-  rotate: false
-  xy: 1007, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-bridge-conduit-bridge
-  rotate: false
-  xy: 1041, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-bridge-conduit-end
-  rotate: false
-  xy: 1075, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-bottom
-  rotate: false
-  xy: 1313, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-bottom-0
-  rotate: false
-  xy: 1347, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-bottom-1
-  rotate: false
-  xy: 1381, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-bottom-2
-  rotate: false
-  xy: 1415, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-bottom-3
-  rotate: false
-  xy: 1415, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-bottom-4
-  rotate: false
-  xy: 1415, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-top-0
-  rotate: false
-  xy: 1943, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-top-1
-  rotate: false
-  xy: 1977, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-top-2
-  rotate: false
-  xy: 2011, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-top-3
-  rotate: false
-  xy: 477, 111
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pulse-conduit-top-3
-  rotate: false
-  xy: 477, 111
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conduit-top-4
-  rotate: false
-  xy: 569, 105
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-junction
-  rotate: false
-  xy: 511, 46
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-overflow-gate
-  rotate: false
-  xy: 35, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-overflow-gate-top
-  rotate: false
-  xy: 69, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-router-bottom
-  rotate: false
-  xy: 103, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-router-liquid
-  rotate: false
-  xy: 137, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-router-top
-  rotate: false
-  xy: 171, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 liquid-tank-bottom
   rotate: false
-  xy: 687, 845
+  xy: 911, 197
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-tank-liquid
   rotate: false
-  xy: 887, 845
+  xy: 911, 99
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-tank-top
   rotate: false
-  xy: 1, 840
+  xy: 911, 1
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-mechanical-pump
-  rotate: false
-  xy: 409, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-mechanical-pump-liquid
-  rotate: false
-  xy: 613, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-rotary-pump-liquid
-  rotate: false
-  xy: 613, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-thermal-pump-liquid
-  rotate: false
-  xy: 613, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-conduit
-  rotate: false
-  xy: 1045, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-conduit-arrow
-  rotate: false
-  xy: 1079, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-conduit-bridge
-  rotate: false
-  xy: 1113, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-conduit-end
-  rotate: false
-  xy: 1147, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plated-conduit-cap
-  rotate: false
-  xy: 545, 37
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plated-conduit-top-0
-  rotate: false
-  xy: 579, 37
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plated-conduit-top-1
-  rotate: false
-  xy: 1687, 36
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plated-conduit-top-2
-  rotate: false
-  xy: 1419, 35
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plated-conduit-top-3
-  rotate: false
-  xy: 1603, 28
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plated-conduit-top-4
-  rotate: false
-  xy: 1637, 28
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pulse-conduit-top-0
-  rotate: false
-  xy: 1805, 19
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pulse-conduit-top-1
-  rotate: false
-  xy: 1839, 19
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pulse-conduit-top-2
-  rotate: false
-  xy: 647, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pulse-conduit-top-4
-  rotate: false
-  xy: 773, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-rotary-pump
-  rotate: false
-  xy: 927, 399
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 thermal-pump
   rotate: false
-  xy: 393, 661
+  xy: 1365, 847
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-battery
+hyper-processor
   rotate: false
-  xy: 239, 147
-  size: 32, 32
-  orig: 32, 32
+  xy: 1491, 1123
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+logic-display
+  rotate: false
+  xy: 1009, 201
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
 battery-large
   rotate: false
-  xy: 1693, 1143
+  xy: 1169, 921
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 battery-large-top
   rotate: false
-  xy: 1791, 1143
+  xy: 1169, 823
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-battery-top
-  rotate: false
-  xy: 273, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-combustion-generator
-  rotate: false
-  xy: 1245, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-combustion-generator-top
-  rotate: false
-  xy: 1279, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 differential-generator
   rotate: false
-  xy: 1765, 947
+  xy: 1445, 1319
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 differential-generator-liquid
   rotate: false
-  xy: 1863, 947
+  xy: 1543, 1319
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 differential-generator-top
   rotate: false
-  xy: 691, 943
+  xy: 1641, 1389
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-diode
-  rotate: false
-  xy: 273, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-diode-arrow
-  rotate: false
-  xy: 307, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-illuminator
-  rotate: false
-  xy: 889, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-illuminator-top
-  rotate: false
-  xy: 923, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 impact-reactor
   rotate: false
-  xy: 911, 1371
+  xy: 595, 583
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-bottom
   rotate: false
-  xy: 1041, 1371
+  xy: 595, 453
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-light
   rotate: false
-  xy: 521, 1359
+  xy: 585, 323
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-plasma-0
   rotate: false
-  xy: 651, 1359
+  xy: 585, 193
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-plasma-1
   rotate: false
-  xy: 1171, 1355
+  xy: 585, 63
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-plasma-2
   rotate: false
-  xy: 1301, 1355
+  xy: 725, 1301
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-plasma-3
   rotate: false
-  xy: 1431, 1355
+  xy: 725, 1171
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-power-node
-  rotate: false
-  xy: 739, 20
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-power-node-large
-  rotate: false
-  xy: 1893, 421
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-power-source
-  rotate: false
-  xy: 1453, 19
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-power-void
-  rotate: false
-  xy: 1771, 19
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-rtg-generator
-  rotate: false
-  xy: 993, 399
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-rtg-generator-top
-  rotate: false
-  xy: 807, 13
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-solar-panel
-  rotate: false
-  xy: 239, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 solar-panel-large
   rotate: false
-  xy: 295, 661
+  xy: 1883, 899
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-surge-tower
-  rotate: false
-  xy: 1471, 389
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-thermal-generator
-  rotate: false
-  xy: 1947, 355
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 thorium-reactor
   rotate: false
-  xy: 1177, 653
+  xy: 1365, 749
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-lights
   rotate: false
-  xy: 1275, 653
+  xy: 1365, 651
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-top
   rotate: false
-  xy: 1373, 653
+  xy: 1365, 553
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-turbine-generator
-  rotate: false
-  xy: 743, 333
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-cap
-  rotate: false
-  xy: 875, 333
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-top
-  rotate: false
-  xy: 941, 333
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-turbine0
-  rotate: false
-  xy: 595, 332
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-turbine1
-  rotate: false
-  xy: 809, 332
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 alloy-smelter
   rotate: false
-  xy: 1497, 1143
+  xy: 1071, 725
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 alloy-smelter-top
   rotate: false
-  xy: 1595, 1143
+  xy: 1071, 627
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-blast-mixer
-  rotate: false
-  xy: 1101, 603
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 block-forge
   rotate: false
-  xy: 883, 1061
+  xy: 1267, 725
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-coal-centrifuge
-  rotate: false
-  xy: 811, 531
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cryofluidmixer-bottom
-  rotate: false
-  xy: 1, 528
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cryofluidmixer-liquid
-  rotate: false
-  xy: 545, 527
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cryofluidmixer-top
-  rotate: false
-  xy: 1629, 526
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cultivator
-  rotate: false
-  xy: 1695, 526
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cultivator-middle
-  rotate: false
-  xy: 1761, 526
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cultivator-top
-  rotate: false
-  xy: 1827, 526
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 disassembler
   rotate: false
-  xy: 903, 943
+  xy: 1739, 1389
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 disassembler-liquid
   rotate: false
-  xy: 1, 938
+  xy: 1837, 1389
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 disassembler-spinner
   rotate: false
-  xy: 491, 935
+  xy: 1641, 1291
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-graphite-press
-  rotate: false
-  xy: 1563, 521
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-incinerator
-  rotate: false
-  xy: 957, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-source
-  rotate: false
-  xy: 1467, 53
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-void
-  rotate: false
-  xy: 1737, 50
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-kiln
-  rotate: false
-  xy: 1893, 487
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-kiln-top
-  rotate: false
-  xy: 1959, 487
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-silicon-smelter-top
-  rotate: false
-  xy: 1959, 487
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-liquid-source
-  rotate: false
-  xy: 273, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-void
-  rotate: false
-  xy: 307, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-melter
-  rotate: false
-  xy: 875, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 multi-press
   rotate: false
-  xy: 197, 759
+  xy: 1107, 137
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-phase-weaver
-  rotate: false
-  xy: 1761, 460
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-phase-weaver-bottom
-  rotate: false
-  xy: 1827, 460
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-phase-weaver-weave
-  rotate: false
-  xy: 1155, 455
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-plastanium-compressor
-  rotate: false
-  xy: 1221, 455
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-plastanium-compressor-top
-  rotate: false
-  xy: 1287, 455
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-pulverizer
-  rotate: false
-  xy: 1487, 16
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pulverizer-rotator
-  rotate: false
-  xy: 1521, 16
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pyratite-mixer
-  rotate: false
-  xy: 1075, 405
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-separator
-  rotate: false
-  xy: 529, 395
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-separator-liquid
-  rotate: false
-  xy: 1617, 394
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-separator-spinner
-  rotate: false
-  xy: 1683, 394
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 silicon-crucible
   rotate: false
-  xy: 99, 661
+  xy: 1687, 899
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 silicon-crucible-top
   rotate: false
-  xy: 197, 661
+  xy: 1785, 899
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-silicon-smelter
-  rotate: false
-  xy: 1749, 394
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-spore-press
-  rotate: false
-  xy: 1815, 394
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-spore-press-frame0
-  rotate: false
-  xy: 1141, 389
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-spore-press-frame1
-  rotate: false
-  xy: 1207, 389
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-spore-press-frame2
-  rotate: false
-  xy: 1273, 389
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-spore-press-liquid
-  rotate: false
-  xy: 1339, 389
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-spore-press-top
-  rotate: false
-  xy: 1405, 389
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-rock1
-  rotate: false
-  xy: 101, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-rock2
-  rotate: false
-  xy: 151, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-sand-boulder1
-  rotate: false
-  xy: 841, 13
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-boulder2
-  rotate: false
-  xy: 511, 12
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shale-boulder1
-  rotate: false
-  xy: 137, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shale-boulder2
-  rotate: false
-  xy: 171, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snowrock1
-  rotate: false
-  xy: 351, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-snowrock2
-  rotate: false
-  xy: 401, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-spore-cluster1
-  rotate: false
-  xy: 1941, 147
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-spore-cluster2
-  rotate: false
-  xy: 1983, 147
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-spore-cluster3
-  rotate: false
-  xy: 493, 145
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-container
-  rotate: false
-  xy: 1023, 531
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 core-foundation
   rotate: false
-  xy: 651, 1489
+  xy: 465, 583
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 core-foundation-team
   rotate: false
-  xy: 1181, 1485
+  xy: 335, 453
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
+core-nucleus
+  rotate: false
+  xy: 1, 11
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
 core-nucleus-team
   rotate: false
-  xy: 1, 1887
+  xy: 1421, 1887
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 core-shard
   rotate: false
-  xy: 1, 1036
+  xy: 1331, 1141
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 core-shard-team
   rotate: false
-  xy: 495, 1033
+  xy: 1295, 1039
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 vault
   rotate: false
-  xy: 1569, 653
+  xy: 1463, 535
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-arc-heat
+vault-team
   rotate: false
-  xy: 785, 190
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-1
-  rotate: false
-  xy: 307, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-2
-  rotate: false
-  xy: 83, 595
-  size: 64, 64
-  orig: 64, 64
+  xy: 1561, 801
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
 block-3
   rotate: false
-  xy: 1889, 1143
+  xy: 1169, 725
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-4
   rotate: false
-  xy: 1831, 1615
+  xy: 465, 1103
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-hail-heat
+foreshadow-heat
   rotate: false
-  xy: 831, 290
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-lancer-heat
-  rotate: false
-  xy: 479, 467
-  size: 64, 64
-  orig: 64, 64
+  xy: 595, 713
+  size: 128, 128
+  orig: 128, 128
   offset: 0, 0
   index: -1
 meltdown-heat
   rotate: false
-  xy: 1821, 1355
+  xy: 725, 781
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 ripple-heat
   rotate: false
-  xy: 687, 747
+  xy: 1401, 39
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-salvo-heat
+tsunami-liquid
   rotate: false
-  xy: 809, 398
-  size: 64, 64
-  orig: 64, 64
+  xy: 1463, 731
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
-salvo-panel-left
+tsunami-top
   rotate: false
-  xy: 67, 397
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-salvo-panel-right
-  rotate: false
-  xy: 133, 397
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scorch-heat
-  rotate: false
-  xy: 1, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-wave-liquid
-  rotate: false
-  xy: 661, 331
-  size: 64, 64
-  orig: 64, 64
+  xy: 1463, 633
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
 additive-reconstructor
   rotate: false
-  xy: 1951, 1387
+  xy: 1099, 1019
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 additive-reconstructor-top
   rotate: false
-  xy: 1301, 1143
+  xy: 1071, 921
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 air-factory
   rotate: false
-  xy: 1399, 1143
+  xy: 1071, 823
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-command-center
-  rotate: false
-  xy: 957, 531
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 factory-in-3
   rotate: false
-  xy: 1001, 931
+  xy: 1739, 1291
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 factory-in-5
   rotate: false
-  xy: 1, 1725
+  xy: 163, 170
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 factory-out-3
   rotate: false
-  xy: 1099, 931
+  xy: 1837, 1291
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 factory-out-5
   rotate: false
-  xy: 163, 1725
+  xy: 163, 8
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 factory-top-3
   rotate: false
-  xy: 789, 865
+  xy: 1429, 1221
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 ground-factory
   rotate: false
-  xy: 393, 857
+  xy: 1821, 1193
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 multiplicative-reconstructor
   rotate: false
-  xy: 325, 1725
+  xy: 389, 1745
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 multiplicative-reconstructor-top
   rotate: false
-  xy: 487, 1725
+  xy: 551, 1745
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 naval-factory
   rotate: false
-  xy: 295, 759
+  xy: 1107, 39
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-rally-point
-  rotate: false
-  xy: 463, 401
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-repair-point-base
-  rotate: false
-  xy: 1721, 16
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-resupply-point
-  rotate: false
-  xy: 743, 399
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-copper-wall
-  rotate: false
-  xy: 511, 80
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-copper-wall-large
-  rotate: false
-  xy: 663, 530
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-door
-  rotate: false
-  xy: 341, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-door-large
-  rotate: false
-  xy: 1299, 521
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-door-large-open
-  rotate: false
-  xy: 1365, 521
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-door-open
-  rotate: false
-  xy: 375, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-wall
-  rotate: false
-  xy: 1317, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-phase-wall-large
-  rotate: false
-  xy: 1695, 460
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-plastanium-wall
-  rotate: false
-  xy: 477, 43
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plastanium-wall-large
-  rotate: false
-  xy: 1353, 455
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 scrap-wall-gigantic
   rotate: false
-  xy: 911, 1241
+  xy: 985, 1313
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 scrap-wall-huge2
   rotate: false
-  xy: 1079, 735
+  xy: 1491, 927
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 scrap-wall-huge3
   rotate: false
-  xy: 785, 669
+  xy: 1589, 899
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-scrap-wall-large1
-  rotate: false
-  xy: 265, 397
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scrap-wall-large2
-  rotate: false
-  xy: 331, 397
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scrap-wall-large3
-  rotate: false
-  xy: 397, 397
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scrap-wall-large4
-  rotate: false
-  xy: 677, 397
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scrap-wall2
-  rotate: false
-  xy: 35, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap-wall3
-  rotate: false
-  xy: 69, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap-wall4
-  rotate: false
-  xy: 103, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap-wall5
-  rotate: false
-  xy: 103, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-surge-wall
-  rotate: false
-  xy: 1147, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-surge-wall-large
-  rotate: false
-  xy: 1537, 389
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-thorium-wall
-  rotate: false
-  xy: 1181, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-thorium-wall-large
-  rotate: false
-  xy: 1059, 339
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 thruster
   rotate: false
-  xy: 521, 1229
+  xy: 985, 1183
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-titanium-wall-large
-  rotate: false
-  xy: 463, 335
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-bullet
-  rotate: false
-  xy: 727, 279
-  size: 52, 52
-  orig: 52, 52
-  offset: 0, 0
-  index: -1
-bullet-back
-  rotate: false
-  xy: 875, 279
-  size: 52, 52
-  orig: 52, 52
-  offset: 0, 0
-  index: -1
 circle-end
   rotate: false
-  xy: 1, 1134
+  xy: 969, 852
   size: 100, 199
   orig: 100, 199
   offset: 0, 0
   index: -1
-error
+large-bomb
   rotate: false
-  xy: 1937, 247
-  size: 48, 48
-  orig: 48, 48
+  xy: 1245, 1341
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+large-bomb-back
+  rotate: false
+  xy: 855, 495
+  size: 100, 100
+  orig: 100, 100
   offset: 0, 0
   index: -1
 laser-end
   rotate: false
-  xy: 491, 599
+  xy: 1945, 1543
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 minelaser-end
   rotate: false
-  xy: 663, 596
+  xy: 1951, 325
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
-missile
-  rotate: false
-  xy: 1629, 615
-  size: 36, 36
-  orig: 36, 36
-  offset: 0, 0
-  index: -1
-missile-back
-  rotate: false
-  xy: 1837, 356
-  size: 36, 36
-  orig: 36, 36
-  offset: 0, 0
-  index: -1
 parallax-laser-end
   rotate: false
-  xy: 883, 596
+  xy: 1609, 303
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
-particle
-  rotate: false
-  xy: 1423, 147
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-shell
-  rotate: false
-  xy: 2011, 317
-  size: 36, 36
-  orig: 36, 36
-  offset: 0, 0
-  index: -1
-shell-back
-  rotate: false
-  xy: 687, 293
-  size: 36, 36
-  orig: 36, 36
-  offset: 0, 0
-  index: -1
-alpha-wreck0
-  rotate: false
-  xy: 875, 414
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-alpha-wreck1
-  rotate: false
-  xy: 1007, 349
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-alpha-wreck2
-  rotate: false
-  xy: 929, 283
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-arc
-  rotate: false
-  xy: 2013, 387
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-arkyid-wreck0
-  rotate: false
-  xy: 921, 1631
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-arkyid-wreck1
-  rotate: false
-  xy: 1051, 1631
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-arkyid-wreck2
-  rotate: false
-  xy: 1181, 1615
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-atrax-wreck0
-  rotate: false
-  xy: 491, 673
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
-atrax-wreck1
-  rotate: false
-  xy: 979, 669
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
-atrax-wreck2
-  rotate: false
-  xy: 1069, 669
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
-beta-wreck0
-  rotate: false
-  xy: 101, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-beta-wreck1
-  rotate: false
-  xy: 151, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-beta-wreck2
-  rotate: false
-  xy: 201, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-additive-reconstructor-full
-  rotate: false
-  xy: 511, 1131
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-air-factory-full
-  rotate: false
-  xy: 609, 1131
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-arc-full
-  rotate: false
-  xy: 341, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-blast-drill-full
-  rotate: false
-  xy: 1, 1595
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-char-full
-  rotate: false
-  xy: 409, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-cliffs-full
-  rotate: false
-  xy: 651, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-conduit-full
-  rotate: false
-  xy: 921, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-conveyor-full
-  rotate: false
-  xy: 955, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-0-0
-  rotate: false
-  xy: 955, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-core-foundation-full
-  rotate: false
-  xy: 131, 1595
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-core-shard-full
-  rotate: false
-  xy: 1087, 1127
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-craters-full
-  rotate: false
-  xy: 989, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-cryofluidmixer-full
-  rotate: false
-  xy: 149, 595
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-cultivator-full
-  rotate: false
-  xy: 215, 595
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-cyclone-full
-  rotate: false
-  xy: 1185, 1127
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-dark-metal-full
-  rotate: false
-  xy: 1023, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-darksand-full
-  rotate: false
-  xy: 1057, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-dunerocks-full
-  rotate: false
-  xy: 1091, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-duo-full
-  rotate: false
-  xy: 1125, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-fuse-full
-  rotate: false
-  xy: 103, 1053
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-grass-full
-  rotate: false
-  xy: 1159, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ground-factory-full
-  rotate: false
-  xy: 201, 1053
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-hail-full
-  rotate: false
-  xy: 1193, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-holostone-full
-  rotate: false
-  xy: 1227, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-hotrock-full
-  rotate: false
-  xy: 1261, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ice-full
-  rotate: false
-  xy: 1295, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ice-snow-full
-  rotate: false
-  xy: 1329, 147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-icerocks-full
-  rotate: false
-  xy: 569, 139
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ignarock-full
-  rotate: false
-  xy: 603, 139
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-impact-reactor-full
-  rotate: false
-  xy: 261, 1595
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-lancer-full
-  rotate: false
-  xy: 281, 595
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-laser-drill-full
-  rotate: false
-  xy: 299, 1053
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-liquid-router-full
-  rotate: false
-  xy: 1739, 138
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-liquid-tank-full
-  rotate: false
-  xy: 397, 1053
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-magmarock-full
-  rotate: false
-  xy: 1465, 137
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-full
-  rotate: false
-  xy: 1381, 1045
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mass-conveyor-icon
-  rotate: false
-  xy: 1381, 1045
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-mass-driver-full
-  rotate: false
-  xy: 1479, 1045
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-mechanical-drill-full
-  rotate: false
-  xy: 347, 595
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-meltdown-full
-  rotate: false
-  xy: 391, 1595
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-metal-floor-damaged-full
-  rotate: false
-  xy: 1651, 130
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-moss-full
-  rotate: false
-  xy: 769, 122
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-naval-factory-full
-  rotate: false
-  xy: 1577, 1045
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-oil-extractor-full
-  rotate: false
-  xy: 1675, 1045
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-ore-coal-full
-  rotate: false
-  xy: 1499, 121
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-copper-full
-  rotate: false
-  xy: 1807, 121
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-lead-full
-  rotate: false
-  xy: 1841, 121
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-scrap-full
-  rotate: false
-  xy: 1875, 121
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-thorium-full
-  rotate: false
-  xy: 685, 119
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-titanium-full
-  rotate: false
-  xy: 803, 119
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-parallax-full
-  rotate: false
-  xy: 413, 595
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-payload-router-full
-  rotate: false
-  xy: 1773, 1045
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-payload-router-icon
-  rotate: false
-  xy: 1773, 1045
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-pebbles-full
-  rotate: false
-  xy: 1533, 118
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-phase-weaver-full
-  rotate: false
-  xy: 1167, 587
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-plated-conduit-full
-  rotate: false
-  xy: 1567, 118
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-pneumatic-drill-full
-  rotate: false
-  xy: 1233, 587
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-pulse-conduit-full
-  rotate: false
-  xy: 1601, 118
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-pulverizer-full
-  rotate: false
-  xy: 1773, 118
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-repair-point-full
-  rotate: false
-  xy: 443, 117
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ripple-full
-  rotate: false
-  xy: 1871, 1045
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-rock-full
-  rotate: false
-  xy: 251, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-rocks-full
-  rotate: false
-  xy: 837, 115
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-saltrocks-full
-  rotate: false
-  xy: 871, 115
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-salvo-full
-  rotate: false
-  xy: 1299, 587
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-sand-boulder-full
-  rotate: false
-  xy: 535, 114
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-sand-full
-  rotate: false
-  xy: 719, 114
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-sandrocks-full
-  rotate: false
-  xy: 1, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scatter-full
-  rotate: false
-  xy: 1365, 587
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-scorch-full
-  rotate: false
-  xy: 35, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scrap-wall-full
-  rotate: false
-  xy: 69, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap-wall1
-  rotate: false
-  xy: 69, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scrap-wall-huge-full
-  rotate: false
-  xy: 707, 1041
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-scrap-wall-huge1
-  rotate: false
-  xy: 707, 1041
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-scrap-wall-large-full
-  rotate: false
-  xy: 1431, 587
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-segment-full
-  rotate: false
-  xy: 1497, 587
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-shale-boulder-full
-  rotate: false
-  xy: 137, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-shale-full
-  rotate: false
-  xy: 171, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-shalerocks-full
-  rotate: false
-  xy: 205, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-shrubs-full
-  rotate: false
-  xy: 239, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-snow-full
-  rotate: false
-  xy: 273, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-snowrock-full
-  rotate: false
-  xy: 301, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-snowrocks-full
-  rotate: false
-  xy: 307, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-spectre-full
-  rotate: false
-  xy: 791, 1501
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-spore-cluster-full
-  rotate: false
-  xy: 1913, 632
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-spore-moss-full
-  rotate: false
-  xy: 341, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-spore-press-full
-  rotate: false
-  xy: 1563, 587
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-sporerocks-full
-  rotate: false
-  xy: 375, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-stone-full
-  rotate: false
-  xy: 409, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-swarmer-full
-  rotate: false
-  xy: 1913, 553
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-tendrils-full
-  rotate: false
-  xy: 637, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-titanium-conveyor-full
-  rotate: false
-  xy: 905, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-0-0
-  rotate: false
-  xy: 905, 113
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-turbine-generator-full
-  rotate: false
-  xy: 1979, 553
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-water-extractor-full
-  rotate: false
-  xy: 1101, 537
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-wave-full
-  rotate: false
-  xy: 479, 533
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-bryde-wreck0
-  rotate: false
-  xy: 1549, 1745
-  size: 140, 140
-  orig: 140, 140
-  offset: 0, 0
-  index: -1
-bryde-wreck1
-  rotate: false
-  xy: 1691, 1745
-  size: 140, 140
-  orig: 140, 140
-  offset: 0, 0
-  index: -1
-bryde-wreck2
-  rotate: false
-  xy: 1833, 1745
-  size: 140, 140
-  orig: 140, 140
-  offset: 0, 0
-  index: -1
-core-foundation-team-crux
-  rotate: false
-  xy: 1311, 1485
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-core-foundation-team-sharded
-  rotate: false
-  xy: 1441, 1485
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-core-nucleus-team-crux
-  rotate: false
-  xy: 163, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-core-nucleus-team-sharded
-  rotate: false
-  xy: 325, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-core-shard-team-crux
-  rotate: false
-  xy: 593, 1033
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-core-shard-team-sharded
-  rotate: false
-  xy: 1079, 1029
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-1-0
-  rotate: false
-  xy: 705, 80
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-1
-  rotate: false
-  xy: 1, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-2
-  rotate: false
-  xy: 35, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-3
-  rotate: false
-  xy: 69, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-4
-  rotate: false
-  xy: 103, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-5
-  rotate: false
-  xy: 137, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-6
-  rotate: false
-  xy: 171, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-7
-  rotate: false
-  xy: 205, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-2-0
-  rotate: false
-  xy: 877, 530
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-1
-  rotate: false
-  xy: 83, 529
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-2
-  rotate: false
-  xy: 149, 529
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-3
-  rotate: false
-  xy: 215, 529
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-4
-  rotate: false
-  xy: 281, 529
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-5
-  rotate: false
-  xy: 347, 529
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-6
-  rotate: false
-  xy: 413, 529
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-7
-  rotate: false
-  xy: 729, 529
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-3-0
-  rotate: false
-  xy: 1177, 1029
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-1
-  rotate: false
-  xy: 805, 963
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-2
-  rotate: false
-  xy: 99, 955
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-3
-  rotate: false
-  xy: 197, 955
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-4
-  rotate: false
-  xy: 295, 955
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-5
-  rotate: false
-  xy: 393, 955
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-6
-  rotate: false
-  xy: 1275, 947
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-7
-  rotate: false
-  xy: 1373, 947
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-4-0
-  rotate: false
-  xy: 1571, 1485
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-1
-  rotate: false
-  xy: 1701, 1485
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-2
-  rotate: false
-  xy: 1831, 1485
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-3
-  rotate: false
-  xy: 1, 1465
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-4
-  rotate: false
-  xy: 131, 1465
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-5
-  rotate: false
-  xy: 261, 1465
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-6
-  rotate: false
-  xy: 391, 1465
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-7
-  rotate: false
-  xy: 781, 1371
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-5-0
-  rotate: false
-  xy: 649, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-1
-  rotate: false
-  xy: 811, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-2
-  rotate: false
-  xy: 973, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-3
-  rotate: false
-  xy: 1135, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-4
-  rotate: false
-  xy: 1297, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-5
-  rotate: false
-  xy: 1459, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-6
-  rotate: false
-  xy: 1621, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-7
-  rotate: false
-  xy: 1783, 1887
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-crawler-wreck0
-  rotate: false
-  xy: 1173, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-crawler-wreck1
-  rotate: false
-  xy: 1223, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-crawler-wreck2
-  rotate: false
-  xy: 1273, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-cyclone
-  rotate: false
-  xy: 1471, 947
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dagger-wreck0
-  rotate: false
-  xy: 1473, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-dagger-wreck1
-  rotate: false
-  xy: 1523, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-dagger-wreck2
-  rotate: false
-  xy: 1837, 247
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-duo
-  rotate: false
-  xy: 409, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-flare-wreck0
-  rotate: false
-  xy: 571, 232
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-flare-wreck1
-  rotate: false
-  xy: 1, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-flare-wreck2
-  rotate: false
-  xy: 51, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-fortress-wreck0
-  rotate: false
-  xy: 205, 1253
-  size: 100, 80
-  orig: 100, 80
-  offset: 0, 0
-  index: -1
-fortress-wreck1
-  rotate: false
-  xy: 307, 1253
-  size: 100, 80
-  orig: 100, 80
-  offset: 0, 0
-  index: -1
-fortress-wreck2
-  rotate: false
-  xy: 409, 1253
-  size: 100, 80
-  orig: 100, 80
-  offset: 0, 0
-  index: -1
-fuse
-  rotate: false
-  xy: 295, 857
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-gamma-wreck0
-  rotate: false
-  xy: 1183, 331
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-gamma-wreck1
-  rotate: false
-  xy: 1241, 331
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-gamma-wreck2
-  rotate: false
-  xy: 1299, 331
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-hail
-  rotate: false
-  xy: 637, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-horizon-wreck0
-  rotate: false
-  xy: 1969, 1069
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-horizon-wreck1
-  rotate: false
-  xy: 805, 1065
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-horizon-wreck2
-  rotate: false
-  xy: 1197, 955
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-item-blast-compound-large
-  rotate: false
-  xy: 1529, 239
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-blast-compound-medium
-  rotate: false
-  xy: 1059, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-blast-compound-xlarge
-  rotate: false
-  xy: 251, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-coal-large
-  rotate: false
-  xy: 881, 237
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-coal-medium
-  rotate: false
-  xy: 1127, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-coal-xlarge
-  rotate: false
-  xy: 301, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-copper-large
-  rotate: false
-  xy: 1529, 197
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-copper-medium
-  rotate: false
-  xy: 1195, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-copper-xlarge
-  rotate: false
-  xy: 351, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-graphite-large
-  rotate: false
-  xy: 1381, 189
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-graphite-medium
-  rotate: false
-  xy: 1263, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-graphite-xlarge
-  rotate: false
-  xy: 401, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-lead-large
-  rotate: false
-  xy: 1423, 189
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-lead-medium
-  rotate: false
-  xy: 1331, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-lead-xlarge
-  rotate: false
-  xy: 621, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-metaglass-large
-  rotate: false
-  xy: 701, 187
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-metaglass-medium
-  rotate: false
-  xy: 1399, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-metaglass-xlarge
-  rotate: false
-  xy: 671, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-phase-fabric-large
-  rotate: false
-  xy: 821, 187
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-phase-fabric-medium
-  rotate: false
-  xy: 1943, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-phase-fabric-xlarge
-  rotate: false
-  xy: 979, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-plastanium-large
-  rotate: false
-  xy: 1571, 186
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-plastanium-medium
-  rotate: false
-  xy: 2011, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-plastanium-xlarge
-  rotate: false
-  xy: 1029, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-pyratite-large
-  rotate: false
-  xy: 1613, 186
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-pyratite-medium
-  rotate: false
-  xy: 545, 71
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-pyratite-xlarge
-  rotate: false
-  xy: 1079, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-sand-large
-  rotate: false
-  xy: 1773, 186
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-sand-medium
-  rotate: false
-  xy: 1703, 70
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-sand-xlarge
-  rotate: false
-  xy: 1129, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-scrap-large
-  rotate: false
-  xy: 451, 185
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-scrap-medium
-  rotate: false
-  xy: 1619, 62
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-scrap-xlarge
-  rotate: false
-  xy: 1179, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-silicon-large
-  rotate: false
-  xy: 743, 182
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-silicon-medium
-  rotate: false
-  xy: 739, 54
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-silicon-xlarge
-  rotate: false
-  xy: 1229, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-spore-pod-large
-  rotate: false
-  xy: 1465, 171
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-spore-pod-medium
-  rotate: false
-  xy: 1821, 53
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-spore-pod-xlarge
-  rotate: false
-  xy: 1279, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-surge-alloy-large
-  rotate: false
-  xy: 1655, 164
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-surge-alloy-medium
-  rotate: false
-  xy: 671, 51
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-surge-alloy-xlarge
-  rotate: false
-  xy: 1329, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-thorium-large
-  rotate: false
-  xy: 1697, 164
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-thorium-medium
-  rotate: false
-  xy: 1501, 50
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-thorium-xlarge
-  rotate: false
-  xy: 1379, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-titanium-large
-  rotate: false
-  xy: 1507, 155
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-titanium-medium
-  rotate: false
-  xy: 1569, 50
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-titanium-xlarge
-  rotate: false
-  xy: 1429, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-lancer
-  rotate: false
-  xy: 1089, 471
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-large
-  rotate: false
-  xy: 1815, 155
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-medium
-  rotate: false
-  xy: 841, 47
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-xlarge
-  rotate: false
-  xy: 831, 229
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-liquid-oil-large
-  rotate: false
-  xy: 1857, 155
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-liquid-oil-medium
-  rotate: false
-  xy: 1, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-oil-xlarge
-  rotate: false
-  xy: 1623, 228
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-liquid-slag-large
-  rotate: false
-  xy: 1899, 155
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-liquid-slag-medium
-  rotate: false
-  xy: 239, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-slag-xlarge
-  rotate: false
-  xy: 1779, 228
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-liquid-water-large
-  rotate: false
-  xy: 1381, 147
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-liquid-water-medium
-  rotate: false
-  xy: 375, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-water-xlarge
-  rotate: false
-  xy: 451, 227
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mace-wreck0
-  rotate: false
-  xy: 861, 464
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mace-wreck1
-  rotate: false
-  xy: 67, 463
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mace-wreck2
-  rotate: false
-  xy: 133, 463
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mass-driver
-  rotate: false
-  xy: 785, 767
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mega-wreck0
-  rotate: false
-  xy: 307, 1151
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-mega-wreck1
-  rotate: false
-  xy: 409, 1151
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-mega-wreck2
-  rotate: false
-  xy: 781, 1139
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-meltdown
-  rotate: false
-  xy: 1691, 1355
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-minke-wreck0
-  rotate: false
-  xy: 261, 1335
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-minke-wreck1
-  rotate: false
-  xy: 391, 1335
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-minke-wreck2
-  rotate: false
-  xy: 781, 1241
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-mono-wreck0
-  rotate: false
-  xy: 1879, 197
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mono-wreck1
-  rotate: false
-  xy: 1929, 197
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mono-wreck2
-  rotate: false
-  xy: 1979, 189
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-nova-wreck0
-  rotate: false
-  xy: 1473, 331
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-nova-wreck1
-  rotate: false
-  xy: 1531, 331
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-nova-wreck2
-  rotate: false
-  xy: 1837, 297
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-parallax
-  rotate: false
-  xy: 1629, 460
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-poly-wreck0
-  rotate: false
-  xy: 529, 287
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-poly-wreck1
-  rotate: false
-  xy: 1589, 286
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-poly-wreck2
-  rotate: false
-  xy: 1007, 281
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-pulsar-wreck0
-  rotate: false
-  xy: 1987, 1237
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-pulsar-wreck1
-  rotate: false
-  xy: 1987, 1187
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-pulsar-wreck2
-  rotate: false
-  xy: 529, 345
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-quasar-wreck0
-  rotate: false
-  xy: 581, 593
-  size: 80, 80
-  orig: 80, 80
-  offset: 0, 0
-  index: -1
-quasar-wreck1
-  rotate: false
-  xy: 1667, 592
-  size: 80, 80
-  orig: 80, 80
-  offset: 0, 0
-  index: -1
-quasar-wreck2
-  rotate: false
-  xy: 1749, 592
-  size: 80, 80
-  orig: 80, 80
-  offset: 0, 0
-  index: -1
-repair-point
-  rotate: false
-  xy: 1555, 16
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ripple
-  rotate: false
-  xy: 1867, 751
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-risse-wreck0
-  rotate: false
-  xy: 589, 741
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-risse-wreck1
-  rotate: false
-  xy: 491, 739
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-risse-wreck2
-  rotate: false
-  xy: 981, 735
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-salvo
-  rotate: false
-  xy: 611, 398
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scatter
-  rotate: false
-  xy: 199, 397
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scorch
-  rotate: false
-  xy: 681, 12
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-segment
-  rotate: false
-  xy: 1, 396
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-spectre
-  rotate: false
-  xy: 1041, 1241
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-spiroct-wreck0
-  rotate: false
-  xy: 1763, 674
-  size: 94, 75
-  orig: 94, 75
-  offset: 0, 0
-  index: -1
-spiroct-wreck1
-  rotate: false
-  xy: 1859, 674
-  size: 94, 75
-  orig: 94, 75
-  offset: 0, 0
-  index: -1
-spiroct-wreck2
-  rotate: false
-  xy: 687, 670
-  size: 94, 75
-  orig: 94, 75
-  offset: 0, 0
-  index: -1
-splash-0
-  rotate: false
-  xy: 341, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-1
-  rotate: false
-  xy: 375, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-10
-  rotate: false
-  xy: 1079, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-11
-  rotate: false
-  xy: 1113, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-2
-  rotate: false
-  xy: 409, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-3
-  rotate: false
-  xy: 613, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-4
-  rotate: false
-  xy: 875, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-5
-  rotate: false
-  xy: 909, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-6
-  rotate: false
-  xy: 943, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-7
-  rotate: false
-  xy: 977, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-8
-  rotate: false
-  xy: 1011, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-9
-  rotate: false
-  xy: 1045, 11
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-swarmer
-  rotate: false
-  xy: 1881, 355
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-unit-alpha-full
-  rotate: false
-  xy: 651, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-arkyid-full
-  rotate: false
-  xy: 651, 1229
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-unit-atrax-full
-  rotate: false
-  xy: 1955, 619
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
-unit-beta-full
-  rotate: false
-  xy: 931, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-bryde-full
-  rotate: false
-  xy: 649, 1619
-  size: 140, 140
-  orig: 140, 140
-  offset: 0, 0
-  index: -1
-unit-crawler-full
-  rotate: false
-  xy: 981, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-dagger-full
-  rotate: false
-  xy: 1031, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-flare-full
-  rotate: false
-  xy: 1081, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-fortress-full
-  rotate: false
-  xy: 883, 1159
-  size: 100, 80
-  orig: 100, 80
-  offset: 0, 0
-  index: -1
-unit-gamma-full
-  rotate: false
-  xy: 1647, 278
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-unit-horizon-full
-  rotate: false
-  xy: 737, 595
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-unit-mace-full
-  rotate: false
-  xy: 67, 331
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-unit-mega-full
-  rotate: false
-  xy: 985, 1139
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-unit-minke-full
-  rotate: false
-  xy: 1171, 1225
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-unit-mono-full
-  rotate: false
-  xy: 1131, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-nova-full
-  rotate: false
-  xy: 1779, 278
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-unit-poly-full
-  rotate: false
-  xy: 463, 277
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-unit-pulsar-full
-  rotate: false
-  xy: 1603, 344
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-unit-quasar-full
-  rotate: false
-  xy: 1831, 592
-  size: 80, 80
-  orig: 80, 80
-  offset: 0, 0
-  index: -1
-unit-risse-full
-  rotate: false
-  xy: 1471, 653
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-unit-spiroct-full
-  rotate: false
-  xy: 883, 670
-  size: 94, 75
-  orig: 94, 75
-  offset: 0, 0
-  index: -1
-unit-zenith-full
-  rotate: false
-  xy: 1301, 1241
-  size: 112, 112
-  orig: 112, 112
-  offset: 0, 0
-  index: -1
-wave
-  rotate: false
-  xy: 397, 331
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-zenith-wreck0
-  rotate: false
-  xy: 1643, 1241
-  size: 112, 112
-  orig: 112, 112
-  offset: 0, 0
-  index: -1
-zenith-wreck1
-  rotate: false
-  xy: 1757, 1241
-  size: 112, 112
-  orig: 112, 112
-  offset: 0, 0
-  index: -1
-zenith-wreck2
-  rotate: false
-  xy: 1871, 1241
-  size: 112, 112
-  orig: 112, 112
-  offset: 0, 0
-  index: -1
-item-blast-compound
-  rotate: false
-  xy: 1025, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-coal
-  rotate: false
-  xy: 1093, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-copper
-  rotate: false
-  xy: 1161, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-graphite
-  rotate: false
-  xy: 1229, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-lead
-  rotate: false
-  xy: 1297, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-metaglass
-  rotate: false
-  xy: 1365, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-phase-fabric
-  rotate: false
-  xy: 1909, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-plastanium
-  rotate: false
-  xy: 1977, 79
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-pyratite
-  rotate: false
-  xy: 477, 77
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-sand
-  rotate: false
-  xy: 579, 71
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-scrap
-  rotate: false
-  xy: 1433, 69
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-silicon
-  rotate: false
-  xy: 1653, 62
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-spore-pod
-  rotate: false
-  xy: 1787, 53
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-surge-alloy
-  rotate: false
-  xy: 1855, 53
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-thorium
-  rotate: false
-  xy: 773, 51
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-titanium
-  rotate: false
-  xy: 1535, 50
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-cryofluid
-  rotate: false
-  xy: 807, 47
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-oil
-  rotate: false
-  xy: 705, 46
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-slag
-  rotate: false
-  xy: 205, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-water
-  rotate: false
-  xy: 341, 45
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shape-3
-  rotate: false
-  xy: 1, 331
-  size: 63, 63
-  orig: 63, 63
-  offset: 0, 0
-  index: -1
-alpha
-  rotate: false
-  xy: 611, 543
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-alpha-cell
-  rotate: false
-  xy: 743, 479
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-arkyid
-  rotate: false
-  xy: 791, 1631
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-chaos-array
-  rotate: false
-  xy: 791, 1631
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-arkyid-cell
-  rotate: false
-  xy: 1955, 685
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
 arkyid-foot
   rotate: false
-  xy: 811, 597
+  xy: 1757, 319
   size: 70, 70
   orig: 70, 70
   offset: 0, 0
   index: -1
 arkyid-joint-base
   rotate: false
-  xy: 957, 597
+  xy: 1829, 319
   size: 70, 70
   orig: 70, 70
   offset: 0, 0
   index: -1
-arkyid-leg
-  rotate: false
-  xy: 1663, 336
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
 arkyid-leg-base
   rotate: false
-  xy: 521, 1659
+  xy: 725, 455
   size: 104, 64
   orig: 104, 64
   offset: 0, 0
   index: -1
-atrax
+arkyid-outline
   rotate: false
-  xy: 1, 676
+  xy: 1067, 1443
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+arkyid-wreck0
+  rotate: false
+  xy: 1197, 1443
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+arkyid-wreck1
+  rotate: false
+  xy: 357, 1363
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+arkyid-wreck2
+  rotate: false
+  xy: 487, 1363
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+artillery-mount-outline
+  rotate: false
+  xy: 1755, 247
+  size: 70, 70
+  orig: 70, 70
+  offset: 0, 0
+  index: -1
+atrax-outline
+  rotate: false
+  xy: 1519, 245
   size: 88, 64
   orig: 88, 64
   offset: 0, 0
   index: -1
-atrax-base
+atrax-wreck0
   rotate: false
-  xy: 1981, 897
-  size: 64, 64
-  orig: 64, 64
+  xy: 1499, 179
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+atrax-wreck1
+  rotate: false
+  xy: 1499, 113
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+atrax-wreck2
+  rotate: false
+  xy: 1499, 47
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+beam-weapon-outline
+  rotate: false
+  xy: 1827, 555
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+block-additive-reconstructor-full
+  rotate: false
+  xy: 1169, 627
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-air-factory-full
+  rotate: false
+  xy: 1197, 1019
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-blast-drill-full
+  rotate: false
+  xy: 335, 843
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-core-foundation-full
+  rotate: false
+  xy: 465, 973
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-core-nucleus-full
+  rotate: false
+  xy: 1, 335
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+block-core-shard-full
+  rotate: false
+  xy: 1267, 921
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-cyclone-full
+  rotate: false
+  xy: 1267, 823
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-foreshadow-full
+  rotate: false
+  xy: 335, 713
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-fuse-full
+  rotate: false
+  xy: 1267, 627
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-ground-factory-full
+  rotate: false
+  xy: 1035, 397
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-impact-reactor-full
+  rotate: false
+  xy: 465, 843
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-laser-drill-full
+  rotate: false
+  xy: 1071, 529
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-liquid-tank-full
+  rotate: false
+  xy: 1169, 529
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-mass-driver-full
+  rotate: false
+  xy: 1133, 431
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-meltdown-full
+  rotate: false
+  xy: 335, 583
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-multiplicative-reconstructor-full
+  rotate: false
+  xy: 1, 173
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+block-naval-factory-full
+  rotate: false
+  xy: 1231, 431
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-oil-extractor-full
+  rotate: false
+  xy: 1329, 431
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-payload-conveyor-full
+  rotate: false
+  xy: 1133, 333
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-conveyor-icon
+  rotate: false
+  xy: 1133, 333
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-payload-router-full
+  rotate: false
+  xy: 1231, 333
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-router-icon
+  rotate: false
+  xy: 1231, 333
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-ripple-full
+  rotate: false
+  xy: 1329, 333
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-scrap-wall-huge-full
+  rotate: false
+  xy: 1035, 299
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+scrap-wall-huge1
+  rotate: false
+  xy: 1035, 299
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-spectre-full
+  rotate: false
+  xy: 465, 713
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-tsunami-full
+  rotate: false
+  xy: 1133, 235
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-vault-full
+  rotate: false
+  xy: 1329, 235
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+bryde-outline
+  rotate: false
+  xy: 675, 1573
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+bryde-wreck0
+  rotate: false
+  xy: 817, 1573
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+bryde-wreck1
+  rotate: false
+  xy: 959, 1573
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+bryde-wreck2
+  rotate: false
+  xy: 1101, 1573
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+core-foundation-team-crux
+  rotate: false
+  xy: 465, 453
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+core-foundation-team-sharded
+  rotate: false
+  xy: 325, 323
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+core-nucleus-team-crux
+  rotate: false
+  xy: 1583, 1887
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+core-nucleus-team-sharded
+  rotate: false
+  xy: 1745, 1887
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+core-shard-team-crux
+  rotate: false
+  xy: 1393, 1043
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+core-shard-team-sharded
+  rotate: false
+  xy: 1357, 1515
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+corvus-foot
+  rotate: false
+  xy: 1427, 289
+  size: 90, 90
+  orig: 90, 90
+  offset: 0, 0
+  index: -1
+corvus-joint-base
+  rotate: false
+  xy: 1827, 247
+  size: 70, 70
+  orig: 70, 70
+  offset: 0, 0
+  index: -1
+toxopid-joint-base
+  rotate: false
+  xy: 1827, 247
+  size: 70, 70
+  orig: 70, 70
+  offset: 0, 0
+  index: -1
+cracks-3-0
+  rotate: false
+  xy: 1455, 1515
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-1
+  rotate: false
+  xy: 1553, 1515
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-2
+  rotate: false
+  xy: 1651, 1487
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-3
+  rotate: false
+  xy: 1749, 1487
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-4
+  rotate: false
+  xy: 1847, 1487
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-5
+  rotate: false
+  xy: 1347, 1417
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-6
+  rotate: false
+  xy: 1347, 1319
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-7
+  rotate: false
+  xy: 1445, 1417
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-4-0
+  rotate: false
+  xy: 325, 193
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-1
+  rotate: false
+  xy: 455, 323
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-2
+  rotate: false
+  xy: 325, 63
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-3
+  rotate: false
+  xy: 455, 193
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-4
+  rotate: false
+  xy: 455, 63
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-5
+  rotate: false
+  xy: 595, 1233
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-6
+  rotate: false
+  xy: 595, 1103
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-7
+  rotate: false
+  xy: 595, 973
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-5-0
+  rotate: false
+  xy: 195, 1466
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-1
+  rotate: false
+  xy: 173, 1304
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-2
+  rotate: false
+  xy: 173, 1142
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-3
+  rotate: false
+  xy: 173, 980
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-4
+  rotate: false
+  xy: 173, 818
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-5
+  rotate: false
+  xy: 173, 656
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-6
+  rotate: false
+  xy: 173, 494
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-7
+  rotate: false
+  xy: 163, 332
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cyclone
+  rotate: false
+  xy: 1543, 1417
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+foreshadow
+  rotate: false
+  xy: 595, 843
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+fortress-leg
+  rotate: false
+  xy: 325, 1
+  size: 80, 60
+  orig: 80, 60
+  offset: 0, 0
+  index: -1
+fortress-outline
+  rotate: false
+  xy: 969, 606
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+fortress-wreck0
+  rotate: false
+  xy: 1357, 1613
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+fortress-wreck1
+  rotate: false
+  xy: 1459, 1613
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+fortress-wreck2
+  rotate: false
+  xy: 1561, 1613
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+fuse
+  rotate: false
+  xy: 1723, 1193
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+gamma-outline
+  rotate: false
+  xy: 1967, 105
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+gamma-wreck0
+  rotate: false
+  xy: 1967, 35
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+horizon-outline
+  rotate: false
+  xy: 1837, 1687
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+horizon-wreck0
+  rotate: false
+  xy: 1911, 1691
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+horizon-wreck1
+  rotate: false
+  xy: 1867, 1613
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+horizon-wreck2
+  rotate: false
+  xy: 1941, 1617
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+large-bullet-mount-outline
+  rotate: false
+  xy: 1679, 55
+  size: 70, 97
+  orig: 70, 97
+  offset: 0, 0
+  index: -1
+large-laser-mount-outline
+  rotate: false
+  xy: 715, 65
+  size: 96, 192
+  orig: 96, 192
+  offset: 0, 0
+  index: -1
+large-purple-mount-outline
+  rotate: false
+  xy: 1823, 148
+  size: 70, 97
+  orig: 70, 97
+  offset: 0, 0
+  index: -1
+mass-driver
+  rotate: false
+  xy: 1009, 103
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+mega-outline
+  rotate: false
+  xy: 1245, 1239
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+mega-wreck0
+  rotate: false
+  xy: 1229, 1137
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+mega-wreck1
+  rotate: false
+  xy: 831, 393
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+mega-wreck2
+  rotate: false
+  xy: 933, 393
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+meltdown
+  rotate: false
+  xy: 725, 911
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+minke-outline
+  rotate: false
+  xy: 1589, 142
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+minke-wreck0
+  rotate: false
+  xy: 1589, 39
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+minke-wreck1
+  rotate: false
+  xy: 1935, 1384
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+minke-wreck2
+  rotate: false
+  xy: 1757, 719
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+omura-cannon-outline
+  rotate: false
+  xy: 195, 1770
+  size: 192, 277
+  orig: 192, 277
+  offset: 0, 0
+  index: -1
+quasar-leg
+  rotate: false
+  xy: 1937, 735
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-outline
+  rotate: false
+  xy: 1705, 481
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-wreck0
+  rotate: false
+  xy: 1705, 399
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-wreck1
+  rotate: false
+  xy: 1787, 473
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-wreck2
+  rotate: false
+  xy: 1869, 473
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+reign-leg
+  rotate: false
+  xy: 357, 1493
+  size: 152, 124
+  orig: 152, 124
+  offset: 0, 0
+  index: -1
+reign-weapon-outline
+  rotate: false
+  xy: 1742, 579
+  size: 83, 138
+  orig: 83, 138
+  offset: 0, 0
+  index: -1
+ripple
+  rotate: false
+  xy: 1401, 137
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+risso-outline
+  rotate: false
+  xy: 1823, 68
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+risso-wreck0
+  rotate: false
+  xy: 1895, 167
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+risso-wreck1
+  rotate: false
+  xy: 1895, 87
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+risso-wreck2
+  rotate: false
+  xy: 1895, 7
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+scepter-leg
+  rotate: false
+  xy: 855, 1183
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+vela-leg
+  rotate: false
+  xy: 855, 1183
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+scepter-outline
+  rotate: false
+  xy: 195, 1628
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scepter-wreck0
+  rotate: false
+  xy: 389, 1907
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scepter-wreck1
+  rotate: false
+  xy: 1, 1207
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scepter-wreck2
+  rotate: false
+  xy: 561, 1907
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+sei-launcher-outline
+  rotate: false
+  xy: 1869, 391
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+spectre
+  rotate: false
+  xy: 855, 1053
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+spiroct-outline
+  rotate: false
+  xy: 1757, 822
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+spiroct-wreck0
+  rotate: false
+  xy: 1561, 549
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+spiroct-wreck1
+  rotate: false
+  xy: 1853, 822
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+spiroct-wreck2
+  rotate: false
+  xy: 1427, 458
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+toxopid-foot
+  rotate: false
+  xy: 1523, 443
+  size: 90, 90
+  orig: 90, 90
+  offset: 0, 0
+  index: -1
+toxopid-leg
+  rotate: false
+  xy: 1685, 1687
+  size: 150, 72
+  orig: 150, 72
+  offset: 0, 0
+  index: -1
+toxopid-outline
+  rotate: false
+  xy: 875, 1715
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+toxopid-wreck0
+  rotate: false
+  xy: 1037, 1715
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+toxopid-wreck1
+  rotate: false
+  xy: 1199, 1715
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+toxopid-wreck2
+  rotate: false
+  xy: 1361, 1695
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+tsunami
+  rotate: false
+  xy: 1463, 829
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+unit-arkyid-full
+  rotate: false
+  xy: 1115, 1313
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+unit-atrax-full
+  rotate: false
+  xy: 1935, 1318
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+unit-bryde-full
+  rotate: false
+  xy: 665, 1431
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+unit-fortress-full
+  rotate: false
+  xy: 1115, 1117
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+unit-horizon-full
+  rotate: false
+  xy: 1683, 325
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+unit-mega-full
+  rotate: false
+  xy: 957, 495
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+unit-minke-full
+  rotate: false
+  xy: 1847, 719
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+unit-quasar-full
+  rotate: false
+  xy: 1951, 473
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+unit-risso-full
+  rotate: false
+  xy: 1967, 245
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+unit-scepter-full
+  rotate: false
+  xy: 1, 1065
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+unit-spiroct-full
+  rotate: false
+  xy: 1427, 381
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+unit-toxopid-full
+  rotate: false
+  xy: 1523, 1695
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+unit-vela-full
+  rotate: false
+  xy: 733, 1907
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+unit-zenith-full
+  rotate: false
+  xy: 1243, 1601
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+vault-team-crux
+  rotate: false
+  xy: 1561, 703
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+vault-team-sharded
+  rotate: false
+  xy: 1659, 801
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+vela-outline
+  rotate: false
+  xy: 1, 781
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+vela-wreck0
+  rotate: false
+  xy: 1, 639
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+vela-wreck1
+  rotate: false
+  xy: 1249, 1907
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+vela-wreck2
+  rotate: false
+  xy: 1, 497
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+zenith-outline
+  rotate: false
+  xy: 1115, 1199
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+zenith-wreck0
+  rotate: false
+  xy: 855, 825
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+zenith-wreck1
+  rotate: false
+  xy: 855, 711
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+zenith-wreck2
+  rotate: false
+  xy: 855, 597
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+arkyid
+  rotate: false
+  xy: 807, 1443
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+arkyid-cell
+  rotate: false
+  xy: 937, 1443
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+atrax
+  rotate: false
+  xy: 1523, 377
+  size: 88, 64
+  orig: 88, 64
   offset: 0, 0
   index: -1
 atrax-cell
   rotate: false
-  xy: 589, 675
+  xy: 1519, 311
   size: 88, 64
   orig: 88, 64
   offset: 0, 0
   index: -1
-atrax-foot
-  rotate: false
-  xy: 1987, 1145
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-atrax-leg
-  rotate: false
-  xy: 1961, 1491
-  size: 36, 26
-  orig: 36, 26
-  offset: 0, 0
-  index: -1
-atrax-leg-base
-  rotate: false
-  xy: 1999, 1491
-  size: 36, 26
-  orig: 36, 26
-  offset: 0, 0
-  index: -1
-beta
-  rotate: false
-  xy: 1, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-beta-cell
-  rotate: false
-  xy: 51, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
 bryde
   rotate: false
-  xy: 1265, 1745
+  xy: 1907, 1907
   size: 140, 140
   orig: 140, 140
   offset: 0, 0
   index: -1
 bryde-cell
   rotate: false
-  xy: 1407, 1745
+  xy: 1907, 1765
   size: 140, 140
   orig: 140, 140
   offset: 0, 0
   index: -1
-chaos-array-base
+corvus-base
   rotate: false
-  xy: 921, 1501
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-chaos-array-cell
-  rotate: false
-  xy: 1051, 1501
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-chaos-array-leg
-  rotate: false
-  xy: 521, 1489
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-crawler
-  rotate: false
-  xy: 351, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-crawler-base
-  rotate: false
-  xy: 401, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-crawler-cell
-  rotate: false
-  xy: 637, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-crawler-leg
-  rotate: false
-  xy: 1123, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-dagger
-  rotate: false
-  xy: 1323, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-dagger-base
-  rotate: false
-  xy: 1373, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-dagger-leg
-  rotate: false
-  xy: 1423, 281
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-eradicator
-  rotate: false
-  xy: 649, 1761
+  xy: 1685, 1761
   size: 152, 124
   orig: 152, 124
   offset: 0, 0
   index: -1
-eradicator-base
-  rotate: false
-  xy: 803, 1761
-  size: 152, 124
-  orig: 152, 124
-  offset: 0, 0
-  index: -1
-eradicator-cell
-  rotate: false
-  xy: 957, 1761
-  size: 152, 124
-  orig: 152, 124
-  offset: 0, 0
-  index: -1
-eradicator-leg
-  rotate: false
-  xy: 1111, 1761
-  size: 152, 124
-  orig: 152, 124
-  offset: 0, 0
-  index: -1
-flare
-  rotate: false
-  xy: 929, 233
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
 fortress
   rotate: false
-  xy: 1945, 1967
+  xy: 969, 770
   size: 100, 80
   orig: 100, 80
   offset: 0, 0
   index: -1
-fortress-base
-  rotate: false
-  xy: 1497, 521
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 fortress-cell
   rotate: false
-  xy: 103, 1253
+  xy: 969, 688
   size: 100, 80
   orig: 100, 80
   offset: 0, 0
   index: -1
-fortress-leg
-  rotate: false
-  xy: 1961, 1601
-  size: 80, 60
-  orig: 80, 60
-  offset: 0, 0
-  index: -1
 gamma
   rotate: false
-  xy: 1779, 336
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-gamma-cell
-  rotate: false
-  xy: 1125, 331
-  size: 56, 56
-  orig: 56, 56
+  xy: 1967, 175
+  size: 68, 68
+  orig: 68, 68
   offset: 0, 0
   index: -1
 horizon
   rotate: false
-  xy: 1975, 1816
+  xy: 1347, 1245
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 horizon-cell
   rotate: false
-  xy: 707, 1155
+  xy: 1951, 399
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
-mace
-  rotate: false
-  xy: 795, 465
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mace-base
-  rotate: false
-  xy: 943, 465
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mace-cell
-  rotate: false
-  xy: 1009, 465
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mace-leg
-  rotate: false
-  xy: 611, 464
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 mega
   rotate: false
-  xy: 103, 1151
+  xy: 1663, 1585
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 mega-cell
   rotate: false
-  xy: 205, 1151
+  xy: 1765, 1585
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 minke
   rotate: false
-  xy: 1, 1335
-  size: 128, 128
-  orig: 128, 128
+  xy: 1615, 446
+  size: 88, 101
+  orig: 88, 101
   offset: 0, 0
   index: -1
 minke-cell
   rotate: false
-  xy: 131, 1335
+  xy: 725, 651
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-mono
+omura-cannon-heat
   rotate: false
-  xy: 1723, 206
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mono-cell
-  rotate: false
-  xy: 1829, 197
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-nova
-  rotate: false
-  xy: 1357, 331
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-nova-base
-  rotate: false
-  xy: 551, 182
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-nova-cell
-  rotate: false
-  xy: 1415, 331
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-nova-leg
-  rotate: false
-  xy: 1, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-poly
-  rotate: false
-  xy: 1895, 297
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-poly-cell
-  rotate: false
-  xy: 1953, 297
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-power-cell
-  rotate: false
-  xy: 1065, 281
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-pulsar
-  rotate: false
-  xy: 1985, 1337
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-pulsar-base
-  rotate: false
-  xy: 51, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-pulsar-cell
-  rotate: false
-  xy: 1985, 1287
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-pulsar-leg
-  rotate: false
-  xy: 1959, 421
-  size: 64, 64
-  orig: 64, 64
+  xy: 1, 1770
+  size: 192, 277
+  orig: 192, 277
   offset: 0, 0
   index: -1
 quasar
   rotate: false
-  xy: 1961, 1519
+  xy: 1909, 637
   size: 80, 80
   orig: 80, 80
   offset: 0, 0
   index: -1
 quasar-base
   rotate: false
-  xy: 1961, 963
+  xy: 1909, 555
   size: 80, 80
   orig: 80, 80
   offset: 0, 0
   index: -1
 quasar-cell
   rotate: false
-  xy: 1965, 767
+  xy: 1949, 817
   size: 80, 80
   orig: 80, 80
   offset: 0, 0
   index: -1
-quasar-leg
+reign-base
   rotate: false
-  xy: 1, 594
-  size: 80, 80
-  orig: 80, 80
+  xy: 367, 1619
+  size: 152, 124
+  orig: 152, 124
   offset: 0, 0
   index: -1
-risse
+reign-cell
   rotate: false
-  xy: 883, 747
+  xy: 521, 1619
+  size: 152, 124
+  orig: 152, 124
+  offset: 0, 0
+  index: -1
+risso
+  rotate: false
+  xy: 1751, 68
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+risso-cell
+  rotate: false
+  xy: 1393, 945
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-cell
+scepter
   rotate: false
-  xy: 1, 742
-  size: 96, 96
-  orig: 96, 96
+  xy: 1, 1349
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scepter-base
+  rotate: false
+  xy: 725, 521
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+vela-base
+  rotate: false
+  xy: 725, 521
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+scepter-cell
+  rotate: false
+  xy: 855, 1313
+  size: 128, 128
+  orig: 128, 128
   offset: 0, 0
   index: -1
 spiroct
   rotate: false
-  xy: 1945, 1890
+  xy: 1561, 626
   size: 94, 75
   orig: 94, 75
   offset: 0, 0
   index: -1
 spiroct-cell
   rotate: false
-  xy: 1667, 674
+  xy: 1659, 724
   size: 94, 75
   orig: 94, 75
   offset: 0, 0
   index: -1
-spiroct-foot
+toxopid
   rotate: false
-  xy: 1981, 849
-  size: 46, 46
-  orig: 46, 46
+  xy: 713, 1715
+  size: 160, 190
+  orig: 160, 190
   offset: 0, 0
   index: -1
-spiroct-joint
+toxopid-cell
   rotate: false
-  xy: 307, 11
-  size: 32, 32
-  orig: 32, 32
+  xy: 511, 1493
+  size: 152, 124
+  orig: 152, 124
   offset: 0, 0
   index: -1
-spiroct-leg
+vela
   rotate: false
-  xy: 521, 1623
-  size: 48, 34
-  orig: 48, 34
+  xy: 1, 923
+  size: 170, 140
+  orig: 170, 140
   offset: 0, 0
   index: -1
-spiroct-leg-base
+vela-cell
   rotate: false
-  xy: 571, 1623
-  size: 48, 34
-  orig: 48, 34
+  xy: 905, 1907
+  size: 170, 140
+  orig: 170, 140
   offset: 0, 0
   index: -1
-vanguard
+vela-weapon-heat
   rotate: false
-  xy: 1181, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-vanguard-cell
-  rotate: false
-  xy: 1231, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-antumbra-missiles
-  rotate: false
-  xy: 587, 282
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-artillery
-  rotate: false
-  xy: 781, 274
-  size: 48, 56
-  orig: 48, 56
+  xy: 1077, 1907
+  size: 170, 140
+  orig: 170, 140
   offset: 0, 0
   index: -1
 artillery-mount
   rotate: false
-  xy: 1029, 597
+  xy: 1683, 253
   size: 70, 70
   orig: 70, 70
   offset: 0, 0
   index: -1
 beam-weapon
   rotate: false
-  xy: 1961, 1663
+  xy: 1827, 637
   size: 80, 80
   orig: 80, 80
   offset: 0, 0
   index: -1
-chaos
+large-bullet-mount
   rotate: false
-  xy: 1721, 256
-  size: 56, 136
-  orig: 56, 136
+  xy: 1679, 154
+  size: 70, 97
+  orig: 70, 97
   offset: 0, 0
   index: -1
-eclipse-weapon
+large-laser-mount
   rotate: false
-  xy: 1887, 247
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-eradication
-  rotate: false
-  xy: 589, 839
+  xy: 715, 259
   size: 96, 192
   orig: 96, 192
   offset: 0, 0
   index: -1
-eruption
+large-purple-mount
   rotate: false
-  xy: 1987, 239
-  size: 48, 56
-  orig: 48, 56
+  xy: 1751, 148
+  size: 70, 97
+  orig: 70, 97
   offset: 0, 0
   index: -1
-flakgun
+omura-cannon-heat
   rotate: false
-  xy: 521, 237
-  size: 48, 48
-  orig: 48, 48
+  xy: 1, 1491
+  size: 192, 277
+  orig: 192, 277
   offset: 0, 0
   index: -1
-flamethrower
+reign-weapon
   rotate: false
-  xy: 1573, 228
-  size: 48, 56
-  orig: 48, 56
+  xy: 1657, 563
+  size: 83, 138
+  orig: 83, 138
   offset: 0, 0
   index: -1
-heal-shotgun-weapon
+sei-launcher
   rotate: false
-  xy: 101, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-heal-weapon
-  rotate: false
-  xy: 151, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-heal-weapon-mount
-  rotate: false
-  xy: 201, 231
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-large-artillery
-  rotate: false
-  xy: 1479, 213
-  size: 48, 66
-  orig: 48, 66
-  offset: 0, 0
-  index: -1
-large-weapon
-  rotate: false
-  xy: 721, 229
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-missiles
-  rotate: false
-  xy: 771, 224
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-missiles-mount
-  rotate: false
-  xy: 1673, 206
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mount-purple-weapon
-  rotate: false
-  xy: 501, 187
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mount-weapon
-  rotate: false
-  xy: 881, 183
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-small-basic-weapon
-  rotate: false
-  xy: 201, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-small-mount-weapon
-  rotate: false
-  xy: 251, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-small-weapon
-  rotate: false
-  xy: 301, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-spiroct-weapon
-  rotate: false
-  xy: 601, 173
-  size: 48, 56
-  orig: 48, 56
-  offset: 0, 0
-  index: -1
-weapon
-  rotate: false
-  xy: 1281, 181
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-zenith-missiles
-  rotate: false
-  xy: 1331, 181
-  size: 48, 48
-  orig: 48, 48
+  xy: 1787, 391
+  size: 80, 80
+  orig: 80, 80
   offset: 0, 0
   index: -1
 zenith
   rotate: false
-  xy: 1415, 1241
+  xy: 855, 939
   size: 112, 112
   orig: 112, 112
   offset: 0, 0
   index: -1
 zenith-cell
   rotate: false
-  xy: 1529, 1241
+  xy: 985, 1069
   size: 112, 112
   orig: 112, 112
   offset: 0, 0
   index: -1
 
-sprites3.png
-size: 256,256
+sprites4.png
+size: 2048,1024
 format: rgba8888
 filter: nearest,nearest
 repeat: none
+launchpod
+  rotate: false
+  xy: 1201, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mend-projector
+  rotate: false
+  xy: 339, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mend-projector-top
+  rotate: false
+  xy: 405, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mender
+  rotate: false
+  xy: 785, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+mender-top
+  rotate: false
+  xy: 785, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+overdrive-projector
+  rotate: false
+  xy: 471, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+overdrive-projector-top
+  rotate: false
+  xy: 537, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+shock-mine
+  rotate: false
+  xy: 819, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-arrow
+  rotate: false
+  xy: 425, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-conveyor
+  rotate: false
+  xy: 445, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-conveyor-bridge
+  rotate: false
+  xy: 445, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-conveyor-end
+  rotate: false
+  xy: 462, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+center
+  rotate: false
+  xy: 462, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-0-0
+  rotate: false
+  xy: 133, 495
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-armored-conveyor-full
+  rotate: false
+  xy: 133, 495
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-0-1
+  rotate: false
+  xy: 133, 461
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-0-2
+  rotate: false
+  xy: 133, 427
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-0-3
+  rotate: false
+  xy: 167, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-1-0
+  rotate: false
+  xy: 190, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-1-1
+  rotate: false
+  xy: 190, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-1-2
+  rotate: false
+  xy: 187, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-1-3
+  rotate: false
+  xy: 187, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-2-0
+  rotate: false
+  xy: 187, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-2-1
+  rotate: false
+  xy: 201, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-2-2
+  rotate: false
+  xy: 224, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-2-3
+  rotate: false
+  xy: 224, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-3-0
+  rotate: false
+  xy: 221, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-3-1
+  rotate: false
+  xy: 221, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-3-2
+  rotate: false
+  xy: 221, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-3-3
+  rotate: false
+  xy: 235, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-4-0
+  rotate: false
+  xy: 258, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-4-1
+  rotate: false
+  xy: 258, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-4-2
+  rotate: false
+  xy: 255, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+armored-conveyor-4-3
+  rotate: false
+  xy: 255, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-0-1
+  rotate: false
+  xy: 493, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-0-2
+  rotate: false
+  xy: 493, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-0-3
+  rotate: false
+  xy: 507, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-1-0
+  rotate: false
+  xy: 513, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-1-1
+  rotate: false
+  xy: 513, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-1-2
+  rotate: false
+  xy: 513, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-1-3
+  rotate: false
+  xy: 513, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-2-0
+  rotate: false
+  xy: 513, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-2-1
+  rotate: false
+  xy: 530, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-2-2
+  rotate: false
+  xy: 530, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-2-3
+  rotate: false
+  xy: 527, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-3-0
+  rotate: false
+  xy: 527, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-3-1
+  rotate: false
+  xy: 527, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-3-2
+  rotate: false
+  xy: 541, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-3-3
+  rotate: false
+  xy: 547, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-4-0
+  rotate: false
+  xy: 547, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-4-1
+  rotate: false
+  xy: 547, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-4-2
+  rotate: false
+  xy: 547, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-4-3
+  rotate: false
+  xy: 547, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plastanium-conveyor
+  rotate: false
+  xy: 847, 469
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plastanium-conveyor-0
+  rotate: false
+  xy: 881, 463
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plastanium-conveyor-1
+  rotate: false
+  xy: 915, 463
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plastanium-conveyor-2
+  rotate: false
+  xy: 813, 447
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plastanium-conveyor-edge
+  rotate: false
+  xy: 847, 435
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plastanium-conveyor-stack
+  rotate: false
+  xy: 881, 429
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-1
+  rotate: false
+  xy: 938, 293
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-2
+  rotate: false
+  xy: 938, 259
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-3
+  rotate: false
+  xy: 935, 225
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-1-0
+  rotate: false
+  xy: 935, 191
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-1-1
+  rotate: false
+  xy: 955, 157
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-1-2
+  rotate: false
+  xy: 955, 123
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-1-3
+  rotate: false
+  xy: 955, 89
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-2-0
+  rotate: false
+  xy: 955, 55
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-2-1
+  rotate: false
+  xy: 955, 21
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-2-2
+  rotate: false
+  xy: 171, 709
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-2-3
+  rotate: false
+  xy: 171, 675
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-3-0
+  rotate: false
+  xy: 171, 641
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-3-1
+  rotate: false
+  xy: 171, 607
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-3-2
+  rotate: false
+  xy: 171, 573
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-3-3
+  rotate: false
+  xy: 205, 725
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-4-0
+  rotate: false
+  xy: 205, 691
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1, 223
+  xy: 205, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1, 189
+  xy: 205, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 35, 223
+  xy: 205, 589
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cross
+  rotate: false
+  xy: 581, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+distributor
+  rotate: false
+  xy: 541, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+inverted-sorter
+  rotate: false
+  xy: 615, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+junction
+  rotate: false
+  xy: 717, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+overflow-gate
+  rotate: false
+  xy: 847, 571
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-conveyor
+  rotate: false
+  xy: 881, 531
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-conveyor-arrow
+  rotate: false
+  xy: 915, 531
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-conveyor-bridge
+  rotate: false
+  xy: 881, 497
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-conveyor-end
+  rotate: false
+  xy: 915, 497
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+router
+  rotate: false
+  xy: 836, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sorter
+  rotate: false
+  xy: 819, 95
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 69, 223
+  xy: 273, 667
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+drill-top
+  rotate: false
+  xy: 739, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-liquid
+  rotate: false
+  xy: 739, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mechanical-drill
+  rotate: false
+  xy: 1861, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mechanical-drill-rotator
+  rotate: false
+  xy: 1927, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mechanical-drill-top
+  rotate: false
+  xy: 207, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+pneumatic-drill
+  rotate: false
+  xy: 1131, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+pneumatic-drill-rotator
+  rotate: false
+  xy: 1197, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+pneumatic-drill-top
+  rotate: false
+  xy: 1263, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+water-extractor
+  rotate: false
+  xy: 1923, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+water-extractor-liquid
+  rotate: false
+  xy: 67, 697
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+water-extractor-rotator
+  rotate: false
+  xy: 67, 631
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+water-extractor-top
+  rotate: false
+  xy: 67, 565
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-border
+  rotate: false
+  xy: 241, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-middle
+  rotate: false
+  xy: 323, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-select
+  rotate: false
+  xy: 391, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-liquid
+  rotate: false
+  xy: 479, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-conduit
+  rotate: false
+  xy: 439, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-conduit-arrow
+  rotate: false
+  xy: 445, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-conveyor-arrow
+  rotate: false
+  xy: 445, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-conduit-bridge
+  rotate: false
+  xy: 445, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+bridge-conduit-end
+  rotate: false
+  xy: 445, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-bottom
+  rotate: false
+  xy: 459, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-bottom-0
+  rotate: false
+  xy: 473, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-bottom-1
+  rotate: false
+  xy: 479, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-bottom-2
+  rotate: false
+  xy: 479, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-bottom-3
+  rotate: false
+  xy: 479, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-bottom-4
+  rotate: false
+  xy: 479, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-top-0
+  rotate: false
+  xy: 479, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-top-1
+  rotate: false
+  xy: 479, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-top-2
+  rotate: false
+  xy: 496, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-top-3
+  rotate: false
+  xy: 496, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-3
+  rotate: false
+  xy: 496, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conduit-top-4
+  rotate: false
+  xy: 493, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-junction
+  rotate: false
+  xy: 731, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-overflow-gate
+  rotate: false
+  xy: 745, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-overflow-gate-top
+  rotate: false
+  xy: 751, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-router-bottom
+  rotate: false
+  xy: 751, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-router-liquid
+  rotate: false
+  xy: 751, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-router-top
+  rotate: false
+  xy: 751, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+mechanical-pump
+  rotate: false
+  xy: 779, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+mechanical-pump-liquid
+  rotate: false
+  xy: 813, 617
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+rotary-pump-liquid
+  rotate: false
+  xy: 813, 617
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+thermal-pump-liquid
+  rotate: false
+  xy: 813, 617
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-conduit
+  rotate: false
+  xy: 813, 549
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-conduit-arrow
+  rotate: false
+  xy: 847, 537
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-conduit-bridge
+  rotate: false
+  xy: 813, 515
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-conduit-end
+  rotate: false
+  xy: 847, 503
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plated-conduit-cap
+  rotate: false
+  xy: 813, 413
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plated-conduit-top-0
+  rotate: false
+  xy: 847, 401
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plated-conduit-top-1
+  rotate: false
+  xy: 813, 379
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plated-conduit-top-2
+  rotate: false
+  xy: 881, 395
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plated-conduit-top-3
+  rotate: false
+  xy: 915, 395
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plated-conduit-top-4
+  rotate: false
+  xy: 847, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-0
+  rotate: false
+  xy: 847, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-1
+  rotate: false
+  xy: 881, 327
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-2
+  rotate: false
+  xy: 915, 327
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pulse-conduit-top-4
+  rotate: false
+  xy: 802, 311
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+rotary-pump
+  rotate: false
+  xy: 1659, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+logic-processor
+  rotate: false
+  xy: 1267, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+memory-bank
+  rotate: false
+  xy: 273, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+memory-cell
+  rotate: false
+  xy: 785, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+message
+  rotate: false
+  xy: 785, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+micro-processor
+  rotate: false
+  xy: 813, 583
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+switch
+  rotate: false
+  xy: 921, 89
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+switch-on
+  rotate: false
+  xy: 921, 55
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+battery
+  rotate: false
+  xy: 255, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+battery-top
+  rotate: false
+  xy: 241, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+combustion-generator
+  rotate: false
+  xy: 459, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+combustion-generator-top
+  rotate: false
+  xy: 459, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+diode
+  rotate: false
+  xy: 581, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+diode-arrow
+  rotate: false
+  xy: 598, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+illuminator
+  rotate: false
+  xy: 609, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+illuminator-top
+  rotate: false
+  xy: 615, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+power-node
+  rotate: false
+  xy: 881, 361
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+power-node-large
+  rotate: false
+  xy: 1329, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+power-source
+  rotate: false
+  xy: 915, 361
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+power-void
+  rotate: false
+  xy: 813, 345
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+rtg-generator
+  rotate: false
+  xy: 1725, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+rtg-generator-top
+  rotate: false
+  xy: 833, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel
+  rotate: false
+  xy: 819, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+steam-generator
+  rotate: false
+  xy: 1131, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-cap
+  rotate: false
+  xy: 1197, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-top
+  rotate: false
+  xy: 1263, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-turbine0
+  rotate: false
+  xy: 1329, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-turbine1
+  rotate: false
+  xy: 1395, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+surge-tower
+  rotate: false
+  xy: 1461, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+thermal-generator
+  rotate: false
+  xy: 1659, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+blast-mixer
+  rotate: false
+  xy: 1, 697
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+coal-centrifuge
+  rotate: false
+  xy: 1, 103
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cryofluid-mixer-bottom
+  rotate: false
+  xy: 1927, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cryofluid-mixer-liquid
+  rotate: false
+  xy: 211, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cryofluid-mixer-top
+  rotate: false
+  xy: 277, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cultivator
+  rotate: false
+  xy: 343, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cultivator-middle
+  rotate: false
+  xy: 409, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cultivator-top
+  rotate: false
+  xy: 475, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+graphite-press
+  rotate: false
+  xy: 871, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+incinerator
+  rotate: false
+  xy: 615, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-source
+  rotate: false
+  xy: 700, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-void
+  rotate: false
+  xy: 717, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+kiln
+  rotate: false
+  xy: 937, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+kiln-top
+  rotate: false
+  xy: 1003, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+silicon-smelter-top
+  rotate: false
+  xy: 1003, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+liquid-source
+  rotate: false
+  xy: 768, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-void
+  rotate: false
+  xy: 765, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+melter
+  rotate: false
+  xy: 785, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-weaver
+  rotate: false
+  xy: 735, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+phase-weaver-bottom
+  rotate: false
+  xy: 801, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+phase-weaver-weave
+  rotate: false
+  xy: 867, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+plastanium-compressor
+  rotate: false
+  xy: 933, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+plastanium-compressor-top
+  rotate: false
+  xy: 999, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+pulverizer
+  rotate: false
+  xy: 802, 277
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pulverizer-rotator
+  rotate: false
+  xy: 799, 243
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pyratite-mixer
+  rotate: false
+  xy: 1461, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+separator
+  rotate: false
+  xy: 471, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+separator-liquid
+  rotate: false
+  xy: 537, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+separator-spinner
+  rotate: false
+  xy: 603, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+silicon-smelter
+  rotate: false
+  xy: 669, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+spore-press
+  rotate: false
+  xy: 735, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+spore-press-frame0
+  rotate: false
+  xy: 801, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+spore-press-frame1
+  rotate: false
+  xy: 867, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+spore-press-frame2
+  rotate: false
+  xy: 933, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+spore-press-liquid
+  rotate: false
+  xy: 999, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+spore-press-top
+  rotate: false
+  xy: 1065, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+boulder1
+  rotate: false
+  xy: 1527, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+boulder2
+  rotate: false
+  xy: 1577, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dacite-boulder1
+  rotate: false
+  xy: 697, 651
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dacite-boulder2
+  rotate: false
+  xy: 747, 651
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+sand-boulder1
+  rotate: false
+  xy: 870, 293
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand-boulder2
+  rotate: false
+  xy: 904, 293
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shale-boulder1
+  rotate: false
+  xy: 867, 191
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shale-boulder2
+  rotate: false
+  xy: 901, 191
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+snow-boulder1
+  rotate: false
+  xy: 1547, 509
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+snow-boulder2
+  rotate: false
+  xy: 1597, 509
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+spore-cluster1
+  rotate: false
+  xy: 1317, 509
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+spore-cluster2
+  rotate: false
+  xy: 1359, 509
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+spore-cluster3
+  rotate: false
+  xy: 1401, 509
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+container
+  rotate: false
+  xy: 1069, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+container-team
+  rotate: false
+  xy: 1135, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 unloader
   rotate: false
-  xy: 1, 121
+  xy: 239, 599
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 35, 155
+  xy: 273, 633
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+arc-heat
+  rotate: false
+  xy: 133, 529
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-1
+  rotate: false
+  xy: 241, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-2
+  rotate: false
+  xy: 71, 767
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+hail-heat
+  rotate: false
+  xy: 1945, 407
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+lancer-heat
+  rotate: false
+  xy: 1135, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+salvo-heat
+  rotate: false
+  xy: 1857, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scorch-heat
+  rotate: false
+  xy: 904, 259
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+wave-liquid
+  rotate: false
+  xy: 67, 433
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+wave-top
+  rotate: false
+  xy: 67, 367
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+command-center
+  rotate: false
+  xy: 871, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+command-center-team
+  rotate: false
+  xy: 1, 37
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+rally-point
+  rotate: false
+  xy: 1527, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+repair-point-base
+  rotate: false
+  xy: 836, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+resupply-point
+  rotate: false
+  xy: 1593, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+copper-wall
+  rotate: false
+  xy: 564, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+copper-wall-large
+  rotate: false
+  xy: 1333, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+door
+  rotate: false
+  xy: 598, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+door-large
+  rotate: false
+  xy: 607, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+door-large-open
+  rotate: false
+  xy: 673, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+door-open
+  rotate: false
+  xy: 595, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-wall
+  rotate: false
+  xy: 813, 481
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+phase-wall-large
+  rotate: false
+  xy: 669, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+plastanium-wall
+  rotate: false
+  xy: 915, 429
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plastanium-wall-large
+  rotate: false
+  xy: 1065, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scrap-wall-large1
+  rotate: false
+  xy: 141, 771
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scrap-wall-large2
+  rotate: false
+  xy: 207, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scrap-wall-large3
+  rotate: false
+  xy: 273, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scrap-wall-large4
+  rotate: false
+  xy: 339, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scrap-wall2
+  rotate: false
+  xy: 867, 225
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap-wall3
+  rotate: false
+  xy: 901, 225
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap-wall4
+  rotate: false
+  xy: 833, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap-wall5
+  rotate: false
+  xy: 833, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+surge-wall
+  rotate: false
+  xy: 921, 123
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+surge-wall-large
+  rotate: false
+  xy: 1527, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+thorium-wall
+  rotate: false
+  xy: 921, 21
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+thorium-wall-large
+  rotate: false
+  xy: 1725, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 titanium-wall
   rotate: false
-  xy: 1, 155
+  xy: 239, 667
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+titanium-wall-large
+  rotate: false
+  xy: 1791, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+bullet
+  rotate: false
+  xy: 1993, 969
+  size: 52, 52
+  orig: 52, 52
+  offset: 0, 0
+  index: -1
+bullet-back
+  rotate: false
+  xy: 821, 705
+  size: 52, 52
+  orig: 52, 52
+  offset: 0, 0
+  index: -1
 casing
   rotate: false
-  xy: 89, 53
+  xy: 1987, 473
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
   index: -1
 circle-mid
   rotate: false
-  xy: 107, 4
+  xy: 975, 244
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
   index: -1
+error
+  rotate: false
+  xy: 1147, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 laser
   rotate: false
-  xy: 251, 207
+  xy: 1977, 709
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 minelaser
   rotate: false
-  xy: 251, 157
+  xy: 1983, 709
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
+missile
+  rotate: false
+  xy: 133, 677
+  size: 36, 36
+  orig: 36, 36
+  offset: 0, 0
+  index: -1
+missile-back
+  rotate: false
+  xy: 133, 639
+  size: 36, 36
+  orig: 36, 36
+  offset: 0, 0
+  index: -1
 parallax-laser
   rotate: false
-  xy: 97, 173
+  xy: 975, 445
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
+particle
+  rotate: false
+  xy: 1275, 509
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
 scale_marker
   rotate: false
-  xy: 1, 1
+  xy: 1191, 603
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
   index: -1
+shell
+  rotate: false
+  xy: 133, 601
+  size: 36, 36
+  orig: 36, 36
+  offset: 0, 0
+  index: -1
+shell-back
+  rotate: false
+  xy: 133, 563
+  size: 36, 36
+  orig: 36, 36
+  offset: 0, 0
+  index: -1
 transfer
   rotate: false
-  xy: 63, 3
+  xy: 981, 449
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 35, 189
+  xy: 239, 633
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 61, 150
+  xy: 1197, 704
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
   index: -1
+alpha-outline
+  rotate: false
+  xy: 1027, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+alpha-wreck0
+  rotate: false
+  xy: 1077, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+alpha-wreck1
+  rotate: false
+  xy: 1127, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+alpha-wreck2
+  rotate: false
+  xy: 1177, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+arc
+  rotate: false
+  xy: 133, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+arkyid-leg
+  rotate: false
+  xy: 67, 132
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+artillery-outline
+  rotate: false
+  xy: 1277, 701
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+atrax-foot
+  rotate: false
+  xy: 1945, 449
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+atrax-joint
+  rotate: false
+  xy: 175, 743
+  size: 26, 26
+  orig: 26, 26
+  offset: 0, 0
+  index: -1
+atrax-leg
+  rotate: false
+  xy: 137, 743
+  size: 36, 26
+  orig: 36, 26
+  offset: 0, 0
+  index: -1
+atrax-leg-base
+  rotate: false
+  xy: 133, 715
+  size: 36, 26
+  orig: 36, 26
+  offset: 0, 0
+  index: -1
+beta-outline
+  rotate: false
+  xy: 67, 20
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+beta-wreck0
+  rotate: false
+  xy: 1989, 835
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+beta-wreck1
+  rotate: false
+  xy: 1989, 779
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+beta-wreck2
+  rotate: false
+  xy: 1989, 723
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+block-arc-full
+  rotate: false
+  xy: 241, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-basalt-full
+  rotate: false
+  xy: 241, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-boulder-full
+  rotate: false
+  xy: 1377, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-char-full
+  rotate: false
+  xy: 269, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-command-center-full
+  rotate: false
+  xy: 141, 837
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-conduit-full
+  rotate: false
+  xy: 275, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-container-full
+  rotate: false
+  xy: 277, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-conveyor-full
+  rotate: false
+  xy: 275, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-0-0
+  rotate: false
+  xy: 275, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-craters-full
+  rotate: false
+  xy: 275, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-cryofluid-mixer-full
+  rotate: false
+  xy: 1, 631
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-cultivator-full
+  rotate: false
+  xy: 343, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-dacite-boulder-full
+  rotate: false
+  xy: 1427, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-dacite-full
+  rotate: false
+  xy: 275, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dacite-wall-full
+  rotate: false
+  xy: 275, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dark-metal-full
+  rotate: false
+  xy: 292, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-darksand-full
+  rotate: false
+  xy: 292, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dirt-full
+  rotate: false
+  xy: 289, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dirt-wall-full
+  rotate: false
+  xy: 289, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dune-wall-full
+  rotate: false
+  xy: 289, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-duo-full
+  rotate: false
+  xy: 303, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-grass-full
+  rotate: false
+  xy: 309, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-hail-full
+  rotate: false
+  xy: 309, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-hotrock-full
+  rotate: false
+  xy: 309, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ice-full
+  rotate: false
+  xy: 309, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ice-snow-full
+  rotate: false
+  xy: 309, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ice-wall-full
+  rotate: false
+  xy: 326, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-lancer-full
+  rotate: false
+  xy: 1, 565
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-liquid-router-full
+  rotate: false
+  xy: 326, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-magmarock-full
+  rotate: false
+  xy: 323, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-mechanical-drill-full
+  rotate: false
+  xy: 409, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-metal-floor-damaged-full
+  rotate: false
+  xy: 323, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-moss-full
+  rotate: false
+  xy: 337, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-mud-full
+  rotate: false
+  xy: 343, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-coal-full
+  rotate: false
+  xy: 343, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-copper-full
+  rotate: false
+  xy: 343, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-lead-full
+  rotate: false
+  xy: 343, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-scrap-full
+  rotate: false
+  xy: 343, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-thorium-full
+  rotate: false
+  xy: 360, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-titanium-full
+  rotate: false
+  xy: 360, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-parallax-full
+  rotate: false
+  xy: 1, 499
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-pebbles-full
+  rotate: false
+  xy: 357, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-phase-weaver-full
+  rotate: false
+  xy: 475, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-plated-conduit-full
+  rotate: false
+  xy: 357, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-pneumatic-drill-full
+  rotate: false
+  xy: 1, 433
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-pulse-conduit-full
+  rotate: false
+  xy: 357, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-pulverizer-full
+  rotate: false
+  xy: 371, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-repair-point-full
+  rotate: false
+  xy: 377, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-salt-wall-full
+  rotate: false
+  xy: 377, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-salvo-full
+  rotate: false
+  xy: 541, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-sand-boulder-full
+  rotate: false
+  xy: 377, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-full
+  rotate: false
+  xy: 377, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-wall-full
+  rotate: false
+  xy: 377, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scatter-full
+  rotate: false
+  xy: 1, 367
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-scorch-full
+  rotate: false
+  xy: 394, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scrap-wall-full
+  rotate: false
+  xy: 394, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap-wall1
+  rotate: false
+  xy: 394, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scrap-wall-large-full
+  rotate: false
+  xy: 607, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-segment-full
+  rotate: false
+  xy: 1, 301
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-shale-boulder-full
+  rotate: false
+  xy: 391, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shale-full
+  rotate: false
+  xy: 391, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shale-wall-full
+  rotate: false
+  xy: 405, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shrubs-full
+  rotate: false
+  xy: 411, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-boulder-full
+  rotate: false
+  xy: 1477, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-snow-full
+  rotate: false
+  xy: 411, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-wall-full
+  rotate: false
+  xy: 411, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spore-cluster-full
+  rotate: false
+  xy: 1987, 431
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spore-moss-full
+  rotate: false
+  xy: 411, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spore-press-full
+  rotate: false
+  xy: 673, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-spore-wall-full
+  rotate: false
+  xy: 411, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-steam-generator-full
+  rotate: false
+  xy: 1, 235
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-stone-full
+  rotate: false
+  xy: 428, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-stone-wall-full
+  rotate: false
+  xy: 428, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-swarmer-full
+  rotate: false
+  xy: 739, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-tendrils-full
+  rotate: false
+  xy: 425, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-titanium-conveyor-full
+  rotate: false
+  xy: 425, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-0
+  rotate: false
+  xy: 425, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-water-extractor-full
+  rotate: false
+  xy: 1, 169
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-wave-full
+  rotate: false
+  xy: 805, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+command-center-team-crux
+  rotate: false
+  xy: 937, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+command-center-team-sharded
+  rotate: false
+  xy: 1003, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+container-team-crux
+  rotate: false
+  xy: 1201, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+container-team-sharded
+  rotate: false
+  xy: 1267, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+corvus-joint
+  rotate: false
+  xy: 67, 240
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+corvus-leg
+  rotate: false
+  xy: 949, 495
+  size: 30, 68
+  orig: 30, 68
+  offset: 0, 0
+  index: -1
+corvus-leg-base
+  rotate: false
+  xy: 307, 635
+  size: 30, 64
+  orig: 30, 64
+  offset: 0, 0
+  index: -1
+cracks-1-0
+  rotate: false
+  xy: 564, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-1
+  rotate: false
+  xy: 561, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-2
+  rotate: false
+  xy: 561, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-3
+  rotate: false
+  xy: 561, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-4
+  rotate: false
+  xy: 575, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-5
+  rotate: false
+  xy: 581, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-6
+  rotate: false
+  xy: 581, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-7
+  rotate: false
+  xy: 581, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-2-0
+  rotate: false
+  xy: 1399, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-1
+  rotate: false
+  xy: 1465, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-2
+  rotate: false
+  xy: 1531, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-3
+  rotate: false
+  xy: 1597, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-4
+  rotate: false
+  xy: 1663, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-5
+  rotate: false
+  xy: 1729, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-6
+  rotate: false
+  xy: 1795, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-7
+  rotate: false
+  xy: 1861, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+crawler-leg
+  rotate: false
+  xy: 1777, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-outline
+  rotate: false
+  xy: 1827, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-wreck0
+  rotate: false
+  xy: 1877, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-wreck1
+  rotate: false
+  xy: 1927, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-wreck2
+  rotate: false
+  xy: 647, 653
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger-leg
+  rotate: false
+  xy: 897, 657
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger-outline
+  rotate: false
+  xy: 947, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger-wreck0
+  rotate: false
+  xy: 997, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger-wreck1
+  rotate: false
+  xy: 1047, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger-wreck2
+  rotate: false
+  xy: 1097, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+duo
+  rotate: false
+  xy: 595, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+eruption-outline
+  rotate: false
+  xy: 1247, 643
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+flamethrower-outline
+  rotate: false
+  xy: 1397, 651
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+flare-outline
+  rotate: false
+  xy: 1497, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+flare-wreck0
+  rotate: false
+  xy: 1547, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+flare-wreck1
+  rotate: false
+  xy: 1597, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+flare-wreck2
+  rotate: false
+  xy: 1647, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+gamma-wreck1
+  rotate: false
+  xy: 1, 953
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+gamma-wreck2
+  rotate: false
+  xy: 1, 883
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+hail
+  rotate: false
+  xy: 595, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+heal-shotgun-weapon-outline
+  rotate: false
+  xy: 875, 707
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+heal-weapon-mount-outline
+  rotate: false
+  xy: 1797, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+heal-weapon-outline
+  rotate: false
+  xy: 1847, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-blast-compound-large
+  rotate: false
+  xy: 1987, 389
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-blast-compound-medium
+  rotate: false
+  xy: 615, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-blast-compound-small
   rotate: false
-  xy: 103, 231
+  xy: 1993, 891
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-tiny
   rotate: false
-  xy: 233, 239
+  xy: 2029, 455
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-blast-compound-xlarge
+  rotate: false
+  xy: 1897, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-coal-large
+  rotate: false
+  xy: 1797, 417
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-coal-medium
+  rotate: false
+  xy: 632, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-coal-small
   rotate: false
-  xy: 1, 95
+  xy: 133, 401
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-tiny
   rotate: false
-  xy: 27, 25
+  xy: 1923, 425
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-coal-xlarge
+  rotate: false
+  xy: 1947, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-copper-large
+  rotate: false
+  xy: 1839, 417
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-copper-medium
+  rotate: false
+  xy: 629, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-copper-small
   rotate: false
-  xy: 35, 129
+  xy: 2019, 891
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 233, 221
+  xy: 1275, 575
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-copper-xlarge
+  rotate: false
+  xy: 1997, 673
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-graphite-large
+  rotate: false
+  xy: 1881, 401
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-graphite-medium
+  rotate: false
+  xy: 643, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-graphite-small
   rotate: false
-  xy: 69, 169
+  xy: 159, 401
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 233, 203
+  xy: 417, 683
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-graphite-xlarge
+  rotate: false
+  xy: 1997, 623
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-lead-large
+  rotate: false
+  xy: 897, 565
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-lead-medium
+  rotate: false
+  xy: 649, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-lead-small
   rotate: false
-  xy: 129, 231
+  xy: 273, 607
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 27, 7
+  xy: 949, 347
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-lead-xlarge
+  rotate: false
+  xy: 1297, 601
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-metaglass-large
+  rotate: false
+  xy: 939, 565
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-metaglass-medium
+  rotate: false
+  xy: 649, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-metaglass-small
   rotate: false
-  xy: 1, 69
+  xy: 949, 469
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 45, 25
+  xy: 1085, 507
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-metaglass-xlarge
+  rotate: false
+  xy: 1347, 601
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-phase-fabric-large
+  rotate: false
+  xy: 981, 567
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-phase-fabric-medium
+  rotate: false
+  xy: 666, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 155, 231
+  xy: 981, 499
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-tiny
   rotate: false
-  xy: 45, 7
+  xy: 2029, 437
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-phase-fabric-xlarge
+  rotate: false
+  xy: 1397, 601
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-plastanium-large
+  rotate: false
+  xy: 1023, 567
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-plastanium-medium
+  rotate: false
+  xy: 663, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-plastanium-small
   rotate: false
-  xy: 1, 43
+  xy: 339, 675
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 61, 125
+  xy: 1923, 407
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-plastanium-xlarge
+  rotate: false
+  xy: 1447, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-pyratite-large
+  rotate: false
+  xy: 1065, 567
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-pyratite-medium
+  rotate: false
+  xy: 663, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-pyratite-small
   rotate: false
-  xy: 181, 231
+  xy: 949, 443
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 79, 125
+  xy: 1275, 557
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-pyratite-xlarge
+  rotate: false
+  xy: 1497, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-sand-large
+  rotate: false
+  xy: 1107, 567
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-sand-medium
+  rotate: false
+  xy: 683, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-sand-small
   rotate: false
-  xy: 1, 17
+  xy: 1007, 499
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 53, 107
+  xy: 417, 665
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-sand-xlarge
+  rotate: false
+  xy: 1547, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-scrap-large
+  rotate: false
+  xy: 1149, 567
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-scrap-medium
+  rotate: false
+  xy: 683, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-scrap-small
   rotate: false
-  xy: 207, 231
+  xy: 339, 649
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 71, 107
+  xy: 435, 683
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-scrap-xlarge
+  rotate: false
+  xy: 1597, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-silicon-large
+  rotate: false
+  xy: 1191, 551
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-silicon-medium
+  rotate: false
+  xy: 683, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-silicon-small
   rotate: false
-  xy: 69, 143
+  xy: 365, 675
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 53, 89
+  xy: 949, 329
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-silicon-xlarge
+  rotate: false
+  xy: 1647, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-spore-pod-large
+  rotate: false
+  xy: 1233, 551
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-spore-pod-medium
+  rotate: false
+  xy: 697, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-spore-pod-small
   rotate: false
-  xy: 103, 205
+  xy: 949, 417
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 71, 89
+  xy: 1103, 507
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-spore-pod-xlarge
+  rotate: false
+  xy: 1697, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-surge-alloy-large
+  rotate: false
+  xy: 981, 525
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-surge-alloy-medium
+  rotate: false
+  xy: 697, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 129, 205
+  xy: 949, 391
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 53, 71
+  xy: 2029, 419
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-surge-alloy-xlarge
+  rotate: false
+  xy: 1747, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-thorium-large
+  rotate: false
+  xy: 1023, 525
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-thorium-medium
+  rotate: false
+  xy: 717, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-thorium-small
   rotate: false
-  xy: 155, 205
+  xy: 1033, 499
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 71, 71
+  xy: 435, 665
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-thorium-xlarge
+  rotate: false
+  xy: 1797, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-titanium-large
+  rotate: false
+  xy: 1065, 525
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-titanium-medium
+  rotate: false
+  xy: 717, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-titanium-small
   rotate: false
-  xy: 181, 205
+  xy: 365, 649
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 53, 53
+  xy: 453, 683
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+item-titanium-xlarge
+  rotate: false
+  xy: 1847, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+lancer
+  rotate: false
+  xy: 1069, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+large-artillery-outline
+  rotate: false
+  xy: 1947, 591
+  size: 48, 66
+  orig: 48, 66
+  offset: 0, 0
+  index: -1
+large-weapon-outline
+  rotate: false
+  xy: 1447, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+liquid-cryofluid-large
+  rotate: false
+  xy: 1107, 525
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+liquid-cryofluid-medium
+  rotate: false
+  xy: 734, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 207, 205
+  xy: 391, 675
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 71, 53
+  xy: 1121, 507
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+liquid-cryofluid-xlarge
+  rotate: false
+  xy: 1497, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+liquid-oil-large
+  rotate: false
+  xy: 1149, 525
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+liquid-oil-medium
+  rotate: false
+  xy: 731, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-oil-small
   rotate: false
-  xy: 27, 95
+  xy: 949, 365
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 89, 107
+  xy: 2029, 401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+liquid-oil-xlarge
+  rotate: false
+  xy: 1547, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+liquid-slag-large
+  rotate: false
+  xy: 1191, 509
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+liquid-slag-medium
+  rotate: false
+  xy: 768, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-slag-small
   rotate: false
-  xy: 27, 69
+  xy: 1059, 499
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 89, 89
+  xy: 453, 665
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+liquid-slag-xlarge
+  rotate: false
+  xy: 1597, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+liquid-water-large
+  rotate: false
+  xy: 1233, 509
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+liquid-water-medium
+  rotate: false
+  xy: 765, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-water-small
   rotate: false
-  xy: 27, 43
+  xy: 391, 649
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 89, 71
+  xy: 471, 683
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+liquid-water-xlarge
+  rotate: false
+  xy: 1647, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mace-leg
+  rotate: false
+  xy: 1531, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-outline
+  rotate: false
+  xy: 1597, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-wreck0
+  rotate: false
+  xy: 1663, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-wreck1
+  rotate: false
+  xy: 1729, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-wreck2
+  rotate: false
+  xy: 1795, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+missiles-mount-outline
+  rotate: false
+  xy: 1797, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mono-outline
+  rotate: false
+  xy: 1947, 541
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mono-wreck0
+  rotate: false
+  xy: 1997, 523
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mono-wreck1
+  rotate: false
+  xy: 847, 605
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mono-wreck2
+  rotate: false
+  xy: 897, 607
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mount-purple-weapon-outline
+  rotate: false
+  xy: 997, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mount-weapon-outline
+  rotate: false
+  xy: 1097, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+nova-leg
+  rotate: false
+  xy: 1197, 593
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+nova-outline
+  rotate: false
+  xy: 125, 70
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+nova-wreck0
+  rotate: false
+  xy: 125, 12
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+nova-wreck1
+  rotate: false
+  xy: 183, 128
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+nova-wreck2
+  rotate: false
+  xy: 183, 70
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+parallax
+  rotate: false
+  xy: 603, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+poly-outline
+  rotate: false
+  xy: 241, 701
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+poly-wreck0
+  rotate: false
+  xy: 299, 701
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+poly-wreck1
+  rotate: false
+  xy: 357, 701
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+poly-wreck2
+  rotate: false
+  xy: 415, 701
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+pulsar-leg
+  rotate: false
+  xy: 1395, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+pulsar-outline
+  rotate: false
+  xy: 1, 823
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+pulsar-wreck0
+  rotate: false
+  xy: 71, 903
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+pulsar-wreck1
+  rotate: false
+  xy: 141, 963
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+pulsar-wreck2
+  rotate: false
+  xy: 1, 763
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+repair-point
+  rotate: false
+  xy: 799, 209
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+salvo
+  rotate: false
+  xy: 1791, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scatter
+  rotate: false
+  xy: 1923, 825
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scepter-weapon-outline
+  rotate: false
+  xy: 589, 655
+  size: 56, 102
+  orig: 56, 102
+  offset: 0, 0
+  index: -1
+scorch
+  rotate: false
+  xy: 870, 259
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+segment
+  rotate: false
+  xy: 405, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+small-basic-weapon-outline
+  rotate: false
+  xy: 1347, 551
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+small-mount-weapon-outline
+  rotate: false
+  xy: 1447, 509
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+spiroct-foot
+  rotate: false
+  xy: 1897, 443
+  size: 46, 46
+  orig: 46, 46
+  offset: 0, 0
+  index: -1
+spiroct-joint
+  rotate: false
+  xy: 819, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+spiroct-leg
+  rotate: false
+  xy: 1, 1
+  size: 48, 34
+  orig: 48, 34
+  offset: 0, 0
+  index: -1
+spiroct-leg-base
+  rotate: false
+  xy: 1647, 523
+  size: 48, 34
+  orig: 48, 34
+  offset: 0, 0
+  index: -1
+spiroct-weapon-outline
+  rotate: false
+  xy: 1747, 501
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+splash-0
+  rotate: false
+  xy: 819, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-1
+  rotate: false
+  xy: 853, 157
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-10
+  rotate: false
+  xy: 887, 21
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-11
+  rotate: false
+  xy: 921, 157
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-2
+  rotate: false
+  xy: 853, 123
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-3
+  rotate: false
+  xy: 887, 157
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-4
+  rotate: false
+  xy: 853, 89
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-5
+  rotate: false
+  xy: 887, 123
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-6
+  rotate: false
+  xy: 853, 55
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-7
+  rotate: false
+  xy: 887, 89
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-8
+  rotate: false
+  xy: 887, 55
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-9
+  rotate: false
+  xy: 853, 21
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+swarmer
+  rotate: false
+  xy: 1593, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+unit-alpha-full
+  rotate: false
+  xy: 1797, 509
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-beta-full
+  rotate: false
+  xy: 647, 703
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+unit-crawler-full
+  rotate: false
+  xy: 1847, 509
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-dagger-full
+  rotate: false
+  xy: 1647, 473
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-flare-full
+  rotate: false
+  xy: 1897, 491
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-gamma-full
+  rotate: false
+  xy: 71, 833
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+unit-mace-full
+  rotate: false
+  xy: 1857, 759
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+unit-mono-full
+  rotate: false
+  xy: 1947, 491
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-nova-full
+  rotate: false
+  xy: 705, 701
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+unit-poly-full
+  rotate: false
+  xy: 763, 701
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+unit-pulsar-full
+  rotate: false
+  xy: 141, 903
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+wave
+  rotate: false
+  xy: 67, 499
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+zenith-missiles-outline
+  rotate: false
+  xy: 1847, 459
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-blast-compound
+  rotate: false
+  xy: 615, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-coal
+  rotate: false
+  xy: 632, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-copper
+  rotate: false
+  xy: 629, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-graphite
+  rotate: false
+  xy: 629, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-lead
+  rotate: false
+  xy: 649, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-metaglass
+  rotate: false
+  xy: 649, 95
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-phase-fabric
+  rotate: false
+  xy: 649, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-plastanium
+  rotate: false
+  xy: 666, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-pyratite
+  rotate: false
+  xy: 663, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-sand
+  rotate: false
+  xy: 677, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-scrap
+  rotate: false
+  xy: 683, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-silicon
+  rotate: false
+  xy: 683, 61
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-spore-pod
+  rotate: false
+  xy: 700, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-surge-alloy
+  rotate: false
+  xy: 697, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-thorium
+  rotate: false
+  xy: 711, 367
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-titanium
+  rotate: false
+  xy: 717, 129
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-cryofluid
+  rotate: false
+  xy: 734, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-oil
+  rotate: false
+  xy: 731, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-slag
+  rotate: false
+  xy: 751, 27
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-water
+  rotate: false
+  xy: 765, 231
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 blank
   rotate: false
-  xy: 66, 152
+  xy: 799, 296
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
-atrax-joint
+shape-3
   rotate: false
-  xy: 69, 195
-  size: 26, 26
-  orig: 26, 26
+  xy: 67, 302
+  size: 63, 63
+  orig: 63, 63
+  offset: 0, 0
+  index: -1
+alpha
+  rotate: false
+  xy: 927, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+alpha-cell
+  rotate: false
+  xy: 977, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+atrax-base
+  rotate: false
+  xy: 211, 957
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+beta
+  rotate: false
+  xy: 67, 76
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+beta-cell
+  rotate: false
+  xy: 1327, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler
+  rotate: false
+  xy: 1627, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-base
+  rotate: false
+  xy: 1677, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-cell
+  rotate: false
+  xy: 1727, 709
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger
+  rotate: false
+  xy: 797, 651
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger-base
+  rotate: false
+  xy: 847, 655
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+flare
+  rotate: false
+  xy: 1447, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+fortress-base
+  rotate: false
+  xy: 805, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+gamma-cell
+  rotate: false
+  xy: 129, 244
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+mace
+  rotate: false
+  xy: 1333, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-base
+  rotate: false
+  xy: 1399, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-cell
+  rotate: false
+  xy: 1465, 891
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mono
+  rotate: false
+  xy: 1847, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mono-cell
+  rotate: false
+  xy: 1897, 541
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+nova
+  rotate: false
+  xy: 129, 186
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+nova-base
+  rotate: false
+  xy: 1147, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+nova-cell
+  rotate: false
+  xy: 125, 128
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+poly
+  rotate: false
+  xy: 183, 12
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+poly-cell
+  rotate: false
+  xy: 132, 309
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+power-cell
+  rotate: false
+  xy: 473, 701
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+pulsar
+  rotate: false
+  xy: 71, 963
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+pulsar-base
+  rotate: false
+  xy: 1247, 593
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+pulsar-cell
+  rotate: false
+  xy: 67, 190
+  size: 58, 48
+  orig: 58, 48
+  offset: 0, 0
+  index: -1
+vanguard
+  rotate: false
+  xy: 1997, 473
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+vanguard-cell
+  rotate: false
+  xy: 1697, 451
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+artillery
+  rotate: false
+  xy: 1227, 701
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+eruption
+  rotate: false
+  xy: 1197, 643
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+flakgun
+  rotate: false
+  xy: 1297, 651
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+flamethrower
+  rotate: false
+  xy: 1347, 651
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+heal-shotgun-weapon
+  rotate: false
+  xy: 1993, 917
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+heal-weapon
+  rotate: false
+  xy: 1697, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+heal-weapon-mount
+  rotate: false
+  xy: 1747, 659
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+large-artillery
+  rotate: false
+  xy: 1897, 591
+  size: 48, 66
+  orig: 48, 66
+  offset: 0, 0
+  index: -1
+large-weapon
+  rotate: false
+  xy: 1997, 573
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+missiles
+  rotate: false
+  xy: 1697, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+missiles-mount
+  rotate: false
+  xy: 1747, 559
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mount-purple-weapon
+  rotate: false
+  xy: 947, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mount-weapon
+  rotate: false
+  xy: 1047, 609
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+scepter-weapon
+  rotate: false
+  xy: 531, 655
+  size: 56, 102
+  orig: 56, 102
+  offset: 0, 0
+  index: -1
+small-basic-weapon
+  rotate: false
+  xy: 1297, 551
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+small-mount-weapon
+  rotate: false
+  xy: 1397, 551
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+small-weapon
+  rotate: false
+  xy: 1497, 509
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+spiroct-weapon
+  rotate: false
+  xy: 1697, 501
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+weapon
+  rotate: false
+  xy: 1747, 451
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+zenith-missiles
+  rotate: false
+  xy: 1797, 459
+  size: 48, 48
+  orig: 48, 48
   offset: 0, 0
   index: -1
 
-sprites4.png
+sprites5.png
 size: 2048,1024
 format: rgba8888
 filter: nearest,nearest
@@ -6722,3491 +7855,3722 @@ scorch-9-2
   offset: 0, 0
   index: -1
 
-sprites5.png
+sprites6.png
 size: 2048,512
 format: rgba8888
 filter: nearest,nearest
 repeat: none
-char1
-  rotate: false
-  xy: 1281, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-char2
-  rotate: false
-  xy: 1315, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-char3
-  rotate: false
-  xy: 1349, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cliff
-  rotate: false
-  xy: 1383, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cliffs1
-  rotate: false
-  xy: 1417, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-coal1
-  rotate: false
-  xy: 1451, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-coal2
-  rotate: false
-  xy: 1485, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-coal3
-  rotate: false
-  xy: 1519, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-copper1
-  rotate: false
-  xy: 1553, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-copper2
-  rotate: false
-  xy: 1587, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-copper3
-  rotate: false
-  xy: 1621, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters1
-  rotate: false
-  xy: 1655, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters2
-  rotate: false
-  xy: 1689, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters3
-  rotate: false
-  xy: 1723, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters4
-  rotate: false
-  xy: 1757, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters5
-  rotate: false
-  xy: 1791, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters6
-  rotate: false
-  xy: 1825, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-metal-large
-  rotate: false
-  xy: 687, 329
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-dark-metal1
-  rotate: false
-  xy: 1859, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-metal2
-  rotate: false
-  xy: 1893, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-panel-1
-  rotate: false
-  xy: 1927, 459
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-panel-1-edge
+basalt-edge
   rotate: false
   xy: 1, 395
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-dark-panel-2
+basalt1
   rotate: false
-  xy: 1961, 459
+  xy: 1561, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-2-edge
+basalt2
   rotate: false
-  xy: 1, 297
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dark-panel-3
-  rotate: false
-  xy: 1995, 459
+  xy: 1595, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-3-edge
+basalt3
   rotate: false
-  xy: 99, 395
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dark-panel-4
-  rotate: false
-  xy: 753, 361
+  xy: 1629, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-4-edge
+char1
   rotate: false
-  xy: 1, 199
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dark-panel-5
-  rotate: false
-  xy: 753, 327
+  xy: 1663, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-5-edge
+char2
   rotate: false
-  xy: 99, 297
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dark-panel-6
-  rotate: false
-  xy: 753, 293
+  xy: 1697, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-6-edge
+char3
   rotate: false
-  xy: 197, 395
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-darksand-edge
-  rotate: false
-  xy: 1, 101
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-darksand-tainted-water
-  rotate: false
-  xy: 525, 1
+  xy: 1731, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-tainted-water-edge
+cliff
   rotate: false
-  xy: 99, 199
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-darksand-tainted-water1
-  rotate: false
-  xy: 655, 131
+  xy: 1765, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-tainted-water2
+coal1
   rotate: false
-  xy: 753, 259
+  xy: 1799, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-tainted-water3
+coal2
   rotate: false
-  xy: 689, 179
+  xy: 1833, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-water
+coal3
   rotate: false
-  xy: 689, 145
+  xy: 1867, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-water-edge
+copper1
   rotate: false
-  xy: 197, 297
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-darksand-water1
-  rotate: false
-  xy: 737, 225
+  xy: 1901, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-water2
+copper2
   rotate: false
-  xy: 1181, 409
+  xy: 1935, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-water3
+copper3
   rotate: false
-  xy: 1215, 409
+  xy: 1969, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand1
+craters1
+  rotate: false
+  xy: 2003, 459
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+craters2
   rotate: false
   xy: 491, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand2
+craters3
   rotate: false
   xy: 557, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand3
+craters4
   rotate: false
   xy: 655, 165
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-deepwater
+craters5
   rotate: false
-  xy: 1249, 409
+  xy: 753, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-deepwater-edge
+craters6
   rotate: false
-  xy: 295, 395
+  xy: 851, 361
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dacite-edge
+  rotate: false
+  xy: 1, 297
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-dunerocks-large
-  rotate: false
-  xy: 785, 427
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-dunerocks1
-  rotate: false
-  xy: 1283, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dunerocks2
-  rotate: false
-  xy: 1317, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-edge
-  rotate: false
-  xy: 1351, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-edge-stencil
-  rotate: false
-  xy: 1, 3
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-edgier
-  rotate: false
-  xy: 1385, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-grass-edge
-  rotate: false
-  xy: 99, 101
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-grass1
-  rotate: false
-  xy: 1419, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-grass2
-  rotate: false
-  xy: 1453, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-grass3
-  rotate: false
-  xy: 1487, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-holostone-edge
-  rotate: false
-  xy: 197, 199
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-holostone1
-  rotate: false
-  xy: 1521, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-holostone2
-  rotate: false
-  xy: 1555, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-holostone3
-  rotate: false
-  xy: 1589, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-hotrock1
-  rotate: false
-  xy: 1623, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-hotrock2
-  rotate: false
-  xy: 1657, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-hotrock3
-  rotate: false
-  xy: 1691, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice-edge
-  rotate: false
-  xy: 295, 297
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-ice-snow-edge
-  rotate: false
-  xy: 393, 395
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-ice-snow1
-  rotate: false
-  xy: 1827, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice-snow2
-  rotate: false
-  xy: 1861, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice-snow3
-  rotate: false
-  xy: 1895, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice1
-  rotate: false
-  xy: 1725, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice2
-  rotate: false
-  xy: 1759, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice3
-  rotate: false
-  xy: 1793, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-icerocks-large
+dacite-wall-large
   rotate: false
   xy: 491, 35
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-icerocks1
+dacite-wall1
   rotate: false
-  xy: 1929, 425
+  xy: 851, 327
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-icerocks2
+dacite-wall2
   rotate: false
-  xy: 1963, 425
+  xy: 1411, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ignarock-edge
+dacite1
   rotate: false
-  xy: 99, 3
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-ignarock1
-  rotate: false
-  xy: 1997, 425
+  xy: 525, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ignarock2
+dacite2
   rotate: false
-  xy: 771, 225
+  xy: 655, 131
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ignarock3
+dacite3
   rotate: false
-  xy: 1283, 391
+  xy: 753, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-lead1
-  rotate: false
-  xy: 1317, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-lead2
-  rotate: false
-  xy: 1351, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-lead3
-  rotate: false
-  xy: 1385, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-magmarock1
-  rotate: false
-  xy: 1419, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-magmarock2
-  rotate: false
-  xy: 1453, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-magmarock3
-  rotate: false
-  xy: 1487, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor
-  rotate: false
-  xy: 1521, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-2
-  rotate: false
-  xy: 1555, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-2-edge
-  rotate: false
-  xy: 197, 101
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-metal-floor-3
-  rotate: false
-  xy: 1589, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-3-edge
-  rotate: false
-  xy: 295, 199
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-metal-floor-5
-  rotate: false
-  xy: 1623, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-5-edge
-  rotate: false
-  xy: 393, 297
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-metal-floor-damaged-edge
-  rotate: false
-  xy: 491, 395
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-metal-floor-damaged1
-  rotate: false
-  xy: 1657, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-damaged2
-  rotate: false
-  xy: 1691, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-damaged3
-  rotate: false
-  xy: 1725, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-edge
-  rotate: false
-  xy: 197, 3
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-moss-edge
-  rotate: false
-  xy: 295, 101
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-moss1
-  rotate: false
-  xy: 1759, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-moss2
-  rotate: false
-  xy: 1793, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-moss3
-  rotate: false
-  xy: 1827, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-coal1
-  rotate: false
-  xy: 1861, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-coal2
-  rotate: false
-  xy: 1895, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-coal3
-  rotate: false
-  xy: 1929, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-copper1
-  rotate: false
-  xy: 1963, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-copper2
-  rotate: false
-  xy: 1997, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-copper3
-  rotate: false
-  xy: 723, 179
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-lead1
-  rotate: false
-  xy: 723, 145
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-lead2
-  rotate: false
-  xy: 757, 191
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-lead3
-  rotate: false
-  xy: 757, 157
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-scrap1
-  rotate: false
-  xy: 689, 111
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-scrap2
-  rotate: false
-  xy: 723, 111
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-scrap3
-  rotate: false
-  xy: 757, 123
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-thorium1
-  rotate: false
-  xy: 791, 191
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-thorium2
-  rotate: false
-  xy: 791, 157
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-thorium3
-  rotate: false
-  xy: 791, 123
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-titanium1
-  rotate: false
-  xy: 757, 89
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-titanium2
-  rotate: false
-  xy: 791, 89
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-titanium3
-  rotate: false
-  xy: 591, 99
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pebbles1
-  rotate: false
-  xy: 591, 65
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pebbles2
-  rotate: false
-  xy: 625, 97
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pebbles3
-  rotate: false
-  xy: 625, 63
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-pine
-  rotate: false
-  xy: 687, 213
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-rocks-large
+dark-metal-large
   rotate: false
   xy: 589, 133
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-rocks1
+dark-metal1
   rotate: false
-  xy: 659, 77
+  xy: 1445, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-rocks2
+dark-metal2
   rotate: false
-  xy: 693, 77
+  xy: 1479, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-salt
+dark-panel-1
   rotate: false
-  xy: 659, 43
+  xy: 1513, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-salt-edge
+dark-panel-1-edge
+  rotate: false
+  xy: 99, 395
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-2
+  rotate: false
+  xy: 1561, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dark-panel-2-edge
+  rotate: false
+  xy: 1, 199
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-3
+  rotate: false
+  xy: 1595, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dark-panel-3-edge
+  rotate: false
+  xy: 99, 297
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-4
+  rotate: false
+  xy: 1629, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dark-panel-4-edge
+  rotate: false
+  xy: 197, 395
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-5
+  rotate: false
+  xy: 1663, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dark-panel-5-edge
+  rotate: false
+  xy: 1, 101
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-6
+  rotate: false
+  xy: 1697, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dark-panel-6-edge
+  rotate: false
+  xy: 99, 199
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+darksand-edge
+  rotate: false
+  xy: 197, 297
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+darksand-tainted-water
+  rotate: false
+  xy: 1833, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-tainted-water-edge
+  rotate: false
+  xy: 295, 395
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+darksand-tainted-water1
+  rotate: false
+  xy: 1867, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-tainted-water2
+  rotate: false
+  xy: 1901, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-tainted-water3
+  rotate: false
+  xy: 1935, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-water
+  rotate: false
+  xy: 1969, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-water-edge
+  rotate: false
+  xy: 1, 3
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+darksand-water1
+  rotate: false
+  xy: 2003, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-water2
+  rotate: false
+  xy: 591, 99
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-water3
+  rotate: false
+  xy: 591, 65
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand1
+  rotate: false
+  xy: 1731, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand2
+  rotate: false
+  xy: 1765, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand3
+  rotate: false
+  xy: 1799, 425
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+deepwater
+  rotate: false
+  xy: 625, 97
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+deepwater-edge
+  rotate: false
+  xy: 99, 101
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dirt-edge
+  rotate: false
+  xy: 197, 199
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dirt-wall-large
+  rotate: false
+  xy: 687, 231
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+dirt-wall1
+  rotate: false
+  xy: 787, 295
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt-wall2
+  rotate: false
+  xy: 787, 261
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt1
+  rotate: false
+  xy: 625, 63
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt2
+  rotate: false
+  xy: 659, 97
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt3
+  rotate: false
+  xy: 659, 63
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dune-wall-large
+  rotate: false
+  xy: 785, 329
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+dune-wall1
+  rotate: false
+  xy: 787, 227
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dune-wall2
+  rotate: false
+  xy: 821, 293
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+edge
+  rotate: false
+  xy: 821, 259
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+edge-stencil
+  rotate: false
+  xy: 295, 297
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+edgier
+  rotate: false
+  xy: 821, 225
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+grass-edge
+  rotate: false
+  xy: 393, 395
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+grass1
+  rotate: false
+  xy: 855, 293
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+grass2
+  rotate: false
+  xy: 855, 259
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+grass3
+  rotate: false
+  xy: 855, 225
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+hotrock1
+  rotate: false
+  xy: 1547, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+hotrock2
+  rotate: false
+  xy: 1581, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+hotrock3
+  rotate: false
+  xy: 1615, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-edge
+  rotate: false
+  xy: 99, 3
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+ice-snow-edge
+  rotate: false
+  xy: 197, 101
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+ice-snow1
+  rotate: false
+  xy: 1751, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-snow2
+  rotate: false
+  xy: 1785, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-snow3
+  rotate: false
+  xy: 1819, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-wall-large
+  rotate: false
+  xy: 883, 427
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+ice-wall1
+  rotate: false
+  xy: 1853, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-wall2
+  rotate: false
+  xy: 1887, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice1
+  rotate: false
+  xy: 1649, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice2
+  rotate: false
+  xy: 1683, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice3
+  rotate: false
+  xy: 1717, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+lead1
+  rotate: false
+  xy: 1921, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+lead2
+  rotate: false
+  xy: 1955, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+lead3
+  rotate: false
+  xy: 1989, 391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+magmarock1
+  rotate: false
+  xy: 689, 197
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+magmarock2
+  rotate: false
+  xy: 689, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+magmarock3
+  rotate: false
+  xy: 723, 195
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+metal-floor
+  rotate: false
+  xy: 723, 161
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+metal-floor-2
+  rotate: false
+  xy: 757, 193
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+metal-floor-2-edge
+  rotate: false
+  xy: 295, 199
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+metal-floor-3
+  rotate: false
+  xy: 757, 159
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+metal-floor-3-edge
+  rotate: false
+  xy: 393, 297
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+metal-floor-5
+  rotate: false
+  xy: 791, 191
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+metal-floor-5-edge
+  rotate: false
+  xy: 491, 395
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+metal-floor-damaged-edge
+  rotate: false
+  xy: 197, 3
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+metal-floor-damaged1
+  rotate: false
+  xy: 825, 191
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+metal-floor-damaged2
+  rotate: false
+  xy: 791, 157
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+metal-floor-damaged3
+  rotate: false
+  xy: 825, 157
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+metal-floor-edge
+  rotate: false
+  xy: 295, 101
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+moss-edge
   rotate: false
   xy: 393, 199
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-saltrocks-large
+moss1
   rotate: false
-  xy: 687, 263
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-saltrocks1
-  rotate: false
-  xy: 693, 43
+  xy: 859, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-saltrocks2
+moss2
   rotate: false
-  xy: 727, 55
+  xy: 859, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-sand-edge
+moss3
+  rotate: false
+  xy: 885, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+mud-edge
   rotate: false
   xy: 491, 297
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-sand-water
+mud1
   rotate: false
-  xy: 761, 21
+  xy: 885, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-sand-water-edge
+mud2
+  rotate: false
+  xy: 919, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+mud3
+  rotate: false
+  xy: 953, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-coal1
+  rotate: false
+  xy: 919, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-coal2
+  rotate: false
+  xy: 987, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-coal3
+  rotate: false
+  xy: 953, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-copper1
+  rotate: false
+  xy: 1021, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-copper2
+  rotate: false
+  xy: 987, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-copper3
+  rotate: false
+  xy: 1055, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-lead1
+  rotate: false
+  xy: 1021, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-lead2
+  rotate: false
+  xy: 1089, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-lead3
+  rotate: false
+  xy: 1055, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-scrap1
+  rotate: false
+  xy: 1123, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-scrap2
+  rotate: false
+  xy: 1089, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-scrap3
+  rotate: false
+  xy: 1157, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-thorium1
+  rotate: false
+  xy: 1123, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-thorium2
+  rotate: false
+  xy: 1191, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-thorium3
+  rotate: false
+  xy: 1157, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium1
+  rotate: false
+  xy: 1225, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium2
+  rotate: false
+  xy: 1191, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium3
+  rotate: false
+  xy: 1259, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pebbles1
+  rotate: false
+  xy: 1225, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pebbles2
+  rotate: false
+  xy: 1293, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pebbles3
+  rotate: false
+  xy: 1259, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+pine
+  rotate: false
+  xy: 1411, 443
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+salt
+  rotate: false
+  xy: 1327, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+salt-edge
   rotate: false
   xy: 589, 395
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-sand-water1
+salt-wall-large
   rotate: false
-  xy: 795, 21
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-water2
-  rotate: false
-  xy: 787, 393
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-water3
-  rotate: false
-  xy: 787, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand1
-  rotate: false
-  xy: 761, 55
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand2
-  rotate: false
-  xy: 795, 55
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand3
-  rotate: false
-  xy: 727, 21
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sandrocks-large
-  rotate: false
-  xy: 851, 427
+  xy: 949, 427
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-sandrocks1
+salt-wall1
   rotate: false
-  xy: 821, 393
+  xy: 1293, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-sandrocks2
+salt-wall2
   rotate: false
-  xy: 787, 325
+  xy: 1361, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-scrap1
-  rotate: false
-  xy: 855, 393
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap2
-  rotate: false
-  xy: 821, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap3
-  rotate: false
-  xy: 787, 291
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shale-edge
+sand-edge
   rotate: false
   xy: 295, 3
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-shale1
+sand-wall-large
   rotate: false
-  xy: 889, 393
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shale2
-  rotate: false
-  xy: 821, 325
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shale3
-  rotate: false
-  xy: 855, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shalerocks-large
-  rotate: false
-  xy: 917, 427
+  xy: 1015, 427
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-shalerocks1
+sand-wall1
   rotate: false
-  xy: 923, 393
+  xy: 1429, 375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-shalerocks2
+sand-wall2
   rotate: false
-  xy: 821, 291
+  xy: 1463, 375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-shrubs-large
+sand-water
   rotate: false
-  xy: 983, 427
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-shrubs1
-  rotate: false
-  xy: 855, 325
+  xy: 1497, 375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-shrubs2
-  rotate: false
-  xy: 889, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-slag
-  rotate: false
-  xy: 957, 393
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-slag-edge
+sand-water-edge
   rotate: false
   xy: 393, 101
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-snow-edge
+sand-water1
+  rotate: false
+  xy: 1395, 341
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand-water2
+  rotate: false
+  xy: 1429, 341
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand-water3
+  rotate: false
+  xy: 1463, 341
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand1
+  rotate: false
+  xy: 1327, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand2
+  rotate: false
+  xy: 1361, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand3
+  rotate: false
+  xy: 1395, 375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap1
+  rotate: false
+  xy: 1497, 341
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap2
+  rotate: false
+  xy: 1531, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap3
+  rotate: false
+  xy: 1565, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shale-edge
   rotate: false
   xy: 491, 199
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-snow-pine
+shale-wall-large
   rotate: false
-  xy: 1181, 443
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-snow1
-  rotate: false
-  xy: 855, 291
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snow2
-  rotate: false
-  xy: 889, 325
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snow3
-  rotate: false
-  xy: 923, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snowrocks-large
-  rotate: false
-  xy: 1049, 427
+  xy: 1081, 427
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-snowrocks1
+shale-wall1
   rotate: false
-  xy: 991, 393
+  xy: 1701, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-snowrocks2
+shale-wall2
   rotate: false
-  xy: 889, 291
+  xy: 1735, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-spawn
+shale1
   rotate: false
-  xy: 923, 325
+  xy: 1599, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-spore-moss-edge
+shale2
+  rotate: false
+  xy: 1633, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shale3
+  rotate: false
+  xy: 1667, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shrubs-large
+  rotate: false
+  xy: 1147, 427
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+shrubs1
+  rotate: false
+  xy: 1769, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shrubs2
+  rotate: false
+  xy: 1803, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+slag
+  rotate: false
+  xy: 1837, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+slag-edge
   rotate: false
   xy: 589, 297
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-spore-moss1
-  rotate: false
-  xy: 957, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-spore-moss2
-  rotate: false
-  xy: 1025, 393
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-spore-moss3
-  rotate: false
-  xy: 923, 291
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-spore-pine
-  rotate: false
-  xy: 1231, 443
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-sporerocks-large
-  rotate: false
-  xy: 1115, 427
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-sporerocks1
-  rotate: false
-  xy: 957, 325
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sporerocks2
-  rotate: false
-  xy: 991, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-stone-edge
+snow-edge
   rotate: false
   xy: 687, 395
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-stone1
+snow-pine
   rotate: false
-  xy: 1059, 393
+  xy: 1461, 443
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+snow-wall-large
+  rotate: false
+  xy: 1213, 427
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+snow-wall1
+  rotate: false
+  xy: 1973, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-stone2
+snow-wall2
   rotate: false
-  xy: 957, 291
+  xy: 1531, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-stone3
+snow1
   rotate: false
-  xy: 991, 325
+  xy: 1871, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-tainted-water
+snow2
   rotate: false
-  xy: 1025, 359
+  xy: 1905, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-tainted-water-edge
+snow3
+  rotate: false
+  xy: 1939, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+spawn
+  rotate: false
+  xy: 1565, 323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+spore-moss-edge
   rotate: false
   xy: 393, 3
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-tar
+spore-moss1
   rotate: false
-  xy: 1093, 393
+  xy: 1599, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-tar-edge
+spore-moss2
+  rotate: false
+  xy: 1633, 323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+spore-moss3
+  rotate: false
+  xy: 1667, 323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+spore-pine
+  rotate: false
+  xy: 1511, 443
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+spore-wall-large
+  rotate: false
+  xy: 1279, 427
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+spore-wall1
+  rotate: false
+  xy: 1701, 323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+spore-wall2
+  rotate: false
+  xy: 1735, 323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+stone-edge
   rotate: false
   xy: 491, 101
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-tendrils1
+stone-wall-large
   rotate: false
-  xy: 991, 291
+  xy: 1345, 427
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+stone-wall1
+  rotate: false
+  xy: 1871, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-tendrils2
+stone-wall2
   rotate: false
-  xy: 1025, 325
+  xy: 1905, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-tendrils3
+stone1
   rotate: false
-  xy: 1059, 359
+  xy: 1769, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-thorium1
+stone2
   rotate: false
-  xy: 1127, 393
+  xy: 1803, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-thorium2
+stone3
   rotate: false
-  xy: 1025, 291
+  xy: 1837, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-thorium3
+tainted-water
   rotate: false
-  xy: 1059, 325
+  xy: 1939, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-titanium1
-  rotate: false
-  xy: 1093, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium2
-  rotate: false
-  xy: 1059, 291
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium3
-  rotate: false
-  xy: 1093, 325
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-water
-  rotate: false
-  xy: 1127, 359
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-water-edge
+tainted-water-edge
   rotate: false
   xy: 589, 199
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+tar
+  rotate: false
+  xy: 1973, 323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+tar-edge
+  rotate: false
+  xy: 687, 297
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+tendrils1
+  rotate: false
+  xy: 2007, 357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+tendrils2
+  rotate: false
+  xy: 2007, 323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+tendrils3
+  rotate: false
+  xy: 889, 325
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+thorium1
+  rotate: false
+  xy: 923, 325
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+thorium2
+  rotate: false
+  xy: 889, 291
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+thorium3
+  rotate: false
+  xy: 957, 325
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium1
+  rotate: false
+  xy: 889, 257
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium2
+  rotate: false
+  xy: 923, 291
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium3
+  rotate: false
+  xy: 991, 325
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+water
+  rotate: false
+  xy: 923, 257
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+water-edge
+  rotate: false
+  xy: 785, 395
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 
-sprites6.png
+sprites7.png
 size: 2048,1024
 format: rgba8888
 filter: nearest,nearest
 repeat: none
 additive-reconstructor-icon-editor
   rotate: false
-  xy: 485, 631
+  xy: 613, 763
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 air-factory-icon-editor
   rotate: false
-  xy: 613, 759
+  xy: 1847, 925
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 alloy-smelter-icon-editor
   rotate: false
-  xy: 1555, 921
+  xy: 711, 763
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 arc-icon-editor
   rotate: false
-  xy: 375, 207
+  xy: 1667, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-icon-editor
   rotate: false
-  xy: 181, 17
+  xy: 423, 375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+basalt-icon-editor
+  rotate: false
+  xy: 423, 341
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-basalt1
+  rotate: false
+  xy: 423, 341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-icon-editor
   rotate: false
-  xy: 295, 47
+  xy: 423, 307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-large-icon-editor
   rotate: false
-  xy: 1653, 921
+  xy: 1945, 925
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 blast-drill-icon-editor
   rotate: false
-  xy: 1, 19
+  xy: 1, 23
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-mixer-icon-editor
   rotate: false
-  xy: 1005, 725
+  xy: 1397, 827
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border-editor
   rotate: false
-  xy: 295, 13
+  xy: 423, 273
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-forge-icon-editor
   rotate: false
-  xy: 1751, 921
+  xy: 809, 763
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-loader-icon-editor
   rotate: false
-  xy: 1849, 921
+  xy: 227, 281
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-unloader-icon-editor
   rotate: false
-  xy: 1947, 921
+  xy: 227, 183
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+boulder-icon-editor
+  rotate: false
+  xy: 1793, 843
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 bridge-conduit-icon-editor
   rotate: false
-  xy: 583, 695
+  xy: 423, 239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-icon-editor
   rotate: false
-  xy: 583, 661
+  xy: 327, 81
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char-icon-editor
   rotate: false
-  xy: 583, 627
+  xy: 361, 81
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char1
   rotate: false
-  xy: 583, 627
+  xy: 361, 81
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 clear-editor
   rotate: false
-  xy: 2045, 1016
+  xy: 2043, 1020
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 cliff-icon-editor
   rotate: false
-  xy: 583, 593
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cliffs-icon-editor
-  rotate: false
-  xy: 583, 559
+  xy: 1009, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal-centrifuge-icon-editor
   rotate: false
-  xy: 1071, 725
+  xy: 1463, 827
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 combustion-generator-icon-editor
   rotate: false
-  xy: 587, 367
+  xy: 1043, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+command-center-icon-editor
+  rotate: false
+  xy: 1529, 827
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 conduit-icon-editor
   rotate: false
-  xy: 587, 333
+  xy: 1077, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 container-icon-editor
   rotate: false
-  xy: 1137, 725
+  xy: 1595, 827
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 conveyor-icon-editor
   rotate: false
-  xy: 587, 299
+  xy: 1111, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-icon-editor
   rotate: false
-  xy: 521, 235
+  xy: 1145, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-large-icon-editor
   rotate: false
-  xy: 1203, 725
+  xy: 1661, 827
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 core-foundation-icon-editor
   rotate: false
-  xy: 323, 437
+  xy: 323, 409
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 core-nucleus-icon-editor
   rotate: false
-  xy: 323, 567
+  xy: 613, 861
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 core-shard-icon-editor
   rotate: false
-  xy: 227, 277
+  xy: 517, 635
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 craters-icon-editor
   rotate: false
-  xy: 555, 235
+  xy: 1179, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters1
   rotate: false
-  xy: 555, 235
+  xy: 1179, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-cryofluidmixer-icon-editor
+cryofluid-mixer-icon-editor
   rotate: false
-  xy: 1269, 725
+  xy: 1727, 827
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-icon-editor
   rotate: false
-  xy: 1335, 725
+  xy: 943, 501
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cyclone-icon-editor
   rotate: false
-  xy: 227, 179
+  xy: 131, 55
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+dacite-boulder-icon-editor
+  rotate: false
+  xy: 1667, 711
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dacite-icon-editor
+  rotate: false
+  xy: 1213, 497
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dacite1
+  rotate: false
+  xy: 1213, 497
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dacite-wall-icon-editor
+  rotate: false
+  xy: 1247, 497
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 dark-metal-icon-editor
   rotate: false
-  xy: 1995, 795
+  xy: 1281, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-1-icon-editor
   rotate: false
-  xy: 1995, 761
+  xy: 1315, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-1
   rotate: false
-  xy: 1995, 761
+  xy: 1315, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-2-icon-editor
   rotate: false
-  xy: 1995, 727
+  xy: 1349, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-2
   rotate: false
-  xy: 1995, 727
+  xy: 1349, 497
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-3-icon-editor
   rotate: false
-  xy: 1995, 693
+  xy: 649, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-3
   rotate: false
-  xy: 1995, 693
+  xy: 649, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-4-icon-editor
   rotate: false
-  xy: 1995, 659
+  xy: 683, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-4
   rotate: false
-  xy: 1995, 659
+  xy: 683, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-5-icon-editor
   rotate: false
-  xy: 1995, 625
+  xy: 717, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-5
   rotate: false
-  xy: 1995, 625
+  xy: 717, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-6-icon-editor
   rotate: false
-  xy: 329, 57
+  xy: 751, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-6
   rotate: false
-  xy: 329, 57
+  xy: 751, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-icon-editor
   rotate: false
-  xy: 329, 23
+  xy: 785, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand1
   rotate: false
-  xy: 329, 23
+  xy: 785, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-tainted-water-icon-editor
   rotate: false
-  xy: 409, 205
+  xy: 819, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water-icon-editor
   rotate: false
-  xy: 443, 205
+  xy: 853, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-data-processor-icon-editor
-  rotate: false
-  xy: 131, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
 deepwater-icon-editor
   rotate: false
-  xy: 477, 205
+  xy: 887, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-deepwater
   rotate: false
-  xy: 477, 205
+  xy: 887, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 differential-generator-icon-editor
   rotate: false
-  xy: 229, 81
+  xy: 517, 537
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 diode-icon-editor
   rotate: false
-  xy: 511, 201
+  xy: 395, 81
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt-icon-editor
+  rotate: false
+  xy: 1383, 497
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dirt1
+  rotate: false
+  xy: 1383, 497
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt-wall-icon-editor
+  rotate: false
+  xy: 1793, 809
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 disassembler-icon-editor
   rotate: false
-  xy: 485, 533
+  xy: 325, 311
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 distributor-icon-editor
   rotate: false
-  xy: 1401, 725
+  xy: 1007, 729
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-icon-editor
   rotate: false
-  xy: 545, 201
+  xy: 1783, 775
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-large-icon-editor
   rotate: false
-  xy: 1467, 725
+  xy: 1007, 663
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-dunerocks-icon-editor
+dune-wall-icon-editor
   rotate: false
-  xy: 363, 57
+  xy: 1717, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-editor
   rotate: false
-  xy: 363, 23
+  xy: 1717, 693
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-basalt2
+  rotate: false
+  xy: 1717, 659
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-basalt3
+  rotate: false
+  xy: 1701, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char2
   rotate: false
-  xy: 579, 201
+  xy: 1735, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char3
   rotate: false
-  xy: 617, 725
+  xy: 985, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters2
   rotate: false
-  xy: 617, 691
+  xy: 1019, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters3
   rotate: false
-  xy: 651, 725
+  xy: 1053, 463
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dacite2
+  rotate: false
+  xy: 1087, 463
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dacite3
+  rotate: false
+  xy: 1121, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-tainted-water1
   rotate: false
-  xy: 685, 725
+  xy: 1223, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-tainted-water2
   rotate: false
-  xy: 617, 623
+  xy: 1257, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-tainted-water3
   rotate: false
-  xy: 651, 657
+  xy: 1291, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-water1
   rotate: false
-  xy: 685, 691
+  xy: 1325, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-water2
   rotate: false
-  xy: 719, 725
+  xy: 1359, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-water3
   rotate: false
-  xy: 617, 589
+  xy: 1393, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand2
   rotate: false
-  xy: 617, 657
+  xy: 1155, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand3
   rotate: false
-  xy: 651, 691
+  xy: 1189, 463
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dirt2
+  rotate: false
+  xy: 1817, 775
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dirt3
+  rotate: false
+  xy: 1851, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass1
   rotate: false
-  xy: 651, 623
+  xy: 1885, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-icon-editor
   rotate: false
-  xy: 651, 623
+  xy: 1885, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass2
   rotate: false
-  xy: 685, 657
+  xy: 1919, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass3
   rotate: false
-  xy: 719, 691
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-holostone1
-  rotate: false
-  xy: 753, 725
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-holostone-icon-editor
-  rotate: false
-  xy: 753, 725
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-holostone2
-  rotate: false
-  xy: 651, 589
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-holostone3
-  rotate: false
-  xy: 685, 623
+  xy: 1953, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock1
   rotate: false
-  xy: 719, 657
+  xy: 1987, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock-icon-editor
   rotate: false
-  xy: 719, 657
+  xy: 1987, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock2
   rotate: false
-  xy: 753, 691
+  xy: 1851, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock3
   rotate: false
-  xy: 685, 589
+  xy: 1885, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow1
   rotate: false
-  xy: 753, 623
+  xy: 425, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow-icon-editor
   rotate: false
-  xy: 753, 623
+  xy: 425, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow2
   rotate: false
-  xy: 753, 589
+  xy: 425, 171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow3
   rotate: false
-  xy: 617, 555
+  xy: 425, 137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice1
   rotate: false
-  xy: 719, 623
+  xy: 1919, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-icon-editor
   rotate: false
-  xy: 719, 623
+  xy: 1919, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice2
   rotate: false
-  xy: 753, 657
+  xy: 1953, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice3
   rotate: false
-  xy: 719, 589
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ignarock1
-  rotate: false
-  xy: 651, 555
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ignarock-icon-editor
-  rotate: false
-  xy: 651, 555
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ignarock2
-  rotate: false
-  xy: 685, 555
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ignarock3
-  rotate: false
-  xy: 719, 555
+  xy: 1987, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock1
   rotate: false
-  xy: 753, 555
+  xy: 429, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock-icon-editor
   rotate: false
-  xy: 753, 555
+  xy: 429, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock2
   rotate: false
-  xy: 787, 659
+  xy: 429, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock3
   rotate: false
-  xy: 787, 625
+  xy: 231, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor
   rotate: false
-  xy: 787, 591
+  xy: 265, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-icon-editor
   rotate: false
-  xy: 787, 591
+  xy: 265, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-2
   rotate: false
-  xy: 821, 659
+  xy: 231, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2-icon-editor
   rotate: false
-  xy: 821, 659
+  xy: 231, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-3
   rotate: false
-  xy: 821, 625
+  xy: 265, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3-icon-editor
   rotate: false
-  xy: 821, 625
+  xy: 265, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-5
   rotate: false
-  xy: 787, 557
+  xy: 299, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5-icon-editor
   rotate: false
-  xy: 787, 557
+  xy: 299, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged1
   rotate: false
-  xy: 821, 591
+  xy: 333, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-editor
   rotate: false
-  xy: 821, 591
+  xy: 333, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged2
   rotate: false
-  xy: 855, 659
+  xy: 367, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged3
   rotate: false
-  xy: 855, 625
+  xy: 299, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss1
   rotate: false
-  xy: 821, 557
+  xy: 333, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss-icon-editor
   rotate: false
-  xy: 821, 557
+  xy: 333, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss2
   rotate: false
-  xy: 855, 591
+  xy: 367, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss3
   rotate: false
-  xy: 889, 659
+  xy: 401, 35
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-mud1
+  rotate: false
+  xy: 435, 35
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+mud-icon-editor
+  rotate: false
+  xy: 435, 35
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-mud2
+  rotate: false
+  xy: 401, 1
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-mud3
+  rotate: false
+  xy: 435, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal1
   rotate: false
-  xy: 889, 625
+  xy: 985, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal2
   rotate: false
-  xy: 855, 557
+  xy: 1019, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal3
   rotate: false
-  xy: 889, 591
+  xy: 1053, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper1
   rotate: false
-  xy: 923, 659
+  xy: 1087, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper2
   rotate: false
-  xy: 923, 625
+  xy: 1121, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper3
   rotate: false
-  xy: 889, 557
+  xy: 1155, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead1
   rotate: false
-  xy: 923, 591
+  xy: 1189, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead2
   rotate: false
-  xy: 957, 659
+  xy: 1223, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead3
   rotate: false
-  xy: 957, 625
+  xy: 1257, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap1
   rotate: false
-  xy: 923, 557
+  xy: 1291, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap2
   rotate: false
-  xy: 957, 591
+  xy: 1325, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap3
   rotate: false
-  xy: 957, 557
+  xy: 1359, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium1
   rotate: false
-  xy: 991, 625
+  xy: 1393, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium2
   rotate: false
-  xy: 991, 591
+  xy: 457, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium3
   rotate: false
-  xy: 1025, 625
+  xy: 491, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium1
   rotate: false
-  xy: 991, 557
+  xy: 457, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium2
   rotate: false
-  xy: 1025, 591
+  xy: 525, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium3
   rotate: false
-  xy: 1059, 625
+  xy: 457, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-pebbles1
   rotate: false
-  xy: 1025, 557
+  xy: 491, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-pebbles2
   rotate: false
-  xy: 1059, 591
+  xy: 559, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-pebbles3
   rotate: false
-  xy: 1093, 625
+  xy: 457, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-salt
   rotate: false
-  xy: 1059, 557
+  xy: 491, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt-icon-editor
   rotate: false
-  xy: 1059, 557
+  xy: 491, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand-water1
   rotate: false
-  xy: 1127, 591
+  xy: 491, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand-water2
   rotate: false
-  xy: 1161, 625
+  xy: 525, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand-water3
   rotate: false
-  xy: 1127, 557
+  xy: 559, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand1
   rotate: false
-  xy: 1093, 591
+  xy: 525, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-icon-editor
   rotate: false
-  xy: 1093, 591
+  xy: 525, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand2
   rotate: false
-  xy: 1127, 625
+  xy: 593, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand3
   rotate: false
-  xy: 1093, 557
+  xy: 457, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale1
   rotate: false
-  xy: 1161, 591
+  xy: 491, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-icon-editor
   rotate: false
-  xy: 1161, 591
+  xy: 491, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale2
   rotate: false
-  xy: 1195, 625
+  xy: 525, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale3
   rotate: false
-  xy: 1161, 557
+  xy: 559, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-slag
   rotate: false
-  xy: 1195, 591
+  xy: 593, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 slag-icon-editor
   rotate: false
-  xy: 1195, 591
+  xy: 593, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow1
   rotate: false
-  xy: 1229, 625
+  xy: 525, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow2
   rotate: false
-  xy: 1195, 557
+  xy: 559, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow3
   rotate: false
-  xy: 1229, 591
+  xy: 593, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spawn
   rotate: false
-  xy: 1263, 625
+  xy: 559, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss1
   rotate: false
-  xy: 1229, 557
+  xy: 593, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss-icon-editor
   rotate: false
-  xy: 1229, 557
+  xy: 593, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss2
   rotate: false
-  xy: 1263, 591
+  xy: 593, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss3
   rotate: false
-  xy: 1297, 625
+  xy: 627, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone1
   rotate: false
-  xy: 1263, 557
+  xy: 627, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-icon-editor
   rotate: false
-  xy: 1263, 557
+  xy: 627, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone2
   rotate: false
-  xy: 1297, 591
+  xy: 661, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone3
   rotate: false
-  xy: 1331, 625
+  xy: 627, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tainted-water
   rotate: false
-  xy: 1297, 557
+  xy: 661, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water-icon-editor
   rotate: false
-  xy: 1297, 557
+  xy: 661, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tar
   rotate: false
-  xy: 1331, 591
+  xy: 695, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-icon-editor
   rotate: false
-  xy: 1331, 591
+  xy: 695, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tendrils1
   rotate: false
-  xy: 1365, 625
+  xy: 627, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tendrils2
   rotate: false
-  xy: 1331, 557
+  xy: 661, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tendrils3
   rotate: false
-  xy: 1365, 591
+  xy: 695, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-water
   rotate: false
-  xy: 1399, 625
+  xy: 729, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-icon-editor
   rotate: false
-  xy: 1399, 625
+  xy: 729, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 exponential-reconstructor-icon-editor
   rotate: false
-  xy: 1, 149
+  xy: 1, 153
   size: 224, 224
   orig: 224, 224
   offset: 0, 0
   index: -1
 force-projector-icon-editor
   rotate: false
-  xy: 711, 759
+  xy: 325, 213
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+foreshadow-icon-editor
+  rotate: false
+  xy: 937, 893
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
 fuse-icon-editor
   rotate: false
-  xy: 809, 791
+  xy: 615, 665
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 graphite-press-icon-editor
   rotate: false
-  xy: 1533, 725
+  xy: 1073, 729
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 ground-factory-icon-editor
   rotate: false
-  xy: 907, 791
+  xy: 615, 567
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 hail-icon-editor
   rotate: false
-  xy: 1365, 557
+  xy: 661, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-icerocks-icon-editor
+hyper-processor-icon-editor
   rotate: false
-  xy: 1399, 591
+  xy: 713, 665
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+ice-wall-icon-editor
+  rotate: false
+  xy: 695, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-icon-editor
   rotate: false
-  xy: 1433, 625
+  xy: 729, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 impact-reactor-icon-editor
   rotate: false
-  xy: 775, 889
+  xy: 1067, 893
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 incinerator-icon-editor
   rotate: false
-  xy: 1399, 557
+  xy: 763, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter-icon-editor
   rotate: false
-  xy: 1433, 591
+  xy: 695, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source-icon-editor
   rotate: false
-  xy: 1467, 625
+  xy: 729, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void-icon-editor
   rotate: false
-  xy: 1433, 557
+  xy: 763, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction-icon-editor
   rotate: false
-  xy: 1467, 591
+  xy: 797, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 kiln-icon-editor
   rotate: false
-  xy: 1599, 757
+  xy: 1007, 597
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 lancer-icon-editor
   rotate: false
-  xy: 1665, 757
+  xy: 1073, 663
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-large-overdrive-projector-icon-editor
+large-logic-display-icon-editor
   rotate: false
-  xy: 1005, 791
-  size: 96, 96
-  orig: 96, 96
+  xy: 323, 539
+  size: 192, 192
+  orig: 192, 192
   offset: 0, 0
   index: -1
 laser-drill-icon-editor
   rotate: false
-  xy: 1103, 791
+  xy: 713, 567
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launch-pad-icon-editor
   rotate: false
-  xy: 1201, 791
+  xy: 811, 665
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launch-pad-large-icon-editor
   rotate: false
-  xy: 905, 889
+  xy: 1197, 893
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 liquid-junction-icon-editor
   rotate: false
-  xy: 1501, 625
+  xy: 729, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-editor
   rotate: false
-  xy: 1467, 557
+  xy: 763, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source-icon-editor
   rotate: false
-  xy: 1501, 591
+  xy: 797, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-tank-icon-editor
   rotate: false
-  xy: 1299, 791
+  xy: 811, 567
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-void-icon-editor
   rotate: false
-  xy: 1535, 625
+  xy: 831, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-mass-conveyor-icon-editor
+logic-display-icon-editor
   rotate: false
-  xy: 1397, 791
+  xy: 229, 85
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+logic-processor-icon-editor
+  rotate: false
+  xy: 1139, 729
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 mass-driver-icon-editor
   rotate: false
-  xy: 453, 435
+  xy: 327, 115
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mechanical-drill-icon-editor
   rotate: false
-  xy: 1731, 757
+  xy: 1073, 597
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-pump-icon-editor
   rotate: false
-  xy: 1501, 557
+  xy: 763, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 meltdown-icon-editor
   rotate: false
-  xy: 1035, 889
+  xy: 1327, 893
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 melter-icon-editor
   rotate: false
-  xy: 1535, 591
+  xy: 797, 333
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+memory-bank-icon-editor
+  rotate: false
+  xy: 1139, 663
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+memory-cell-icon-editor
+  rotate: false
+  xy: 831, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mend-projector-icon-editor
   rotate: false
-  xy: 1797, 757
+  xy: 1205, 729
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mender-icon-editor
   rotate: false
-  xy: 1535, 557
+  xy: 865, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message-icon-editor
   rotate: false
-  xy: 617, 521
+  xy: 797, 299
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+micro-processor-icon-editor
+  rotate: false
+  xy: 831, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 multi-press-icon-editor
   rotate: false
-  xy: 1495, 791
+  xy: 453, 439
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 multiplicative-reconstructor-icon-editor
   rotate: false
-  xy: 613, 857
+  xy: 775, 861
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 naval-factory-icon-editor
   rotate: false
-  xy: 1593, 823
+  xy: 551, 439
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-icon-editor
   rotate: false
-  xy: 1691, 823
+  xy: 649, 469
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+overdrive-dome-icon-editor
+  rotate: false
+  xy: 747, 469
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 overdrive-projector-icon-editor
   rotate: false
-  xy: 1863, 757
+  xy: 1139, 597
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 overflow-gate-icon-editor
   rotate: false
-  xy: 617, 487
+  xy: 865, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 parallax-icon-editor
   rotate: false
-  xy: 1929, 757
+  xy: 1205, 663
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+payload-conveyor-icon-editor
+  rotate: false
+  xy: 845, 469
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 payload-router-icon-editor
   rotate: false
-  xy: 1789, 823
+  xy: 1847, 827
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 pebbles-icon-editor
   rotate: false
-  xy: 651, 521
+  xy: 831, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-icon-editor
   rotate: false
-  xy: 617, 453
+  xy: 865, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-icon-editor
   rotate: false
-  xy: 651, 487
+  xy: 865, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-icon-editor
   rotate: false
-  xy: 685, 521
+  xy: 627, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-large-icon-editor
   rotate: false
-  xy: 551, 467
+  xy: 1271, 729
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-icon-editor
   rotate: false
-  xy: 1005, 659
+  xy: 1205, 597
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pine-icon-editor
   rotate: false
-  xy: 325, 191
+  xy: 1733, 777
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-editor
   rotate: false
-  xy: 1071, 659
+  xy: 1271, 663
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-conveyor-icon-editor
   rotate: false
-  xy: 617, 419
+  xy: 661, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall-icon-editor
   rotate: false
-  xy: 651, 453
+  xy: 695, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall-large-icon-editor
   rotate: false
-  xy: 1137, 659
+  xy: 1271, 597
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plated-conduit-icon-editor
   rotate: false
-  xy: 685, 487
+  xy: 729, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pneumatic-drill-icon-editor
   rotate: false
-  xy: 1203, 659
+  xy: 1337, 729
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-node-icon-editor
   rotate: false
-  xy: 719, 521
+  xy: 763, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large-icon-editor
   rotate: false
-  xy: 1269, 659
+  xy: 1337, 663
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-source-icon-editor
   rotate: false
-  xy: 651, 419
+  xy: 797, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void-icon-editor
   rotate: false
-  xy: 685, 453
+  xy: 831, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-editor
   rotate: false
-  xy: 719, 487
+  xy: 865, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-editor
   rotate: false
-  xy: 753, 521
+  xy: 899, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-editor
   rotate: false
-  xy: 1335, 659
+  xy: 1337, 597
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 repair-point-icon-editor
   rotate: false
-  xy: 787, 523
+  xy: 899, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 resupply-point-icon-editor
   rotate: false
-  xy: 1401, 659
+  xy: 1009, 531
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 ripple-icon-editor
   rotate: false
-  xy: 1887, 823
+  xy: 1945, 827
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-rock-icon-editor
-  rotate: false
-  xy: 1985, 871
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-rocks-icon-editor
-  rotate: false
-  xy: 685, 419
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 rotary-pump-icon-editor
   rotate: false
-  xy: 1467, 659
+  xy: 1075, 531
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 router-icon-editor
   rotate: false
-  xy: 719, 453
+  xy: 899, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-icon-editor
   rotate: false
-  xy: 1533, 659
+  xy: 1141, 531
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-saltrocks-icon-editor
+salt-wall-icon-editor
   rotate: false
-  xy: 753, 487
+  xy: 899, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salvo-icon-editor
   rotate: false
-  xy: 1599, 691
+  xy: 1207, 531
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sand-boulder-icon-editor
   rotate: false
-  xy: 787, 489
+  xy: 899, 265
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand-wall-icon-editor
+  rotate: false
+  xy: 459, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-icon-editor
   rotate: false
-  xy: 821, 523
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sandrocks-icon-editor
-  rotate: false
-  xy: 719, 419
+  xy: 459, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scatter-icon-editor
   rotate: false
-  xy: 1665, 691
+  xy: 1273, 531
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scorch-icon-editor
   rotate: false
-  xy: 753, 453
+  xy: 493, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-gigantic-icon-editor
   rotate: false
-  xy: 1165, 889
+  xy: 1457, 893
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 scrap-wall-huge-icon-editor
   rotate: false
-  xy: 325, 339
+  xy: 907, 763
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 scrap-wall-icon-editor
   rotate: false
-  xy: 787, 455
+  xy: 459, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-large-icon-editor
   rotate: false
-  xy: 1731, 691
+  xy: 1339, 531
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 segment-icon-editor
   rotate: false
-  xy: 1797, 691
+  xy: 1403, 761
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-icon-editor
   rotate: false
-  xy: 1863, 691
+  xy: 1403, 695
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shale-boulder-icon-editor
   rotate: false
-  xy: 821, 489
+  xy: 493, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-shalerocks-icon-editor
+shale-wall-icon-editor
   rotate: false
-  xy: 855, 523
+  xy: 527, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shock-mine-icon-editor
   rotate: false
-  xy: 753, 419
+  xy: 493, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrubs-icon-editor
   rotate: false
-  xy: 787, 421
+  xy: 527, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 silicon-crucible-icon-editor
   rotate: false
-  xy: 325, 241
+  xy: 909, 665
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 silicon-smelter-icon-editor
   rotate: false
-  xy: 1929, 691
+  xy: 1469, 761
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+snow-boulder-icon-editor
+  rotate: false
+  xy: 1667, 661
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 snow-icon-editor
   rotate: false
-  xy: 821, 455
+  xy: 561, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-pine-icon-editor
   rotate: false
-  xy: 327, 141
+  xy: 131, 5
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-snowrock-icon-editor
+snow-wall-icon-editor
   rotate: false
-  xy: 327, 91
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-snowrocks-icon-editor
-  rotate: false
-  xy: 855, 489
+  xy: 527, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-icon-editor
   rotate: false
-  xy: 889, 523
+  xy: 561, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-large-icon-editor
   rotate: false
-  xy: 423, 337
+  xy: 909, 567
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 sorter-icon-editor
   rotate: false
-  xy: 821, 421
+  xy: 561, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn-icon-editor
   rotate: false
-  xy: 855, 455
+  xy: 463, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spectre-icon-editor
   rotate: false
-  xy: 1295, 889
+  xy: 1587, 893
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 spore-cluster-icon-editor
   rotate: false
-  xy: 1985, 829
+  xy: 943, 459
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-pine-icon-editor
   rotate: false
-  xy: 131, 1
+  xy: 181, 5
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-press-icon-editor
   rotate: false
-  xy: 551, 401
+  xy: 1403, 629
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-sporerocks-icon-editor
+spore-wall-icon-editor
   rotate: false
-  xy: 889, 489
+  xy: 463, 99
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+steam-generator-icon-editor
+  rotate: false
+  xy: 1469, 695
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+stone-wall-icon-editor
+  rotate: false
+  xy: 497, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-tower-icon-editor
   rotate: false
-  xy: 521, 335
+  xy: 1535, 761
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 surge-wall-icon-editor
   rotate: false
-  xy: 923, 523
+  xy: 497, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large-icon-editor
   rotate: false
-  xy: 521, 269
+  xy: 1469, 629
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 swarmer-icon-editor
   rotate: false
-  xy: 1599, 625
+  xy: 1535, 695
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+switch-icon-editor
+  rotate: false
+  xy: 531, 133
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 tendrils-icon-editor
   rotate: false
-  xy: 855, 421
+  xy: 531, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tetrative-reconstructor-icon-editor
   rotate: false
-  xy: 323, 729
+  xy: 323, 733
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 thermal-generator-icon-editor
   rotate: false
-  xy: 1665, 625
+  xy: 1601, 761
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-pump-icon-editor
   rotate: false
-  xy: 423, 239
+  xy: 1005, 795
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-icon-editor
   rotate: false
-  xy: 809, 693
+  xy: 1103, 795
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-wall-icon-editor
   rotate: false
-  xy: 889, 455
+  xy: 565, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-editor
   rotate: false
-  xy: 1731, 625
+  xy: 1535, 629
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thruster-icon-editor
   rotate: false
-  xy: 1425, 889
+  xy: 1717, 893
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-editor
   rotate: false
-  xy: 923, 489
+  xy: 565, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-icon-editor
   rotate: false
-  xy: 957, 523
+  xy: 469, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-editor
   rotate: false
-  xy: 1797, 625
+  xy: 1601, 695
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-turbine-generator-icon-editor
+tsunami-icon-editor
   rotate: false
-  xy: 1863, 625
-  size: 64, 64
-  orig: 64, 64
+  xy: 1201, 795
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
 underflow-gate-icon-editor
   rotate: false
-  xy: 889, 421
+  xy: 469, 31
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-icon-editor
   rotate: false
-  xy: 923, 455
+  xy: 503, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault-icon-editor
   rotate: false
-  xy: 907, 693
+  xy: 1299, 795
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 water-extractor-icon-editor
   rotate: false
-  xy: 1929, 625
+  xy: 1667, 761
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wave-icon-editor
   rotate: false
-  xy: 229, 15
+  xy: 1601, 629
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 white-tree-dead-icon-editor
   rotate: false
-  xy: 1, 697
+  xy: 1, 701
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 white-tree-icon-editor
   rotate: false
-  xy: 1, 375
+  xy: 1, 379
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 
-sprites7.png
+sprites8.png
 size: 2048,1024
 format: rgba8888
 filter: nearest,nearest
@@ -10220,7 +11584,7 @@ alpha-bg
   index: -1
 bar
   rotate: false
-  xy: 719, 282
+  xy: 1048, 560
   size: 27, 36
   split: 9, 9, 9, 9
   orig: 27, 36
@@ -10228,7 +11592,7 @@ bar
   index: -1
 bar-top
   rotate: false
-  xy: 751, 578
+  xy: 1455, 483
   size: 27, 36
   split: 9, 10, 9, 10
   orig: 27, 36
@@ -10243,21 +11607,21 @@ block-additive-reconstructor-large
   index: -1
 block-additive-reconstructor-medium
   rotate: false
-  xy: 957, 589
+  xy: 1627, 618
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-additive-reconstructor-small
   rotate: false
-  xy: 781, 690
+  xy: 1013, 359
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-additive-reconstructor-tiny
   rotate: false
-  xy: 2031, 821
+  xy: 327, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -10278,21 +11642,21 @@ block-air-factory-large
   index: -1
 block-air-factory-medium
   rotate: false
-  xy: 995, 618
+  xy: 1665, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-air-factory-small
   rotate: false
-  xy: 80, 2
+  xy: 2023, 881
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-air-factory-tiny
   rotate: false
-  xy: 2031, 803
+  xy: 881, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -10306,28 +11670,28 @@ block-air-factory-xlarge
   index: -1
 block-alloy-smelter-large
   rotate: false
-  xy: 351, 74
+  xy: 651, 274
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-alloy-smelter-medium
   rotate: false
-  xy: 1033, 647
+  xy: 1699, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-alloy-smelter-small
   rotate: false
-  xy: 106, 2
+  xy: 2023, 855
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-alloy-smelter-tiny
   rotate: false
-  xy: 2031, 785
+  xy: 899, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -10341,28 +11705,28 @@ block-alloy-smelter-xlarge
   index: -1
 block-arc-large
   rotate: false
-  xy: 401, 124
+  xy: 551, 141
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-arc-medium
   rotate: false
-  xy: 1067, 647
+  xy: 2014, 907
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-arc-small
   rotate: false
-  xy: 1953, 802
+  xy: 2023, 829
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-arc-tiny
   rotate: false
-  xy: 2031, 767
+  xy: 917, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -10376,28 +11740,28 @@ block-arc-xlarge
   index: -1
 block-armored-conveyor-large
   rotate: false
-  xy: 451, 174
+  xy: 451, 74
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-armored-conveyor-medium
   rotate: false
-  xy: 1101, 647
+  xy: 1909, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-armored-conveyor-small
   rotate: false
-  xy: 1953, 776
+  xy: 2023, 803
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-armored-conveyor-tiny
   rotate: false
-  xy: 2031, 749
+  xy: 935, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -10409,6974 +11773,7464 @@ block-armored-conveyor-xlarge
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-battery-large
+block-basalt-large
   rotate: false
-  xy: 501, 224
+  xy: 646, 232
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-battery-large-large
+block-basalt-medium
   rotate: false
-  xy: 551, 274
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-battery-large-medium
-  rotate: false
-  xy: 1135, 647
+  xy: 1989, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-battery-large-small
+block-basalt-small
   rotate: false
-  xy: 1979, 805
+  xy: 781, 690
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-battery-large-tiny
+block-basalt-tiny
   rotate: false
-  xy: 2031, 731
+  xy: 953, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-battery-large-xlarge
+block-basalt-xlarge
   rotate: false
   xy: 51, 478
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-battery-medium
+block-battery-large
   rotate: false
-  xy: 1169, 647
+  xy: 401, 34
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-battery-large-large
+  rotate: false
+  xy: 443, 32
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-battery-large-medium
+  rotate: false
+  xy: 1661, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-battery-small
+block-battery-large-small
   rotate: false
-  xy: 1979, 779
+  xy: 1251, 427
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-battery-tiny
+block-battery-large-tiny
   rotate: false
-  xy: 2031, 713
+  xy: 971, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-battery-xlarge
+block-battery-large-xlarge
   rotate: false
   xy: 131, 558
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-blast-drill-large
+block-battery-medium
   rotate: false
-  xy: 601, 324
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-blast-drill-medium
-  rotate: false
-  xy: 1203, 647
+  xy: 1695, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-blast-drill-small
+block-battery-small
   rotate: false
-  xy: 2005, 813
+  xy: 1420, 461
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-blast-drill-tiny
+block-battery-tiny
   rotate: false
-  xy: 301, 1
+  xy: 989, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-blast-drill-xlarge
+block-battery-xlarge
   rotate: false
   xy: 181, 608
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-blast-mixer-large
+block-blast-drill-large
   rotate: false
-  xy: 651, 374
+  xy: 501, 100
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-blast-mixer-medium
+block-blast-drill-medium
   rotate: false
-  xy: 1237, 647
+  xy: 351, 6
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-blast-mixer-small
+block-blast-drill-small
   rotate: false
-  xy: 2005, 787
+  xy: 1277, 427
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-blast-mixer-tiny
+block-blast-drill-tiny
   rotate: false
-  xy: 319, 1
+  xy: 1007, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-blast-mixer-xlarge
+block-blast-drill-xlarge
   rotate: false
   xy: 259, 769
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-block-forge-large
+block-blast-mixer-large
   rotate: false
-  xy: 701, 424
+  xy: 543, 99
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-block-forge-medium
+block-blast-mixer-medium
   rotate: false
-  xy: 1271, 647
+  xy: 881, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-block-forge-small
+block-blast-mixer-small
   rotate: false
-  xy: 351, 6
+  xy: 1303, 427
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-block-forge-tiny
+block-blast-mixer-tiny
   rotate: false
-  xy: 2031, 695
+  xy: 1025, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-block-forge-xlarge
+block-blast-mixer-xlarge
   rotate: false
   xy: 1, 378
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-block-loader-large
+block-block-forge-large
   rotate: false
-  xy: 351, 32
+  xy: 593, 133
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-block-loader-medium
+block-block-forge-medium
   rotate: false
-  xy: 1305, 647
+  xy: 915, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-block-loader-small
+block-block-forge-small
   rotate: false
-  xy: 377, 6
+  xy: 1329, 427
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-block-loader-tiny
+block-block-forge-tiny
   rotate: false
-  xy: 309, 698
+  xy: 1043, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-block-loader-xlarge
+block-block-forge-xlarge
   rotate: false
   xy: 51, 428
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-block-unloader-large
+block-block-loader-large
   rotate: false
-  xy: 751, 536
+  xy: 585, 91
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-block-unloader-medium
+block-block-loader-medium
   rotate: false
-  xy: 1339, 647
+  xy: 877, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-block-unloader-small
+block-block-loader-small
   rotate: false
-  xy: 403, 6
+  xy: 1484, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-block-unloader-tiny
+block-block-loader-tiny
   rotate: false
-  xy: 331, 598
+  xy: 1061, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-block-unloader-xlarge
+block-block-loader-xlarge
   rotate: false
   xy: 181, 558
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-bridge-conduit-large
+block-block-unloader-large
   rotate: false
-  xy: 751, 494
+  xy: 493, 58
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-bridge-conduit-medium
+block-block-unloader-medium
   rotate: false
-  xy: 1373, 647
+  xy: 877, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-bridge-conduit-small
+block-block-unloader-small
   rotate: false
-  xy: 885, 342
+  xy: 1510, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-bridge-conduit-tiny
+block-block-unloader-tiny
   rotate: false
-  xy: 132, 10
+  xy: 1079, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-bridge-conduit-xlarge
+block-block-unloader-xlarge
   rotate: false
   xy: 259, 719
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-bridge-conveyor-large
+block-boulder-large
   rotate: false
-  xy: 793, 536
+  xy: 535, 57
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-bridge-conveyor-medium
+block-boulder-medium
   rotate: false
-  xy: 1407, 647
+  xy: 911, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-bridge-conveyor-small
+block-boulder-small
   rotate: false
-  xy: 911, 330
+  xy: 1355, 433
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-bridge-conveyor-tiny
+block-boulder-tiny
   rotate: false
-  xy: 1899, 770
+  xy: 1097, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-bridge-conveyor-xlarge
+block-boulder-xlarge
   rotate: false
   xy: 1, 328
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-char-large
+block-bridge-conduit-large
   rotate: false
-  xy: 793, 494
+  xy: 577, 49
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-char-medium
+block-bridge-conduit-medium
   rotate: false
-  xy: 1441, 647
+  xy: 877, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-char-small
+block-bridge-conduit-small
   rotate: false
-  xy: 937, 325
+  xy: 1115, 393
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-char-tiny
+block-bridge-conduit-tiny
   rotate: false
-  xy: 989, 11
+  xy: 331, 598
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-char-xlarge
+block-bridge-conduit-xlarge
   rotate: false
   xy: 51, 378
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-cliff-large
+block-bridge-conveyor-large
   rotate: false
-  xy: 835, 536
+  xy: 485, 16
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-cliff-medium
+block-bridge-conveyor-medium
   rotate: false
-  xy: 991, 584
+  xy: 911, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-cliff-small
+block-bridge-conveyor-small
   rotate: false
-  xy: 885, 316
+  xy: 1081, 375
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-cliff-tiny
+block-bridge-conveyor-tiny
   rotate: false
-  xy: 1119, 63
+  xy: 1096, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-cliff-xlarge
+block-bridge-conveyor-xlarge
   rotate: false
   xy: 259, 669
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-cliffs-large
+block-char-large
   rotate: false
-  xy: 835, 494
+  xy: 527, 15
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-cliffs-medium
+block-char-medium
   rotate: false
-  xy: 1029, 613
+  xy: 877, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-cliffs-small
+block-char-small
   rotate: false
-  xy: 911, 304
+  xy: 1076, 349
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-cliffs-tiny
+block-char-tiny
   rotate: false
-  xy: 1145, 89
+  xy: 464, 14
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-cliffs-xlarge
+block-char-xlarge
   rotate: false
   xy: 1, 278
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-coal-centrifuge-large
+block-cliff-large
   rotate: false
-  xy: 751, 452
+  xy: 569, 7
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-coal-centrifuge-medium
+block-cliff-medium
   rotate: false
-  xy: 1063, 613
+  xy: 911, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-coal-centrifuge-small
+block-cliff-small
   rotate: false
-  xy: 937, 299
+  xy: 1446, 457
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-coal-centrifuge-tiny
+block-cliff-tiny
   rotate: false
-  xy: 1171, 115
+  xy: 309, 672
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-coal-centrifuge-xlarge
+block-cliff-xlarge
   rotate: false
   xy: 51, 328
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-combustion-generator-large
+block-coal-centrifuge-large
   rotate: false
-  xy: 793, 452
+  xy: 751, 536
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-combustion-generator-medium
+block-coal-centrifuge-medium
   rotate: false
-  xy: 1097, 613
+  xy: 877, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-combustion-generator-small
+block-coal-centrifuge-small
   rotate: false
-  xy: 885, 290
+  xy: 1472, 457
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-combustion-generator-tiny
+block-coal-centrifuge-tiny
   rotate: false
-  xy: 1197, 141
+  xy: 1534, 221
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-combustion-generator-xlarge
+block-coal-centrifuge-xlarge
   rotate: false
   xy: 1, 228
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-conduit-large
+block-combustion-generator-large
   rotate: false
-  xy: 835, 452
+  xy: 751, 494
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-conduit-medium
+block-combustion-generator-medium
   rotate: false
-  xy: 1131, 613
+  xy: 911, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-conduit-small
+block-combustion-generator-small
   rotate: false
-  xy: 911, 278
+  xy: 1498, 463
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-conduit-tiny
+block-combustion-generator-tiny
   rotate: false
-  xy: 1223, 167
+  xy: 1552, 221
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-conduit-xlarge
+block-combustion-generator-xlarge
   rotate: false
   xy: 51, 278
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-container-large
+block-command-center-large
   rotate: false
-  xy: 743, 410
+  xy: 793, 536
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-container-medium
+block-command-center-medium
   rotate: false
-  xy: 1165, 613
+  xy: 911, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-container-small
+block-command-center-small
   rotate: false
-  xy: 937, 273
+  xy: 1524, 463
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-container-tiny
-  rotate: false
-  xy: 1249, 193
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-container-xlarge
-  rotate: false
-  xy: 1, 178
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-conveyor-large
-  rotate: false
-  xy: 785, 410
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-conveyor-medium
-  rotate: false
-  xy: 1199, 613
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-conveyor-small
-  rotate: false
-  xy: 885, 264
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-conveyor-tiny
-  rotate: false
-  xy: 1275, 219
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-conveyor-xlarge
-  rotate: false
-  xy: 51, 228
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-copper-wall-large
-  rotate: false
-  xy: 827, 410
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-copper-wall-large-large
-  rotate: false
-  xy: 701, 382
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-copper-wall-large-medium
-  rotate: false
-  xy: 1233, 613
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-copper-wall-large-small
-  rotate: false
-  xy: 911, 252
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-copper-wall-large-tiny
-  rotate: false
-  xy: 1327, 255
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-copper-wall-large-xlarge
-  rotate: false
-  xy: 1, 128
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-copper-wall-medium
-  rotate: false
-  xy: 1267, 613
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-copper-wall-small
-  rotate: false
-  xy: 937, 247
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-copper-wall-tiny
-  rotate: false
-  xy: 1353, 281
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-copper-wall-xlarge
-  rotate: false
-  xy: 51, 178
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-core-foundation-large
-  rotate: false
-  xy: 743, 368
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-core-foundation-medium
-  rotate: false
-  xy: 1301, 613
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-core-foundation-small
-  rotate: false
-  xy: 885, 238
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-core-foundation-tiny
-  rotate: false
-  xy: 1431, 323
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-core-foundation-xlarge
-  rotate: false
-  xy: 1, 78
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-core-nucleus-large
-  rotate: false
-  xy: 785, 368
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-core-nucleus-medium
-  rotate: false
-  xy: 1335, 613
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-core-nucleus-small
-  rotate: false
-  xy: 911, 226
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-core-nucleus-tiny
-  rotate: false
-  xy: 309, 680
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-core-nucleus-xlarge
-  rotate: false
-  xy: 51, 128
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-core-shard-large
-  rotate: false
-  xy: 827, 368
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-core-shard-medium
-  rotate: false
-  xy: 1369, 613
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-core-shard-small
-  rotate: false
-  xy: 937, 221
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-core-shard-tiny
+block-command-center-tiny
   rotate: false
   xy: 331, 580
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-core-shard-xlarge
+block-command-center-xlarge
+  rotate: false
+  xy: 1, 178
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-conduit-large
+  rotate: false
+  xy: 751, 452
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-conduit-medium
+  rotate: false
+  xy: 877, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-conduit-small
+  rotate: false
+  xy: 1107, 367
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-conduit-tiny
+  rotate: false
+  xy: 1510, 195
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-conduit-xlarge
+  rotate: false
+  xy: 51, 228
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-container-large
+  rotate: false
+  xy: 793, 494
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-container-medium
+  rotate: false
+  xy: 911, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-container-small
+  rotate: false
+  xy: 1102, 341
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-container-tiny
+  rotate: false
+  xy: 1563, 495
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-container-xlarge
+  rotate: false
+  xy: 1, 128
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-conveyor-large
+  rotate: false
+  xy: 835, 536
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-conveyor-medium
+  rotate: false
+  xy: 872, 325
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-conveyor-small
+  rotate: false
+  xy: 1102, 315
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-conveyor-tiny
+  rotate: false
+  xy: 1570, 216
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-conveyor-xlarge
+  rotate: false
+  xy: 51, 178
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-copper-wall-large
+  rotate: false
+  xy: 751, 410
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-copper-wall-large-large
+  rotate: false
+  xy: 793, 452
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-copper-wall-large-medium
+  rotate: false
+  xy: 906, 325
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-copper-wall-large-small
+  rotate: false
+  xy: 1102, 289
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-copper-wall-large-tiny
+  rotate: false
+  xy: 1534, 203
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-copper-wall-large-xlarge
+  rotate: false
+  xy: 1, 78
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-copper-wall-medium
+  rotate: false
+  xy: 869, 291
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-copper-wall-small
+  rotate: false
+  xy: 1102, 263
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-copper-wall-tiny
+  rotate: false
+  xy: 1552, 203
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-copper-wall-xlarge
+  rotate: false
+  xy: 51, 128
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-core-foundation-large
+  rotate: false
+  xy: 835, 494
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-core-foundation-medium
+  rotate: false
+  xy: 903, 291
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-core-foundation-small
+  rotate: false
+  xy: 1096, 237
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-core-foundation-tiny
+  rotate: false
+  xy: 1570, 198
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-core-foundation-xlarge
   rotate: false
   xy: 1, 28
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-craters-large
+block-core-nucleus-large
   rotate: false
-  xy: 393, 74
+  xy: 793, 410
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-craters-medium
+block-core-nucleus-medium
   rotate: false
-  xy: 1403, 613
+  xy: 1133, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-craters-small
+block-core-nucleus-small
   rotate: false
-  xy: 885, 212
+  xy: 1096, 211
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-craters-tiny
+block-core-nucleus-tiny
   rotate: false
-  xy: 1007, 11
+  xy: 1588, 216
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-craters-xlarge
+block-core-nucleus-xlarge
   rotate: false
   xy: 51, 78
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-cryofluidmixer-large
+block-core-shard-large
   rotate: false
-  xy: 393, 32
+  xy: 835, 452
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-cryofluidmixer-medium
+block-core-shard-medium
   rotate: false
-  xy: 1437, 613
+  xy: 1167, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-cryofluidmixer-small
+block-core-shard-small
   rotate: false
-  xy: 911, 200
+  xy: 1141, 393
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-cryofluidmixer-tiny
+block-core-shard-tiny
   rotate: false
-  xy: 1119, 45
+  xy: 1588, 198
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-cryofluidmixer-xlarge
+block-core-shard-xlarge
   rotate: false
   xy: 51, 28
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-cultivator-large
+block-craters-large
   rotate: false
-  xy: 443, 124
+  xy: 835, 410
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-cultivator-medium
+block-craters-medium
   rotate: false
-  xy: 1025, 579
+  xy: 1201, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-cultivator-small
+block-craters-small
   rotate: false
-  xy: 937, 195
+  xy: 1133, 367
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-cultivator-tiny
+block-craters-tiny
   rotate: false
-  xy: 1449, 323
+  xy: 1510, 177
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-cultivator-xlarge
+block-craters-xlarge
   rotate: false
   xy: 857, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-cyclone-large
+block-cryofluid-mixer-large
   rotate: false
-  xy: 435, 82
+  xy: 751, 368
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-cyclone-medium
+block-cryofluid-mixer-medium
   rotate: false
-  xy: 1059, 579
+  xy: 1235, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-cyclone-small
+block-cryofluid-mixer-small
   rotate: false
-  xy: 885, 186
+  xy: 1128, 341
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-cyclone-tiny
+block-cryofluid-mixer-tiny
   rotate: false
-  xy: 1025, 11
+  xy: 1528, 185
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-cyclone-xlarge
+block-cryofluid-mixer-xlarge
   rotate: false
   xy: 907, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dark-metal-large
+block-cultivator-large
   rotate: false
-  xy: 435, 40
+  xy: 793, 368
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-dark-metal-medium
+block-cultivator-medium
   rotate: false
-  xy: 1093, 579
+  xy: 1269, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-dark-metal-small
+block-cultivator-small
   rotate: false
-  xy: 911, 174
+  xy: 1128, 315
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-dark-metal-tiny
+block-cultivator-tiny
   rotate: false
-  xy: 1467, 323
+  xy: 1546, 185
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-dark-metal-xlarge
+block-cultivator-xlarge
   rotate: false
   xy: 957, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dark-panel-1-large
+block-cyclone-large
   rotate: false
-  xy: 493, 174
+  xy: 835, 368
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-dark-panel-1-medium
+block-cyclone-medium
   rotate: false
-  xy: 1127, 579
+  xy: 1303, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-dark-panel-1-small
+block-cyclone-small
   rotate: false
-  xy: 937, 169
+  xy: 1128, 289
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-dark-panel-1-tiny
+block-cyclone-tiny
   rotate: false
-  xy: 1043, 11
+  xy: 1528, 167
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-dark-panel-1-xlarge
+block-cyclone-xlarge
   rotate: false
   xy: 1007, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dark-panel-2-large
+block-dacite-boulder-large
   rotate: false
-  xy: 485, 132
+  xy: 746, 326
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-dark-panel-2-medium
+block-dacite-boulder-medium
   rotate: false
-  xy: 1161, 579
+  xy: 1337, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-dark-panel-2-small
+block-dacite-boulder-small
   rotate: false
-  xy: 885, 160
+  xy: 1128, 263
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-dark-panel-2-tiny
+block-dacite-boulder-tiny
   rotate: false
-  xy: 1061, 11
+  xy: 1546, 167
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-dark-panel-2-xlarge
+block-dacite-boulder-xlarge
   rotate: false
   xy: 1057, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dark-panel-3-large
+block-dacite-large
   rotate: false
-  xy: 543, 224
+  xy: 788, 326
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-dark-panel-3-medium
+block-dacite-medium
   rotate: false
-  xy: 1195, 579
+  xy: 1371, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-dark-panel-3-small
+block-dacite-small
   rotate: false
-  xy: 911, 148
+  xy: 1122, 237
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-dark-panel-3-tiny
+block-dacite-tiny
   rotate: false
-  xy: 1079, 11
+  xy: 1564, 180
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-dark-panel-3-xlarge
+block-dacite-wall-large
+  rotate: false
+  xy: 830, 326
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-dacite-wall-medium
+  rotate: false
+  xy: 1405, 589
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dacite-wall-small
+  rotate: false
+  xy: 1122, 211
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-dacite-wall-tiny
+  rotate: false
+  xy: 1582, 180
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-dacite-wall-xlarge
   rotate: false
   xy: 1107, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dark-panel-4-large
-  rotate: false
-  xy: 535, 182
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-dark-panel-4-medium
-  rotate: false
-  xy: 1229, 579
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-dark-panel-4-small
-  rotate: false
-  xy: 937, 143
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-dark-panel-4-tiny
-  rotate: false
-  xy: 1097, 11
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-dark-panel-4-xlarge
+block-dacite-xlarge
   rotate: false
   xy: 1157, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dark-panel-5-large
+block-dark-metal-large
   rotate: false
-  xy: 593, 274
+  xy: 701, 284
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-dark-panel-5-medium
+block-dark-metal-medium
   rotate: false
-  xy: 1263, 579
+  xy: 1439, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-dark-panel-5-small
+block-dark-metal-small
   rotate: false
-  xy: 885, 134
+  xy: 1167, 395
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-dark-panel-5-tiny
+block-dark-metal-tiny
   rotate: false
-  xy: 1379, 297
+  xy: 1564, 162
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-dark-panel-5-xlarge
+block-dark-metal-xlarge
   rotate: false
   xy: 1207, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dark-panel-6-large
+block-dark-panel-1-large
   rotate: false
-  xy: 585, 232
+  xy: 743, 284
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-dark-panel-6-medium
+block-dark-panel-1-medium
   rotate: false
-  xy: 1297, 579
+  xy: 1473, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-dark-panel-6-small
+block-dark-panel-1-small
   rotate: false
-  xy: 911, 122
+  xy: 1193, 398
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-dark-panel-6-tiny
+block-dark-panel-1-tiny
   rotate: false
-  xy: 1397, 297
+  xy: 1582, 162
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-dark-panel-6-xlarge
+block-dark-panel-1-xlarge
   rotate: false
   xy: 1257, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-darksand-large
+block-dark-panel-2-large
   rotate: false
-  xy: 643, 324
+  xy: 785, 284
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-darksand-medium
+block-dark-panel-2-medium
   rotate: false
-  xy: 1331, 579
+  xy: 1507, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-darksand-small
+block-dark-panel-2-small
   rotate: false
-  xy: 937, 117
+  xy: 1219, 399
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-darksand-tainted-water-large
+block-dark-panel-2-tiny
   rotate: false
-  xy: 635, 282
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-darksand-tainted-water-medium
-  rotate: false
-  xy: 1365, 579
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-darksand-tainted-water-small
-  rotate: false
-  xy: 885, 108
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-darksand-tainted-water-tiny
-  rotate: false
-  xy: 1119, 27
+  xy: 1600, 180
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-darksand-tainted-water-xlarge
+block-dark-panel-2-xlarge
   rotate: false
   xy: 1307, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-darksand-tiny
+block-dark-panel-3-large
   rotate: false
-  xy: 1415, 297
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-darksand-water-large
-  rotate: false
-  xy: 869, 410
+  xy: 827, 284
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-darksand-water-medium
+block-dark-panel-3-medium
   rotate: false
-  xy: 1399, 579
+  xy: 1541, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-darksand-water-small
+block-dark-panel-3-small
   rotate: false
-  xy: 911, 96
+  xy: 1159, 367
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-darksand-water-tiny
+block-dark-panel-3-tiny
   rotate: false
-  xy: 1301, 234
+  xy: 1600, 162
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-darksand-water-xlarge
+block-dark-panel-3-xlarge
   rotate: false
   xy: 1357, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-darksand-xlarge
+block-dark-panel-4-large
+  rotate: false
+  xy: 635, 133
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-dark-panel-4-medium
+  rotate: false
+  xy: 1575, 589
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dark-panel-4-small
+  rotate: false
+  xy: 1154, 341
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-dark-panel-4-tiny
+  rotate: false
+  xy: 1330, 205
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-dark-panel-4-xlarge
   rotate: false
   xy: 1407, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-data-processor-large
+block-dark-panel-5-large
   rotate: false
-  xy: 869, 368
+  xy: 627, 91
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-data-processor-medium
+block-dark-panel-5-medium
   rotate: false
-  xy: 1433, 579
+  xy: 1943, 681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-data-processor-small
+block-dark-panel-5-small
   rotate: false
-  xy: 937, 91
+  xy: 1154, 315
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-data-processor-tiny
+block-dark-panel-5-tiny
   rotate: false
-  xy: 2025, 677
+  xy: 1348, 205
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-data-processor-xlarge
+block-dark-panel-5-xlarge
   rotate: false
   xy: 1457, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-deepwater-large
+block-dark-panel-6-large
   rotate: false
-  xy: 477, 82
+  xy: 619, 49
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-deepwater-medium
+block-dark-panel-6-medium
   rotate: false
-  xy: 1979, 899
+  xy: 949, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-deepwater-small
+block-dark-panel-6-small
   rotate: false
-  xy: 885, 82
+  xy: 1154, 289
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-deepwater-tiny
+block-dark-panel-6-tiny
   rotate: false
-  xy: 2025, 659
+  xy: 1408, 210
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-deepwater-xlarge
+block-dark-panel-6-xlarge
   rotate: false
   xy: 1507, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-differential-generator-large
+block-darksand-large
   rotate: false
-  xy: 477, 40
+  xy: 611, 7
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-differential-generator-medium
+block-darksand-medium
   rotate: false
-  xy: 2013, 907
+  xy: 945, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-differential-generator-small
+block-darksand-small
   rotate: false
-  xy: 911, 70
+  xy: 1154, 263
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-differential-generator-tiny
+block-darksand-tainted-water-large
   rotate: false
-  xy: 1115, 9
+  xy: 669, 91
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-darksand-tainted-water-medium
+  rotate: false
+  xy: 945, 495
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-darksand-tainted-water-small
+  rotate: false
+  xy: 1148, 237
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-darksand-tainted-water-tiny
+  rotate: false
+  xy: 1426, 205
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-differential-generator-xlarge
+block-darksand-tainted-water-xlarge
   rotate: false
   xy: 1557, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-diode-large
+block-darksand-tiny
   rotate: false
-  xy: 527, 132
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-diode-medium
-  rotate: false
-  xy: 881, 560
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-diode-small
-  rotate: false
-  xy: 937, 65
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-diode-tiny
-  rotate: false
-  xy: 1641, 708
+  xy: 1536, 495
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-diode-xlarge
+block-darksand-water-large
+  rotate: false
+  xy: 661, 49
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-darksand-water-medium
+  rotate: false
+  xy: 945, 461
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-darksand-water-small
+  rotate: false
+  xy: 1148, 211
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-darksand-water-tiny
+  rotate: false
+  xy: 1550, 477
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-darksand-water-xlarge
   rotate: false
   xy: 1607, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-disassembler-large
-  rotate: false
-  xy: 519, 90
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-disassembler-medium
-  rotate: false
-  xy: 915, 560
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-disassembler-small
-  rotate: false
-  xy: 885, 56
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-disassembler-tiny
-  rotate: false
-  xy: 1433, 305
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-disassembler-xlarge
+block-darksand-xlarge
   rotate: false
   xy: 1657, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-distributor-large
+block-deepwater-large
   rotate: false
-  xy: 519, 48
+  xy: 653, 7
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-distributor-medium
+block-deepwater-medium
   rotate: false
-  xy: 877, 526
+  xy: 945, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-distributor-small
+block-deepwater-small
   rotate: false
-  xy: 855, 30
+  xy: 1581, 524
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-distributor-tiny
+block-deepwater-tiny
   rotate: false
-  xy: 1451, 305
+  xy: 1568, 477
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-distributor-xlarge
+block-deepwater-xlarge
   rotate: false
   xy: 1707, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-door-large
+block-differential-generator-large
   rotate: false
-  xy: 577, 182
+  xy: 703, 49
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-door-large-large
+block-differential-generator-medium
   rotate: false
-  xy: 569, 140
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-door-large-medium
-  rotate: false
-  xy: 911, 526
+  xy: 945, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-door-large-small
+block-differential-generator-small
   rotate: false
-  xy: 881, 30
+  xy: 1607, 524
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-door-large-tiny
+block-differential-generator-tiny
   rotate: false
-  xy: 1469, 305
+  xy: 1586, 480
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-door-large-xlarge
+block-differential-generator-xlarge
   rotate: false
   xy: 1757, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-door-medium
+block-diode-large
   rotate: false
-  xy: 877, 492
+  xy: 695, 7
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-diode-medium
+  rotate: false
+  xy: 945, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-door-small
+block-diode-small
   rotate: false
-  xy: 885, 4
+  xy: 1633, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-door-tiny
+block-diode-tiny
   rotate: false
-  xy: 1487, 302
+  xy: 1604, 480
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-door-xlarge
+block-diode-xlarge
   rotate: false
   xy: 1807, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dunerocks-large
+block-dirt-large
   rotate: false
-  xy: 627, 232
+  xy: 737, 7
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-dunerocks-medium
+block-dirt-medium
   rotate: false
-  xy: 911, 492
+  xy: 940, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-dunerocks-small
+block-dirt-small
   rotate: false
-  xy: 911, 44
+  xy: 1659, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-dunerocks-tiny
+block-dirt-tiny
   rotate: false
-  xy: 1505, 302
+  xy: 1563, 459
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-dunerocks-xlarge
+block-dirt-wall-large
+  rotate: false
+  xy: 646, 190
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-dirt-wall-medium
+  rotate: false
+  xy: 937, 291
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dirt-wall-small
+  rotate: false
+  xy: 1685, 519
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-dirt-wall-tiny
+  rotate: false
+  xy: 1563, 441
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-dirt-wall-xlarge
   rotate: false
   xy: 1857, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-duo-large
-  rotate: false
-  xy: 619, 190
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-duo-medium
-  rotate: false
-  xy: 877, 458
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-duo-small
-  rotate: false
-  xy: 937, 39
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-duo-tiny
-  rotate: false
-  xy: 1523, 302
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-duo-xlarge
+block-dirt-xlarge
   rotate: false
   xy: 1907, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-exponential-reconstructor-large
-  rotate: false
-  xy: 677, 282
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-exponential-reconstructor-medium
-  rotate: false
-  xy: 911, 458
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-exponential-reconstructor-small
-  rotate: false
-  xy: 911, 18
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-exponential-reconstructor-tiny
-  rotate: false
-  xy: 1541, 302
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-exponential-reconstructor-xlarge
-  rotate: false
-  xy: 1957, 975
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-force-projector-large
-  rotate: false
-  xy: 669, 240
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-force-projector-medium
-  rotate: false
-  xy: 911, 424
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-force-projector-small
-  rotate: false
-  xy: 937, 13
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-force-projector-tiny
-  rotate: false
-  xy: 1559, 302
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-force-projector-xlarge
-  rotate: false
-  xy: 345, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-fuse-large
-  rotate: false
-  xy: 561, 90
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-fuse-medium
-  rotate: false
-  xy: 911, 390
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-fuse-small
-  rotate: false
-  xy: 1953, 750
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-fuse-tiny
-  rotate: false
-  xy: 1577, 302
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-fuse-xlarge
-  rotate: false
-  xy: 395, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-graphite-press-large
-  rotate: false
-  xy: 561, 48
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-graphite-press-medium
-  rotate: false
-  xy: 911, 356
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-graphite-press-small
-  rotate: false
-  xy: 1979, 753
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-graphite-press-tiny
-  rotate: false
-  xy: 1595, 302
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-graphite-press-xlarge
-  rotate: false
-  xy: 445, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-grass-large
-  rotate: false
-  xy: 519, 6
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-grass-medium
-  rotate: false
-  xy: 949, 555
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-grass-small
-  rotate: false
-  xy: 2005, 761
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-grass-tiny
-  rotate: false
-  xy: 687, 4
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-grass-xlarge
-  rotate: false
-  xy: 495, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-ground-factory-large
-  rotate: false
-  xy: 561, 6
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-ground-factory-medium
-  rotate: false
-  xy: 945, 521
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ground-factory-small
-  rotate: false
-  xy: 963, 320
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-ground-factory-tiny
-  rotate: false
-  xy: 705, 4
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-ground-factory-xlarge
-  rotate: false
-  xy: 545, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-hail-large
-  rotate: false
-  xy: 611, 140
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-hail-medium
-  rotate: false
-  xy: 945, 487
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-hail-small
-  rotate: false
-  xy: 963, 294
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-hail-tiny
-  rotate: false
-  xy: 723, 4
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-hail-xlarge
-  rotate: false
-  xy: 595, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-holostone-large
-  rotate: false
-  xy: 603, 98
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-holostone-medium
-  rotate: false
-  xy: 945, 453
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-holostone-small
-  rotate: false
-  xy: 963, 268
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-holostone-tiny
-  rotate: false
-  xy: 741, 4
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-holostone-xlarge
-  rotate: false
-  xy: 645, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-hotrock-large
-  rotate: false
-  xy: 603, 56
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-hotrock-medium
-  rotate: false
-  xy: 945, 419
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-hotrock-small
-  rotate: false
-  xy: 963, 242
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-hotrock-tiny
-  rotate: false
-  xy: 1137, 63
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-hotrock-xlarge
-  rotate: false
-  xy: 695, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-ice-large
-  rotate: false
-  xy: 603, 14
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-ice-medium
-  rotate: false
-  xy: 945, 385
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ice-small
-  rotate: false
-  xy: 963, 216
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-ice-snow-large
-  rotate: false
-  xy: 661, 190
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-ice-snow-medium
-  rotate: false
-  xy: 945, 351
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ice-snow-small
-  rotate: false
-  xy: 963, 190
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-ice-snow-tiny
-  rotate: false
-  xy: 1137, 45
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-ice-snow-xlarge
-  rotate: false
-  xy: 101, 478
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-ice-tiny
-  rotate: false
-  xy: 1137, 27
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-ice-xlarge
-  rotate: false
-  xy: 101, 428
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-icerocks-large
-  rotate: false
-  xy: 653, 148
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-icerocks-medium
-  rotate: false
-  xy: 983, 550
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-icerocks-small
-  rotate: false
-  xy: 963, 164
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-icerocks-tiny
-  rotate: false
-  xy: 1133, 9
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-icerocks-xlarge
-  rotate: false
-  xy: 101, 378
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-ignarock-large
-  rotate: false
-  xy: 711, 240
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-ignarock-medium
-  rotate: false
-  xy: 979, 516
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ignarock-small
-  rotate: false
-  xy: 963, 138
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-ignarock-tiny
-  rotate: false
-  xy: 1163, 89
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-ignarock-xlarge
-  rotate: false
-  xy: 101, 328
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-illuminator-large
-  rotate: false
-  xy: 703, 198
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-illuminator-medium
-  rotate: false
-  xy: 979, 482
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-illuminator-small
-  rotate: false
-  xy: 963, 112
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-illuminator-tiny
-  rotate: false
-  xy: 1155, 71
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-illuminator-xlarge
-  rotate: false
-  xy: 101, 278
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-impact-reactor-large
-  rotate: false
-  xy: 645, 98
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-impact-reactor-medium
-  rotate: false
-  xy: 979, 448
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-impact-reactor-small
-  rotate: false
-  xy: 963, 86
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-impact-reactor-tiny
-  rotate: false
-  xy: 1155, 53
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-impact-reactor-xlarge
-  rotate: false
-  xy: 101, 228
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-incinerator-large
-  rotate: false
-  xy: 645, 56
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-incinerator-medium
-  rotate: false
-  xy: 979, 414
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-incinerator-small
-  rotate: false
-  xy: 963, 60
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-incinerator-tiny
-  rotate: false
-  xy: 1155, 35
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-incinerator-xlarge
-  rotate: false
-  xy: 101, 178
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-inverted-sorter-large
-  rotate: false
-  xy: 645, 14
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-inverted-sorter-medium
-  rotate: false
-  xy: 979, 380
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-inverted-sorter-small
-  rotate: false
-  xy: 963, 34
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-inverted-sorter-tiny
-  rotate: false
-  xy: 1189, 115
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-inverted-sorter-xlarge
-  rotate: false
-  xy: 101, 128
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-item-source-large
-  rotate: false
-  xy: 695, 148
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-item-source-medium
-  rotate: false
-  xy: 979, 346
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-item-source-small
-  rotate: false
-  xy: 963, 8
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-item-source-tiny
-  rotate: false
-  xy: 1181, 97
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-item-source-xlarge
-  rotate: false
-  xy: 101, 78
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-item-void-large
-  rotate: false
-  xy: 687, 106
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-item-void-medium
-  rotate: false
-  xy: 1017, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-item-void-small
-  rotate: false
-  xy: 2005, 735
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-item-void-tiny
-  rotate: false
-  xy: 1215, 141
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-item-void-xlarge
-  rotate: false
-  xy: 101, 28
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-junction-large
-  rotate: false
-  xy: 687, 64
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-junction-medium
-  rotate: false
-  xy: 1051, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-junction-small
-  rotate: false
-  xy: 1979, 727
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-junction-tiny
-  rotate: false
-  xy: 1207, 123
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-junction-xlarge
-  rotate: false
-  xy: 231, 608
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-kiln-large
-  rotate: false
-  xy: 687, 22
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-kiln-medium
-  rotate: false
-  xy: 1085, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-kiln-small
-  rotate: false
-  xy: 2005, 709
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-kiln-tiny
-  rotate: false
-  xy: 1241, 167
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-kiln-xlarge
-  rotate: false
-  xy: 231, 558
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-lancer-large
-  rotate: false
-  xy: 745, 198
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-lancer-medium
-  rotate: false
-  xy: 1119, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-lancer-small
-  rotate: false
-  xy: 1693, 472
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-lancer-tiny
-  rotate: false
-  xy: 1233, 149
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-lancer-xlarge
-  rotate: false
-  xy: 745, 866
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-large-overdrive-projector-large
-  rotate: false
-  xy: 737, 156
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-large-overdrive-projector-medium
-  rotate: false
-  xy: 1153, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-large-overdrive-projector-small
-  rotate: false
-  xy: 1693, 446
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-large-overdrive-projector-tiny
-  rotate: false
-  xy: 1267, 193
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-large-overdrive-projector-xlarge
-  rotate: false
-  xy: 151, 508
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-laser-drill-large
-  rotate: false
-  xy: 729, 106
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-laser-drill-medium
-  rotate: false
-  xy: 1187, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-laser-drill-small
-  rotate: false
-  xy: 1693, 420
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-laser-drill-tiny
-  rotate: false
-  xy: 1259, 175
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-laser-drill-xlarge
-  rotate: false
-  xy: 151, 458
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-launch-pad-large
-  rotate: false
-  xy: 729, 64
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-launch-pad-large-large
-  rotate: false
-  xy: 729, 22
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-launch-pad-large-medium
-  rotate: false
-  xy: 1221, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-launch-pad-large-small
-  rotate: false
-  xy: 1693, 394
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-launch-pad-large-tiny
-  rotate: false
-  xy: 1345, 255
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-launch-pad-large-xlarge
-  rotate: false
-  xy: 201, 508
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-launch-pad-medium
-  rotate: false
-  xy: 1255, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-launch-pad-small
-  rotate: false
-  xy: 1693, 368
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-launch-pad-tiny
-  rotate: false
-  xy: 1371, 279
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-launch-pad-xlarge
-  rotate: false
-  xy: 151, 408
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-liquid-junction-large
-  rotate: false
-  xy: 779, 156
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-liquid-junction-medium
-  rotate: false
-  xy: 1289, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-liquid-junction-small
-  rotate: false
-  xy: 1693, 342
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-liquid-junction-tiny
-  rotate: false
-  xy: 1389, 279
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-liquid-junction-xlarge
-  rotate: false
-  xy: 201, 458
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-liquid-router-large
-  rotate: false
-  xy: 771, 114
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-liquid-router-medium
-  rotate: false
-  xy: 1323, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-liquid-router-small
-  rotate: false
-  xy: 1693, 316
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-liquid-router-tiny
-  rotate: false
-  xy: 1407, 279
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-liquid-router-xlarge
-  rotate: false
-  xy: 151, 358
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-liquid-source-large
-  rotate: false
-  xy: 771, 72
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-liquid-source-medium
-  rotate: false
-  xy: 1357, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-liquid-source-small
-  rotate: false
-  xy: 1693, 290
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-liquid-source-tiny
-  rotate: false
-  xy: 1319, 234
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-liquid-source-xlarge
-  rotate: false
-  xy: 201, 408
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-liquid-tank-large
-  rotate: false
-  xy: 771, 30
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-liquid-tank-medium
-  rotate: false
-  xy: 1391, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-liquid-tank-small
-  rotate: false
-  xy: 1691, 768
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-liquid-tank-tiny
-  rotate: false
-  xy: 1337, 237
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-liquid-tank-xlarge
-  rotate: false
-  xy: 151, 308
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-liquid-void-large
-  rotate: false
-  xy: 813, 114
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-liquid-void-medium
-  rotate: false
-  xy: 1425, 545
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-liquid-void-small
-  rotate: false
-  xy: 1717, 768
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-liquid-void-tiny
-  rotate: false
-  xy: 1645, 690
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-liquid-void-xlarge
-  rotate: false
-  xy: 201, 358
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-magmarock-large
-  rotate: false
-  xy: 813, 72
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-magmarock-medium
-  rotate: false
-  xy: 1013, 511
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-magmarock-small
-  rotate: false
-  xy: 1743, 768
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-magmarock-tiny
-  rotate: false
-  xy: 1645, 672
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-magmarock-xlarge
-  rotate: false
-  xy: 151, 258
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-large
-  rotate: false
-  xy: 813, 30
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-medium
-  rotate: false
-  xy: 1013, 477
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-small
-  rotate: false
-  xy: 1769, 768
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-tiny
-  rotate: false
-  xy: 1645, 654
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-xlarge
-  rotate: false
-  xy: 201, 308
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-mass-driver-large
+block-disassembler-large
   rotate: false
   xy: 821, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-mass-driver-medium
+block-disassembler-medium
   rotate: false
-  xy: 1047, 511
+  xy: 1609, 584
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-mass-driver-small
+block-disassembler-small
   rotate: false
-  xy: 1795, 768
+  xy: 1711, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-mass-driver-tiny
+block-disassembler-tiny
   rotate: false
-  xy: 1645, 636
+  xy: 1563, 423
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-mass-driver-xlarge
+block-disassembler-xlarge
   rotate: false
-  xy: 151, 208
+  xy: 1957, 975
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-mechanical-drill-large
+block-distributor-large
   rotate: false
   xy: 863, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-mechanical-drill-medium
+block-distributor-medium
   rotate: false
-  xy: 1013, 443
+  xy: 1643, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-mechanical-drill-small
+block-distributor-small
   rotate: false
-  xy: 1687, 742
+  xy: 1737, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-mechanical-drill-tiny
+block-distributor-tiny
   rotate: false
-  xy: 1645, 618
+  xy: 1563, 405
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-mechanical-drill-xlarge
+block-distributor-xlarge
   rotate: false
-  xy: 201, 258
+  xy: 345, 866
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-mechanical-pump-large
+block-door-large
   rotate: false
   xy: 905, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-mechanical-pump-medium
-  rotate: false
-  xy: 1047, 477
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-mechanical-pump-small
-  rotate: false
-  xy: 1713, 742
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-mechanical-pump-tiny
-  rotate: false
-  xy: 1645, 600
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-mechanical-pump-xlarge
-  rotate: false
-  xy: 151, 158
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-meltdown-large
+block-door-large-large
   rotate: false
   xy: 947, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-meltdown-medium
+block-door-large-medium
   rotate: false
-  xy: 1081, 511
+  xy: 1677, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-meltdown-small
+block-door-large-small
   rotate: false
-  xy: 1739, 742
+  xy: 1763, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-meltdown-tiny
+block-door-large-tiny
   rotate: false
-  xy: 1433, 287
+  xy: 1563, 387
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-meltdown-xlarge
+block-door-large-xlarge
   rotate: false
-  xy: 201, 208
+  xy: 395, 866
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-melter-large
+block-door-medium
+  rotate: false
+  xy: 1711, 579
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-door-small
+  rotate: false
+  xy: 1789, 519
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-door-tiny
+  rotate: false
+  xy: 1581, 459
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-door-xlarge
+  rotate: false
+  xy: 445, 866
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-dune-wall-large
   rotate: false
   xy: 989, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-melter-medium
+block-dune-wall-medium
   rotate: false
-  xy: 1013, 409
+  xy: 1729, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-melter-small
+block-dune-wall-small
   rotate: false
-  xy: 1765, 742
+  xy: 1815, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-melter-tiny
+block-dune-wall-tiny
   rotate: false
-  xy: 1451, 287
+  xy: 1581, 441
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-melter-xlarge
+block-dune-wall-xlarge
   rotate: false
-  xy: 151, 108
+  xy: 495, 866
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-mend-projector-large
+block-duo-large
   rotate: false
   xy: 1031, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-mend-projector-medium
+block-duo-medium
   rotate: false
-  xy: 1047, 443
+  xy: 1733, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-mend-projector-small
+block-duo-small
   rotate: false
-  xy: 1791, 742
+  xy: 1841, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-mend-projector-tiny
+block-duo-tiny
   rotate: false
-  xy: 1469, 287
+  xy: 1581, 423
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-mend-projector-xlarge
+block-duo-xlarge
   rotate: false
-  xy: 201, 158
+  xy: 545, 866
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-mender-large
+block-exponential-reconstructor-large
   rotate: false
   xy: 1073, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-mender-medium
+block-exponential-reconstructor-medium
   rotate: false
-  xy: 1081, 477
+  xy: 1745, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-mender-small
+block-exponential-reconstructor-small
   rotate: false
-  xy: 1821, 762
+  xy: 1867, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-mender-tiny
+block-exponential-reconstructor-tiny
   rotate: false
-  xy: 1487, 284
+  xy: 1581, 405
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-mender-xlarge
+block-exponential-reconstructor-xlarge
   rotate: false
-  xy: 151, 58
+  xy: 595, 866
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-message-large
+block-force-projector-large
   rotate: false
   xy: 1115, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-message-medium
+block-force-projector-medium
   rotate: false
-  xy: 1115, 511
+  xy: 1763, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-message-small
+block-force-projector-small
   rotate: false
-  xy: 1847, 762
+  xy: 1893, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-message-tiny
+block-force-projector-tiny
   rotate: false
-  xy: 1505, 284
+  xy: 1581, 387
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-message-xlarge
+block-force-projector-xlarge
   rotate: false
-  xy: 201, 108
+  xy: 645, 866
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-metal-floor-2-large
+block-foreshadow-large
   rotate: false
   xy: 1157, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-metal-floor-2-medium
+block-foreshadow-medium
   rotate: false
-  xy: 1013, 375
+  xy: 1767, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-metal-floor-2-small
+block-foreshadow-small
   rotate: false
-  xy: 1873, 762
+  xy: 1919, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-metal-floor-2-tiny
+block-foreshadow-tiny
   rotate: false
-  xy: 1523, 284
+  xy: 1575, 369
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-metal-floor-2-xlarge
+block-foreshadow-xlarge
   rotate: false
-  xy: 201, 58
+  xy: 695, 866
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-metal-floor-3-large
+block-fuse-large
   rotate: false
   xy: 1199, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-metal-floor-3-medium
+block-fuse-medium
   rotate: false
-  xy: 1047, 409
+  xy: 1779, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-metal-floor-3-small
+block-fuse-small
   rotate: false
-  xy: 1817, 736
+  xy: 1945, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-metal-floor-3-tiny
+block-fuse-tiny
   rotate: false
-  xy: 1541, 284
+  xy: 1575, 351
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-metal-floor-3-xlarge
+block-fuse-xlarge
   rotate: false
-  xy: 251, 508
+  xy: 101, 478
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-metal-floor-5-large
+block-graphite-press-large
   rotate: false
   xy: 1241, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-metal-floor-5-medium
+block-graphite-press-medium
   rotate: false
-  xy: 1081, 443
+  xy: 1797, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-metal-floor-5-small
+block-graphite-press-small
   rotate: false
-  xy: 1843, 736
+  xy: 1971, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-metal-floor-5-tiny
+block-graphite-press-tiny
   rotate: false
-  xy: 1559, 284
+  xy: 1575, 333
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-metal-floor-5-xlarge
+block-graphite-press-xlarge
   rotate: false
-  xy: 251, 458
+  xy: 101, 428
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-metal-floor-damaged-large
+block-grass-large
   rotate: false
   xy: 1283, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-metal-floor-damaged-medium
+block-grass-medium
   rotate: false
-  xy: 1115, 477
+  xy: 1801, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-metal-floor-damaged-small
+block-grass-small
   rotate: false
-  xy: 1869, 736
+  xy: 1997, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-metal-floor-damaged-tiny
+block-grass-tiny
   rotate: false
-  xy: 1577, 284
+  xy: 1575, 315
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-metal-floor-damaged-xlarge
+block-grass-xlarge
   rotate: false
-  xy: 251, 408
+  xy: 101, 378
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-metal-floor-large
+block-ground-factory-large
   rotate: false
   xy: 1325, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-metal-floor-medium
+block-ground-factory-medium
   rotate: false
-  xy: 1149, 511
+  xy: 1813, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-metal-floor-small
+block-ground-factory-small
   rotate: false
-  xy: 1649, 726
+  xy: 2023, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-metal-floor-tiny
+block-ground-factory-tiny
   rotate: false
-  xy: 1595, 284
+  xy: 1599, 462
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-metal-floor-xlarge
+block-ground-factory-xlarge
   rotate: false
-  xy: 251, 358
+  xy: 101, 328
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-moss-large
+block-hail-large
   rotate: false
   xy: 1367, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-moss-medium
+block-hail-medium
   rotate: false
-  xy: 1047, 375
+  xy: 1831, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-moss-small
+block-hail-small
   rotate: false
-  xy: 1895, 736
+  xy: 1581, 498
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-moss-tiny
+block-hail-tiny
   rotate: false
-  xy: 1173, 71
+  xy: 1599, 444
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-moss-xlarge
+block-hail-xlarge
   rotate: false
-  xy: 251, 308
+  xy: 101, 278
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-multi-press-large
+block-hotrock-large
   rotate: false
   xy: 1409, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-multi-press-medium
+block-hotrock-medium
   rotate: false
-  xy: 1081, 409
+  xy: 1835, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-multi-press-small
+block-hotrock-small
   rotate: false
-  xy: 1921, 739
+  xy: 1607, 498
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-multi-press-tiny
+block-hotrock-tiny
   rotate: false
-  xy: 1173, 53
+  xy: 1599, 426
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-multi-press-xlarge
+block-hotrock-xlarge
   rotate: false
-  xy: 251, 258
+  xy: 101, 228
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-multiplicative-reconstructor-large
+block-hyper-processor-large
   rotate: false
   xy: 1451, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-multiplicative-reconstructor-medium
+block-hyper-processor-medium
   rotate: false
-  xy: 1115, 443
+  xy: 1847, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-multiplicative-reconstructor-small
+block-hyper-processor-small
   rotate: false
-  xy: 1947, 724
+  xy: 1633, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-multiplicative-reconstructor-tiny
+block-hyper-processor-tiny
   rotate: false
-  xy: 1173, 35
+  xy: 1599, 408
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-multiplicative-reconstructor-xlarge
+block-hyper-processor-xlarge
   rotate: false
-  xy: 251, 208
+  xy: 101, 178
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-naval-factory-large
+block-ice-large
   rotate: false
   xy: 1493, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-naval-factory-medium
+block-ice-medium
   rotate: false
-  xy: 1149, 477
+  xy: 1865, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-naval-factory-small
+block-ice-small
   rotate: false
-  xy: 1921, 713
+  xy: 1659, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-naval-factory-tiny
-  rotate: false
-  xy: 1155, 17
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-naval-factory-xlarge
-  rotate: false
-  xy: 251, 158
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-oil-extractor-large
+block-ice-snow-large
   rotate: false
   xy: 1535, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-oil-extractor-medium
+block-ice-snow-medium
   rotate: false
-  xy: 1183, 511
+  xy: 1869, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-oil-extractor-small
+block-ice-snow-small
   rotate: false
-  xy: 1947, 698
+  xy: 1685, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-oil-extractor-tiny
+block-ice-snow-tiny
   rotate: false
-  xy: 1173, 17
+  xy: 1599, 390
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-oil-extractor-xlarge
+block-ice-snow-xlarge
   rotate: false
-  xy: 251, 108
+  xy: 101, 128
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-ore-coal-large
+block-ice-tiny
+  rotate: false
+  xy: 1593, 369
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-ice-wall-large
   rotate: false
   xy: 1577, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-ore-coal-medium
+block-ice-wall-medium
   rotate: false
-  xy: 1081, 375
+  xy: 1903, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-ore-coal-small
+block-ice-wall-small
   rotate: false
-  xy: 1973, 701
+  xy: 1711, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-ore-coal-tiny
+block-ice-wall-tiny
   rotate: false
-  xy: 1199, 97
+  xy: 1593, 351
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-ore-coal-xlarge
+block-ice-wall-xlarge
   rotate: false
-  xy: 251, 58
+  xy: 101, 78
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-ore-copper-large
+block-ice-xlarge
+  rotate: false
+  xy: 101, 28
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-illuminator-large
   rotate: false
   xy: 1619, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-ore-copper-medium
+block-illuminator-medium
   rotate: false
-  xy: 1115, 409
+  xy: 1937, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-ore-copper-small
+block-illuminator-small
   rotate: false
-  xy: 1675, 716
+  xy: 1737, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-ore-copper-tiny
+block-illuminator-tiny
   rotate: false
-  xy: 1191, 79
+  xy: 1593, 333
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-ore-copper-xlarge
+block-illuminator-xlarge
   rotate: false
-  xy: 151, 8
+  xy: 231, 608
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-ore-lead-large
+block-impact-reactor-large
   rotate: false
   xy: 1661, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-ore-lead-medium
+block-impact-reactor-medium
   rotate: false
-  xy: 1149, 443
+  xy: 1881, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-ore-lead-small
+block-impact-reactor-small
   rotate: false
-  xy: 1701, 716
+  xy: 1763, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-ore-lead-tiny
+block-impact-reactor-tiny
   rotate: false
-  xy: 1191, 61
+  xy: 1593, 315
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-ore-lead-xlarge
+block-impact-reactor-xlarge
   rotate: false
-  xy: 201, 8
+  xy: 231, 558
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-ore-scrap-large
+block-incinerator-large
   rotate: false
   xy: 1703, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-ore-scrap-medium
+block-incinerator-medium
   rotate: false
-  xy: 1183, 477
+  xy: 1899, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-ore-scrap-small
+block-incinerator-small
   rotate: false
-  xy: 1727, 716
+  xy: 1789, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-ore-scrap-tiny
+block-incinerator-tiny
   rotate: false
-  xy: 1191, 43
+  xy: 1596, 297
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-ore-scrap-xlarge
+block-incinerator-xlarge
   rotate: false
-  xy: 251, 8
+  xy: 745, 866
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-ore-thorium-large
+block-inverted-sorter-large
   rotate: false
   xy: 1745, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-ore-thorium-medium
+block-inverted-sorter-medium
   rotate: false
-  xy: 1217, 511
+  xy: 1933, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-ore-thorium-small
+block-inverted-sorter-small
   rotate: false
-  xy: 1753, 716
+  xy: 1815, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-ore-thorium-tiny
+block-inverted-sorter-tiny
   rotate: false
-  xy: 1191, 25
+  xy: 1596, 279
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-ore-thorium-xlarge
+block-inverted-sorter-xlarge
   rotate: false
-  xy: 281, 619
+  xy: 151, 508
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-ore-titanium-large
+block-item-source-large
   rotate: false
   xy: 1787, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-ore-titanium-medium
+block-item-source-medium
   rotate: false
-  xy: 1115, 375
+  xy: 1915, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-ore-titanium-small
+block-item-source-small
   rotate: false
-  xy: 1779, 716
+  xy: 1841, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-ore-titanium-tiny
+block-item-source-tiny
   rotate: false
-  xy: 1225, 123
+  xy: 1596, 261
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-ore-titanium-xlarge
+block-item-source-xlarge
   rotate: false
-  xy: 281, 569
+  xy: 151, 458
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-overdrive-projector-large
+block-item-void-large
   rotate: false
   xy: 1829, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-overdrive-projector-medium
+block-item-void-medium
   rotate: false
-  xy: 1149, 409
+  xy: 1949, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-overdrive-projector-small
+block-item-void-small
   rotate: false
-  xy: 1805, 710
+  xy: 1867, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-overdrive-projector-tiny
+block-item-void-tiny
   rotate: false
-  xy: 1217, 105
+  xy: 1596, 243
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-overdrive-projector-xlarge
+block-item-void-xlarge
   rotate: false
-  xy: 301, 519
+  xy: 201, 508
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-overflow-gate-large
+block-junction-large
   rotate: false
   xy: 1871, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-overflow-gate-medium
+block-junction-medium
   rotate: false
-  xy: 1183, 443
+  xy: 1967, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-overflow-gate-small
+block-junction-small
   rotate: false
-  xy: 1831, 710
+  xy: 1893, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-overflow-gate-tiny
+block-junction-tiny
   rotate: false
-  xy: 1251, 149
+  xy: 1617, 462
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-overflow-gate-xlarge
+block-junction-xlarge
   rotate: false
-  xy: 301, 469
+  xy: 151, 408
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-parallax-large
+block-kiln-large
   rotate: false
   xy: 1913, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-parallax-medium
+block-kiln-medium
   rotate: false
-  xy: 1217, 477
+  xy: 1971, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-parallax-small
+block-kiln-small
   rotate: false
-  xy: 1857, 710
+  xy: 1919, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-parallax-tiny
+block-kiln-tiny
   rotate: false
-  xy: 1243, 131
+  xy: 1617, 444
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-parallax-xlarge
+block-kiln-xlarge
   rotate: false
-  xy: 301, 419
+  xy: 201, 458
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-payload-router-large
+block-lancer-large
   rotate: false
   xy: 1955, 933
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-payload-router-medium
+block-lancer-medium
   rotate: false
-  xy: 1251, 511
+  xy: 1977, 681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-payload-router-small
+block-lancer-small
   rotate: false
-  xy: 1883, 710
+  xy: 1945, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-payload-router-tiny
+block-lancer-tiny
   rotate: false
-  xy: 1277, 175
+  xy: 1617, 426
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-payload-router-xlarge
+block-lancer-xlarge
   rotate: false
-  xy: 301, 369
+  xy: 151, 358
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-pebbles-large
+block-large-logic-display-large
   rotate: false
   xy: 845, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-pebbles-medium
+block-large-logic-display-medium
   rotate: false
-  xy: 1149, 375
+  xy: 1983, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-pebbles-small
+block-large-logic-display-small
   rotate: false
-  xy: 1973, 675
+  xy: 1971, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-pebbles-tiny
+block-large-logic-display-tiny
   rotate: false
-  xy: 1269, 157
+  xy: 1617, 408
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-pebbles-xlarge
+block-large-logic-display-xlarge
   rotate: false
-  xy: 301, 319
+  xy: 201, 408
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-phase-conduit-large
+block-laser-drill-large
   rotate: false
   xy: 887, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-phase-conduit-medium
+block-laser-drill-medium
   rotate: false
-  xy: 1183, 409
+  xy: 2001, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-phase-conduit-small
+block-laser-drill-small
   rotate: false
-  xy: 1999, 683
+  xy: 1997, 493
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-phase-conduit-tiny
+block-laser-drill-tiny
   rotate: false
-  xy: 1355, 237
+  xy: 1617, 390
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-phase-conduit-xlarge
+block-laser-drill-xlarge
   rotate: false
-  xy: 301, 269
+  xy: 151, 308
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-phase-conveyor-large
+block-launch-pad-large
   rotate: false
   xy: 929, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-phase-conveyor-medium
-  rotate: false
-  xy: 1217, 443
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-phase-conveyor-small
-  rotate: false
-  xy: 1999, 657
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-phase-conveyor-tiny
-  rotate: false
-  xy: 1209, 79
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-phase-conveyor-xlarge
-  rotate: false
-  xy: 301, 219
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-phase-wall-large
+block-launch-pad-large-large
   rotate: false
   xy: 971, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-phase-wall-large-large
+block-launch-pad-large-medium
+  rotate: false
+  xy: 2005, 647
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-launch-pad-large-small
+  rotate: false
+  xy: 2023, 493
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-launch-pad-large-tiny
+  rotate: false
+  xy: 1611, 372
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-launch-pad-large-xlarge
+  rotate: false
+  xy: 201, 358
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-launch-pad-medium
+  rotate: false
+  xy: 1989, 823
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-launch-pad-small
+  rotate: false
+  xy: 1355, 407
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-launch-pad-tiny
+  rotate: false
+  xy: 1611, 354
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-launch-pad-xlarge
+  rotate: false
+  xy: 151, 258
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-liquid-junction-large
   rotate: false
   xy: 1013, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-phase-wall-large-medium
+block-liquid-junction-medium
   rotate: false
-  xy: 1251, 477
+  xy: 1988, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-phase-wall-large-small
+block-liquid-junction-small
   rotate: false
-  xy: 989, 315
+  xy: 1381, 433
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-phase-wall-large-tiny
+block-liquid-junction-tiny
   rotate: false
-  xy: 1209, 61
+  xy: 1611, 336
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-phase-wall-large-xlarge
+block-liquid-junction-xlarge
   rotate: false
-  xy: 301, 169
+  xy: 201, 308
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-phase-wall-medium
-  rotate: false
-  xy: 1285, 511
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-phase-wall-small
-  rotate: false
-  xy: 1015, 315
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-phase-wall-tiny
-  rotate: false
-  xy: 1209, 43
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-phase-wall-xlarge
-  rotate: false
-  xy: 301, 119
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-phase-weaver-large
+block-liquid-router-large
   rotate: false
   xy: 1055, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-phase-weaver-medium
+block-liquid-router-medium
   rotate: false
-  xy: 1183, 375
+  xy: 1987, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-phase-weaver-small
+block-liquid-router-small
   rotate: false
-  xy: 989, 289
+  xy: 1381, 407
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-phase-weaver-tiny
+block-liquid-router-tiny
   rotate: false
-  xy: 1209, 25
+  xy: 1611, 318
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-phase-weaver-xlarge
+block-liquid-router-xlarge
   rotate: false
-  xy: 301, 69
+  xy: 151, 208
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-pine-large
+block-liquid-source-large
   rotate: false
   xy: 1097, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-pine-medium
+block-liquid-source-medium
   rotate: false
-  xy: 1217, 409
+  xy: 1986, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-pine-small
+block-liquid-source-small
   rotate: false
-  xy: 1041, 315
+  xy: 1407, 434
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-pine-tiny
+block-liquid-source-tiny
   rotate: false
-  xy: 1191, 7
+  xy: 1614, 300
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-pine-xlarge
+block-liquid-source-xlarge
   rotate: false
-  xy: 301, 19
+  xy: 201, 258
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-plastanium-compressor-large
+block-liquid-tank-large
   rotate: false
   xy: 1139, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-plastanium-compressor-medium
+block-liquid-tank-medium
   rotate: false
-  xy: 1251, 443
+  xy: 869, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-plastanium-compressor-small
+block-liquid-tank-small
   rotate: false
-  xy: 989, 263
+  xy: 1407, 408
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-plastanium-compressor-tiny
+block-liquid-tank-tiny
   rotate: false
-  xy: 1209, 7
+  xy: 1614, 282
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-plastanium-compressor-xlarge
+block-liquid-tank-xlarge
   rotate: false
-  xy: 795, 878
+  xy: 151, 158
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-plastanium-conveyor-large
+block-liquid-void-large
   rotate: false
   xy: 1181, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-plastanium-conveyor-medium
+block-liquid-void-medium
   rotate: false
-  xy: 1285, 477
+  xy: 903, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-plastanium-conveyor-small
+block-liquid-void-small
   rotate: false
-  xy: 1015, 289
+  xy: 1433, 431
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-plastanium-conveyor-tiny
+block-liquid-void-tiny
   rotate: false
-  xy: 1235, 105
+  xy: 1614, 264
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-plastanium-conveyor-xlarge
+block-liquid-void-xlarge
   rotate: false
-  xy: 309, 816
+  xy: 201, 208
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-plastanium-wall-large
+block-logic-display-large
   rotate: false
   xy: 1223, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-plastanium-wall-large-large
+block-logic-display-medium
+  rotate: false
+  xy: 937, 257
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-logic-display-small
+  rotate: false
+  xy: 1459, 431
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-logic-display-tiny
+  rotate: false
+  xy: 1614, 246
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-logic-display-xlarge
+  rotate: false
+  xy: 151, 108
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-logic-processor-large
   rotate: false
   xy: 1265, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-plastanium-wall-large-medium
+block-logic-processor-medium
   rotate: false
-  xy: 1319, 511
+  xy: 1091, 571
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-plastanium-wall-large-small
+block-logic-processor-small
   rotate: false
-  xy: 1067, 315
+  xy: 1433, 405
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-plastanium-wall-large-tiny
+block-logic-processor-tiny
   rotate: false
-  xy: 1227, 87
+  xy: 1629, 372
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-plastanium-wall-large-xlarge
+block-logic-processor-xlarge
   rotate: false
-  xy: 309, 766
+  xy: 201, 158
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-plastanium-wall-medium
-  rotate: false
-  xy: 1217, 375
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-plastanium-wall-small
-  rotate: false
-  xy: 989, 237
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-plastanium-wall-tiny
-  rotate: false
-  xy: 1227, 69
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-plastanium-wall-xlarge
-  rotate: false
-  xy: 359, 816
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-plated-conduit-large
+block-magmarock-large
   rotate: false
   xy: 1307, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-plated-conduit-medium
+block-magmarock-medium
   rotate: false
-  xy: 1251, 409
+  xy: 1125, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-plated-conduit-small
+block-magmarock-small
   rotate: false
-  xy: 1015, 263
+  xy: 1459, 405
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-plated-conduit-tiny
+block-magmarock-tiny
   rotate: false
-  xy: 1227, 51
+  xy: 1629, 354
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-plated-conduit-xlarge
+block-magmarock-xlarge
   rotate: false
-  xy: 309, 716
+  xy: 151, 58
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-pneumatic-drill-large
+block-mass-driver-large
   rotate: false
   xy: 1349, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-pneumatic-drill-medium
+block-mass-driver-medium
   rotate: false
-  xy: 1285, 443
+  xy: 1159, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-pneumatic-drill-small
+block-mass-driver-small
   rotate: false
-  xy: 1041, 289
+  xy: 1485, 431
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-pneumatic-drill-tiny
+block-mass-driver-tiny
   rotate: false
-  xy: 1227, 33
+  xy: 1629, 336
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-pneumatic-drill-xlarge
+block-mass-driver-xlarge
   rotate: false
-  xy: 359, 766
+  xy: 201, 108
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-power-node-large
+block-mechanical-drill-large
   rotate: false
   xy: 1391, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-power-node-large-large
+block-mechanical-drill-medium
+  rotate: false
+  xy: 1193, 555
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-mechanical-drill-small
+  rotate: false
+  xy: 1485, 405
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-mechanical-drill-tiny
+  rotate: false
+  xy: 1629, 318
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-mechanical-drill-xlarge
+  rotate: false
+  xy: 201, 58
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-mechanical-pump-large
   rotate: false
   xy: 1433, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-power-node-large-medium
+block-mechanical-pump-medium
   rotate: false
-  xy: 1319, 477
+  xy: 1227, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-power-node-large-small
+block-mechanical-pump-small
   rotate: false
-  xy: 1093, 315
+  xy: 1511, 437
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-power-node-large-tiny
+block-mechanical-pump-tiny
   rotate: false
-  xy: 1227, 15
+  xy: 1632, 300
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-power-node-large-xlarge
+block-mechanical-pump-xlarge
   rotate: false
-  xy: 409, 816
+  xy: 251, 508
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-power-node-medium
-  rotate: false
-  xy: 1353, 511
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-power-node-small
-  rotate: false
-  xy: 989, 211
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-power-node-tiny
-  rotate: false
-  xy: 1261, 131
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-power-node-xlarge
-  rotate: false
-  xy: 359, 716
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-power-source-large
+block-meltdown-large
   rotate: false
   xy: 1475, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-power-source-medium
+block-meltdown-medium
   rotate: false
-  xy: 1251, 375
+  xy: 1261, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-power-source-small
+block-meltdown-small
   rotate: false
-  xy: 1015, 237
+  xy: 1511, 411
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-power-source-tiny
+block-meltdown-tiny
   rotate: false
-  xy: 1253, 113
+  xy: 1632, 282
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-power-source-xlarge
+block-meltdown-xlarge
   rotate: false
-  xy: 409, 766
+  xy: 251, 458
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-power-void-large
+block-melter-large
   rotate: false
   xy: 1517, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-power-void-medium
+block-melter-medium
   rotate: false
-  xy: 1285, 409
+  xy: 1295, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-power-void-small
+block-melter-small
   rotate: false
-  xy: 1041, 263
+  xy: 1537, 437
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-power-void-tiny
+block-melter-tiny
   rotate: false
-  xy: 1287, 157
+  xy: 1632, 264
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-power-void-xlarge
+block-melter-xlarge
   rotate: false
-  xy: 459, 816
+  xy: 251, 408
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-pulse-conduit-large
+block-memory-bank-large
   rotate: false
   xy: 1559, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-pulse-conduit-medium
+block-memory-bank-medium
   rotate: false
-  xy: 1319, 443
+  xy: 1329, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-pulse-conduit-small
+block-memory-bank-small
   rotate: false
-  xy: 1067, 289
+  xy: 1537, 411
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-pulse-conduit-tiny
+block-memory-bank-tiny
   rotate: false
-  xy: 1279, 139
+  xy: 1632, 246
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-pulse-conduit-xlarge
+block-memory-bank-xlarge
   rotate: false
-  xy: 409, 716
+  xy: 251, 358
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-pulverizer-large
+block-memory-cell-large
   rotate: false
   xy: 1601, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-pulverizer-medium
+block-memory-cell-medium
   rotate: false
-  xy: 1353, 477
+  xy: 1363, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-pulverizer-small
+block-memory-cell-small
   rotate: false
-  xy: 1119, 315
+  xy: 1185, 369
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-pulverizer-tiny
+block-memory-cell-tiny
   rotate: false
-  xy: 1245, 87
+  xy: 1635, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-pulverizer-xlarge
+block-memory-cell-xlarge
   rotate: false
-  xy: 459, 766
+  xy: 251, 308
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-pyratite-mixer-large
+block-mend-projector-large
   rotate: false
   xy: 1643, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-pyratite-mixer-medium
+block-mend-projector-medium
   rotate: false
-  xy: 1387, 511
+  xy: 1397, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-pyratite-mixer-small
+block-mend-projector-small
   rotate: false
-  xy: 989, 185
+  xy: 1174, 237
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-pyratite-mixer-tiny
+block-mend-projector-tiny
   rotate: false
-  xy: 1245, 69
+  xy: 1635, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-pyratite-mixer-xlarge
+block-mend-projector-xlarge
   rotate: false
-  xy: 509, 816
+  xy: 251, 258
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-repair-point-large
+block-mender-large
   rotate: false
   xy: 1685, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-repair-point-medium
+block-mender-medium
   rotate: false
-  xy: 1285, 375
+  xy: 1431, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-repair-point-small
+block-mender-small
   rotate: false
-  xy: 1015, 211
+  xy: 1174, 211
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-repair-point-tiny
+block-mender-tiny
   rotate: false
-  xy: 1245, 51
+  xy: 1653, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-repair-point-xlarge
+block-mender-xlarge
   rotate: false
-  xy: 459, 716
+  xy: 251, 208
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-resupply-point-large
+block-message-large
   rotate: false
   xy: 1727, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-resupply-point-medium
+block-message-medium
   rotate: false
-  xy: 1319, 409
+  xy: 1465, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-resupply-point-small
+block-message-small
   rotate: false
-  xy: 1041, 237
+  xy: 1245, 399
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-resupply-point-tiny
+block-message-tiny
   rotate: false
-  xy: 1245, 33
+  xy: 1635, 439
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-resupply-point-xlarge
+block-message-xlarge
   rotate: false
-  xy: 509, 766
+  xy: 251, 158
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-ripple-large
+block-metal-floor-2-large
   rotate: false
   xy: 1769, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-ripple-medium
+block-metal-floor-2-medium
   rotate: false
-  xy: 1353, 443
+  xy: 1499, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-ripple-small
+block-metal-floor-2-small
   rotate: false
-  xy: 1067, 263
+  xy: 1271, 401
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-ripple-tiny
+block-metal-floor-2-tiny
   rotate: false
-  xy: 1245, 15
+  xy: 1653, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-ripple-xlarge
+block-metal-floor-2-xlarge
   rotate: false
-  xy: 559, 816
+  xy: 251, 108
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-rock-large
+block-metal-floor-3-large
   rotate: false
   xy: 1811, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-rock-medium
+block-metal-floor-3-medium
   rotate: false
-  xy: 1387, 477
+  xy: 1533, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-rock-small
+block-metal-floor-3-small
   rotate: false
-  xy: 1093, 289
+  xy: 1297, 401
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-rock-tiny
+block-metal-floor-3-tiny
   rotate: false
-  xy: 1271, 113
+  xy: 1671, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-rock-xlarge
+block-metal-floor-3-xlarge
   rotate: false
-  xy: 509, 716
+  xy: 251, 58
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-rocks-large
+block-metal-floor-5-large
   rotate: false
   xy: 1853, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-rocks-medium
+block-metal-floor-5-medium
   rotate: false
-  xy: 1421, 511
+  xy: 1567, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-rocks-small
+block-metal-floor-5-small
   rotate: false
-  xy: 1145, 315
+  xy: 1323, 401
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-rocks-tiny
+block-metal-floor-5-tiny
   rotate: false
-  xy: 1263, 95
+  xy: 1635, 421
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-rocks-xlarge
+block-metal-floor-5-xlarge
   rotate: false
-  xy: 559, 766
+  xy: 151, 8
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-rotary-pump-large
+block-metal-floor-damaged-large
   rotate: false
   xy: 1895, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-rotary-pump-medium
+block-metal-floor-damaged-medium
   rotate: false
-  xy: 1319, 375
+  xy: 1601, 550
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-rotary-pump-small
+block-metal-floor-damaged-small
   rotate: false
-  xy: 989, 159
+  xy: 1511, 385
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-rotary-pump-tiny
+block-metal-floor-damaged-tiny
   rotate: false
-  xy: 1263, 77
+  xy: 1653, 439
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-rotary-pump-xlarge
+block-metal-floor-damaged-xlarge
   rotate: false
-  xy: 609, 816
+  xy: 201, 8
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-router-large
+block-metal-floor-large
   rotate: false
   xy: 1937, 891
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-router-medium
+block-metal-floor-medium
   rotate: false
-  xy: 1353, 409
+  xy: 1635, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-router-small
+block-metal-floor-small
   rotate: false
-  xy: 1015, 185
+  xy: 1537, 385
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-router-tiny
+block-metal-floor-tiny
   rotate: false
-  xy: 1263, 59
+  xy: 1671, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-router-xlarge
+block-metal-floor-xlarge
   rotate: false
-  xy: 559, 716
+  xy: 251, 8
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-rtg-generator-large
+block-micro-processor-large
   rotate: false
   xy: 859, 849
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-rtg-generator-medium
+block-micro-processor-medium
   rotate: false
-  xy: 1387, 443
+  xy: 1669, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-rtg-generator-small
+block-micro-processor-small
   rotate: false
-  xy: 1041, 211
+  xy: 1180, 341
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-rtg-generator-tiny
+block-micro-processor-tiny
   rotate: false
-  xy: 1263, 41
+  xy: 1689, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-rtg-generator-xlarge
+block-micro-processor-xlarge
   rotate: false
-  xy: 609, 766
+  xy: 281, 619
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-salt-large
+block-moss-large
   rotate: false
   xy: 859, 807
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-salt-medium
+block-moss-medium
   rotate: false
-  xy: 1421, 477
+  xy: 1703, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-salt-small
+block-moss-small
   rotate: false
-  xy: 1067, 237
+  xy: 1180, 315
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-salt-tiny
+block-moss-tiny
   rotate: false
-  xy: 1263, 23
+  xy: 1635, 403
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-salt-xlarge
+block-moss-xlarge
   rotate: false
-  xy: 659, 816
+  xy: 281, 569
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-saltrocks-large
+block-mud-large
   rotate: false
   xy: 901, 849
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-saltrocks-medium
+block-mud-medium
   rotate: false
-  xy: 1353, 375
+  xy: 1737, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-saltrocks-small
+block-mud-small
   rotate: false
-  xy: 1093, 263
+  xy: 1180, 289
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-saltrocks-tiny
+block-mud-tiny
   rotate: false
-  xy: 1297, 139
+  xy: 1653, 421
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-saltrocks-xlarge
+block-mud-xlarge
   rotate: false
-  xy: 609, 716
+  xy: 301, 519
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-salvo-large
+block-multi-press-large
   rotate: false
   xy: 859, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-salvo-medium
+block-multi-press-medium
   rotate: false
-  xy: 1387, 409
+  xy: 1771, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-salvo-small
+block-multi-press-small
   rotate: false
-  xy: 1119, 289
+  xy: 1180, 263
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-salvo-tiny
+block-multi-press-tiny
   rotate: false
-  xy: 1289, 121
+  xy: 1671, 439
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-salvo-xlarge
+block-multi-press-xlarge
   rotate: false
-  xy: 659, 766
+  xy: 301, 469
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-sand-boulder-large
-  rotate: false
-  xy: 943, 849
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-sand-boulder-medium
-  rotate: false
-  xy: 1421, 443
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-sand-boulder-small
-  rotate: false
-  xy: 1171, 315
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-sand-boulder-tiny
-  rotate: false
-  xy: 1281, 95
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-sand-boulder-xlarge
-  rotate: false
-  xy: 709, 816
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-sand-large
+block-multiplicative-reconstructor-large
   rotate: false
   xy: 901, 807
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-sand-medium
+block-multiplicative-reconstructor-medium
   rotate: false
-  xy: 1387, 375
+  xy: 1805, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-sand-small
+block-multiplicative-reconstructor-small
   rotate: false
-  xy: 989, 133
+  xy: 1200, 237
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-sand-tiny
+block-multiplicative-reconstructor-tiny
   rotate: false
-  xy: 1281, 77
+  xy: 1689, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-sand-water-large
+block-multiplicative-reconstructor-xlarge
+  rotate: false
+  xy: 301, 419
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-naval-factory-large
+  rotate: false
+  xy: 943, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-naval-factory-medium
+  rotate: false
+  xy: 1839, 545
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-naval-factory-small
+  rotate: false
+  xy: 1200, 211
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-naval-factory-tiny
+  rotate: false
+  xy: 1707, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-naval-factory-xlarge
+  rotate: false
+  xy: 301, 369
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-oil-extractor-large
   rotate: false
   xy: 859, 723
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-sand-water-medium
+block-oil-extractor-medium
   rotate: false
-  xy: 1421, 409
+  xy: 1873, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-sand-water-small
+block-oil-extractor-small
   rotate: false
-  xy: 1015, 159
+  xy: 1211, 372
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-sand-water-tiny
+block-oil-extractor-tiny
   rotate: false
-  xy: 1281, 59
+  xy: 1653, 403
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-sand-water-xlarge
+block-oil-extractor-xlarge
   rotate: false
-  xy: 659, 716
+  xy: 301, 319
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-sand-xlarge
-  rotate: false
-  xy: 709, 766
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-sandrocks-large
-  rotate: false
-  xy: 985, 849
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-sandrocks-medium
-  rotate: false
-  xy: 1421, 375
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-sandrocks-small
-  rotate: false
-  xy: 1041, 185
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-sandrocks-tiny
-  rotate: false
-  xy: 1281, 41
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-sandrocks-xlarge
-  rotate: false
-  xy: 709, 716
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-scatter-large
-  rotate: false
-  xy: 943, 807
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-scatter-medium
-  rotate: false
-  xy: 1013, 341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scatter-small
-  rotate: false
-  xy: 1067, 211
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-scatter-tiny
-  rotate: false
-  xy: 1281, 23
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-scatter-xlarge
-  rotate: false
-  xy: 759, 816
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-scorch-large
+block-ore-coal-large
   rotate: false
   xy: 901, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-scorch-medium
+block-ore-coal-medium
   rotate: false
-  xy: 1047, 341
+  xy: 1907, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-scorch-small
+block-ore-coal-small
   rotate: false
-  xy: 1093, 237
+  xy: 1237, 373
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-scorch-tiny
+block-ore-coal-tiny
   rotate: false
-  xy: 1263, 5
+  xy: 1671, 421
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-scorch-xlarge
+block-ore-coal-xlarge
   rotate: false
-  xy: 759, 766
+  xy: 301, 269
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-scrap-wall-gigantic-large
+block-ore-copper-large
+  rotate: false
+  xy: 943, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-ore-copper-medium
+  rotate: false
+  xy: 1941, 545
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-copper-small
+  rotate: false
+  xy: 1263, 373
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-ore-copper-tiny
+  rotate: false
+  xy: 1689, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-ore-copper-xlarge
+  rotate: false
+  xy: 301, 219
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-ore-lead-large
+  rotate: false
+  xy: 985, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-ore-lead-medium
+  rotate: false
+  xy: 1975, 545
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-lead-small
+  rotate: false
+  xy: 1289, 375
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-ore-lead-tiny
+  rotate: false
+  xy: 1707, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-ore-lead-xlarge
+  rotate: false
+  xy: 301, 169
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-ore-scrap-large
   rotate: false
   xy: 859, 681
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-scrap-wall-gigantic-medium
+block-ore-scrap-medium
   rotate: false
-  xy: 1081, 341
+  xy: 2009, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-scrap-wall-gigantic-small
+block-ore-scrap-small
   rotate: false
-  xy: 1119, 263
+  xy: 1315, 375
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-scrap-wall-gigantic-tiny
+block-ore-scrap-tiny
   rotate: false
-  xy: 1281, 5
+  xy: 1725, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-scrap-wall-gigantic-xlarge
+block-ore-scrap-xlarge
   rotate: false
-  xy: 759, 716
+  xy: 301, 119
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-scrap-wall-huge-large
-  rotate: false
-  xy: 1027, 849
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-scrap-wall-huge-medium
-  rotate: false
-  xy: 1115, 341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scrap-wall-huge-small
-  rotate: false
-  xy: 1145, 289
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-scrap-wall-huge-tiny
-  rotate: false
-  xy: 1307, 121
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-scrap-wall-huge-xlarge
-  rotate: false
-  xy: 809, 828
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-scrap-wall-large
-  rotate: false
-  xy: 985, 807
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-scrap-wall-large-large
-  rotate: false
-  xy: 943, 765
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-scrap-wall-large-medium
-  rotate: false
-  xy: 1149, 341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scrap-wall-large-small
-  rotate: false
-  xy: 1197, 315
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-scrap-wall-large-tiny
-  rotate: false
-  xy: 1299, 103
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-scrap-wall-large-xlarge
-  rotate: false
-  xy: 809, 778
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-scrap-wall-medium
-  rotate: false
-  xy: 1183, 341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scrap-wall-small
-  rotate: false
-  xy: 989, 107
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-scrap-wall-tiny
-  rotate: false
-  xy: 1299, 85
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-scrap-wall-xlarge
-  rotate: false
-  xy: 809, 728
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-segment-large
+block-ore-thorium-large
   rotate: false
   xy: 901, 723
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-segment-medium
+block-ore-thorium-medium
   rotate: false
-  xy: 1217, 341
+  xy: 974, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-segment-small
+block-ore-thorium-small
   rotate: false
-  xy: 1015, 133
+  xy: 1341, 375
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-segment-tiny
+block-ore-thorium-tiny
   rotate: false
-  xy: 1299, 67
+  xy: 1671, 403
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-segment-xlarge
+block-ore-thorium-xlarge
   rotate: false
-  xy: 809, 678
+  xy: 301, 69
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-separator-large
+block-ore-titanium-large
   rotate: false
-  xy: 1069, 849
+  xy: 943, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-separator-medium
+block-ore-titanium-medium
   rotate: false
-  xy: 1251, 341
+  xy: 971, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-separator-small
+block-ore-titanium-small
   rotate: false
-  xy: 1041, 159
+  xy: 1367, 381
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-separator-tiny
+block-ore-titanium-tiny
   rotate: false
-  xy: 1299, 49
+  xy: 1689, 421
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-separator-xlarge
+block-ore-titanium-xlarge
   rotate: false
-  xy: 331, 666
+  xy: 301, 19
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-shale-boulder-large
+block-overdrive-dome-large
   rotate: false
-  xy: 1027, 807
+  xy: 985, 807
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-shale-boulder-medium
+block-overdrive-dome-medium
   rotate: false
-  xy: 1285, 341
+  xy: 971, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-shale-boulder-small
+block-overdrive-dome-small
   rotate: false
-  xy: 1067, 185
+  xy: 1393, 381
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-shale-boulder-tiny
+block-overdrive-dome-tiny
   rotate: false
-  xy: 1299, 31
+  xy: 1707, 439
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-shale-boulder-xlarge
+block-overdrive-dome-xlarge
   rotate: false
-  xy: 331, 616
+  xy: 795, 878
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-shale-large
+block-overdrive-projector-large
   rotate: false
-  xy: 985, 765
+  xy: 1027, 849
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-shale-medium
+block-overdrive-projector-medium
   rotate: false
-  xy: 1319, 341
+  xy: 688, 240
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-shale-small
+block-overdrive-projector-small
   rotate: false
-  xy: 1093, 211
+  xy: 1419, 379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-shale-tiny
+block-overdrive-projector-tiny
   rotate: false
-  xy: 1299, 13
+  xy: 1725, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-shale-xlarge
+block-overdrive-projector-xlarge
   rotate: false
-  xy: 381, 666
+  xy: 309, 816
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-shalerocks-large
-  rotate: false
-  xy: 943, 723
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-shalerocks-medium
-  rotate: false
-  xy: 1353, 341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-shalerocks-small
-  rotate: false
-  xy: 1119, 237
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-shalerocks-tiny
-  rotate: false
-  xy: 1317, 103
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-shalerocks-xlarge
-  rotate: false
-  xy: 381, 616
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-shock-mine-large
+block-overflow-gate-large
   rotate: false
   xy: 901, 681
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-shock-mine-medium
+block-overflow-gate-medium
   rotate: false
-  xy: 1387, 341
+  xy: 688, 206
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-shock-mine-small
+block-overflow-gate-small
   rotate: false
-  xy: 1145, 263
+  xy: 1445, 379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-shock-mine-tiny
+block-overflow-gate-tiny
   rotate: false
-  xy: 1317, 85
+  xy: 1743, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-shock-mine-xlarge
+block-overflow-gate-xlarge
   rotate: false
-  xy: 431, 666
+  xy: 309, 766
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-shrubs-large
+block-parallax-large
   rotate: false
-  xy: 1111, 849
+  xy: 943, 723
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-shrubs-medium
+block-parallax-medium
   rotate: false
-  xy: 1421, 341
+  xy: 722, 250
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-shrubs-small
+block-parallax-small
   rotate: false
-  xy: 1171, 289
+  xy: 1471, 379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-shrubs-tiny
+block-parallax-tiny
   rotate: false
-  xy: 1317, 67
+  xy: 1689, 403
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-shrubs-xlarge
+block-parallax-xlarge
   rotate: false
-  xy: 431, 616
+  xy: 359, 816
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-silicon-crucible-large
+block-payload-conveyor-large
   rotate: false
-  xy: 1069, 807
+  xy: 985, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-silicon-crucible-medium
+block-payload-conveyor-medium
   rotate: false
-  xy: 1475, 647
+  xy: 756, 250
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-silicon-crucible-small
+block-payload-conveyor-small
   rotate: false
-  xy: 1223, 315
+  xy: 1367, 355
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-silicon-crucible-tiny
+block-payload-conveyor-tiny
   rotate: false
-  xy: 1317, 49
+  xy: 1707, 421
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-silicon-crucible-xlarge
+block-payload-conveyor-xlarge
   rotate: false
-  xy: 481, 666
+  xy: 309, 716
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-silicon-smelter-large
+block-payload-router-large
   rotate: false
-  xy: 1027, 765
+  xy: 1027, 807
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-silicon-smelter-medium
+block-payload-router-medium
   rotate: false
-  xy: 1471, 613
+  xy: 722, 216
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-silicon-smelter-small
+block-payload-router-small
   rotate: false
-  xy: 989, 81
+  xy: 1393, 355
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-silicon-smelter-tiny
+block-payload-router-tiny
   rotate: false
-  xy: 1317, 31
+  xy: 1725, 439
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-silicon-smelter-xlarge
+block-payload-router-xlarge
   rotate: false
-  xy: 481, 616
+  xy: 359, 766
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-slag-large
+block-pebbles-large
   rotate: false
-  xy: 985, 723
+  xy: 1069, 849
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-slag-medium
+block-pebbles-medium
   rotate: false
-  xy: 1467, 579
+  xy: 790, 250
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-slag-small
+block-pebbles-small
   rotate: false
-  xy: 1015, 107
+  xy: 1419, 353
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-slag-tiny
+block-pebbles-tiny
   rotate: false
-  xy: 1317, 13
+  xy: 1743, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-slag-xlarge
+block-pebbles-xlarge
   rotate: false
-  xy: 531, 666
+  xy: 409, 816
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-snow-large
+block-phase-conduit-large
   rotate: false
   xy: 943, 681
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-snow-medium
+block-phase-conduit-medium
   rotate: false
-  xy: 1459, 545
+  xy: 756, 216
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-snow-pine-large
+block-phase-conduit-small
   rotate: false
-  xy: 1153, 849
+  xy: 1445, 353
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-phase-conduit-tiny
+  rotate: false
+  xy: 1761, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-phase-conduit-xlarge
+  rotate: false
+  xy: 359, 716
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-phase-conveyor-large
+  rotate: false
+  xy: 985, 723
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-snow-pine-medium
+block-phase-conveyor-medium
   rotate: false
-  xy: 1455, 511
+  xy: 824, 250
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-snow-pine-small
+block-phase-conveyor-small
   rotate: false
-  xy: 1041, 133
+  xy: 1471, 353
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-snow-pine-tiny
+block-phase-conveyor-tiny
   rotate: false
-  xy: 1293, 216
+  xy: 1707, 403
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-snow-pine-xlarge
+block-phase-conveyor-xlarge
   rotate: false
-  xy: 531, 616
+  xy: 409, 766
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-snow-small
+block-phase-wall-large
   rotate: false
-  xy: 1067, 159
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-snow-tiny
-  rotate: false
-  xy: 1311, 216
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-snow-xlarge
-  rotate: false
-  xy: 581, 666
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-snowrock-large
-  rotate: false
-  xy: 1111, 807
+  xy: 1027, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-snowrock-medium
+block-phase-wall-large-large
   rotate: false
-  xy: 1455, 477
+  xy: 1069, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-phase-wall-large-medium
+  rotate: false
+  xy: 790, 216
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-snowrock-small
+block-phase-wall-large-small
   rotate: false
-  xy: 1093, 185
+  xy: 1497, 359
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-snowrock-tiny
+block-phase-wall-large-tiny
   rotate: false
-  xy: 1329, 216
+  xy: 1725, 421
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-snowrock-xlarge
+block-phase-wall-large-xlarge
   rotate: false
-  xy: 581, 616
+  xy: 459, 816
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-snowrocks-large
+block-phase-wall-medium
   rotate: false
-  xy: 1069, 765
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-snowrocks-medium
-  rotate: false
-  xy: 1455, 443
+  xy: 824, 216
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-snowrocks-small
+block-phase-wall-small
   rotate: false
-  xy: 1119, 211
+  xy: 1523, 359
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-snowrocks-tiny
+block-phase-wall-tiny
   rotate: false
-  xy: 1347, 219
+  xy: 1743, 439
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-snowrocks-xlarge
+block-phase-wall-xlarge
   rotate: false
-  xy: 631, 666
+  xy: 409, 716
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-solar-panel-large
+block-phase-weaver-large
   rotate: false
-  xy: 1027, 723
+  xy: 1111, 849
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-solar-panel-large-large
+block-phase-weaver-medium
+  rotate: false
+  xy: 858, 223
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-phase-weaver-small
+  rotate: false
+  xy: 1549, 359
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-phase-weaver-tiny
+  rotate: false
+  xy: 1761, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-phase-weaver-xlarge
+  rotate: false
+  xy: 459, 766
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-pine-large
   rotate: false
   xy: 985, 681
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-solar-panel-large-medium
+block-pine-medium
   rotate: false
-  xy: 1455, 409
+  xy: 892, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-solar-panel-large-small
+block-pine-small
   rotate: false
-  xy: 1145, 237
+  xy: 1497, 333
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-solar-panel-large-tiny
+block-pine-tiny
   rotate: false
-  xy: 1365, 219
+  xy: 1779, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-solar-panel-large-xlarge
+block-pine-xlarge
   rotate: false
-  xy: 631, 616
+  xy: 509, 816
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-solar-panel-medium
+block-plastanium-compressor-large
   rotate: false
-  xy: 1455, 375
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-solar-panel-small
-  rotate: false
-  xy: 1171, 263
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-solar-panel-tiny
-  rotate: false
-  xy: 1285, 198
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-solar-panel-xlarge
-  rotate: false
-  xy: 681, 666
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-sorter-large
-  rotate: false
-  xy: 1195, 849
+  xy: 1027, 723
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-sorter-medium
+block-plastanium-compressor-medium
   rotate: false
-  xy: 1455, 341
+  xy: 926, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-sorter-small
+block-plastanium-compressor-small
   rotate: false
-  xy: 1197, 289
+  xy: 1523, 333
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-sorter-tiny
+block-plastanium-compressor-tiny
   rotate: false
-  xy: 1303, 198
+  xy: 1725, 403
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-sorter-xlarge
+block-plastanium-compressor-xlarge
   rotate: false
-  xy: 681, 616
+  xy: 459, 716
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-spawn-large
+block-plastanium-conveyor-large
   rotate: false
-  xy: 1153, 807
+  xy: 1069, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-spawn-medium
+block-plastanium-conveyor-medium
   rotate: false
-  xy: 1509, 660
+  xy: 960, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-spawn-small
+block-plastanium-conveyor-small
   rotate: false
-  xy: 1249, 315
+  xy: 1549, 333
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-spawn-tiny
+block-plastanium-conveyor-tiny
   rotate: false
-  xy: 1321, 198
+  xy: 1743, 421
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-spawn-xlarge
+block-plastanium-conveyor-xlarge
   rotate: false
-  xy: 731, 666
+  xy: 509, 766
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-spectre-large
+block-plastanium-wall-large
   rotate: false
-  xy: 1111, 765
+  xy: 1111, 807
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-spectre-medium
+block-plastanium-wall-large-large
   rotate: false
-  xy: 1543, 660
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-spectre-small
-  rotate: false
-  xy: 989, 55
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-spectre-tiny
-  rotate: false
-  xy: 1295, 180
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-spectre-xlarge
-  rotate: false
-  xy: 731, 616
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-spore-cluster-large
-  rotate: false
-  xy: 1069, 723
+  xy: 1153, 849
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-spore-cluster-medium
+block-plastanium-wall-large-medium
   rotate: false
-  xy: 1699, 828
+  xy: 688, 172
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-spore-cluster-small
-  rotate: false
-  xy: 1015, 81
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-spore-cluster-tiny
-  rotate: false
-  xy: 1313, 180
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-spore-cluster-xlarge
-  rotate: false
-  xy: 781, 628
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-spore-moss-large
-  rotate: false
-  xy: 1027, 681
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-spore-moss-medium
-  rotate: false
-  xy: 1733, 828
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-spore-moss-small
-  rotate: false
-  xy: 1041, 107
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-spore-moss-tiny
-  rotate: false
-  xy: 1305, 162
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-spore-moss-xlarge
-  rotate: false
-  xy: 831, 628
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-spore-pine-large
-  rotate: false
-  xy: 1237, 849
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-spore-pine-medium
-  rotate: false
-  xy: 1767, 828
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-spore-pine-small
-  rotate: false
-  xy: 1067, 133
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-spore-pine-tiny
-  rotate: false
-  xy: 1339, 198
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-spore-pine-xlarge
-  rotate: false
-  xy: 781, 578
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-spore-press-large
-  rotate: false
-  xy: 1195, 807
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-spore-press-medium
-  rotate: false
-  xy: 1801, 828
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-spore-press-small
-  rotate: false
-  xy: 1093, 159
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-spore-press-tiny
-  rotate: false
-  xy: 1331, 180
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-spore-press-xlarge
-  rotate: false
-  xy: 831, 578
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-sporerocks-large
-  rotate: false
-  xy: 1153, 765
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-sporerocks-medium
-  rotate: false
-  xy: 1835, 828
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-sporerocks-small
+block-plastanium-wall-large-small
   rotate: false
   xy: 1119, 185
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-sporerocks-tiny
+block-plastanium-wall-large-tiny
   rotate: false
-  xy: 1323, 162
+  xy: 1761, 439
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-sporerocks-xlarge
+block-plastanium-wall-large-xlarge
   rotate: false
-  xy: 351, 566
+  xy: 559, 816
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-stone-large
+block-plastanium-wall-medium
   rotate: false
-  xy: 1111, 723
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-stone-medium
-  rotate: false
-  xy: 1869, 828
+  xy: 722, 182
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-stone-small
-  rotate: false
-  xy: 1145, 211
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-stone-tiny
-  rotate: false
-  xy: 1357, 201
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-stone-xlarge
-  rotate: false
-  xy: 351, 516
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-surge-tower-large
-  rotate: false
-  xy: 1069, 681
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-surge-tower-medium
-  rotate: false
-  xy: 1903, 828
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-surge-tower-small
-  rotate: false
-  xy: 1171, 237
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-surge-tower-tiny
-  rotate: false
-  xy: 1315, 144
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-surge-tower-xlarge
-  rotate: false
-  xy: 401, 566
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-surge-wall-large
-  rotate: false
-  xy: 1279, 849
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-surge-wall-large-large
-  rotate: false
-  xy: 1237, 807
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-surge-wall-large-medium
-  rotate: false
-  xy: 1937, 828
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-surge-wall-large-small
-  rotate: false
-  xy: 1197, 263
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-surge-wall-large-tiny
-  rotate: false
-  xy: 1349, 180
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-surge-wall-large-xlarge
-  rotate: false
-  xy: 351, 466
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-surge-wall-medium
-  rotate: false
-  xy: 1657, 786
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-surge-wall-small
-  rotate: false
-  xy: 1223, 289
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-surge-wall-tiny
-  rotate: false
-  xy: 1341, 162
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-surge-wall-xlarge
-  rotate: false
-  xy: 401, 516
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-swarmer-large
-  rotate: false
-  xy: 1195, 765
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-swarmer-medium
-  rotate: false
-  xy: 1615, 744
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-swarmer-small
-  rotate: false
-  xy: 1275, 315
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-swarmer-tiny
-  rotate: false
-  xy: 1333, 144
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-swarmer-xlarge
-  rotate: false
-  xy: 451, 566
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-tainted-water-large
-  rotate: false
-  xy: 1153, 723
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-tainted-water-medium
-  rotate: false
-  xy: 1509, 626
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-tainted-water-small
-  rotate: false
-  xy: 989, 29
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-tainted-water-tiny
-  rotate: false
-  xy: 1325, 126
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-tainted-water-xlarge
-  rotate: false
-  xy: 351, 416
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-tar-large
-  rotate: false
-  xy: 1111, 681
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-tar-medium
-  rotate: false
-  xy: 1543, 626
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-tar-small
-  rotate: false
-  xy: 1015, 55
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-tar-tiny
-  rotate: false
-  xy: 1375, 201
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-tar-xlarge
-  rotate: false
-  xy: 401, 466
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-tendrils-large
-  rotate: false
-  xy: 1321, 849
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-tendrils-medium
-  rotate: false
-  xy: 1573, 702
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-tendrils-small
-  rotate: false
-  xy: 1041, 81
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-tendrils-tiny
-  rotate: false
-  xy: 1367, 183
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-tendrils-xlarge
-  rotate: false
-  xy: 451, 516
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-tetrative-reconstructor-large
-  rotate: false
-  xy: 1279, 807
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-tetrative-reconstructor-medium
-  rotate: false
-  xy: 1577, 668
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-tetrative-reconstructor-small
-  rotate: false
-  xy: 1067, 107
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-tetrative-reconstructor-tiny
-  rotate: false
-  xy: 1359, 162
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-tetrative-reconstructor-xlarge
-  rotate: false
-  xy: 501, 566
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-thermal-generator-large
-  rotate: false
-  xy: 1237, 765
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-thermal-generator-medium
-  rotate: false
-  xy: 1577, 634
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-thermal-generator-small
-  rotate: false
-  xy: 1093, 133
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-thermal-generator-tiny
-  rotate: false
-  xy: 1351, 144
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-thermal-generator-xlarge
-  rotate: false
-  xy: 351, 366
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-thermal-pump-large
-  rotate: false
-  xy: 1195, 723
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-thermal-pump-medium
-  rotate: false
-  xy: 1505, 592
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-thermal-pump-small
+block-plastanium-wall-small
   rotate: false
   xy: 1119, 159
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-thermal-pump-tiny
+block-plastanium-wall-tiny
   rotate: false
-  xy: 1343, 126
+  xy: 1779, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-thermal-pump-xlarge
+block-plastanium-wall-xlarge
   rotate: false
-  xy: 401, 416
+  xy: 509, 716
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-thorium-reactor-large
+block-plated-conduit-large
   rotate: false
-  xy: 1153, 681
+  xy: 1027, 681
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-thorium-reactor-medium
+block-plated-conduit-medium
   rotate: false
-  xy: 1539, 592
+  xy: 756, 182
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-thorium-reactor-small
+block-plated-conduit-small
   rotate: false
   xy: 1145, 185
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-thorium-reactor-tiny
+block-plated-conduit-tiny
   rotate: false
-  xy: 1335, 108
+  xy: 1797, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-thorium-reactor-xlarge
+block-plated-conduit-xlarge
   rotate: false
-  xy: 451, 466
+  xy: 559, 766
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-thorium-wall-large
+block-pneumatic-drill-large
   rotate: false
-  xy: 1363, 849
+  xy: 1069, 723
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-thorium-wall-large-large
+block-pneumatic-drill-medium
   rotate: false
-  xy: 1321, 807
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-thorium-wall-large-medium
-  rotate: false
-  xy: 1501, 558
+  xy: 790, 182
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-thorium-wall-large-small
-  rotate: false
-  xy: 1171, 211
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-thorium-wall-large-tiny
-  rotate: false
-  xy: 1335, 90
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-thorium-wall-large-xlarge
-  rotate: false
-  xy: 501, 516
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-thorium-wall-medium
-  rotate: false
-  xy: 1535, 558
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-thorium-wall-small
-  rotate: false
-  xy: 1197, 237
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-thorium-wall-tiny
-  rotate: false
-  xy: 1335, 72
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-thorium-wall-xlarge
-  rotate: false
-  xy: 551, 566
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-thruster-large
-  rotate: false
-  xy: 1279, 765
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-thruster-medium
-  rotate: false
-  xy: 435, 6
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-thruster-small
-  rotate: false
-  xy: 1223, 263
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-thruster-tiny
-  rotate: false
-  xy: 1335, 54
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-thruster-xlarge
-  rotate: false
-  xy: 351, 316
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-titanium-conveyor-large
-  rotate: false
-  xy: 1237, 723
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-titanium-conveyor-medium
-  rotate: false
-  xy: 469, 6
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-titanium-conveyor-small
-  rotate: false
-  xy: 1249, 289
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-titanium-conveyor-tiny
-  rotate: false
-  xy: 1335, 36
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-titanium-conveyor-xlarge
-  rotate: false
-  xy: 401, 366
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-titanium-wall-large
-  rotate: false
-  xy: 1195, 681
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-titanium-wall-large-large
-  rotate: false
-  xy: 1405, 849
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-titanium-wall-large-medium
-  rotate: false
-  xy: 1979, 865
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-titanium-wall-large-small
-  rotate: false
-  xy: 1301, 315
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-titanium-wall-large-tiny
-  rotate: false
-  xy: 1335, 18
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-titanium-wall-large-xlarge
-  rotate: false
-  xy: 451, 416
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-titanium-wall-medium
-  rotate: false
-  xy: 2013, 873
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-titanium-wall-small
-  rotate: false
-  xy: 1015, 29
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-titanium-wall-tiny
-  rotate: false
-  xy: 1385, 183
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-titanium-wall-xlarge
-  rotate: false
-  xy: 501, 466
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-turbine-generator-large
-  rotate: false
-  xy: 1363, 807
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-turbine-generator-medium
-  rotate: false
-  xy: 1971, 831
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-turbine-generator-small
-  rotate: false
-  xy: 1041, 55
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-turbine-generator-tiny
-  rotate: false
-  xy: 1377, 165
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-turbine-generator-xlarge
-  rotate: false
-  xy: 551, 516
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-underflow-gate-large
-  rotate: false
-  xy: 1321, 765
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-underflow-gate-medium
-  rotate: false
-  xy: 1607, 702
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-underflow-gate-small
-  rotate: false
-  xy: 1067, 81
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-underflow-gate-tiny
-  rotate: false
-  xy: 1369, 144
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-underflow-gate-xlarge
-  rotate: false
-  xy: 601, 566
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-unloader-large
-  rotate: false
-  xy: 1279, 723
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-unloader-medium
-  rotate: false
-  xy: 1611, 668
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-unloader-small
-  rotate: false
-  xy: 1093, 107
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-unloader-tiny
-  rotate: false
-  xy: 1361, 126
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-unloader-xlarge
-  rotate: false
-  xy: 351, 266
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-vault-large
-  rotate: false
-  xy: 1237, 681
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-vault-medium
-  rotate: false
-  xy: 1611, 634
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-vault-small
+block-pneumatic-drill-small
   rotate: false
   xy: 1119, 133
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-vault-tiny
+block-pneumatic-drill-tiny
   rotate: false
-  xy: 1353, 108
+  xy: 1743, 403
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-vault-xlarge
+block-pneumatic-drill-xlarge
   rotate: false
-  xy: 401, 316
+  xy: 609, 816
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-water-extractor-large
+block-power-node-large
   rotate: false
-  xy: 1447, 849
+  xy: 1111, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-water-extractor-medium
+block-power-node-large-large
   rotate: false
-  xy: 1577, 600
+  xy: 1153, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-power-node-large-medium
+  rotate: false
+  xy: 824, 182
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-water-extractor-small
+block-power-node-large-small
   rotate: false
   xy: 1145, 159
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-water-extractor-tiny
+block-power-node-large-tiny
   rotate: false
-  xy: 1353, 90
+  xy: 1761, 421
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-water-extractor-xlarge
+block-power-node-large-xlarge
   rotate: false
-  xy: 451, 366
+  xy: 559, 716
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-water-large
+block-power-node-medium
   rotate: false
-  xy: 1405, 807
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-water-medium
-  rotate: false
-  xy: 1611, 600
+  xy: 858, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-water-small
+block-power-node-small
   rotate: false
   xy: 1171, 185
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-water-tiny
+block-power-node-tiny
   rotate: false
-  xy: 1353, 72
+  xy: 1779, 439
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-water-xlarge
+block-power-node-xlarge
   rotate: false
-  xy: 501, 416
+  xy: 609, 766
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-wave-large
+block-power-source-large
   rotate: false
-  xy: 1363, 765
+  xy: 1195, 849
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-wave-medium
+block-power-source-medium
   rotate: false
-  xy: 2013, 839
+  xy: 892, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-wave-small
+block-power-source-small
   rotate: false
-  xy: 1197, 211
+  xy: 1119, 107
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-wave-tiny
+block-power-source-tiny
   rotate: false
-  xy: 1353, 54
+  xy: 1797, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-wave-xlarge
+block-power-source-xlarge
   rotate: false
-  xy: 551, 466
+  xy: 659, 816
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-white-tree-dead-large
+block-power-void-large
   rotate: false
-  xy: 1321, 723
+  xy: 1069, 681
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-white-tree-dead-medium
+block-power-void-medium
   rotate: false
-  xy: 1493, 524
+  xy: 926, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-white-tree-dead-small
+block-power-void-small
   rotate: false
-  xy: 1223, 237
+  xy: 1145, 133
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-white-tree-dead-tiny
+block-power-void-tiny
   rotate: false
-  xy: 1353, 36
+  xy: 1815, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-white-tree-dead-xlarge
+block-power-void-xlarge
   rotate: false
-  xy: 601, 516
+  xy: 609, 716
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-white-tree-large
+block-pulse-conduit-large
+  rotate: false
+  xy: 1111, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-pulse-conduit-medium
+  rotate: false
+  xy: 960, 189
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-pulse-conduit-small
+  rotate: false
+  xy: 1171, 159
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-pulse-conduit-tiny
+  rotate: false
+  xy: 1761, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-pulse-conduit-xlarge
+  rotate: false
+  xy: 659, 766
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-pulverizer-large
+  rotate: false
+  xy: 1153, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-pulverizer-medium
+  rotate: false
+  xy: 677, 138
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-pulverizer-small
+  rotate: false
+  xy: 1197, 185
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-pulverizer-tiny
+  rotate: false
+  xy: 1779, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-pulverizer-xlarge
+  rotate: false
+  xy: 709, 816
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-pyratite-mixer-large
+  rotate: false
+  xy: 1195, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-pyratite-mixer-medium
+  rotate: false
+  xy: 994, 223
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-pyratite-mixer-small
+  rotate: false
+  xy: 1119, 81
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-pyratite-mixer-tiny
+  rotate: false
+  xy: 1797, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-pyratite-mixer-xlarge
+  rotate: false
+  xy: 659, 716
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-repair-point-large
+  rotate: false
+  xy: 1237, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-repair-point-medium
+  rotate: false
+  xy: 994, 189
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-repair-point-small
+  rotate: false
+  xy: 1145, 107
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-repair-point-tiny
+  rotate: false
+  xy: 1815, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-repair-point-xlarge
+  rotate: false
+  xy: 709, 766
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-resupply-point-large
+  rotate: false
+  xy: 1111, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-resupply-point-medium
+  rotate: false
+  xy: 711, 138
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-resupply-point-small
+  rotate: false
+  xy: 1171, 133
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-resupply-point-tiny
+  rotate: false
+  xy: 1833, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-resupply-point-xlarge
+  rotate: false
+  xy: 709, 716
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-ripple-large
+  rotate: false
+  xy: 1153, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-ripple-medium
+  rotate: false
+  xy: 711, 104
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ripple-small
+  rotate: false
+  xy: 1197, 159
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-ripple-tiny
+  rotate: false
+  xy: 1779, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-ripple-xlarge
+  rotate: false
+  xy: 759, 816
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-rotary-pump-large
+  rotate: false
+  xy: 1195, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-rotary-pump-medium
+  rotate: false
+  xy: 745, 148
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-rotary-pump-small
+  rotate: false
+  xy: 1119, 55
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-rotary-pump-tiny
+  rotate: false
+  xy: 1797, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-rotary-pump-xlarge
+  rotate: false
+  xy: 759, 766
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-router-large
+  rotate: false
+  xy: 1237, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-router-medium
+  rotate: false
+  xy: 779, 148
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-router-small
+  rotate: false
+  xy: 1145, 81
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-router-tiny
+  rotate: false
+  xy: 1815, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-router-xlarge
+  rotate: false
+  xy: 759, 716
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-rtg-generator-large
+  rotate: false
+  xy: 1279, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-rtg-generator-medium
+  rotate: false
+  xy: 745, 114
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-rtg-generator-small
+  rotate: false
+  xy: 1171, 107
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-rtg-generator-tiny
+  rotate: false
+  xy: 1833, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-rtg-generator-xlarge
+  rotate: false
+  xy: 809, 828
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-salt-large
+  rotate: false
+  xy: 1153, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-salt-medium
+  rotate: false
+  xy: 779, 114
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-salt-small
+  rotate: false
+  xy: 1197, 133
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-salt-tiny
+  rotate: false
+  xy: 1851, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-salt-wall-large
+  rotate: false
+  xy: 1195, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-salt-wall-medium
+  rotate: false
+  xy: 813, 148
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-salt-wall-small
+  rotate: false
+  xy: 1119, 29
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-salt-wall-tiny
+  rotate: false
+  xy: 1797, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-salt-wall-xlarge
+  rotate: false
+  xy: 809, 778
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-salt-xlarge
+  rotate: false
+  xy: 809, 728
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-salvo-large
+  rotate: false
+  xy: 1237, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-salvo-medium
+  rotate: false
+  xy: 813, 114
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-salvo-small
+  rotate: false
+  xy: 1145, 55
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-salvo-tiny
+  rotate: false
+  xy: 1815, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-salvo-xlarge
+  rotate: false
+  xy: 809, 678
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-sand-boulder-large
+  rotate: false
+  xy: 1279, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-sand-boulder-medium
+  rotate: false
+  xy: 745, 80
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-boulder-small
+  rotate: false
+  xy: 1171, 81
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-sand-boulder-tiny
+  rotate: false
+  xy: 1833, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-sand-boulder-xlarge
+  rotate: false
+  xy: 331, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-sand-large
+  rotate: false
+  xy: 1321, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-sand-medium
+  rotate: false
+  xy: 779, 80
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-small
+  rotate: false
+  xy: 1197, 107
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-sand-tiny
+  rotate: false
+  xy: 1851, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-sand-wall-large
+  rotate: false
+  xy: 1195, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-sand-wall-medium
+  rotate: false
+  xy: 813, 80
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-wall-small
+  rotate: false
+  xy: 1145, 29
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-sand-wall-tiny
+  rotate: false
+  xy: 1869, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-sand-wall-xlarge
+  rotate: false
+  xy: 331, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-sand-water-large
+  rotate: false
+  xy: 1237, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-sand-water-medium
+  rotate: false
+  xy: 847, 148
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-water-small
+  rotate: false
+  xy: 1171, 55
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-sand-water-tiny
+  rotate: false
+  xy: 1815, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-sand-water-xlarge
+  rotate: false
+  xy: 381, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-sand-xlarge
+  rotate: false
+  xy: 381, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-scatter-large
+  rotate: false
+  xy: 1279, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-scatter-medium
+  rotate: false
+  xy: 847, 114
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scatter-small
+  rotate: false
+  xy: 1197, 81
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-scatter-tiny
+  rotate: false
+  xy: 1833, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-scatter-xlarge
+  rotate: false
+  xy: 431, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-scorch-large
+  rotate: false
+  xy: 1321, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-scorch-medium
+  rotate: false
+  xy: 847, 80
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scorch-small
+  rotate: false
+  xy: 1171, 29
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-scorch-tiny
+  rotate: false
+  xy: 1851, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-scorch-xlarge
+  rotate: false
+  xy: 431, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-scrap-wall-gigantic-large
+  rotate: false
+  xy: 1363, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-scrap-wall-gigantic-medium
+  rotate: false
+  xy: 881, 155
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scrap-wall-gigantic-small
+  rotate: false
+  xy: 1197, 55
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-scrap-wall-gigantic-tiny
+  rotate: false
+  xy: 1869, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-scrap-wall-gigantic-xlarge
+  rotate: false
+  xy: 481, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-scrap-wall-huge-large
+  rotate: false
+  xy: 1237, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-scrap-wall-huge-medium
+  rotate: false
+  xy: 881, 121
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scrap-wall-huge-small
+  rotate: false
+  xy: 1197, 29
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-scrap-wall-huge-tiny
+  rotate: false
+  xy: 1887, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-scrap-wall-huge-xlarge
+  rotate: false
+  xy: 481, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-scrap-wall-large
+  rotate: false
+  xy: 1279, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-scrap-wall-large-large
+  rotate: false
+  xy: 1321, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-scrap-wall-large-medium
+  rotate: false
+  xy: 915, 155
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scrap-wall-large-small
+  rotate: false
+  xy: 1119, 3
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-scrap-wall-large-tiny
+  rotate: false
+  xy: 1833, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-scrap-wall-large-xlarge
+  rotate: false
+  xy: 531, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-scrap-wall-medium
+  rotate: false
+  xy: 881, 87
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scrap-wall-small
+  rotate: false
+  xy: 1145, 3
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-scrap-wall-tiny
+  rotate: false
+  xy: 1851, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-scrap-wall-xlarge
+  rotate: false
+  xy: 531, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-segment-large
+  rotate: false
+  xy: 1363, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-segment-medium
+  rotate: false
+  xy: 915, 121
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-segment-small
+  rotate: false
+  xy: 1171, 3
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-segment-tiny
+  rotate: false
+  xy: 1869, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-segment-xlarge
+  rotate: false
+  xy: 581, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-separator-large
+  rotate: false
+  xy: 1405, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-separator-medium
+  rotate: false
+  xy: 949, 155
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-separator-small
+  rotate: false
+  xy: 1197, 3
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-separator-tiny
+  rotate: false
+  xy: 1887, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-separator-xlarge
+  rotate: false
+  xy: 581, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-shale-boulder-large
   rotate: false
   xy: 1279, 681
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-white-tree-medium
+block-shale-boulder-medium
   rotate: false
-  xy: 1527, 524
+  xy: 915, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-white-tree-small
+block-shale-boulder-small
   rotate: false
-  xy: 1249, 263
+  xy: 1206, 343
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-white-tree-tiny
+block-shale-boulder-tiny
   rotate: false
-  xy: 1353, 18
+  xy: 1905, 475
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-white-tree-xlarge
+block-shale-boulder-xlarge
+  rotate: false
+  xy: 631, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-shale-large
+  rotate: false
+  xy: 1321, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-shale-medium
+  rotate: false
+  xy: 949, 121
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shale-small
+  rotate: false
+  xy: 1206, 317
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-shale-tiny
+  rotate: false
+  xy: 1851, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-shale-wall-large
+  rotate: false
+  xy: 1363, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-shale-wall-medium
+  rotate: false
+  xy: 983, 155
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shale-wall-small
+  rotate: false
+  xy: 1206, 291
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-shale-wall-tiny
+  rotate: false
+  xy: 1869, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-shale-wall-xlarge
+  rotate: false
+  xy: 631, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-shale-xlarge
+  rotate: false
+  xy: 681, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-shock-mine-large
+  rotate: false
+  xy: 1405, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-shock-mine-medium
+  rotate: false
+  xy: 949, 87
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shock-mine-small
+  rotate: false
+  xy: 1206, 265
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-shock-mine-tiny
+  rotate: false
+  xy: 1887, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-shock-mine-xlarge
+  rotate: false
+  xy: 681, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-shrubs-large
+  rotate: false
+  xy: 1447, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-shrubs-medium
+  rotate: false
+  xy: 983, 121
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shrubs-small
+  rotate: false
+  xy: 1226, 239
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-shrubs-tiny
+  rotate: false
+  xy: 1905, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-shrubs-xlarge
+  rotate: false
+  xy: 731, 666
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-silicon-crucible-large
+  rotate: false
+  xy: 1321, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-silicon-crucible-medium
+  rotate: false
+  xy: 983, 87
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-silicon-crucible-small
+  rotate: false
+  xy: 1226, 213
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-silicon-crucible-tiny
+  rotate: false
+  xy: 1923, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-silicon-crucible-xlarge
+  rotate: false
+  xy: 731, 616
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-silicon-smelter-large
+  rotate: false
+  xy: 1363, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-silicon-smelter-medium
+  rotate: false
+  xy: 1017, 155
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-silicon-smelter-small
+  rotate: false
+  xy: 1223, 185
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-silicon-smelter-tiny
+  rotate: false
+  xy: 1869, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-silicon-smelter-xlarge
+  rotate: false
+  xy: 781, 628
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-slag-large
+  rotate: false
+  xy: 1405, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-slag-medium
+  rotate: false
+  xy: 1017, 121
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-slag-small
+  rotate: false
+  xy: 1223, 159
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-slag-tiny
+  rotate: false
+  xy: 1887, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-slag-xlarge
+  rotate: false
+  xy: 831, 628
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-snow-boulder-large
+  rotate: false
+  xy: 1447, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-snow-boulder-medium
+  rotate: false
+  xy: 1017, 87
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-boulder-small
+  rotate: false
+  xy: 1223, 133
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-snow-boulder-tiny
+  rotate: false
+  xy: 1905, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-snow-boulder-xlarge
+  rotate: false
+  xy: 781, 578
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-snow-large
+  rotate: false
+  xy: 1489, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-snow-medium
+  rotate: false
+  xy: 881, 53
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-pine-large
+  rotate: false
+  xy: 1363, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-snow-pine-medium
+  rotate: false
+  xy: 915, 53
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-pine-small
+  rotate: false
+  xy: 1223, 107
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-snow-pine-tiny
+  rotate: false
+  xy: 1923, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-snow-pine-xlarge
+  rotate: false
+  xy: 831, 578
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-snow-small
+  rotate: false
+  xy: 1223, 81
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-snow-tiny
+  rotate: false
+  xy: 1941, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-snow-wall-large
+  rotate: false
+  xy: 1405, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-snow-wall-medium
+  rotate: false
+  xy: 949, 53
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-wall-small
+  rotate: false
+  xy: 1223, 55
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-snow-wall-tiny
+  rotate: false
+  xy: 1887, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-snow-wall-xlarge
+  rotate: false
+  xy: 351, 566
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-snow-xlarge
+  rotate: false
+  xy: 351, 516
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-solar-panel-large
+  rotate: false
+  xy: 1447, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-solar-panel-large-large
+  rotate: false
+  xy: 1489, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-solar-panel-large-medium
+  rotate: false
+  xy: 983, 53
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-solar-panel-large-small
+  rotate: false
+  xy: 1223, 29
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-solar-panel-large-tiny
+  rotate: false
+  xy: 1905, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-solar-panel-large-xlarge
+  rotate: false
+  xy: 401, 566
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-solar-panel-medium
+  rotate: false
+  xy: 1017, 53
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-solar-panel-small
+  rotate: false
+  xy: 1223, 3
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-solar-panel-tiny
+  rotate: false
+  xy: 1923, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-solar-panel-xlarge
+  rotate: false
+  xy: 351, 466
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-sorter-large
+  rotate: false
+  xy: 1531, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-sorter-medium
+  rotate: false
+  xy: 979, 529
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sorter-small
+  rotate: false
+  xy: 1289, 349
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-sorter-tiny
+  rotate: false
+  xy: 1941, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-sorter-xlarge
+  rotate: false
+  xy: 401, 516
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-spawn-large
+  rotate: false
+  xy: 1405, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spawn-medium
+  rotate: false
+  xy: 979, 495
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spawn-small
+  rotate: false
+  xy: 1315, 349
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-spawn-tiny
+  rotate: false
+  xy: 1959, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-spawn-xlarge
+  rotate: false
+  xy: 451, 566
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-spectre-large
+  rotate: false
+  xy: 1447, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spectre-medium
+  rotate: false
+  xy: 979, 461
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spectre-small
+  rotate: false
+  xy: 1341, 349
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-spectre-tiny
+  rotate: false
+  xy: 1905, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-spectre-xlarge
+  rotate: false
+  xy: 351, 416
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-spore-cluster-large
+  rotate: false
+  xy: 1489, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spore-cluster-medium
+  rotate: false
+  xy: 979, 427
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spore-cluster-small
+  rotate: false
+  xy: 1367, 329
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-spore-cluster-tiny
+  rotate: false
+  xy: 1923, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-spore-cluster-xlarge
+  rotate: false
+  xy: 401, 466
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-spore-moss-large
+  rotate: false
+  xy: 1531, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spore-moss-medium
+  rotate: false
+  xy: 979, 393
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spore-moss-small
+  rotate: false
+  xy: 1393, 329
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-spore-moss-tiny
+  rotate: false
+  xy: 1941, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-spore-moss-xlarge
+  rotate: false
+  xy: 451, 516
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-spore-pine-large
+  rotate: false
+  xy: 1573, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spore-pine-medium
+  rotate: false
+  xy: 979, 359
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spore-pine-small
+  rotate: false
+  xy: 1419, 327
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-spore-pine-tiny
+  rotate: false
+  xy: 1959, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-spore-pine-xlarge
+  rotate: false
+  xy: 501, 566
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-spore-press-large
+  rotate: false
+  xy: 1447, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spore-press-medium
+  rotate: false
+  xy: 1008, 325
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spore-press-small
+  rotate: false
+  xy: 1445, 327
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-spore-press-tiny
+  rotate: false
+  xy: 1977, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-spore-press-xlarge
+  rotate: false
+  xy: 351, 366
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-spore-wall-large
+  rotate: false
+  xy: 1489, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spore-wall-medium
+  rotate: false
+  xy: 1005, 291
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spore-wall-small
+  rotate: false
+  xy: 1471, 327
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-spore-wall-tiny
+  rotate: false
+  xy: 1923, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-spore-wall-xlarge
+  rotate: false
+  xy: 401, 416
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-steam-generator-large
+  rotate: false
+  xy: 1531, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-steam-generator-medium
+  rotate: false
+  xy: 1005, 257
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-steam-generator-small
+  rotate: false
+  xy: 1497, 307
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-steam-generator-tiny
+  rotate: false
+  xy: 1941, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-steam-generator-xlarge
+  rotate: false
+  xy: 451, 466
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-stone-large
+  rotate: false
+  xy: 1573, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-stone-medium
+  rotate: false
+  xy: 1028, 223
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-stone-small
+  rotate: false
+  xy: 1523, 307
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-stone-tiny
+  rotate: false
+  xy: 1959, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-stone-wall-large
+  rotate: false
+  xy: 1615, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-stone-wall-medium
+  rotate: false
+  xy: 1028, 189
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-stone-wall-small
+  rotate: false
+  xy: 1549, 307
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-stone-wall-tiny
+  rotate: false
+  xy: 1977, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-stone-wall-xlarge
+  rotate: false
+  xy: 501, 516
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-stone-xlarge
+  rotate: false
+  xy: 551, 566
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-surge-tower-large
+  rotate: false
+  xy: 1489, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-surge-tower-medium
+  rotate: false
+  xy: 1051, 155
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-surge-tower-small
+  rotate: false
+  xy: 1232, 346
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-surge-tower-tiny
+  rotate: false
+  xy: 1995, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-surge-tower-xlarge
+  rotate: false
+  xy: 351, 316
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-surge-wall-large
+  rotate: false
+  xy: 1531, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-surge-wall-large-large
+  rotate: false
+  xy: 1573, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-surge-wall-large-medium
+  rotate: false
+  xy: 1051, 121
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-surge-wall-large-small
+  rotate: false
+  xy: 1232, 320
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-surge-wall-large-tiny
+  rotate: false
+  xy: 1941, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-surge-wall-large-xlarge
+  rotate: false
+  xy: 401, 366
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-surge-wall-medium
+  rotate: false
+  xy: 1051, 87
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-surge-wall-small
+  rotate: false
+  xy: 1232, 294
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-surge-wall-tiny
+  rotate: false
+  xy: 1959, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-surge-wall-xlarge
+  rotate: false
+  xy: 451, 416
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-swarmer-large
+  rotate: false
+  xy: 1615, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-swarmer-medium
+  rotate: false
+  xy: 1051, 53
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-swarmer-small
+  rotate: false
+  xy: 1232, 268
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-swarmer-tiny
+  rotate: false
+  xy: 1977, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-swarmer-xlarge
+  rotate: false
+  xy: 501, 466
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-switch-large
+  rotate: false
+  xy: 1657, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-switch-medium
+  rotate: false
+  xy: 2011, 687
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-switch-small
+  rotate: false
+  xy: 1258, 347
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-switch-tiny
+  rotate: false
+  xy: 1995, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-switch-xlarge
+  rotate: false
+  xy: 551, 516
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-tainted-water-large
+  rotate: false
+  xy: 1531, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-tainted-water-medium
+  rotate: false
+  xy: 779, 46
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-tainted-water-small
+  rotate: false
+  xy: 1258, 321
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-tainted-water-tiny
+  rotate: false
+  xy: 2013, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-tainted-water-xlarge
+  rotate: false
+  xy: 601, 566
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-tar-large
+  rotate: false
+  xy: 1573, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-tar-medium
+  rotate: false
+  xy: 779, 12
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-tar-small
+  rotate: false
+  xy: 1258, 295
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-tar-tiny
+  rotate: false
+  xy: 2031, 475
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-tar-xlarge
+  rotate: false
+  xy: 351, 266
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-tendrils-large
+  rotate: false
+  xy: 1615, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-tendrils-medium
+  rotate: false
+  xy: 813, 46
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-tendrils-small
+  rotate: false
+  xy: 1258, 269
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-tendrils-tiny
+  rotate: false
+  xy: 1959, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-tendrils-xlarge
+  rotate: false
+  xy: 401, 316
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-tetrative-reconstructor-large
+  rotate: false
+  xy: 1657, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-tetrative-reconstructor-medium
+  rotate: false
+  xy: 847, 46
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-tetrative-reconstructor-small
+  rotate: false
+  xy: 1284, 323
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-tetrative-reconstructor-tiny
+  rotate: false
+  xy: 1977, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-tetrative-reconstructor-xlarge
+  rotate: false
+  xy: 451, 366
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-thermal-generator-large
+  rotate: false
+  xy: 1699, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-thermal-generator-medium
+  rotate: false
+  xy: 813, 12
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-thermal-generator-small
+  rotate: false
+  xy: 1310, 323
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-thermal-generator-tiny
+  rotate: false
+  xy: 1995, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-thermal-generator-xlarge
+  rotate: false
+  xy: 501, 416
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-thermal-pump-large
+  rotate: false
+  xy: 1573, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-thermal-pump-medium
+  rotate: false
+  xy: 847, 12
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-thermal-pump-small
+  rotate: false
+  xy: 1284, 297
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-thermal-pump-tiny
+  rotate: false
+  xy: 2013, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-thermal-pump-xlarge
+  rotate: false
+  xy: 551, 466
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-thorium-reactor-large
+  rotate: false
+  xy: 1615, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-thorium-reactor-medium
+  rotate: false
+  xy: 881, 19
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-thorium-reactor-small
+  rotate: false
+  xy: 1336, 323
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-thorium-reactor-tiny
+  rotate: false
+  xy: 2031, 457
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-thorium-reactor-xlarge
+  rotate: false
+  xy: 601, 516
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-thorium-wall-large
+  rotate: false
+  xy: 1657, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-thorium-wall-large-large
+  rotate: false
+  xy: 1699, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-thorium-wall-large-medium
+  rotate: false
+  xy: 915, 19
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-thorium-wall-large-small
+  rotate: false
+  xy: 1284, 271
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-thorium-wall-large-tiny
+  rotate: false
+  xy: 1977, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-thorium-wall-large-xlarge
   rotate: false
   xy: 651, 566
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+block-thorium-wall-medium
+  rotate: false
+  xy: 949, 19
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-thorium-wall-small
+  rotate: false
+  xy: 1310, 297
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-thorium-wall-tiny
+  rotate: false
+  xy: 1995, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-thorium-wall-xlarge
+  rotate: false
+  xy: 351, 216
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-thruster-large
+  rotate: false
+  xy: 1741, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-thruster-medium
+  rotate: false
+  xy: 983, 19
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-thruster-small
+  rotate: false
+  xy: 1310, 271
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-thruster-tiny
+  rotate: false
+  xy: 2013, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-thruster-xlarge
+  rotate: false
+  xy: 401, 266
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-titanium-conveyor-large
+  rotate: false
+  xy: 1615, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-titanium-conveyor-medium
+  rotate: false
+  xy: 1017, 19
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-titanium-conveyor-small
+  rotate: false
+  xy: 1336, 297
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-titanium-conveyor-tiny
+  rotate: false
+  xy: 2031, 439
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-titanium-conveyor-xlarge
+  rotate: false
+  xy: 451, 316
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-titanium-wall-large
+  rotate: false
+  xy: 1657, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-titanium-wall-large-large
+  rotate: false
+  xy: 1699, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-titanium-wall-large-medium
+  rotate: false
+  xy: 1051, 19
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-titanium-wall-large-small
+  rotate: false
+  xy: 1336, 271
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-titanium-wall-large-tiny
+  rotate: false
+  xy: 1995, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-titanium-wall-large-xlarge
+  rotate: false
+  xy: 501, 366
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-titanium-wall-medium
+  rotate: false
+  xy: 1039, 291
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-titanium-wall-small
+  rotate: false
+  xy: 1362, 303
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-titanium-wall-tiny
+  rotate: false
+  xy: 2013, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-titanium-wall-xlarge
+  rotate: false
+  xy: 551, 416
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-tsunami-large
+  rotate: false
+  xy: 1741, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-tsunami-medium
+  rotate: false
+  xy: 1039, 257
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-tsunami-small
+  rotate: false
+  xy: 1388, 303
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-tsunami-tiny
+  rotate: false
+  xy: 2031, 421
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-tsunami-xlarge
+  rotate: false
+  xy: 601, 466
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-underflow-gate-large
+  rotate: false
+  xy: 1783, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-underflow-gate-medium
+  rotate: false
+  xy: 1062, 223
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-underflow-gate-small
+  rotate: false
+  xy: 1362, 277
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-underflow-gate-tiny
+  rotate: false
+  xy: 2013, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-underflow-gate-xlarge
+  rotate: false
+  xy: 651, 516
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-unloader-large
+  rotate: false
+  xy: 1657, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-unloader-medium
+  rotate: false
+  xy: 1062, 189
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-unloader-small
+  rotate: false
+  xy: 1388, 277
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-unloader-tiny
+  rotate: false
+  xy: 2031, 403
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-unloader-xlarge
+  rotate: false
+  xy: 701, 566
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-vault-large
+  rotate: false
+  xy: 1699, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-vault-medium
+  rotate: false
+  xy: 1085, 155
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-vault-small
+  rotate: false
+  xy: 1414, 301
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-vault-tiny
+  rotate: false
+  xy: 1647, 385
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-vault-xlarge
+  rotate: false
+  xy: 351, 166
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-water-extractor-large
+  rotate: false
+  xy: 1741, 765
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-water-extractor-medium
+  rotate: false
+  xy: 1085, 121
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-water-extractor-small
+  rotate: false
+  xy: 1440, 301
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-water-extractor-tiny
+  rotate: false
+  xy: 1647, 367
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-water-extractor-xlarge
+  rotate: false
+  xy: 401, 216
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-water-large
+  rotate: false
+  xy: 1783, 807
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-water-medium
+  rotate: false
+  xy: 1085, 87
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-water-small
+  rotate: false
+  xy: 1466, 301
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-water-tiny
+  rotate: false
+  xy: 1665, 385
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-water-xlarge
+  rotate: false
+  xy: 451, 266
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-wave-large
+  rotate: false
+  xy: 1825, 849
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-wave-medium
+  rotate: false
+  xy: 1085, 53
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-wave-small
+  rotate: false
+  xy: 1414, 275
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-wave-tiny
+  rotate: false
+  xy: 1647, 349
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-wave-xlarge
+  rotate: false
+  xy: 501, 316
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-white-tree-dead-large
+  rotate: false
+  xy: 1699, 681
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-white-tree-dead-medium
+  rotate: false
+  xy: 1085, 19
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-white-tree-dead-small
+  rotate: false
+  xy: 1440, 275
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-white-tree-dead-tiny
+  rotate: false
+  xy: 1665, 367
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-white-tree-dead-xlarge
+  rotate: false
+  xy: 551, 366
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-white-tree-large
+  rotate: false
+  xy: 1741, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-white-tree-medium
+  rotate: false
+  xy: 983, 571
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-white-tree-small
+  rotate: false
+  xy: 1466, 275
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-white-tree-tiny
+  rotate: false
+  xy: 1683, 385
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-white-tree-xlarge
+  rotate: false
+  xy: 601, 416
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 button
   rotate: false
-  xy: 881, 623
+  xy: 1437, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17384,7 +19238,7 @@ button
   index: -1
 button-disabled
   rotate: false
-  xy: 771, 1
+  xy: 1133, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17392,7 +19246,7 @@ button-disabled
   index: -1
 button-down
   rotate: false
-  xy: 809, 1
+  xy: 1133, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17400,7 +19254,7 @@ button-down
   index: -1
 button-edge-1
   rotate: false
-  xy: 847, 1
+  xy: 1171, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17408,7 +19262,7 @@ button-edge-1
   index: -1
 button-edge-2
   rotate: false
-  xy: 1489, 694
+  xy: 1171, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17416,7 +19270,7 @@ button-edge-2
   index: -1
 button-edge-3
   rotate: false
-  xy: 1699, 862
+  xy: 1209, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17424,7 +19278,15 @@ button-edge-3
   index: -1
 button-edge-4
   rotate: false
-  xy: 1657, 820
+  xy: 1209, 623
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
+button-right-disabled
+  rotate: false
+  xy: 1209, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17432,7 +19294,7 @@ button-edge-4
   index: -1
 button-edge-over-4
   rotate: false
-  xy: 1615, 778
+  xy: 1247, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17440,7 +19302,7 @@ button-edge-over-4
   index: -1
 button-over
   rotate: false
-  xy: 1573, 736
+  xy: 1247, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17448,7 +19310,7 @@ button-over
   index: -1
 button-red
   rotate: false
-  xy: 1527, 694
+  xy: 1285, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17456,7 +19318,7 @@ button-red
   index: -1
 button-right
   rotate: false
-  xy: 1813, 862
+  xy: 1323, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17464,7 +19326,7 @@ button-right
   index: -1
 button-right-down
   rotate: false
-  xy: 1737, 862
+  xy: 1285, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17472,7 +19334,7 @@ button-right-down
   index: -1
 button-right-over
   rotate: false
-  xy: 1775, 862
+  xy: 1323, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17480,7 +19342,7 @@ button-right-over
   index: -1
 button-select
   rotate: false
-  xy: 1275, 289
+  xy: 1492, 281
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -17488,7 +19350,7 @@ button-select
   index: -1
 button-square
   rotate: false
-  xy: 1927, 862
+  xy: 1399, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17496,7 +19358,7 @@ button-square
   index: -1
 button-square-down
   rotate: false
-  xy: 1851, 862
+  xy: 1361, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17504,7 +19366,7 @@ button-square-down
   index: -1
 button-square-over
   rotate: false
-  xy: 1889, 862
+  xy: 1361, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17512,7 +19374,7 @@ button-square-over
   index: -1
 button-trans
   rotate: false
-  xy: 881, 652
+  xy: 1399, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17520,49 +19382,49 @@ button-trans
   index: -1
 check-disabled
   rotate: false
-  xy: 1489, 490
+  xy: 1013, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-off
   rotate: false
-  xy: 1489, 456
+  xy: 1013, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on
   rotate: false
-  xy: 1523, 490
+  xy: 1013, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on-disabled
   rotate: false
-  xy: 1489, 422
+  xy: 1013, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 1523, 456
+  xy: 1013, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 1489, 388
+  xy: 1047, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 clear
   rotate: false
-  xy: 771, 916
+  xy: 795, 866
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -17576,7 +19438,7 @@ crater
   index: -1
 cursor
   rotate: false
-  xy: 877, 452
+  xy: 1937, 683
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
@@ -17590,7 +19452,7 @@ discord-banner
   index: -1
 flat-down-base
   rotate: false
-  xy: 919, 652
+  xy: 1437, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17605,7 +19467,7 @@ info-banner
   index: -1
 inventory
   rotate: false
-  xy: 1327, 299
+  xy: 1518, 265
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -17613,140 +19475,147 @@ inventory
   index: -1
 item-blast-compound-icon
   rotate: false
-  xy: 1523, 422
+  xy: 1047, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal-icon
   rotate: false
-  xy: 1489, 354
+  xy: 1047, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-icon
   rotate: false
-  xy: 1523, 388
+  xy: 1047, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-icon
   rotate: false
-  xy: 1523, 354
+  xy: 1047, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-icon
   rotate: false
-  xy: 1489, 320
+  xy: 1042, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass-icon
   rotate: false
-  xy: 1523, 320
+  xy: 1081, 537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-icon
   rotate: false
-  xy: 1561, 524
+  xy: 1081, 503
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-icon
   rotate: false
-  xy: 1557, 490
+  xy: 1081, 469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-icon
   rotate: false
-  xy: 1557, 456
+  xy: 1081, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-icon
   rotate: false
-  xy: 1557, 422
+  xy: 1081, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-icon
   rotate: false
-  xy: 1557, 388
+  xy: 1115, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-icon
   rotate: false
-  xy: 1557, 354
+  xy: 1149, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-icon
   rotate: false
-  xy: 1557, 320
+  xy: 1115, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-icon
   rotate: false
-  xy: 1569, 558
+  xy: 1183, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-icon
   rotate: false
-  xy: 1603, 566
+  xy: 1149, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-icon
   rotate: false
-  xy: 1595, 524
+  xy: 1115, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-icon
   rotate: false
-  xy: 1591, 490
+  xy: 1217, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-icon
   rotate: false
-  xy: 1591, 456
+  xy: 1183, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-icon
   rotate: false
-  xy: 1591, 422
+  xy: 1149, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-icon
   rotate: false
-  xy: 1591, 388
+  xy: 1115, 419
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+logic-node
+  rotate: false
+  xy: 1251, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -17767,7 +19636,7 @@ nomap
   index: -1
 pane
   rotate: false
-  xy: 919, 623
+  xy: 1475, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17775,7 +19644,7 @@ pane
   index: -1
 pane-2
   rotate: false
-  xy: 881, 594
+  xy: 1475, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17783,7 +19652,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 1301, 278
+  xy: 1492, 244
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -17806,63 +19675,63 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 1353, 299
+  xy: 1544, 265
   size: 24, 40
   orig: 24, 40
   offset: 0, 0
   index: -1
 scroll-knob-vertical-thin
   rotate: false
-  xy: 1425, 87
+  xy: 1249, 171
   size: 12, 40
   orig: 12, 40
   offset: 0, 0
   index: -1
 selection
   rotate: false
-  xy: 309, 866
+  xy: 1611, 315
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 1675, 742
+  xy: 1039, 375
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 1831, 788
+  xy: 1017, 565
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 1862, 788
+  xy: 1489, 515
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 1893, 788
+  xy: 1520, 515
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-vertical
   rotate: false
-  xy: 1327, 252
+  xy: 1183, 421
   size: 8, 1
   orig: 8, 1
   offset: 0, 0
   index: -1
 underline
   rotate: false
-  xy: 995, 652
+  xy: 1589, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17870,7 +19739,7 @@ underline
   index: -1
 underline-2
   rotate: false
-  xy: 957, 652
+  xy: 1513, 652
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17878,7 +19747,7 @@ underline-2
   index: -1
 underline-disabled
   rotate: false
-  xy: 919, 594
+  xy: 1513, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17886,7 +19755,15 @@ underline-disabled
   index: -1
 underline-red
   rotate: false
-  xy: 957, 623
+  xy: 1551, 652
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
+underline-white
+  rotate: false
+  xy: 1551, 623
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17894,854 +19771,1185 @@ underline-red
   index: -1
 unit-alpha-large
   rotate: false
-  xy: 1489, 849
+  xy: 1783, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-alpha-medium
   rotate: false
-  xy: 1591, 354
+  xy: 1217, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-alpha-small
   rotate: false
-  xy: 1275, 263
+  xy: 1518, 239
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-alpha-tiny
   rotate: false
-  xy: 1395, 165
+  xy: 1647, 331
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-alpha-xlarge
   rotate: false
-  xy: 351, 216
+  xy: 651, 466
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-antumbra-large
   rotate: false
-  xy: 1447, 807
-  size: 40, 40
-  orig: 40, 40
+  xy: 1951, 849
+  size: 36, 40
+  orig: 36, 40
   offset: 0, 0
   index: -1
 unit-antumbra-medium
   rotate: false
-  xy: 1591, 320
-  size: 32, 32
-  orig: 32, 32
+  xy: 751, 582
+  size: 28, 32
+  orig: 28, 32
   offset: 0, 0
   index: -1
 unit-antumbra-small
   rotate: false
-  xy: 1041, 29
-  size: 24, 24
-  orig: 24, 24
+  xy: 418, 8
+  size: 21, 24
+  orig: 21, 24
   offset: 0, 0
   index: -1
 unit-antumbra-tiny
   rotate: false
-  xy: 1387, 147
-  size: 16, 16
-  orig: 16, 16
+  xy: 1444, 205
+  size: 14, 16
+  orig: 14, 16
   offset: 0, 0
   index: -1
 unit-antumbra-xlarge
   rotate: false
-  xy: 401, 266
-  size: 48, 48
-  orig: 48, 48
+  xy: 601, 225
+  size: 43, 48
+  orig: 43, 48
   offset: 0, 0
   index: -1
 unit-arkyid-large
   rotate: false
-  xy: 1405, 765
+  xy: 1825, 807
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-arkyid-medium
   rotate: false
-  xy: 1637, 566
+  xy: 1183, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-arkyid-small
   rotate: false
-  xy: 1067, 55
+  xy: 1544, 239
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-arkyid-tiny
   rotate: false
-  xy: 1379, 126
+  xy: 1665, 349
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-arkyid-xlarge
   rotate: false
-  xy: 451, 316
+  xy: 701, 516
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-atrax-large
   rotate: false
-  xy: 1363, 723
-  size: 40, 40
-  orig: 40, 40
+  xy: 1867, 860
+  size: 40, 29
+  orig: 40, 29
   offset: 0, 0
   index: -1
 unit-atrax-medium
   rotate: false
-  xy: 1629, 532
-  size: 32, 32
-  orig: 32, 32
+  xy: 745, 55
+  size: 32, 23
+  orig: 32, 23
   offset: 0, 0
   index: -1
 unit-atrax-small
   rotate: false
-  xy: 1093, 81
-  size: 24, 24
-  orig: 24, 24
+  xy: 1075, 330
+  size: 24, 17
+  orig: 24, 17
   offset: 0, 0
   index: -1
 unit-atrax-tiny
   rotate: false
-  xy: 1371, 108
-  size: 16, 16
-  orig: 16, 16
+  xy: 711, 91
+  size: 16, 11
+  orig: 16, 11
   offset: 0, 0
   index: -1
 unit-atrax-xlarge
   rotate: false
-  xy: 501, 366
-  size: 48, 48
-  orig: 48, 48
+  xy: 351, 130
+  size: 48, 34
+  orig: 48, 34
   offset: 0, 0
   index: -1
 unit-beta-large
   rotate: false
-  xy: 1321, 681
-  size: 40, 40
-  orig: 40, 40
+  xy: 1741, 683
+  size: 40, 38
+  orig: 40, 38
   offset: 0, 0
   index: -1
 unit-beta-medium
   rotate: false
-  xy: 1629, 498
-  size: 32, 32
-  orig: 32, 32
+  xy: 1149, 421
+  size: 32, 30
+  orig: 32, 30
   offset: 0, 0
   index: -1
 unit-beta-small
   rotate: false
-  xy: 1119, 107
-  size: 24, 24
-  orig: 24, 24
+  xy: 1362, 252
+  size: 24, 23
+  orig: 24, 23
   offset: 0, 0
   index: -1
 unit-beta-tiny
   rotate: false
-  xy: 1371, 90
-  size: 16, 16
-  orig: 16, 16
+  xy: 1683, 368
+  size: 16, 15
+  orig: 16, 15
   offset: 0, 0
   index: -1
 unit-beta-xlarge
   rotate: false
-  xy: 551, 416
-  size: 48, 48
-  orig: 48, 48
+  xy: 401, 168
+  size: 48, 46
+  orig: 48, 46
   offset: 0, 0
   index: -1
 unit-bryde-large
   rotate: false
-  xy: 1531, 849
+  xy: 1783, 723
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-bryde-medium
   rotate: false
-  xy: 1625, 464
+  xy: 1285, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-bryde-small
   rotate: false
-  xy: 1145, 133
+  xy: 1388, 251
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-bryde-tiny
   rotate: false
-  xy: 1371, 72
+  xy: 1701, 385
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-bryde-xlarge
   rotate: false
-  xy: 601, 466
+  xy: 451, 216
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+unit-corvus-large
+  rotate: false
+  xy: 1825, 779
+  size: 40, 26
+  orig: 40, 26
+  offset: 0, 0
+  index: -1
+unit-corvus-medium
+  rotate: false
+  xy: 1042, 329
+  size: 31, 20
+  orig: 31, 20
+  offset: 0, 0
+  index: -1
+unit-corvus-small
+  rotate: false
+  xy: 1867, 681
+  size: 24, 15
+  orig: 24, 15
+  offset: 0, 0
+  index: -1
+unit-corvus-tiny
+  rotate: false
+  xy: 771, 916
+  size: 15, 10
+  orig: 15, 10
+  offset: 0, 0
+  index: -1
+unit-corvus-xlarge
+  rotate: false
+  xy: 501, 283
+  size: 48, 31
+  orig: 48, 31
+  offset: 0, 0
+  index: -1
 unit-crawler-large
   rotate: false
-  xy: 1489, 807
+  xy: 1867, 818
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-crawler-medium
   rotate: false
-  xy: 1625, 430
+  xy: 1251, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-crawler-small
   rotate: false
-  xy: 1171, 159
+  xy: 1414, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-crawler-tiny
   rotate: false
-  xy: 1371, 54
+  xy: 1665, 331
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-crawler-xlarge
   rotate: false
-  xy: 651, 516
+  xy: 551, 316
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-large
   rotate: false
-  xy: 1447, 765
+  xy: 1909, 849
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-dagger-medium
   rotate: false
-  xy: 1625, 396
+  xy: 1217, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-dagger-small
   rotate: false
-  xy: 1197, 185
+  xy: 1440, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-dagger-tiny
   rotate: false
-  xy: 1371, 36
+  xy: 1683, 350
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-dagger-xlarge
   rotate: false
-  xy: 701, 566
+  xy: 601, 366
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-eclipse-large
   rotate: false
-  xy: 1405, 723
+  xy: 1825, 737
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-eclipse-medium
   rotate: false
-  xy: 1625, 362
+  xy: 1319, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-eclipse-small
   rotate: false
-  xy: 1223, 211
+  xy: 1466, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-eclipse-tiny
   rotate: false
-  xy: 1371, 18
+  xy: 1701, 367
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-eclipse-xlarge
   rotate: false
-  xy: 351, 166
+  xy: 651, 416
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-flare-large
   rotate: false
-  xy: 1363, 681
+  xy: 1867, 776
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-flare-medium
   rotate: false
-  xy: 1625, 328
+  xy: 1285, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-flare-small
   rotate: false
-  xy: 1249, 237
+  xy: 1570, 281
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-flare-tiny
   rotate: false
-  xy: 1405, 147
+  xy: 1719, 385
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-flare-xlarge
   rotate: false
-  xy: 401, 216
+  xy: 701, 466
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-fortress-large
   rotate: false
-  xy: 1573, 849
-  size: 40, 40
-  orig: 40, 40
+  xy: 1783, 689
+  size: 40, 32
+  orig: 40, 32
   offset: 0, 0
   index: -1
 unit-fortress-medium
   rotate: false
-  xy: 1663, 532
-  size: 32, 32
-  orig: 32, 32
+  xy: 80, 1
+  size: 32, 25
+  orig: 32, 25
   offset: 0, 0
   index: -1
 unit-fortress-small
   rotate: false
-  xy: 1379, 315
-  size: 24, 24
-  orig: 24, 24
+  xy: 1570, 260
+  size: 24, 19
+  orig: 24, 19
   offset: 0, 0
   index: -1
 unit-fortress-tiny
   rotate: false
-  xy: 1397, 129
-  size: 16, 16
-  orig: 16, 16
+  xy: 965, 597
+  size: 16, 12
+  orig: 16, 12
   offset: 0, 0
   index: -1
 unit-fortress-xlarge
   rotate: false
-  xy: 451, 266
-  size: 48, 48
-  orig: 48, 48
+  xy: 351, 90
+  size: 48, 38
+  orig: 48, 38
   offset: 0, 0
   index: -1
 unit-gamma-large
   rotate: false
-  xy: 1531, 807
+  xy: 1909, 807
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-gamma-medium
   rotate: false
-  xy: 1663, 498
+  xy: 1251, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-gamma-small
   rotate: false
-  xy: 1067, 29
+  xy: 1570, 234
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-gamma-tiny
   rotate: false
-  xy: 1389, 108
+  xy: 1683, 332
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-gamma-xlarge
   rotate: false
-  xy: 501, 316
+  xy: 401, 118
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-horizon-large
   rotate: false
-  xy: 1489, 765
+  xy: 1825, 695
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-horizon-medium
   rotate: false
-  xy: 1659, 464
+  xy: 1353, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-horizon-small
   rotate: false
-  xy: 1093, 55
+  xy: 1252, 242
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-horizon-tiny
   rotate: false
-  xy: 1389, 90
+  xy: 1701, 349
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-horizon-xlarge
   rotate: false
-  xy: 551, 366
+  xy: 451, 166
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-mace-large
   rotate: false
-  xy: 1447, 723
+  xy: 1867, 734
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-mace-medium
   rotate: false
-  xy: 1659, 430
+  xy: 1319, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-mace-small
   rotate: false
-  xy: 1119, 81
+  xy: 1252, 216
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-mace-tiny
   rotate: false
-  xy: 1389, 72
+  xy: 1719, 367
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-mace-xlarge
   rotate: false
-  xy: 601, 416
+  xy: 501, 233
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-mega-large
   rotate: false
-  xy: 1405, 681
+  xy: 1909, 765
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-mega-medium
   rotate: false
-  xy: 1659, 396
+  xy: 1285, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-mega-small
   rotate: false
-  xy: 1145, 107
+  xy: 1278, 243
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-mega-tiny
   rotate: false
-  xy: 1389, 54
+  xy: 1737, 385
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-mega-xlarge
   rotate: false
-  xy: 651, 466
+  xy: 551, 266
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-minke-large
   rotate: false
-  xy: 1615, 849
-  size: 40, 40
-  orig: 40, 40
+  xy: 1951, 765
+  size: 34, 40
+  orig: 34, 40
   offset: 0, 0
   index: -1
 unit-minke-medium
   rotate: false
-  xy: 1659, 362
-  size: 32, 32
-  orig: 32, 32
+  xy: 2020, 721
+  size: 27, 32
+  orig: 27, 32
   offset: 0, 0
   index: -1
 unit-minke-small
   rotate: false
-  xy: 1171, 133
-  size: 24, 24
-  orig: 24, 24
+  xy: 309, 690
+  size: 20, 24
+  orig: 20, 24
   offset: 0, 0
   index: -1
 unit-minke-tiny
   rotate: false
-  xy: 1389, 36
-  size: 16, 16
-  orig: 16, 16
+  xy: 1773, 349
+  size: 13, 16
+  orig: 13, 16
   offset: 0, 0
   index: -1
 unit-minke-xlarge
   rotate: false
-  xy: 701, 516
-  size: 48, 48
-  orig: 48, 48
+  xy: 601, 175
+  size: 41, 48
+  orig: 41, 48
   offset: 0, 0
   index: -1
 unit-mono-large
   rotate: false
-  xy: 1573, 807
+  xy: 881, 639
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-mono-medium
   rotate: false
-  xy: 1659, 328
+  xy: 1387, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-mono-small
   rotate: false
-  xy: 1197, 159
+  xy: 1278, 217
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-mono-tiny
   rotate: false
-  xy: 1389, 18
+  xy: 1719, 349
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-mono-xlarge
   rotate: false
-  xy: 351, 116
+  xy: 601, 316
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-nova-large
   rotate: false
-  xy: 1531, 765
+  xy: 881, 597
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-nova-medium
   rotate: false
-  xy: 1625, 294
+  xy: 1353, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-nova-small
   rotate: false
-  xy: 1223, 185
+  xy: 1304, 245
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-nova-tiny
   rotate: false
-  xy: 1415, 129
+  xy: 1737, 367
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-nova-xlarge
   rotate: false
-  xy: 401, 166
+  xy: 651, 366
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+unit-oct-large
+  rotate: false
+  xy: 923, 639
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+unit-oct-medium
+  rotate: false
+  xy: 1319, 453
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+unit-oct-small
+  rotate: false
+  xy: 1330, 245
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+unit-oct-tiny
+  rotate: false
+  xy: 1755, 385
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+unit-oct-xlarge
+  rotate: false
+  xy: 701, 416
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-omura-large
+  rotate: false
+  xy: 1551, 513
+  size: 28, 40
+  orig: 28, 40
+  offset: 0, 0
+  index: -1
+unit-omura-medium
+  rotate: false
+  xy: 1486, 189
+  size: 22, 32
+  orig: 22, 32
+  offset: 0, 0
+  index: -1
+unit-omura-small
+  rotate: false
+  xy: 1737, 341
+  size: 16, 24
+  orig: 16, 24
+  offset: 0, 0
+  index: -1
+unit-omura-tiny
+  rotate: false
+  xy: 1077, 580
+  size: 11, 16
+  orig: 11, 16
+  offset: 0, 0
+  index: -1
+unit-omura-xlarge
+  rotate: false
+  xy: 1951, 715
+  size: 33, 48
+  orig: 33, 48
+  offset: 0, 0
+  index: -1
 unit-poly-large
   rotate: false
-  xy: 1489, 723
+  xy: 923, 597
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-poly-medium
   rotate: false
-  xy: 1659, 294
+  xy: 1421, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-poly-small
   rotate: false
-  xy: 1249, 211
+  xy: 1304, 219
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-poly-tiny
   rotate: false
-  xy: 1407, 111
+  xy: 1755, 367
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-poly-xlarge
   rotate: false
-  xy: 451, 216
+  xy: 351, 40
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-pulsar-large
   rotate: false
-  xy: 1447, 681
-  size: 40, 40
-  orig: 40, 40
+  xy: 1867, 698
+  size: 40, 34
+  orig: 40, 34
   offset: 0, 0
   index: -1
 unit-pulsar-medium
   rotate: false
-  xy: 1653, 752
-  size: 32, 32
-  orig: 32, 32
+  xy: 1183, 424
+  size: 32, 27
+  orig: 32, 27
   offset: 0, 0
   index: -1
 unit-pulsar-small
   rotate: false
-  xy: 1275, 237
-  size: 24, 24
-  orig: 24, 24
+  xy: 1330, 223
+  size: 24, 20
+  orig: 24, 20
   offset: 0, 0
   index: -1
 unit-pulsar-tiny
   rotate: false
-  xy: 1407, 93
-  size: 16, 16
-  orig: 16, 16
+  xy: 644, 175
+  size: 16, 13
+  orig: 16, 13
   offset: 0, 0
   index: -1
 unit-pulsar-xlarge
   rotate: false
-  xy: 501, 266
+  xy: 401, 76
+  size: 48, 40
+  orig: 48, 40
+  offset: 0, 0
+  index: -1
+unit-quad-large
+  rotate: false
+  xy: 1909, 723
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+unit-quad-medium
+  rotate: false
+  xy: 385, 1
+  size: 31, 31
+  orig: 31, 31
+  offset: 0, 0
+  index: -1
+unit-quad-small
+  rotate: false
+  xy: 1356, 226
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+unit-quad-tiny
+  rotate: false
+  xy: 1701, 332
+  size: 15, 15
+  orig: 15, 15
+  offset: 0, 0
+  index: -1
+unit-quad-xlarge
+  rotate: false
+  xy: 451, 116
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-quasar-large
   rotate: false
-  xy: 1657, 849
+  xy: 965, 639
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-quasar-medium
   rotate: false
-  xy: 1695, 794
+  xy: 1387, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-quasar-small
   rotate: false
-  xy: 1301, 252
+  xy: 1382, 225
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-quasar-tiny
   rotate: false
-  xy: 1407, 75
+  xy: 1773, 385
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-quasar-xlarge
   rotate: false
-  xy: 551, 316
+  xy: 501, 183
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-unit-risse-large
+unit-reign-large
   rotate: false
-  xy: 1615, 807
+  xy: 965, 611
+  size: 40, 26
+  orig: 40, 26
+  offset: 0, 0
+  index: -1
+unit-reign-medium
+  rotate: false
+  xy: 114, 6
+  size: 31, 20
+  orig: 31, 20
+  offset: 0, 0
+  index: -1
+unit-reign-small
+  rotate: false
+  xy: 301, 2
+  size: 24, 15
+  orig: 24, 15
+  offset: 0, 0
+  index: -1
+unit-reign-tiny
+  rotate: false
+  xy: 781, 678
+  size: 15, 10
+  orig: 15, 10
+  offset: 0, 0
+  index: -1
+unit-reign-xlarge
+  rotate: false
+  xy: 551, 233
+  size: 48, 31
+  orig: 48, 31
+  offset: 0, 0
+  index: -1
+unit-risso-large
+  rotate: false
+  xy: 1951, 807
+  size: 35, 40
+  orig: 35, 40
+  offset: 0, 0
+  index: -1
+unit-risso-medium
+  rotate: false
+  xy: 2017, 579
+  size: 28, 32
+  orig: 28, 32
+  offset: 0, 0
+  index: -1
+unit-risso-small
+  rotate: false
+  xy: 441, 6
+  size: 21, 24
+  orig: 21, 24
+  offset: 0, 0
+  index: -1
+unit-risso-tiny
+  rotate: false
+  xy: 1791, 385
+  size: 14, 16
+  orig: 14, 16
+  offset: 0, 0
+  index: -1
+unit-risso-xlarge
+  rotate: false
+  xy: 701, 326
+  size: 43, 48
+  orig: 43, 48
+  offset: 0, 0
+  index: -1
+unit-scepter-large
+  rotate: false
+  xy: 1007, 647
+  size: 40, 32
+  orig: 40, 32
+  offset: 0, 0
+  index: -1
+unit-scepter-medium
+  rotate: false
+  xy: 1353, 459
+  size: 32, 26
+  orig: 32, 26
+  offset: 0, 0
+  index: -1
+unit-scepter-small
+  rotate: false
+  xy: 1408, 228
+  size: 24, 19
+  orig: 24, 19
+  offset: 0, 0
+  index: -1
+unit-scepter-tiny
+  rotate: false
+  xy: 662, 175
+  size: 16, 13
+  orig: 16, 13
+  offset: 0, 0
+  index: -1
+unit-scepter-xlarge
+  rotate: false
+  xy: 601, 275
+  size: 48, 39
+  orig: 48, 39
+  offset: 0, 0
+  index: -1
+unit-sei-large
+  rotate: false
+  xy: 1007, 605
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-unit-risse-medium
+unit-sei-medium
   rotate: false
-  xy: 1729, 794
+  xy: 1455, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-unit-risse-small
+unit-sei-small
   rotate: false
-  xy: 1327, 273
+  xy: 1434, 223
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-unit-risse-tiny
+unit-sei-tiny
   rotate: false
-  xy: 1407, 57
+  xy: 1755, 349
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-unit-risse-xlarge
+unit-sei-xlarge
   rotate: false
-  xy: 601, 366
+  xy: 651, 316
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-spiroct-large
   rotate: false
-  xy: 1573, 765
-  size: 40, 40
-  orig: 40, 40
+  xy: 1049, 648
+  size: 40, 31
+  orig: 40, 31
   offset: 0, 0
   index: -1
 unit-spiroct-medium
   rotate: false
-  xy: 1763, 794
-  size: 32, 32
-  orig: 32, 32
+  xy: 1387, 460
+  size: 31, 25
+  orig: 31, 25
   offset: 0, 0
   index: -1
 unit-spiroct-small
   rotate: false
-  xy: 1405, 315
-  size: 24, 24
-  orig: 24, 24
+  xy: 1460, 228
+  size: 24, 19
+  orig: 24, 19
   offset: 0, 0
   index: -1
 unit-spiroct-tiny
   rotate: false
-  xy: 1407, 39
-  size: 16, 16
-  orig: 16, 16
+  xy: 2022, 789
+  size: 15, 12
+  orig: 15, 12
   offset: 0, 0
   index: -1
 unit-spiroct-xlarge
   rotate: false
-  xy: 651, 416
-  size: 48, 48
-  orig: 48, 48
+  xy: 701, 376
+  size: 48, 38
+  orig: 48, 38
+  offset: 0, 0
+  index: -1
+unit-toxopid-large
+  rotate: false
+  xy: 1979, 891
+  size: 33, 40
+  orig: 33, 40
+  offset: 0, 0
+  index: -1
+unit-toxopid-medium
+  rotate: false
+  xy: 2021, 755
+  size: 26, 32
+  orig: 26, 32
+  offset: 0, 0
+  index: -1
+unit-toxopid-small
+  rotate: false
+  xy: 1512, 213
+  size: 20, 24
+  orig: 20, 24
+  offset: 0, 0
+  index: -1
+unit-toxopid-tiny
+  rotate: false
+  xy: 1791, 367
+  size: 13, 16
+  orig: 13, 16
+  offset: 0, 0
+  index: -1
+unit-toxopid-xlarge
+  rotate: false
+  xy: 1049, 598
+  size: 40, 48
+  orig: 40, 48
+  offset: 0, 0
+  index: -1
+unit-vela-large
+  rotate: false
+  xy: 1091, 647
+  size: 40, 32
+  orig: 40, 32
+  offset: 0, 0
+  index: -1
+unit-vela-medium
+  rotate: false
+  xy: 1217, 425
+  size: 32, 26
+  orig: 32, 26
+  offset: 0, 0
+  index: -1
+unit-vela-small
+  rotate: false
+  xy: 1486, 223
+  size: 24, 19
+  orig: 24, 19
+  offset: 0, 0
+  index: -1
+unit-vela-tiny
+  rotate: false
+  xy: 482, 1
+  size: 16, 13
+  orig: 16, 13
+  offset: 0, 0
+  index: -1
+unit-vela-xlarge
+  rotate: false
+  xy: 501, 142
+  size: 48, 39
+  orig: 48, 39
   offset: 0, 0
   index: -1
 unit-zenith-large
   rotate: false
-  xy: 1531, 723
+  xy: 1091, 605
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-zenith-medium
   rotate: false
-  xy: 1797, 794
+  xy: 1421, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-zenith-small
   rotate: false
-  xy: 1093, 29
+  xy: 1460, 202
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-zenith-tiny
   rotate: false
-  xy: 1407, 21
+  xy: 1773, 367
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-zenith-xlarge
   rotate: false
-  xy: 701, 466
+  xy: 551, 183
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+wavepane
+  rotate: false
+  xy: 1589, 623
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
+white-pane
+  rotate: false
+  xy: 1627, 652
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
 whiteui
   rotate: false
-  xy: 821, 928
+  xy: 746, 371
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
   index: -1
 window-empty
   rotate: false
-  xy: 1924, 765
+  xy: 1073, 266
   size: 27, 61
   split: 4, 4, 2, 2
   orig: 27, 61
diff --git a/core/assets/sprites/fallback/sprites.png b/core/assets/sprites/fallback/sprites.png
index 0ac9ae0e72..4f9c0dffcc 100644
Binary files a/core/assets/sprites/fallback/sprites.png and b/core/assets/sprites/fallback/sprites.png differ
diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png
index 0d87820cf5..aa17fbbe89 100644
Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ
diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png
index d7621ba8ac..05f78947ea 100644
Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ
diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png
index 340afcfeb1..a54ba96e8b 100644
Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ
diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png
index 69ee2ace6b..ffc65a7f9d 100644
Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ
diff --git a/core/assets/sprites/fallback/sprites6.png b/core/assets/sprites/fallback/sprites6.png
index 95d69da677..43330a0028 100644
Binary files a/core/assets/sprites/fallback/sprites6.png and b/core/assets/sprites/fallback/sprites6.png differ
diff --git a/core/assets/sprites/fallback/sprites7.png b/core/assets/sprites/fallback/sprites7.png
index 449c7250a1..8ba18e157c 100644
Binary files a/core/assets/sprites/fallback/sprites7.png and b/core/assets/sprites/fallback/sprites7.png differ
diff --git a/core/assets/sprites/fallback/sprites8.png b/core/assets/sprites/fallback/sprites8.png
new file mode 100644
index 0000000000..4cb8e05377
Binary files /dev/null and b/core/assets/sprites/fallback/sprites8.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index d79c126414..303a643a31 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -1,6424 +1,7551 @@
 
 sprites.png
-size: 4096,2048
+size: 4096,4096
 format: rgba8888
 filter: nearest,nearest
 repeat: none
-core-silo
-  rotate: false
-  xy: 1097, 563
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-data-processor
-  rotate: false
-  xy: 1877, 931
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-data-processor-2
-  rotate: false
-  xy: 3559, 773
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-data-processor-top
-  rotate: false
-  xy: 1975, 931
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
 launch-pad
   rotate: false
-  xy: 2529, 747
+  xy: 1951, 2545
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launch-pad-large
   rotate: false
-  xy: 3121, 1273
+  xy: 1703, 3035
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 launch-pad-light
   rotate: false
-  xy: 2627, 747
+  xy: 2245, 2643
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launchpod
   rotate: false
-  xy: 3771, 1337
-  size: 66, 64
-  orig: 66, 64
+  xy: 2013, 1618
+  size: 64, 64
+  orig: 64, 64
   offset: 0, 0
   index: -1
 force-projector
   rotate: false
-  xy: 1941, 637
+  xy: 2918, 2757
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 force-projector-top
   rotate: false
-  xy: 2039, 735
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-large-overdrive-projector
-  rotate: false
-  xy: 2137, 648
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-large-overdrive-projector-top
-  rotate: false
-  xy: 2235, 783
+  xy: 1657, 2643
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mend-projector
   rotate: false
-  xy: 3757, 537
+  xy: 2029, 760
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mend-projector-top
   rotate: false
-  xy: 3823, 537
+  xy: 2091, 1156
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mender
   rotate: false
-  xy: 2393, 177
+  xy: 3323, 2187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 2427, 149
+  xy: 2439, 812
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+overdrive-dome
+  rotate: false
+  xy: 2245, 2447
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+overdrive-dome-top
+  rotate: false
+  xy: 2343, 2447
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 overdrive-projector
   rotate: false
-  xy: 3889, 537
+  xy: 2095, 1090
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 overdrive-projector-top
   rotate: false
-  xy: 3691, 517
+  xy: 2095, 1024
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shock-mine
   rotate: false
-  xy: 3549, 59
+  xy: 3585, 2319
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-loader
   rotate: false
-  xy: 2755, 845
+  xy: 1899, 2937
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-unloader
   rotate: false
-  xy: 3771, 1195
+  xy: 1644, 2741
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 2597, 251
+  xy: 2361, 1746
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 2767, 251
+  xy: 2361, 1576
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 2801, 251
+  xy: 2361, 1542
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 2835, 251
+  xy: 2279, 718
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 2869, 251
+  xy: 2279, 684
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-0
   rotate: false
-  xy: 269, 1
+  xy: 1981, 1518
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-armored-conveyor-full
   rotate: false
-  xy: 269, 1
+  xy: 1981, 1518
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-1
   rotate: false
-  xy: 303, 1
+  xy: 1053, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-2
   rotate: false
-  xy: 337, 1
+  xy: 2319, 1160
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-3
   rotate: false
-  xy: 371, 1
+  xy: 2277, 1076
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 405, 1
+  xy: 1113, 2285
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 439, 1
+  xy: 4005, 3587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 473, 1
+  xy: 1087, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 4063, 977
+  xy: 2319, 1126
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 4063, 943
+  xy: 2277, 1042
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 4061, 2015
+  xy: 1113, 2251
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 3252, 408
+  xy: 4039, 3587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 2143, 236
+  xy: 1121, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 2223, 271
+  xy: 2277, 1008
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 4061, 1981
+  xy: 1155, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 4061, 1947
+  xy: 2277, 974
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 4061, 1913
+  xy: 1189, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 4061, 1879
+  xy: 2277, 940
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 4061, 1845
+  xy: 2277, 906
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 4061, 1811
+  xy: 1654, 3015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 4063, 1777
+  xy: 3559, 2622
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 2665, 217
+  xy: 2347, 642
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 2699, 217
+  xy: 2313, 608
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 2733, 217
+  xy: 2347, 608
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 2767, 217
+  xy: 2313, 574
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 2801, 217
+  xy: 2347, 574
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 2835, 217
+  xy: 2313, 540
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 2869, 217
+  xy: 2347, 540
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 2903, 217
+  xy: 2313, 506
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 2937, 217
+  xy: 2347, 506
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 2971, 217
+  xy: 2313, 472
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 3005, 217
+  xy: 2347, 472
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 3039, 301
+  xy: 2313, 438
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 3039, 267
+  xy: 2347, 438
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 3039, 233
+  xy: 2317, 404
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 3039, 199
+  xy: 2351, 404
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 3073, 269
+  xy: 2381, 710
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 3107, 269
+  xy: 2381, 676
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 3073, 235
+  xy: 2381, 642
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 3141, 269
+  xy: 2381, 608
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 2835, 149
+  xy: 3347, 2337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 2869, 149
+  xy: 3347, 2303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 2903, 149
+  xy: 3381, 2337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 2937, 149
+  xy: 3381, 2303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 2971, 149
+  xy: 3415, 2337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 3005, 149
+  xy: 3415, 2303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 3583, 23
+  xy: 2511, 2109
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 3617, 23
+  xy: 2395, 2075
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 2185, 233
+  xy: 2395, 2041
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 2185, 199
+  xy: 2429, 2075
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 2185, 165
+  xy: 2395, 2007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 2185, 131
+  xy: 2463, 2075
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 2185, 97
+  xy: 2429, 2041
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 2219, 203
+  xy: 2395, 1973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 2253, 203
+  xy: 2497, 2075
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 2219, 169
+  xy: 2463, 2041
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 2219, 135
+  xy: 2429, 2007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 2253, 169
+  xy: 2395, 1939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 2219, 101
+  xy: 2497, 2041
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 2253, 135
+  xy: 2463, 2007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 2253, 101
+  xy: 2429, 1973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 2287, 173
+  xy: 2395, 1905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 2321, 173
+  xy: 2497, 2007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 2287, 139
+  xy: 2463, 1973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 2355, 173
+  xy: 2429, 1939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 3243, 256
+  xy: 3085, 2227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 distributor
   rotate: false
-  xy: 3559, 707
+  xy: 2845, 2331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 inverted-sorter
   rotate: false
-  xy: 3379, 193
+  xy: 3245, 2357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 2971, 183
+  xy: 3211, 2283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-mass-conveyor
-  rotate: false
-  xy: 2529, 649
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mass-conveyor-edge
-  rotate: false
-  xy: 2627, 649
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mass-conveyor-top
-  rotate: false
-  xy: 2725, 649
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-payload-router-top
-  rotate: false
-  xy: 2725, 649
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
 mass-driver-base
   rotate: false
-  xy: 2235, 587
+  xy: 2343, 2545
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 2495, 149
+  xy: 2449, 710
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+payload-conveyor
+  rotate: false
+  xy: 2441, 2447
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-conveyor-edge
+  rotate: false
+  xy: 2539, 2447
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-conveyor-top
+  rotate: false
+  xy: 2637, 2643
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-router-top
+  rotate: false
+  xy: 2637, 2643
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 payload-router
   rotate: false
-  xy: 2823, 551
+  xy: 2637, 2545
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 payload-router-edge
   rotate: false
-  xy: 2235, 489
+  xy: 2637, 2447
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 payload-router-over
   rotate: false
-  xy: 2333, 489
+  xy: 2735, 2647
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 2665, 149
+  xy: 2449, 540
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 2699, 149
+  xy: 2449, 506
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 2733, 149
+  xy: 2449, 472
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 2767, 149
+  xy: 2449, 438
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 3549, 161
+  xy: 3493, 2201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 3617, 57
+  xy: 3527, 2253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 2321, 105
+  xy: 2463, 1939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blast-drill
   rotate: false
-  xy: 1561, 1143
+  xy: 1805, 1148
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-drill-rim
   rotate: false
-  xy: 1821, 1403
+  xy: 3263, 3099
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-drill-rotator
   rotate: false
-  xy: 1821, 1273
+  xy: 3393, 3099
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-drill-top
   rotate: false
-  xy: 1691, 1143
+  xy: 1899, 1018
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 drill-top
   rotate: false
-  xy: 3625, 773
+  xy: 2911, 2265
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-turbine-generator-liquid
+steam-generator-liquid
   rotate: false
-  xy: 3625, 773
+  xy: 2911, 2265
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 laser-drill
   rotate: false
-  xy: 2235, 685
+  xy: 1657, 2447
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 laser-drill-rim
   rotate: false
-  xy: 2333, 783
+  xy: 1951, 2643
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 laser-drill-rotator
   rotate: false
-  xy: 2333, 685
+  xy: 2049, 2643
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 laser-drill-top
   rotate: false
-  xy: 2431, 747
+  xy: 2147, 2643
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mechanical-drill
   rotate: false
-  xy: 3889, 735
+  xy: 2029, 1024
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill-rotator
   rotate: false
-  xy: 3889, 669
+  xy: 2029, 958
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill-top
   rotate: false
-  xy: 3889, 603
+  xy: 2029, 892
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 oil-extractor
   rotate: false
-  xy: 2431, 551
+  xy: 2539, 2545
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-liquid
   rotate: false
-  xy: 2529, 551
+  xy: 1951, 2447
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-rotator
   rotate: false
-  xy: 2627, 551
+  xy: 2049, 2447
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-top
   rotate: false
-  xy: 2725, 551
+  xy: 2147, 2447
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 pneumatic-drill
   rotate: false
-  xy: 3955, 670
+  xy: 2147, 430
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-rotator
   rotate: false
-  xy: 3955, 604
+  xy: 2647, 2245
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-top
   rotate: false
-  xy: 3955, 538
+  xy: 2713, 2249
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor
   rotate: false
-  xy: 729, 22
+  xy: 2145, 1958
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 795, 22
+  xy: 2145, 1892
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 861, 22
+  xy: 2145, 1826
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 4015, 142
+  xy: 2145, 1760
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 4063, 1607
+  xy: 2353, 1152
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 2893, 319
+  xy: 2379, 914
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 2801, 285
+  xy: 1524, 2635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 2461, 217
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-message
-  rotate: false
-  xy: 2461, 149
+  xy: 2279, 446
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 place-arrow
   rotate: false
-  xy: 2431, 453
+  xy: 2735, 2549
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 2631, 251
+  xy: 2361, 1712
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 2665, 251
+  xy: 2361, 1678
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 2665, 251
+  xy: 2361, 1678
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 2699, 251
+  xy: 2361, 1644
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 2733, 251
+  xy: 2361, 1610
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 2971, 251
+  xy: 2279, 582
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 3005, 251
+  xy: 2279, 548
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 2393, 245
+  xy: 2279, 514
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 2427, 217
+  xy: 2279, 480
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 2427, 217
+  xy: 2279, 480
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 2427, 217
+  xy: 2279, 480
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 2495, 217
+  xy: 2313, 710
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 2529, 217
+  xy: 2347, 710
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 2563, 217
+  xy: 2313, 676
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 2597, 217
+  xy: 2347, 676
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 2597, 217
+  xy: 2347, 676
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 2631, 217
+  xy: 2313, 642
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 3073, 167
+  xy: 3313, 2289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 3175, 156
+  xy: 3153, 2199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 3209, 156
+  xy: 3187, 2249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 3243, 154
+  xy: 3187, 2215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 3277, 126
+  xy: 3221, 2249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 3311, 126
+  xy: 3221, 2215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-tank-bottom
   rotate: false
-  xy: 2725, 747
+  xy: 2049, 2545
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-tank-liquid
   rotate: false
-  xy: 2823, 747
+  xy: 2147, 2545
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-tank-top
   rotate: false
-  xy: 2431, 649
+  xy: 2343, 2643
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 2291, 207
+  xy: 3187, 2181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-liquid
   rotate: false
-  xy: 2325, 207
+  xy: 3221, 2181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-liquid
   rotate: false
-  xy: 2325, 207
+  xy: 3221, 2181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-liquid
   rotate: false
-  xy: 2325, 207
+  xy: 3221, 2181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 2529, 149
+  xy: 2449, 676
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 2563, 149
+  xy: 2449, 642
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 2597, 149
+  xy: 2449, 608
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 2631, 149
+  xy: 2449, 574
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 3073, 133
+  xy: 3449, 2303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 3107, 133
+  xy: 3483, 2337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 3141, 133
+  xy: 3483, 2303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 3175, 122
+  xy: 3357, 2269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 3209, 122
+  xy: 3357, 2235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 3243, 120
+  xy: 3391, 2269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 3379, 91
+  xy: 3391, 2201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 3413, 91
+  xy: 3425, 2235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 3447, 91
+  xy: 3459, 2269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 3481, 91
+  xy: 3425, 2201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump
   rotate: false
-  xy: 4021, 472
+  xy: 2079, 1882
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-pump
   rotate: false
-  xy: 3019, 551
+  xy: 3127, 2671
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+hyper-processor
+  rotate: false
+  xy: 1853, 2643
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+large-logic-display
+  rotate: false
+  xy: 1307, 1646
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+logic-display
+  rotate: false
+  xy: 2245, 2545
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+logic-processor
+  rotate: false
+  xy: 2013, 1552
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+memory-bank
+  rotate: false
+  xy: 2029, 826
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+memory-cell
+  rotate: false
+  xy: 3289, 2187
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+message
+  rotate: false
+  xy: 2439, 778
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+micro-processor
+  rotate: false
+  xy: 2439, 744
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+switch
+  rotate: false
+  xy: 2409, 2109
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+switch-on
+  rotate: false
+  xy: 2443, 2109
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 battery
   rotate: false
-  xy: 4063, 1743
+  xy: 3593, 2622
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-large
   rotate: false
-  xy: 3673, 1045
+  xy: 1935, 1224
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 battery-large-top
   rotate: false
-  xy: 509, 695
+  xy: 3231, 2989
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 battery-top
   rotate: false
-  xy: 4063, 1709
+  xy: 2291, 80
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 2903, 251
+  xy: 2279, 650
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 2937, 251
+  xy: 2279, 616
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 differential-generator
   rotate: false
-  xy: 1811, 817
+  xy: 2330, 2741
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 differential-generator-liquid
   rotate: false
-  xy: 1909, 833
+  xy: 2526, 2839
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 differential-generator-top
   rotate: false
-  xy: 2007, 833
+  xy: 2428, 2741
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 diode
   rotate: false
-  xy: 3243, 222
+  xy: 3085, 2193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 3175, 190
+  xy: 3119, 2267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 3311, 228
+  xy: 3279, 2391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 3311, 194
+  xy: 3313, 2391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 impact-reactor
   rotate: false
-  xy: 2861, 1403
+  xy: 3913, 3079
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-bottom
   rotate: false
-  xy: 2861, 1273
+  xy: 1817, 1908
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-light
   rotate: false
-  xy: 2731, 1143
+  xy: 1817, 1778
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-plasma-0
   rotate: false
-  xy: 2991, 1403
+  xy: 1817, 1648
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-plasma-1
   rotate: false
-  xy: 2991, 1273
+  xy: 1817, 1518
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-plasma-2
   rotate: false
-  xy: 2861, 1143
+  xy: 2143, 238
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 impact-reactor-plasma-3
   rotate: false
-  xy: 3121, 1403
+  xy: 2143, 108
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 3277, 92
+  xy: 3357, 2201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large
   rotate: false
-  xy: 3955, 472
+  xy: 2779, 2249
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-source
   rotate: false
-  xy: 3311, 92
+  xy: 3391, 2235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 3345, 91
+  xy: 3425, 2269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 3559, 509
+  xy: 2079, 1816
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 3549, 127
+  xy: 3357, 2167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 3583, 57
+  xy: 3527, 2287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-large
   rotate: false
-  xy: 3019, 649
+  xy: 3029, 2671
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+steam-generator
+  rotate: false
+  xy: 2213, 562
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-cap
+  rotate: false
+  xy: 2213, 496
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-top
+  rotate: false
+  xy: 2213, 430
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-turbine0
+  rotate: false
+  xy: 2037, 2222
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+steam-generator-turbine1
+  rotate: false
+  xy: 2103, 2222
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 surge-tower
   rotate: false
-  xy: 3619, 311
+  xy: 2027, 2156
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-generator
   rotate: false
-  xy: 3817, 207
+  xy: 2159, 2156
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thorium-reactor
   rotate: false
-  xy: 3019, 453
+  xy: 3029, 2573
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-lights
   rotate: false
-  xy: 3117, 747
+  xy: 3029, 2475
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-top
   rotate: false
-  xy: 3117, 649
+  xy: 3127, 2573
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-turbine-generator
-  rotate: false
-  xy: 3949, 273
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-cap
-  rotate: false
-  xy: 3949, 207
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-top
-  rotate: false
-  xy: 4015, 340
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-turbine0
-  rotate: false
-  xy: 4015, 274
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-turbine-generator-turbine1
-  rotate: false
-  xy: 4015, 208
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 alloy-smelter
   rotate: false
-  xy: 3477, 1045
+  xy: 1919, 1420
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 alloy-smelter-top
   rotate: false
-  xy: 3575, 1045
+  xy: 1935, 1322
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 blast-mixer
   rotate: false
-  xy: 3289, 464
+  xy: 1825, 2043
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-forge
   rotate: false
-  xy: 2265, 881
+  xy: 3281, 2695
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 coal-centrifuge
   rotate: false
-  xy: 3355, 369
+  xy: 3874, 2651
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-cryofluidmixer-bottom
+cryofluid-mixer-bottom
   rotate: false
-  xy: 3493, 699
+  xy: 3029, 2409
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-cryofluidmixer-liquid
+cryofluid-mixer-liquid
   rotate: false
-  xy: 3493, 633
+  xy: 3095, 2409
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-cryofluidmixer-top
+cryofluid-mixer-top
   rotate: false
-  xy: 3493, 567
+  xy: 3373, 2371
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 3487, 501
+  xy: 3439, 2371
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 3487, 435
+  xy: 2833, 2397
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 3487, 369
+  xy: 2899, 2397
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 disassembler
   rotate: false
-  xy: 2105, 844
+  xy: 2526, 2741
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 disassembler-liquid
   rotate: false
-  xy: 2979, 963
+  xy: 2624, 2839
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 disassembler-spinner
   rotate: false
-  xy: 3077, 943
+  xy: 2624, 2741
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 graphite-press
   rotate: false
-  xy: 3625, 641
+  xy: 2013, 1948
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 3345, 193
+  xy: 3211, 2351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 2631, 183
+  xy: 2415, 472
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 2937, 183
+  xy: 3313, 2323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 kiln
   rotate: false
-  xy: 3625, 575
+  xy: 2013, 1882
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 kiln-top
   rotate: false
-  xy: 3691, 781
+  xy: 2013, 1816
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 silicon-smelter-top
   rotate: false
-  xy: 3691, 781
+  xy: 2013, 1816
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 3413, 125
+  xy: 3289, 2255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 3447, 125
+  xy: 3289, 2221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 2359, 207
+  xy: 3255, 2187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 multi-press
   rotate: false
-  xy: 2333, 587
+  xy: 2539, 2643
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 phase-weaver
   rotate: false
-  xy: 3889, 471
+  xy: 2095, 826
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-bottom
   rotate: false
-  xy: 3909, 868
+  xy: 2095, 760
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-weave
   rotate: false
-  xy: 3909, 802
+  xy: 2147, 694
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-compressor
   rotate: false
-  xy: 3975, 868
+  xy: 2147, 628
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-compressor-top
   rotate: false
-  xy: 3975, 802
+  xy: 2147, 562
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 3515, 91
+  xy: 3459, 2235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 3520, 229
+  xy: 3459, 2201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-mixer
   rotate: false
-  xy: 4021, 670
+  xy: 2911, 2199
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 3955, 406
+  xy: 2099, 1222
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 4021, 406
+  xy: 2157, 1156
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-spinner
   rotate: false
-  xy: 3751, 339
+  xy: 2161, 1090
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 silicon-crucible
   rotate: false
-  xy: 3049, 845
+  xy: 2931, 2561
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 silicon-crucible-top
   rotate: false
-  xy: 3019, 747
+  xy: 2931, 2463
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 silicon-smelter
   rotate: false
-  xy: 3817, 339
+  xy: 2161, 1024
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press
   rotate: false
-  xy: 3883, 339
+  xy: 2161, 958
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame0
   rotate: false
-  xy: 3685, 319
+  xy: 2161, 892
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame1
   rotate: false
-  xy: 3751, 273
+  xy: 2161, 826
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame2
   rotate: false
-  xy: 3817, 273
+  xy: 2161, 760
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-liquid
   rotate: false
-  xy: 3883, 273
+  xy: 2213, 694
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-top
   rotate: false
-  xy: 3553, 311
+  xy: 2213, 628
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-rock1
+boulder1
   rotate: false
-  xy: 2952, 353
+  xy: 1604, 2999
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-rock2
+boulder2
   rotate: false
-  xy: 3002, 353
+  xy: 3796, 2610
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dacite-boulder1
+  rotate: false
+  xy: 2221, 2086
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dacite-boulder2
+  rotate: false
+  xy: 2211, 2036
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-boulder1
   rotate: false
-  xy: 3549, 93
+  xy: 3391, 2167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 3583, 193
+  xy: 3425, 2167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 3583, 91
+  xy: 3551, 2321
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 3617, 91
+  xy: 3585, 2353
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-snowrock1
+snow-boulder1
   rotate: false
-  xy: 3202, 292
+  xy: 2315, 1286
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-snowrock2
+snow-boulder2
   rotate: false
-  xy: 3252, 348
+  xy: 2357, 1486
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 2354, 347
+  xy: 1641, 6
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 2185, 305
+  xy: 2277, 1152
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 2227, 305
+  xy: 2277, 1110
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 white-tree
   rotate: false
-  xy: 1, 761
+  xy: 1, 1523
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 white-tree-dead
   rotate: false
-  xy: 323, 1083
+  xy: 2173, 3775
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
+white-tree-dead-shadow
+  rotate: false
+  xy: 403, 2943
+  size: 353, 348
+  orig: 353, 348
+  offset: 0, 0
+  index: -1
+white-tree-shadow
+  rotate: false
+  xy: 403, 2943
+  size: 353, 348
+  orig: 353, 348
+  offset: 0, 0
+  index: -1
 container
   rotate: false
-  xy: 3427, 765
+  xy: 4022, 2709
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+container-team
+  rotate: false
+  xy: 4006, 2643
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 core-foundation
   rotate: false
-  xy: 2341, 1403
+  xy: 2017, 628
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 core-foundation-team
   rotate: false
-  xy: 2341, 1273
+  xy: 2017, 498
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 core-nucleus
   rotate: false
-  xy: 1161, 887
+  xy: 1401, 460
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 core-nucleus-team
   rotate: false
-  xy: 1323, 887
+  xy: 1397, 298
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 core-shard
   rotate: false
-  xy: 3771, 1097
+  xy: 1840, 2839
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 core-shard-team
   rotate: false
-  xy: 3869, 1195
+  xy: 1742, 2741
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 2355, 139
+  xy: 2429, 1905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 2355, 105
+  xy: 2395, 1837
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault
   rotate: false
-  xy: 3117, 453
+  xy: 3323, 2511
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+vault-team
+  rotate: false
+  xy: 3421, 2511
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 arc-heat
   rotate: false
-  xy: 1711, 749
+  xy: 2820, 2855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 4063, 1675
+  xy: 2291, 46
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-2
   rotate: false
-  xy: 3289, 398
+  xy: 1895, 2212
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-3
   rotate: false
-  xy: 2469, 943
+  xy: 3329, 3001
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-4
   rotate: false
-  xy: 1951, 1403
+  xy: 1899, 888
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+foreshadow-heat
+  rotate: false
+  xy: 3783, 3079
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 hail-heat
   rotate: false
-  xy: 829, 547
+  xy: 781, 1
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 3691, 649
+  xy: 2013, 1684
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 meltdown-heat
   rotate: false
-  xy: 3121, 1143
+  xy: 1963, 3035
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 ripple-heat
   rotate: false
-  xy: 2627, 453
+  xy: 2833, 2659
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 salvo-heat
   rotate: false
-  xy: 3553, 443
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-salvo-panel-left
-  rotate: false
-  xy: 3553, 377
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-salvo-panel-right
-  rotate: false
-  xy: 3619, 443
+  xy: 2079, 1684
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scorch-heat
   rotate: false
-  xy: 3583, 159
+  xy: 3493, 2167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+tsunami-liquid
+  rotate: false
+  xy: 3225, 2597
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+tsunami-top
+  rotate: false
+  xy: 3225, 2499
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 wave-liquid
   rotate: false
-  xy: 1796, 418
+  xy: 2145, 1628
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+wave-top
+  rotate: false
+  xy: 2145, 1562
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 additive-reconstructor
   rotate: false
-  xy: 3183, 1045
+  xy: 2873, 3103
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 additive-reconstructor-top
   rotate: false
-  xy: 3281, 1045
+  xy: 1559, 2571
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 air-factory
   rotate: false
-  xy: 3379, 1045
+  xy: 1559, 2473
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 command-center
   rotate: false
-  xy: 3457, 831
+  xy: 3961, 2775
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+command-center-team
+  rotate: false
+  xy: 3956, 2709
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 exponential-reconstructor
   rotate: false
-  xy: 935, 985
+  xy: 1127, 3211
   size: 224, 224
   orig: 224, 224
   offset: 0, 0
   index: -1
 exponential-reconstructor-top
   rotate: false
-  xy: 1193, 1049
+  xy: 2531, 3307
   size: 224, 224
   orig: 224, 224
   offset: 0, 0
   index: -1
 factory-in-3
   rotate: false
-  xy: 1843, 719
+  xy: 2722, 2843
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 factory-in-5
   rotate: false
-  xy: 1148, 239
+  xy: 1563, 608
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 factory-in-7
   rotate: false
-  xy: 903, 759
+  xy: 831, 899
   size: 224, 224
   orig: 224, 224
   offset: 0, 0
   index: -1
 factory-in-9
   rotate: false
-  xy: 2127, 1759
+  xy: 3655, 3807
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 factory-out-3
   rotate: false
-  xy: 1843, 621
+  xy: 2722, 2745
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 factory-out-5
   rotate: false
-  xy: 1310, 239
+  xy: 1563, 446
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 factory-out-7
   rotate: false
-  xy: 871, 533
+  xy: 831, 673
   size: 224, 224
   orig: 224, 224
   offset: 0, 0
   index: -1
 factory-out-9
   rotate: false
-  xy: 2417, 1759
+  xy: 403, 2331
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 factory-top-3
   rotate: false
-  xy: 1941, 735
+  xy: 2820, 2757
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 ground-factory
   rotate: false
-  xy: 2137, 746
+  xy: 1755, 2643
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 multiplicative-reconstructor
   rotate: false
-  xy: 1472, 239
+  xy: 1559, 284
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 multiplicative-reconstructor-top
   rotate: false
-  xy: 1634, 239
+  xy: 1559, 122
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 naval-factory
   rotate: false
-  xy: 2137, 550
+  xy: 2441, 2545
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 rally-point
   rotate: false
-  xy: 4021, 604
+  xy: 2079, 2014
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 repair-point-base
   rotate: false
-  xy: 3549, 195
+  xy: 3493, 2235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 resupply-point
   rotate: false
-  xy: 4021, 538
+  xy: 2079, 1948
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 tetrative-reconstructor
   rotate: false
-  xy: 2707, 1759
+  xy: 323, 2041
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 tetrative-reconstructor-top
   rotate: false
-  xy: 2997, 1759
+  xy: 323, 1751
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 3073, 201
+  xy: 2381, 574
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-large
   rotate: false
-  xy: 3427, 699
+  xy: 2317, 2301
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 3209, 190
+  xy: 3119, 2233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-large
   rotate: false
-  xy: 3559, 641
+  xy: 2911, 2331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-large-open
   rotate: false
-  xy: 3559, 575
+  xy: 2845, 2265
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 3243, 188
+  xy: 3119, 2199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 2801, 149
+  xy: 2453, 404
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-large
   rotate: false
-  xy: 3823, 471
+  xy: 2095, 892
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-wall
   rotate: false
-  xy: 3039, 131
+  xy: 3449, 2337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall-large
   rotate: false
-  xy: 3955, 736
+  xy: 2147, 496
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-gigantic
   rotate: false
-  xy: 3511, 1143
+  xy: 2613, 3035
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 scrap-wall-huge2
   rotate: false
-  xy: 2921, 453
+  xy: 2833, 2463
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 scrap-wall-huge3
   rotate: false
-  xy: 2951, 845
+  xy: 2931, 2659
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 scrap-wall-large1
   rotate: false
-  xy: 3691, 451
+  xy: 2079, 1552
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large2
   rotate: false
-  xy: 3685, 385
+  xy: 2083, 1486
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large3
   rotate: false
-  xy: 3757, 405
+  xy: 2083, 1420
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large4
   rotate: false
-  xy: 3823, 405
+  xy: 2099, 1354
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall2
   rotate: false
-  xy: 3583, 125
+  xy: 3517, 2355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 3617, 159
+  xy: 3517, 2321
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 3617, 125
+  xy: 3551, 2355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 3617, 125
+  xy: 3551, 2355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 3515, 57
+  xy: 2375, 2109
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large
   rotate: false
-  xy: 3685, 253
+  xy: 2093, 2156
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 3549, 25
+  xy: 2477, 2109
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large
   rotate: false
-  xy: 3883, 207
+  xy: 2155, 2090
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thruster
   rotate: false
-  xy: 3641, 1143
+  xy: 2743, 2941
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 titanium-wall
   rotate: false
-  xy: 2287, 105
+  xy: 2395, 1871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large
   rotate: false
-  xy: 3949, 339
+  xy: 2169, 2222
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 bullet
   rotate: false
-  xy: 3655, 851
+  xy: 4043, 3285
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 bullet-back
   rotate: false
-  xy: 2152, 496
+  xy: 4043, 3231
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 casing
   rotate: false
-  xy: 1931, 603
+  xy: 3517, 2303
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
   index: -1
 circle-end
   rotate: false
-  xy: 2163, 942
+  xy: 1440, 2754
   size: 100, 199
   orig: 100, 199
   offset: 0, 0
   index: -1
 circle-mid
   rotate: false
-  xy: 4081, 205
+  xy: 605, 1550
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
   index: -1
 circle-shadow
   rotate: false
-  xy: 727, 88
+  xy: 1356, 2422
   size: 201, 201
   orig: 201, 201
   offset: 0, 0
   index: -1
 error
   rotate: false
-  xy: 2078, 34
+  xy: 2211, 1636
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+large-bomb
+  rotate: false
+  xy: 2189, 6
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+large-bomb-back
+  rotate: false
+  xy: 2873, 2855
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 laser
   rotate: false
-  xy: 607, 743
+  xy: 567, 93
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 laser-end
   rotate: false
-  xy: 3215, 664
+  xy: 3299, 2425
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 minelaser
   rotate: false
-  xy: 3553, 517
+  xy: 2973, 3293
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 minelaser-end
   rotate: false
-  xy: 3215, 590
+  xy: 3373, 2437
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 missile
   rotate: false
-  xy: 2269, 309
+  xy: 1683, 10
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 2307, 309
+  xy: 1113, 2319
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 parallax-laser
   rotate: false
-  xy: 3685, 459
+  xy: 2751, 3257
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 parallax-laser-end
   rotate: false
-  xy: 3215, 516
+  xy: 3447, 2437
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 particle
   rotate: false
-  xy: 2312, 347
+  xy: 1109, 2601
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 scale_marker
   rotate: false
-  xy: 3355, 590
+  xy: 1501, 1088
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
   index: -1
 shell
   rotate: false
-  xy: 2345, 309
+  xy: 3967, 3583
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 2185, 267
+  xy: 2683, 2941
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 607, 693
+  xy: 397, 2439
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 2321, 139
+  xy: 2497, 1973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 1856, 348
+  xy: 3652, 2791
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
   index: -1
+alpha-outline
+  rotate: false
+  xy: 3225, 2719
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 alpha-wreck0
   rotate: false
-  xy: 2093, 334
+  xy: 3323, 2645
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-wreck1
   rotate: false
-  xy: 2093, 284
+  xy: 2590, 2251
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-wreck2
   rotate: false
-  xy: 1856, 246
+  xy: 3035, 2245
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+antumbra-outline
+  rotate: false
+  xy: 935, 2357
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
 antumbra-wreck0
   rotate: false
-  xy: 509, 389
+  xy: 895, 2115
   size: 216, 240
   orig: 216, 240
   offset: 0, 0
   index: -1
 antumbra-wreck1
   rotate: false
-  xy: 509, 147
+  xy: 895, 1873
   size: 216, 240
   orig: 216, 240
   offset: 0, 0
   index: -1
 antumbra-wreck2
   rotate: false
-  xy: 291, 35
+  xy: 895, 1631
   size: 216, 240
   orig: 216, 240
   offset: 0, 0
   index: -1
 arc
   rotate: false
-  xy: 1711, 783
+  xy: 1947, 1518
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-arkyid-wreck0
-  rotate: false
-  xy: 1561, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-arkyid-wreck1
-  rotate: false
-  xy: 1691, 1403
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-arkyid-wreck2
-  rotate: false
-  xy: 1691, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-atrax-wreck0
-  rotate: false
-  xy: 3459, 979
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
-atrax-wreck1
-  rotate: false
-  xy: 3549, 979
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
-atrax-wreck2
-  rotate: false
-  xy: 3639, 979
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
-beta-wreck0
-  rotate: false
-  xy: 1885, 146
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-beta-wreck1
-  rotate: false
-  xy: 1935, 220
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-beta-wreck2
-  rotate: false
-  xy: 1935, 170
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-additive-reconstructor-full
-  rotate: false
-  xy: 2567, 943
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-air-factory-full
-  rotate: false
-  xy: 2665, 943
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-arc-full
-  rotate: false
-  xy: 4063, 1641
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-blast-drill-full
-  rotate: false
-  xy: 1951, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-char-full
-  rotate: false
-  xy: 927, 4
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-cliffs-full
-  rotate: false
-  xy: 961, 4
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-conduit-full
-  rotate: false
-  xy: 995, 4
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-conveyor-full
-  rotate: false
-  xy: 1029, 4
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-conveyor-0-0
-  rotate: false
-  xy: 1029, 4
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-core-foundation-full
-  rotate: false
-  xy: 1821, 1143
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-core-nucleus-full
-  rotate: false
-  xy: 1, 19
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-block-core-shard-full
-  rotate: false
-  xy: 2763, 943
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-craters-full
-  rotate: false
-  xy: 1063, 4
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-cryofluidmixer-full
-  rotate: false
-  xy: 3711, 913
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-cultivator-full
-  rotate: false
-  xy: 3777, 933
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-cyclone-full
-  rotate: false
-  xy: 2861, 943
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-dark-metal-full
-  rotate: false
-  xy: 2383, 313
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-darksand-full
-  rotate: false
-  xy: 2417, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-dunerocks-full
-  rotate: false
-  xy: 2451, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-duo-full
-  rotate: false
-  xy: 2485, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-exponential-reconstructor-full
-  rotate: false
-  xy: 1193, 1275
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-block-fuse-full
-  rotate: false
-  xy: 2363, 881
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-grass-full
-  rotate: false
-  xy: 2519, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ground-factory-full
-  rotate: false
-  xy: 2461, 845
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-hail-full
-  rotate: false
-  xy: 2553, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-holostone-full
-  rotate: false
-  xy: 2587, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-hotrock-full
-  rotate: false
-  xy: 2621, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ice-full
-  rotate: false
-  xy: 2655, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ice-snow-full
-  rotate: false
-  xy: 2689, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-icerocks-full
-  rotate: false
-  xy: 2723, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ignarock-full
-  rotate: false
-  xy: 2757, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-impact-reactor-full
-  rotate: false
-  xy: 2081, 1403
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-lancer-full
-  rotate: false
-  xy: 3843, 933
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-laser-drill-full
-  rotate: false
-  xy: 2559, 845
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-liquid-router-full
-  rotate: false
-  xy: 2791, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-liquid-tank-full
-  rotate: false
-  xy: 2657, 845
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-magmarock-full
-  rotate: false
-  xy: 2825, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-full
-  rotate: false
-  xy: 2853, 845
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mass-conveyor-icon
-  rotate: false
-  xy: 2853, 845
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-mass-driver-full
-  rotate: false
-  xy: 930, 38
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-mechanical-drill-full
-  rotate: false
-  xy: 3777, 867
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-meltdown-full
-  rotate: false
-  xy: 2081, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-metal-floor-damaged-full
-  rotate: false
-  xy: 2859, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-moss-full
-  rotate: false
-  xy: 2927, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-multiplicative-reconstructor-full
-  rotate: false
-  xy: 3841, 1435
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-block-naval-factory-full
-  rotate: false
-  xy: 1028, 38
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-oil-extractor-full
-  rotate: false
-  xy: 1126, 15
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-ore-coal-full
-  rotate: false
-  xy: 2961, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-copper-full
-  rotate: false
-  xy: 2995, 319
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-lead-full
-  rotate: false
-  xy: 2257, 271
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-scrap-full
-  rotate: false
-  xy: 2291, 275
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-thorium-full
-  rotate: false
-  xy: 2325, 275
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ore-titanium-full
-  rotate: false
-  xy: 2359, 275
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-parallax-full
-  rotate: false
-  xy: 3843, 867
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-payload-router-full
-  rotate: false
-  xy: 1224, 15
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-payload-router-icon
-  rotate: false
-  xy: 1224, 15
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-pebbles-full
-  rotate: false
-  xy: 2393, 279
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-phase-weaver-full
-  rotate: false
-  xy: 3711, 847
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-plated-conduit-full
-  rotate: false
-  xy: 2427, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-pneumatic-drill-full
-  rotate: false
-  xy: 3777, 801
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-pulse-conduit-full
-  rotate: false
-  xy: 2461, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-pulverizer-full
-  rotate: false
-  xy: 2495, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-repair-point-full
-  rotate: false
-  xy: 2529, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ripple-full
-  rotate: false
-  xy: 1322, 15
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-rock-full
-  rotate: false
-  xy: 1985, 220
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-rocks-full
-  rotate: false
-  xy: 2563, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-saltrocks-full
-  rotate: false
-  xy: 2597, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-salvo-full
-  rotate: false
-  xy: 3843, 801
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-sand-boulder-full
-  rotate: false
-  xy: 2631, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-sand-full
-  rotate: false
-  xy: 2665, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-sandrocks-full
-  rotate: false
-  xy: 2699, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scatter-full
-  rotate: false
-  xy: 3325, 831
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-scorch-full
-  rotate: false
-  xy: 2733, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scrap-wall-full
-  rotate: false
-  xy: 2767, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap-wall1
-  rotate: false
-  xy: 2767, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-scrap-wall-huge-full
-  rotate: false
-  xy: 1420, 15
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-scrap-wall-huge1
-  rotate: false
-  xy: 1420, 15
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-block-scrap-wall-large-full
-  rotate: false
-  xy: 3391, 831
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-segment-full
-  rotate: false
-  xy: 3361, 765
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-shale-boulder-full
-  rotate: false
-  xy: 2835, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-shale-full
-  rotate: false
-  xy: 2869, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-shalerocks-full
-  rotate: false
-  xy: 2903, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-shrubs-full
-  rotate: false
-  xy: 2937, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-snow-full
-  rotate: false
-  xy: 2971, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-snowrock-full
-  rotate: false
-  xy: 1985, 170
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-snowrocks-full
-  rotate: false
-  xy: 3005, 285
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-spectre-full
-  rotate: false
-  xy: 1951, 1143
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-block-spore-cluster-full
-  rotate: false
-  xy: 3729, 1003
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-spore-moss-full
-  rotate: false
-  xy: 2427, 251
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-spore-press-full
-  rotate: false
-  xy: 3361, 699
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-sporerocks-full
-  rotate: false
-  xy: 2461, 251
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-stone-full
-  rotate: false
-  xy: 2495, 251
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-swarmer-full
-  rotate: false
-  xy: 3361, 633
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-tendrils-full
-  rotate: false
-  xy: 2529, 251
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-tetrative-reconstructor-full
-  rotate: false
-  xy: 645, 1437
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-block-titanium-conveyor-full
-  rotate: false
-  xy: 2563, 251
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-titanium-conveyor-0-0
-  rotate: false
-  xy: 2563, 251
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-turbine-generator-full
-  rotate: false
-  xy: 3361, 567
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-water-extractor-full
-  rotate: false
-  xy: 3355, 501
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-block-wave-full
-  rotate: false
-  xy: 3355, 435
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-bryde-wreck0
-  rotate: false
-  xy: 3841, 1293
-  size: 140, 140
-  orig: 140, 140
-  offset: 0, 0
-  index: -1
-bryde-wreck1
-  rotate: false
-  xy: 1419, 1359
-  size: 140, 140
-  orig: 140, 140
-  offset: 0, 0
-  index: -1
-bryde-wreck2
-  rotate: false
-  xy: 1419, 1217
-  size: 140, 140
-  orig: 140, 140
-  offset: 0, 0
-  index: -1
-core-foundation-team-crux
-  rotate: false
-  xy: 2211, 1143
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-core-foundation-team-sharded
-  rotate: false
-  xy: 2471, 1403
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-core-nucleus-team-crux
-  rotate: false
-  xy: 1129, 725
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-core-nucleus-team-sharded
-  rotate: false
-  xy: 1291, 725
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-core-shard-team-crux
-  rotate: false
-  xy: 3869, 1097
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-core-shard-team-sharded
-  rotate: false
-  xy: 3967, 1109
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-1-0
-  rotate: false
-  xy: 3107, 235
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-1
-  rotate: false
-  xy: 3107, 201
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-2
-  rotate: false
-  xy: 3141, 235
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-3
-  rotate: false
-  xy: 3141, 201
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-4
-  rotate: false
-  xy: 3175, 258
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-5
-  rotate: false
-  xy: 3209, 258
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-6
-  rotate: false
-  xy: 3175, 224
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-1-7
-  rotate: false
-  xy: 3209, 224
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cracks-2-0
-  rotate: false
-  xy: 3427, 633
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-1
-  rotate: false
-  xy: 3427, 567
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-2
-  rotate: false
-  xy: 3421, 501
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-3
-  rotate: false
-  xy: 3421, 435
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-4
-  rotate: false
-  xy: 3421, 369
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-5
-  rotate: false
-  xy: 3523, 839
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-6
-  rotate: false
-  xy: 3589, 839
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-2-7
-  rotate: false
-  xy: 3493, 765
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cracks-3-0
-  rotate: false
-  xy: 3771, 999
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-1
-  rotate: false
-  xy: 3869, 999
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-2
-  rotate: false
-  xy: 3967, 1011
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-3
-  rotate: false
-  xy: 1485, 915
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-4
-  rotate: false
-  xy: 1583, 915
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-5
-  rotate: false
-  xy: 1681, 915
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-6
-  rotate: false
-  xy: 1615, 817
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-3-7
-  rotate: false
-  xy: 1713, 817
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cracks-4-0
-  rotate: false
-  xy: 2471, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-1
-  rotate: false
-  xy: 2341, 1143
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-2
-  rotate: false
-  xy: 2601, 1403
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-3
-  rotate: false
-  xy: 2601, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-4
-  rotate: false
-  xy: 2471, 1143
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-5
-  rotate: false
-  xy: 2731, 1403
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-6
-  rotate: false
-  xy: 2731, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-4-7
-  rotate: false
-  xy: 2601, 1143
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-cracks-5-0
-  rotate: false
-  xy: 1259, 563
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-1
-  rotate: false
-  xy: 1148, 401
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-2
-  rotate: false
-  xy: 1310, 401
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-3
-  rotate: false
-  xy: 1421, 563
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-4
-  rotate: false
-  xy: 1453, 725
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-5
-  rotate: false
-  xy: 1472, 401
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-6
-  rotate: false
-  xy: 1583, 563
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-5-7
-  rotate: false
-  xy: 1634, 401
-  size: 160, 160
-  orig: 160, 160
-  offset: 0, 0
-  index: -1
-cracks-6-0
-  rotate: false
-  xy: 945, 136
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-1
-  rotate: false
-  xy: 3287, 1597
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-2
-  rotate: false
-  xy: 3481, 1597
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-3
-  rotate: false
-  xy: 3675, 1597
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-4
-  rotate: false
-  xy: 3869, 1597
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-5
-  rotate: false
-  xy: 3259, 1403
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-6
-  rotate: false
-  xy: 3453, 1403
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-6-7
-  rotate: false
-  xy: 3647, 1403
-  size: 192, 192
-  orig: 192, 192
-  offset: 0, 0
-  index: -1
-cracks-7-0
-  rotate: false
-  xy: 1451, 1533
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-1
-  rotate: false
-  xy: 1677, 1533
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-2
-  rotate: false
-  xy: 1903, 1533
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-3
-  rotate: false
-  xy: 2129, 1533
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-4
-  rotate: false
-  xy: 2355, 1533
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-5
-  rotate: false
-  xy: 2581, 1533
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-6
-  rotate: false
-  xy: 2807, 1533
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-7-7
-  rotate: false
-  xy: 3033, 1533
-  size: 224, 224
-  orig: 224, 224
-  offset: 0, 0
-  index: -1
-cracks-8-0
-  rotate: false
-  xy: 3287, 1791
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-1
-  rotate: false
-  xy: 3545, 1791
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-2
-  rotate: false
-  xy: 3803, 1791
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-3
-  rotate: false
-  xy: 645, 889
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-4
-  rotate: false
-  xy: 613, 631
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-5
-  rotate: false
-  xy: 935, 1469
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-6
-  rotate: false
-  xy: 935, 1211
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-8-7
-  rotate: false
-  xy: 1193, 1501
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-cracks-9-0
-  rotate: false
-  xy: 967, 1759
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-cracks-9-1
-  rotate: false
-  xy: 1, 471
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-cracks-9-2
-  rotate: false
-  xy: 323, 793
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-cracks-9-3
-  rotate: false
-  xy: 645, 1147
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-cracks-9-4
-  rotate: false
-  xy: 1257, 1759
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-cracks-9-5
-  rotate: false
-  xy: 1, 181
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-cracks-9-6
-  rotate: false
-  xy: 1547, 1759
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-cracks-9-7
-  rotate: false
-  xy: 1837, 1759
-  size: 288, 288
-  orig: 288, 288
-  offset: 0, 0
-  index: -1
-crawler-wreck0
-  rotate: false
-  xy: 1985, 120
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-crawler-wreck1
-  rotate: false
-  xy: 2035, 120
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-crawler-wreck2
-  rotate: false
-  xy: 2085, 134
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-cyclone
-  rotate: false
-  xy: 1779, 915
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dagger-wreck0
-  rotate: false
-  xy: 1978, 20
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-dagger-wreck1
-  rotate: false
-  xy: 2028, 70
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-dagger-wreck2
-  rotate: false
-  xy: 2028, 20
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-duo
-  rotate: false
-  xy: 3277, 228
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-eclipse-wreck0
-  rotate: false
-  xy: 323, 1727
-  size: 320, 320
-  orig: 320, 320
-  offset: 0, 0
-  index: -1
-eclipse-wreck1
-  rotate: false
-  xy: 1, 1083
-  size: 320, 320
-  orig: 320, 320
-  offset: 0, 0
-  index: -1
-eclipse-wreck2
-  rotate: false
-  xy: 323, 1405
-  size: 320, 320
-  orig: 320, 320
-  offset: 0, 0
-  index: -1
-flare-wreck0
-  rotate: false
-  xy: 2152, 396
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-flare-wreck1
-  rotate: false
-  xy: 2202, 439
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-flare-wreck2
-  rotate: false
-  xy: 2252, 439
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-fortress-wreck0
-  rotate: false
-  xy: 2265, 979
-  size: 100, 80
-  orig: 100, 80
-  offset: 0, 0
-  index: -1
-fortress-wreck1
-  rotate: false
-  xy: 2367, 1061
-  size: 100, 80
-  orig: 100, 80
-  offset: 0, 0
-  index: -1
-fortress-wreck2
-  rotate: false
-  xy: 2367, 979
-  size: 100, 80
-  orig: 100, 80
-  offset: 0, 0
-  index: -1
-fuse
-  rotate: false
-  xy: 2039, 637
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-gamma-wreck0
-  rotate: false
-  xy: 1978, 502
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-gamma-wreck1
-  rotate: false
-  xy: 1920, 444
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-gamma-wreck2
-  rotate: false
-  xy: 2036, 502
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-hail
-  rotate: false
-  xy: 3277, 194
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-horizon-wreck0
-  rotate: false
-  xy: 3637, 905
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-horizon-wreck1
-  rotate: false
-  xy: 3243, 812
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-horizon-wreck2
-  rotate: false
-  xy: 3215, 738
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-item-blast-compound-large
-  rotate: false
-  xy: 1885, 104
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-blast-compound-medium
-  rotate: false
-  xy: 3447, 193
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-blast-compound-small
-  rotate: false
-  xy: 1419, 1049
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-blast-compound-tiny
-  rotate: false
-  xy: 1, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-blast-compound-xlarge
-  rotate: false
-  xy: 2252, 389
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-coal-large
-  rotate: false
-  xy: 3600, 269
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-coal-medium
-  rotate: false
-  xy: 3277, 160
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-coal-small
-  rotate: false
-  xy: 1445, 1049
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-coal-tiny
-  rotate: false
-  xy: 19, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-coal-xlarge
-  rotate: false
-  xy: 2302, 389
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-copper-large
-  rotate: false
-  xy: 3642, 269
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-copper-medium
-  rotate: false
-  xy: 3345, 159
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-copper-small
-  rotate: false
-  xy: 613, 1057
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-copper-tiny
-  rotate: false
-  xy: 37, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-copper-xlarge
-  rotate: false
-  xy: 2352, 389
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-graphite-large
-  rotate: false
-  xy: 2178, 26
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-graphite-medium
-  rotate: false
-  xy: 3413, 159
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-graphite-small
-  rotate: false
-  xy: 967, 1733
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-graphite-tiny
-  rotate: false
-  xy: 55, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-graphite-xlarge
-  rotate: false
-  xy: 2402, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-lead-large
-  rotate: false
-  xy: 3352, 227
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-lead-medium
-  rotate: false
-  xy: 3481, 159
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-lead-small
-  rotate: false
-  xy: 903, 1121
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-lead-tiny
-  rotate: false
-  xy: 73, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-lead-xlarge
-  rotate: false
-  xy: 2452, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-metaglass-large
-  rotate: false
-  xy: 3394, 227
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-metaglass-medium
-  rotate: false
-  xy: 3515, 159
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-metaglass-small
-  rotate: false
-  xy: 871, 863
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-metaglass-tiny
-  rotate: false
-  xy: 91, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-metaglass-xlarge
-  rotate: false
-  xy: 2502, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-phase-fabric-large
-  rotate: false
-  xy: 3436, 227
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-phase-fabric-medium
-  rotate: false
-  xy: 2257, 237
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-phase-fabric-small
-  rotate: false
-  xy: 1161, 1185
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-phase-fabric-tiny
-  rotate: false
-  xy: 109, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-phase-fabric-xlarge
-  rotate: false
-  xy: 2552, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-plastanium-large
-  rotate: false
-  xy: 3478, 227
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-plastanium-medium
-  rotate: false
-  xy: 2325, 241
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-plastanium-small
-  rotate: false
-  xy: 1129, 959
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-plastanium-tiny
-  rotate: false
-  xy: 127, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-plastanium-xlarge
-  rotate: false
-  xy: 2602, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-pyratite-large
-  rotate: false
-  xy: 3600, 227
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-pyratite-medium
-  rotate: false
-  xy: 2393, 211
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-pyratite-small
-  rotate: false
-  xy: 1097, 733
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-pyratite-tiny
-  rotate: false
-  xy: 145, 1
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-pyratite-xlarge
-  rotate: false
-  xy: 2652, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-sand-large
-  rotate: false
-  xy: 3642, 227
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-sand-medium
-  rotate: false
-  xy: 2461, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-sand-small
-  rotate: false
-  xy: 1097, 537
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-sand-tiny
-  rotate: false
-  xy: 3029, 335
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-sand-xlarge
-  rotate: false
-  xy: 2702, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-scrap-large
-  rotate: false
-  xy: 3684, 211
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-scrap-medium
-  rotate: false
-  xy: 2529, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-scrap-small
-  rotate: false
-  xy: 1451, 1507
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-scrap-tiny
-  rotate: false
-  xy: 2959, 1023
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-scrap-xlarge
-  rotate: false
-  xy: 2752, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-silicon-large
-  rotate: false
-  xy: 1805, 579
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-silicon-medium
-  rotate: false
-  xy: 2597, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-silicon-small
-  rotate: false
-  xy: 323, 767
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-silicon-tiny
-  rotate: false
-  xy: 3147, 848
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-silicon-xlarge
-  rotate: false
-  xy: 2802, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-spore-pod-large
-  rotate: false
-  xy: 1847, 579
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-spore-pod-medium
-  rotate: false
-  xy: 2699, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-spore-pod-small
-  rotate: false
-  xy: 2431, 855
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-spore-pod-tiny
-  rotate: false
-  xy: 3757, 829
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-spore-pod-xlarge
-  rotate: false
-  xy: 2852, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-surge-alloy-large
-  rotate: false
-  xy: 1889, 579
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-surge-alloy-medium
-  rotate: false
-  xy: 2767, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-surge-alloy-small
-  rotate: false
-  xy: 2073, 937
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-surge-alloy-tiny
-  rotate: false
-  xy: 4041, 808
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-surge-alloy-xlarge
-  rotate: false
-  xy: 2902, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-thorium-large
-  rotate: false
-  xy: 2144, 354
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-thorium-medium
-  rotate: false
-  xy: 2835, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-thorium-small
-  rotate: false
-  xy: 2203, 866
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-thorium-tiny
-  rotate: false
-  xy: 3821, 1319
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-thorium-xlarge
-  rotate: false
-  xy: 2952, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-item-titanium-large
-  rotate: false
-  xy: 2143, 312
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-item-titanium-medium
-  rotate: false
-  xy: 2903, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-titanium-small
-  rotate: false
-  xy: 2206, 524
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-item-titanium-tiny
-  rotate: false
-  xy: 3729, 985
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-item-titanium-xlarge
-  rotate: false
-  xy: 3002, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-lancer
-  rotate: false
-  xy: 3691, 715
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-large
-  rotate: false
-  xy: 2143, 270
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-medium
-  rotate: false
-  xy: 3039, 165
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-small
-  rotate: false
-  xy: 2402, 463
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-tiny
-  rotate: false
-  xy: 3726, 235
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-xlarge
-  rotate: false
-  xy: 3152, 403
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-liquid-oil-large
-  rotate: false
-  xy: 2186, 347
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-liquid-oil-medium
-  rotate: false
-  xy: 3141, 167
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-oil-small
-  rotate: false
-  xy: 1561, 889
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-liquid-oil-tiny
-  rotate: false
-  xy: 3073, 317
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-liquid-oil-xlarge
-  rotate: false
-  xy: 3202, 392
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-liquid-slag-large
-  rotate: false
-  xy: 2228, 347
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-liquid-slag-medium
-  rotate: false
-  xy: 3379, 125
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-slag-small
-  rotate: false
-  xy: 4065, 1181
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-liquid-slag-tiny
-  rotate: false
-  xy: 3277, 272
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-liquid-slag-xlarge
-  rotate: false
-  xy: 3102, 353
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-liquid-water-large
-  rotate: false
-  xy: 2270, 347
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-liquid-water-medium
-  rotate: false
-  xy: 3515, 125
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-water-small
-  rotate: false
-  xy: 1097, 12
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-liquid-water-tiny
-  rotate: false
-  xy: 3651, 209
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-liquid-water-xlarge
-  rotate: false
-  xy: 3152, 353
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mace-wreck0
-  rotate: false
-  xy: 3757, 603
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mace-wreck1
-  rotate: false
-  xy: 3823, 669
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mace-wreck2
-  rotate: false
-  xy: 3823, 603
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-mass-driver
-  rotate: false
-  xy: 2823, 649
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mega-wreck0
-  rotate: false
-  xy: 2673, 1041
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-mega-wreck1
-  rotate: false
-  xy: 2775, 1041
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-mega-wreck2
-  rotate: false
-  xy: 2877, 1041
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-meltdown
-  rotate: false
-  xy: 2991, 1143
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-minke-wreck0
-  rotate: false
-  xy: 3381, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-minke-wreck1
-  rotate: false
-  xy: 3381, 1143
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-minke-wreck2
-  rotate: false
-  xy: 3511, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-mono-wreck0
-  rotate: false
-  xy: 2552, 353
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mono-wreck1
-  rotate: false
-  xy: 2602, 353
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mono-wreck2
-  rotate: false
-  xy: 2652, 353
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-nova-wreck0
-  rotate: false
-  xy: 1920, 386
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-nova-wreck1
-  rotate: false
-  xy: 1978, 386
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-nova-wreck2
-  rotate: false
-  xy: 2036, 386
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-parallax
-  rotate: false
-  xy: 3757, 471
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-poly-wreck0
-  rotate: false
-  xy: 2035, 328
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-poly-wreck1
-  rotate: false
-  xy: 1861, 296
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-poly-wreck2
-  rotate: false
-  xy: 1919, 270
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-pulsar-wreck0
-  rotate: false
-  xy: 663, 97
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-pulsar-wreck1
-  rotate: false
-  xy: 1796, 303
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-pulsar-wreck2
-  rotate: false
-  xy: 1796, 253
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-quasar-wreck0
-  rotate: false
-  xy: 1846, 15
-  size: 80, 80
-  orig: 80, 80
-  offset: 0, 0
-  index: -1
-quasar-wreck1
-  rotate: false
-  xy: 3243, 886
-  size: 80, 80
-  orig: 80, 80
-  offset: 0, 0
-  index: -1
-quasar-wreck2
-  rotate: false
-  xy: 3325, 897
-  size: 80, 80
-  orig: 80, 80
-  offset: 0, 0
-  index: -1
-repair-point
-  rotate: false
-  xy: 3554, 229
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ripple
-  rotate: false
-  xy: 2529, 453
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-risse-wreck0
-  rotate: false
-  xy: 2921, 747
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-risse-wreck1
-  rotate: false
-  xy: 2921, 649
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-risse-wreck2
-  rotate: false
-  xy: 2921, 551
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-salvo
-  rotate: false
-  xy: 3625, 509
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scatter
-  rotate: false
-  xy: 3619, 377
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-scorch
-  rotate: false
-  xy: 3617, 193
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-segment
-  rotate: false
-  xy: 3889, 405
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-spectre
-  rotate: false
-  xy: 3641, 1273
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-spiroct-wreck0
-  rotate: false
-  xy: 2037, 560
-  size: 94, 75
-  orig: 94, 75
-  offset: 0, 0
-  index: -1
-spiroct-wreck1
-  rotate: false
-  xy: 3967, 934
-  size: 94, 75
-  orig: 94, 75
-  offset: 0, 0
-  index: -1
-spiroct-wreck2
-  rotate: false
-  xy: 3147, 866
-  size: 94, 75
-  orig: 94, 75
-  offset: 0, 0
-  index: -1
-splash-0
-  rotate: false
-  xy: 3107, 99
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-1
-  rotate: false
-  xy: 3141, 99
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-10
-  rotate: false
-  xy: 3447, 57
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-11
-  rotate: false
-  xy: 3481, 57
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-2
-  rotate: false
-  xy: 3175, 88
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-3
-  rotate: false
-  xy: 3209, 88
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-4
-  rotate: false
-  xy: 3243, 86
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-5
-  rotate: false
-  xy: 3277, 58
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-6
-  rotate: false
-  xy: 3311, 58
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-7
-  rotate: false
-  xy: 3345, 57
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-8
-  rotate: false
-  xy: 3379, 57
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-splash-9
-  rotate: false
-  xy: 3413, 57
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-swarmer
-  rotate: false
-  xy: 3751, 207
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-unit-alpha-full
-  rotate: false
-  xy: 3302, 312
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-antumbra-full
-  rotate: false
-  xy: 727, 291
-  size: 216, 240
-  orig: 216, 240
-  offset: 0, 0
-  index: -1
-unit-arkyid-full
-  rotate: false
-  xy: 1561, 1013
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-unit-atrax-full
-  rotate: false
-  xy: 4003, 1531
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
-unit-beta-full
-  rotate: false
-  xy: 3352, 319
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-bryde-full
-  rotate: false
-  xy: 1419, 1075
-  size: 140, 140
-  orig: 140, 140
-  offset: 0, 0
-  index: -1
-unit-crawler-full
-  rotate: false
-  xy: 3402, 319
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-dagger-full
-  rotate: false
-  xy: 3452, 319
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-eclipse-full
-  rotate: false
-  xy: 645, 1727
-  size: 320, 320
-  orig: 320, 320
-  offset: 0, 0
-  index: -1
-unit-flare-full
-  rotate: false
-  xy: 3502, 319
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-fortress-full
-  rotate: false
-  xy: 2979, 1061
-  size: 100, 80
-  orig: 100, 80
-  offset: 0, 0
-  index: -1
-unit-gamma-full
-  rotate: false
-  xy: 2035, 270
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-unit-horizon-full
-  rotate: false
-  xy: 3215, 442
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-unit-mace-full
-  rotate: false
-  xy: 663, 22
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-unit-mega-full
-  rotate: false
-  xy: 3081, 1041
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-unit-minke-full
-  rotate: false
-  xy: 1691, 1013
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-unit-mono-full
-  rotate: false
-  xy: 3302, 262
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-nova-full
-  rotate: false
-  xy: 2094, 492
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-unit-poly-full
-  rotate: false
-  xy: 2094, 434
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-unit-pulsar-full
-  rotate: false
-  xy: 1485, 1025
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-unit-quasar-full
-  rotate: false
-  xy: 3407, 897
-  size: 80, 80
-  orig: 80, 80
-  offset: 0, 0
-  index: -1
-unit-risse-full
-  rotate: false
-  xy: 3117, 551
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-unit-spiroct-full
-  rotate: false
-  xy: 3183, 968
-  size: 94, 75
-  orig: 94, 75
-  offset: 0, 0
-  index: -1
-unit-zenith-full
-  rotate: false
-  xy: 3983, 1321
-  size: 112, 112
-  orig: 112, 112
-  offset: 0, 0
-  index: -1
-wave
-  rotate: false
-  xy: 1796, 484
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-zenith-wreck0
-  rotate: false
-  xy: 1821, 1029
-  size: 112, 112
-  orig: 112, 112
-  offset: 0, 0
-  index: -1
-zenith-wreck1
-  rotate: false
-  xy: 1935, 1029
-  size: 112, 112
-  orig: 112, 112
-  offset: 0, 0
-  index: -1
-zenith-wreck2
-  rotate: false
-  xy: 2049, 1029
-  size: 112, 112
-  orig: 112, 112
-  offset: 0, 0
-  index: -1
-item-blast-compound
-  rotate: false
-  xy: 3413, 193
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-coal
-  rotate: false
-  xy: 3481, 193
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-copper
-  rotate: false
-  xy: 3311, 160
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-graphite
-  rotate: false
-  xy: 3379, 159
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-lead
-  rotate: false
-  xy: 3447, 159
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-metaglass
-  rotate: false
-  xy: 3515, 193
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-phase-fabric
-  rotate: false
-  xy: 2223, 237
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-plastanium
-  rotate: false
-  xy: 2291, 241
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-pyratite
-  rotate: false
-  xy: 2359, 241
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-sand
-  rotate: false
-  xy: 2427, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-scrap
-  rotate: false
-  xy: 2495, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-silicon
-  rotate: false
-  xy: 2563, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-spore-pod
-  rotate: false
-  xy: 2665, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-surge-alloy
-  rotate: false
-  xy: 2733, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-thorium
-  rotate: false
-  xy: 2801, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-titanium
-  rotate: false
-  xy: 2869, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-cryofluid
-  rotate: false
-  xy: 3005, 183
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-oil
-  rotate: false
-  xy: 3107, 167
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-slag
-  rotate: false
-  xy: 3345, 125
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-water
-  rotate: false
-  xy: 3481, 125
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-blank
-  rotate: false
-  xy: 3352, 395
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-circle
-  rotate: false
-  xy: 945, 330
-  size: 201, 201
-  orig: 201, 201
-  offset: 0, 0
-  index: -1
-shape-3
-  rotate: false
-  xy: 1796, 353
-  size: 63, 63
-  orig: 63, 63
-  offset: 0, 0
-  index: -1
-alpha
-  rotate: false
-  xy: 2152, 446
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-alpha-cell
-  rotate: false
-  xy: 2094, 384
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-antumbra
-  rotate: false
-  xy: 291, 519
-  size: 216, 240
-  orig: 216, 240
-  offset: 0, 0
-  index: -1
-antumbra-cell
-  rotate: false
-  xy: 291, 277
-  size: 216, 240
-  orig: 216, 240
-  offset: 0, 0
-  index: -1
-arkyid
-  rotate: false
-  xy: 1561, 1403
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-chaos-array
-  rotate: false
-  xy: 1561, 1403
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-arkyid-cell
-  rotate: false
-  xy: 2073, 963
-  size: 88, 64
-  orig: 88, 64
-  offset: 0, 0
-  index: -1
 arkyid-foot
   rotate: false
-  xy: 3289, 740
+  xy: 3652, 2605
   size: 70, 70
   orig: 70, 70
   offset: 0, 0
   index: -1
 arkyid-joint-base
   rotate: false
-  xy: 3289, 668
+  xy: 3601, 2533
   size: 70, 70
   orig: 70, 70
   offset: 0, 0
   index: -1
 arkyid-leg
   rotate: false
-  xy: 3909, 941
+  xy: 1063, 3315
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 arkyid-leg-base
   rotate: false
-  xy: 163, 1
+  xy: 1479, 3709
   size: 104, 64
   orig: 104, 64
   offset: 0, 0
   index: -1
-atrax
+arkyid-outline
   rotate: false
-  xy: 3279, 979
-  size: 88, 64
-  orig: 88, 64
+  xy: 3263, 3229
+  size: 128, 128
+  orig: 128, 128
   offset: 0, 0
   index: -1
-atrax-base
+arkyid-wreck0
   rotate: false
-  xy: 3289, 530
-  size: 64, 64
-  orig: 64, 64
+  xy: 3393, 3229
+  size: 128, 128
+  orig: 128, 128
   offset: 0, 0
   index: -1
-atrax-cell
+arkyid-wreck1
   rotate: false
-  xy: 3369, 979
-  size: 88, 64
-  orig: 88, 64
+  xy: 1397, 6
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+arkyid-wreck2
+  rotate: false
+  xy: 1805, 1278
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+artillery-mount-outline
+  rotate: false
+  xy: 3724, 2605
+  size: 70, 70
+  orig: 70, 70
+  offset: 0, 0
+  index: -1
+artillery-outline
+  rotate: false
+  xy: 4043, 3115
+  size: 48, 56
+  orig: 48, 56
   offset: 0, 0
   index: -1
 atrax-foot
   rotate: false
-  xy: 829, 589
+  xy: 1585, 3733
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 atrax-joint
   rotate: false
-  xy: 3259, 1731
+  xy: 1317, 3183
   size: 26, 26
   orig: 26, 26
   offset: 0, 0
   index: -1
 atrax-leg
   rotate: false
-  xy: 1485, 887
+  xy: 1279, 3183
   size: 36, 26
   orig: 36, 26
   offset: 0, 0
   index: -1
 atrax-leg-base
   rotate: false
-  xy: 1523, 887
+  xy: 1817, 1408
   size: 36, 26
   orig: 36, 26
   offset: 0, 0
   index: -1
-beta
+atrax-outline
   rotate: false
-  xy: 2093, 234
+  xy: 1935, 1158
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+atrax-wreck0
+  rotate: false
+  xy: 3907, 3013
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+atrax-wreck1
+  rotate: false
+  xy: 691, 27
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+atrax-wreck2
+  rotate: false
+  xy: 91, 7
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+beam-weapon-outline
+  rotate: false
+  xy: 3477, 2611
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+beta-outline
+  rotate: false
+  xy: 2683, 2979
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+beta-wreck0
+  rotate: false
+  xy: 3016, 2799
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+beta-wreck1
+  rotate: false
+  xy: 3161, 2419
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+beta-wreck2
+  rotate: false
+  xy: 2965, 2407
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+block-additive-reconstructor-full
+  rotate: false
+  xy: 3281, 2891
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-air-factory-full
+  rotate: false
+  xy: 3281, 2793
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-arc-full
+  rotate: false
+  xy: 2291, 12
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-basalt-full
+  rotate: false
+  xy: 2357, 1186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-blast-drill-full
+  rotate: false
+  xy: 1899, 758
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-boulder-full
+  rotate: false
+  xy: 1001, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-beta-cell
+block-char-full
   rotate: false
-  xy: 1885, 196
+  xy: 2353, 1118
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-command-center-full
+  rotate: false
+  xy: 1961, 2212
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-conduit-full
+  rotate: false
+  xy: 2391, 1186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-container-full
+  rotate: false
+  xy: 1895, 2146
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-conveyor-full
+  rotate: false
+  xy: 2387, 1152
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+conveyor-0-0
+  rotate: false
+  xy: 2387, 1152
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-core-foundation-full
+  rotate: false
+  xy: 1887, 628
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-core-nucleus-full
+  rotate: false
+  xy: 1423, 784
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+block-core-shard-full
+  rotate: false
+  xy: 3379, 2903
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-craters-full
+  rotate: false
+  xy: 2387, 1118
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-cryofluid-mixer-full
+  rotate: false
+  xy: 1961, 2146
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-cultivator-full
+  rotate: false
+  xy: 1891, 2080
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-cyclone-full
+  rotate: false
+  xy: 3379, 2805
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-dacite-boulder-full
+  rotate: false
+  xy: 3035, 2195
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-bryde
+block-dacite-full
   rotate: false
-  xy: 1601, 97
+  xy: 2319, 1092
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dacite-wall-full
+  rotate: false
+  xy: 2311, 1058
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dark-metal-full
+  rotate: false
+  xy: 2311, 1024
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-darksand-full
+  rotate: false
+  xy: 2311, 990
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dirt-full
+  rotate: false
+  xy: 2311, 956
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dirt-wall-full
+  rotate: false
+  xy: 2311, 922
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dune-wall-full
+  rotate: false
+  xy: 2353, 1084
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-duo-full
+  rotate: false
+  xy: 2387, 1084
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-exponential-reconstructor-full
+  rotate: false
+  xy: 2837, 3581
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+block-foreshadow-full
+  rotate: false
+  xy: 1887, 498
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-fuse-full
+  rotate: false
+  xy: 3379, 2707
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-grass-full
+  rotate: false
+  xy: 2345, 1050
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ground-factory-full
+  rotate: false
+  xy: 3379, 2609
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-hail-full
+  rotate: false
+  xy: 2345, 1016
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-hotrock-full
+  rotate: false
+  xy: 2379, 1050
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ice-full
+  rotate: false
+  xy: 2345, 982
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ice-snow-full
+  rotate: false
+  xy: 2379, 1016
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ice-wall-full
+  rotate: false
+  xy: 2345, 948
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-impact-reactor-full
+  rotate: false
+  xy: 1887, 368
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-lancer-full
+  rotate: false
+  xy: 1957, 2080
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-laser-drill-full
+  rotate: false
+  xy: 1703, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-liquid-router-full
+  rotate: false
+  xy: 2379, 982
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-liquid-tank-full
+  rotate: false
+  xy: 1801, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-magmarock-full
+  rotate: false
+  xy: 2379, 948
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-mass-driver-full
+  rotate: false
+  xy: 1997, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-mechanical-drill-full
+  rotate: false
+  xy: 1947, 2014
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-meltdown-full
+  rotate: false
+  xy: 1883, 238
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-metal-floor-damaged-full
+  rotate: false
+  xy: 2345, 914
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-moss-full
+  rotate: false
+  xy: 2311, 888
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-mud-full
+  rotate: false
+  xy: 2277, 872
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-multiplicative-reconstructor-full
+  rotate: false
+  xy: 1401, 622
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+block-naval-factory-full
+  rotate: false
+  xy: 2095, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-oil-extractor-full
+  rotate: false
+  xy: 2193, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-ore-coal-full
+  rotate: false
+  xy: 2345, 880
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-copper-full
+  rotate: false
+  xy: 2379, 880
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-lead-full
+  rotate: false
+  xy: 2269, 838
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-scrap-full
+  rotate: false
+  xy: 2269, 804
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-thorium-full
+  rotate: false
+  xy: 2269, 770
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ore-titanium-full
+  rotate: false
+  xy: 2311, 854
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-parallax-full
+  rotate: false
+  xy: 1947, 1948
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-payload-conveyor-full
+  rotate: false
+  xy: 2291, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-conveyor-icon
+  rotate: false
+  xy: 2291, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-payload-router-full
+  rotate: false
+  xy: 2389, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+payload-router-icon
+  rotate: false
+  xy: 2389, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-pebbles-full
+  rotate: false
+  xy: 2345, 846
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-phase-weaver-full
+  rotate: false
+  xy: 1947, 1882
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-plated-conduit-full
+  rotate: false
+  xy: 2379, 846
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-pneumatic-drill-full
+  rotate: false
+  xy: 1947, 1816
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-pulse-conduit-full
+  rotate: false
+  xy: 2303, 820
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-pulverizer-full
+  rotate: false
+  xy: 2303, 786
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-repair-point-full
+  rotate: false
+  xy: 2337, 812
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ripple-full
+  rotate: false
+  xy: 2487, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-salt-wall-full
+  rotate: false
+  xy: 2371, 812
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-salvo-full
+  rotate: false
+  xy: 1947, 1750
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-sand-boulder-full
+  rotate: false
+  xy: 2337, 778
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-full
+  rotate: false
+  xy: 2371, 778
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-wall-full
+  rotate: false
+  xy: 2303, 752
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scatter-full
+  rotate: false
+  xy: 1947, 1684
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-scorch-full
+  rotate: false
+  xy: 2337, 744
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scrap-wall-full
+  rotate: false
+  xy: 2371, 744
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap-wall1
+  rotate: false
+  xy: 2371, 744
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-scrap-wall-huge-full
+  rotate: false
+  xy: 2585, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+scrap-wall-huge1
+  rotate: false
+  xy: 2585, 2937
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-scrap-wall-large-full
+  rotate: false
+  xy: 1947, 1618
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-segment-full
+  rotate: false
+  xy: 1947, 1552
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-shale-boulder-full
+  rotate: false
+  xy: 1638, 2965
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shale-full
+  rotate: false
+  xy: 2575, 2159
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shale-wall-full
+  rotate: false
+  xy: 2575, 2125
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-shrubs-full
+  rotate: false
+  xy: 2361, 2052
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-boulder-full
+  rotate: false
+  xy: 1554, 2999
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-snow-full
+  rotate: false
+  xy: 2361, 2018
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-wall-full
+  rotate: false
+  xy: 2361, 1984
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spectre-full
+  rotate: false
+  xy: 1883, 108
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+block-spore-cluster-full
+  rotate: false
+  xy: 1891, 2038
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-spore-moss-full
+  rotate: false
+  xy: 2361, 1950
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-spore-press-full
+  rotate: false
+  xy: 3829, 2792
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-spore-wall-full
+  rotate: false
+  xy: 2361, 1916
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-steam-generator-full
+  rotate: false
+  xy: 3895, 2783
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-stone-full
+  rotate: false
+  xy: 2361, 1882
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-stone-wall-full
+  rotate: false
+  xy: 2361, 1848
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-swarmer-full
+  rotate: false
+  xy: 3824, 2726
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-tendrils-full
+  rotate: false
+  xy: 2361, 1814
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-tetrative-reconstructor-full
+  rotate: false
+  xy: 1, 1233
+  size: 288, 288
+  orig: 288, 288
+  offset: 0, 0
+  index: -1
+block-titanium-conveyor-full
+  rotate: false
+  xy: 2361, 1780
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+titanium-conveyor-0-0
+  rotate: false
+  xy: 2361, 1780
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-tsunami-full
+  rotate: false
+  xy: 1644, 2839
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-vault-full
+  rotate: false
+  xy: 1742, 2839
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+block-water-extractor-full
+  rotate: false
+  xy: 3890, 2717
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+block-wave-full
+  rotate: false
+  xy: 3808, 2660
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+bryde-outline
+  rotate: false
+  xy: 1663, 1124
   size: 140, 140
   orig: 140, 140
   offset: 0, 0
   index: -1
-bryde-cell
+bryde-wreck0
   rotate: false
-  xy: 1743, 97
+  xy: 1757, 982
   size: 140, 140
   orig: 140, 140
   offset: 0, 0
   index: -1
-chaos-array-base
+bryde-wreck1
   rotate: false
-  xy: 2211, 1403
+  xy: 1757, 840
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+bryde-wreck2
+  rotate: false
+  xy: 2979, 3217
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+command-center-team-crux
+  rotate: false
+  xy: 3940, 2643
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+command-center-team-sharded
+  rotate: false
+  xy: 4027, 2775
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+container-team-crux
+  rotate: false
+  xy: 2185, 2301
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+container-team-sharded
+  rotate: false
+  xy: 2251, 2301
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+core-foundation-team-crux
+  rotate: false
+  xy: 2017, 368
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-chaos-array-cell
+core-foundation-team-sharded
   rotate: false
-  xy: 2211, 1273
+  xy: 2013, 238
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-chaos-array-leg
+core-nucleus-team-crux
   rotate: false
-  xy: 2081, 1143
+  xy: 1397, 136
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+core-nucleus-team-sharded
+  rotate: false
+  xy: 1501, 2066
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+core-shard-team-crux
+  rotate: false
+  xy: 1938, 2839
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+core-shard-team-sharded
+  rotate: false
+  xy: 1840, 2741
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+corvus-foot
+  rotate: false
+  xy: 507, 1
+  size: 90, 90
+  orig: 90, 90
+  offset: 0, 0
+  index: -1
+corvus-joint
+  rotate: false
+  xy: 2147, 368
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+corvus-joint-base
+  rotate: false
+  xy: 3745, 2533
+  size: 70, 70
+  orig: 70, 70
+  offset: 0, 0
+  index: -1
+toxopid-joint-base
+  rotate: false
+  xy: 3745, 2533
+  size: 70, 70
+  orig: 70, 70
+  offset: 0, 0
+  index: -1
+corvus-leg
+  rotate: false
+  xy: 291, 1453
+  size: 30, 68
+  orig: 30, 68
+  offset: 0, 0
+  index: -1
+corvus-leg-base
+  rotate: false
+  xy: 573, 1283
+  size: 30, 64
+  orig: 30, 64
+  offset: 0, 0
+  index: -1
+corvus-outline
+  rotate: false
+  xy: 2757, 3201
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-wreck0
+  rotate: false
+  xy: 1016, 2927
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-wreck1
+  rotate: false
+  xy: 1016, 2785
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-wreck2
+  rotate: false
+  xy: 983, 2643
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+cracks-1-0
+  rotate: false
+  xy: 2381, 540
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-1
+  rotate: false
+  xy: 2381, 506
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-2
+  rotate: false
+  xy: 2381, 472
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-3
+  rotate: false
+  xy: 2381, 438
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-4
+  rotate: false
+  xy: 2385, 404
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-5
+  rotate: false
+  xy: 3587, 2421
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-6
+  rotate: false
+  xy: 3587, 2387
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-1-7
+  rotate: false
+  xy: 3085, 2261
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cracks-2-0
+  rotate: false
+  xy: 2383, 2301
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-1
+  rotate: false
+  xy: 2449, 2301
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-2
+  rotate: false
+  xy: 2515, 2301
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-3
+  rotate: false
+  xy: 2581, 2301
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-4
+  rotate: false
+  xy: 2647, 2311
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-5
+  rotate: false
+  xy: 3521, 2389
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-6
+  rotate: false
+  xy: 2713, 2315
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-2-7
+  rotate: false
+  xy: 2779, 2315
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+cracks-3-0
+  rotate: false
+  xy: 2036, 2839
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-1
+  rotate: false
+  xy: 1938, 2741
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-2
+  rotate: false
+  xy: 2134, 2839
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-3
+  rotate: false
+  xy: 2036, 2741
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-4
+  rotate: false
+  xy: 2232, 2839
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-5
+  rotate: false
+  xy: 2134, 2741
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-6
+  rotate: false
+  xy: 2330, 2839
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-3-7
+  rotate: false
+  xy: 2232, 2741
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+cracks-4-0
+  rotate: false
+  xy: 2013, 108
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-crawler
+cracks-4-1
   rotate: false
-  xy: 2035, 220
-  size: 48, 48
-  orig: 48, 48
+  xy: 2973, 3087
+  size: 128, 128
+  orig: 128, 128
   offset: 0, 0
   index: -1
-crawler-base
+cracks-4-2
   rotate: false
-  xy: 2035, 170
-  size: 48, 48
-  orig: 48, 48
+  xy: 3103, 3087
+  size: 128, 128
+  orig: 128, 128
   offset: 0, 0
   index: -1
-crawler-cell
+cracks-4-3
   rotate: false
-  xy: 2085, 184
-  size: 48, 48
-  orig: 48, 48
+  xy: 3523, 3209
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-4
+  rotate: false
+  xy: 3653, 3209
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-5
+  rotate: false
+  xy: 3783, 3209
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-6
+  rotate: false
+  xy: 3913, 3209
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-4-7
+  rotate: false
+  xy: 3523, 3079
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+cracks-5-0
+  rotate: false
+  xy: 1501, 1904
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-1
+  rotate: false
+  xy: 1501, 1742
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-2
+  rotate: false
+  xy: 1501, 1580
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-3
+  rotate: false
+  xy: 1501, 1418
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-4
+  rotate: false
+  xy: 1501, 1256
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-5
+  rotate: false
+  xy: 1501, 1094
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-6
+  rotate: false
+  xy: 1595, 932
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-5-7
+  rotate: false
+  xy: 1585, 770
+  size: 160, 160
+  orig: 160, 160
+  offset: 0, 0
+  index: -1
+cracks-6-0
+  rotate: false
+  xy: 1153, 2228
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-1
+  rotate: false
+  xy: 1347, 2228
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-2
+  rotate: false
+  xy: 1113, 2034
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-3
+  rotate: false
+  xy: 1113, 1840
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-4
+  rotate: false
+  xy: 1307, 2034
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-5
+  rotate: false
+  xy: 1113, 1646
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-6
+  rotate: false
+  xy: 1307, 1840
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-6-7
+  rotate: false
+  xy: 1113, 1452
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+cracks-7-0
+  rotate: false
+  xy: 3063, 3581
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-1
+  rotate: false
+  xy: 3289, 3581
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-2
+  rotate: false
+  xy: 3515, 3581
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-3
+  rotate: false
+  xy: 3741, 3581
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-4
+  rotate: false
+  xy: 1627, 3307
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-5
+  rotate: false
+  xy: 1853, 3307
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-6
+  rotate: false
+  xy: 2079, 3307
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-7-7
+  rotate: false
+  xy: 2305, 3307
+  size: 224, 224
+  orig: 224, 224
+  offset: 0, 0
+  index: -1
+cracks-8-0
+  rotate: false
+  xy: 573, 867
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-1
+  rotate: false
+  xy: 573, 609
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-2
+  rotate: false
+  xy: 573, 351
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-3
+  rotate: false
+  xy: 573, 93
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-4
+  rotate: false
+  xy: 1127, 3437
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-5
+  rotate: false
+  xy: 805, 3115
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-6
+  rotate: false
+  xy: 758, 2857
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-8-7
+  rotate: false
+  xy: 725, 2599
+  size: 256, 256
+  orig: 256, 256
+  offset: 0, 0
+  index: -1
+cracks-9-0
+  rotate: false
+  xy: 2495, 3807
+  size: 288, 288
+  orig: 288, 288
+  offset: 0, 0
+  index: -1
+cracks-9-1
+  rotate: false
+  xy: 1, 943
+  size: 288, 288
+  orig: 288, 288
+  offset: 0, 0
+  index: -1
+cracks-9-2
+  rotate: false
+  xy: 2785, 3807
+  size: 288, 288
+  orig: 288, 288
+  offset: 0, 0
+  index: -1
+cracks-9-3
+  rotate: false
+  xy: 1, 653
+  size: 288, 288
+  orig: 288, 288
+  offset: 0, 0
+  index: -1
+cracks-9-4
+  rotate: false
+  xy: 3075, 3807
+  size: 288, 288
+  orig: 288, 288
+  offset: 0, 0
+  index: -1
+cracks-9-5
+  rotate: false
+  xy: 1, 363
+  size: 288, 288
+  orig: 288, 288
+  offset: 0, 0
+  index: -1
+cracks-9-6
+  rotate: false
+  xy: 3365, 3807
+  size: 288, 288
+  orig: 288, 288
+  offset: 0, 0
+  index: -1
+cracks-9-7
+  rotate: false
+  xy: 1, 73
+  size: 288, 288
+  orig: 288, 288
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 1935, 120
+  xy: 2165, 1346
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-dagger
+crawler-outline
   rotate: false
-  xy: 1928, 70
+  xy: 2165, 1296
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-dagger-base
+crawler-wreck0
   rotate: false
-  xy: 1928, 20
+  xy: 2165, 1246
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+crawler-wreck1
+  rotate: false
+  xy: 2235, 2186
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-wreck2
+  rotate: false
+  xy: 2225, 2136
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+cyclone
+  rotate: false
+  xy: 2428, 2839
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 dagger-leg
   rotate: false
-  xy: 1978, 70
+  xy: 2211, 1886
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-eclipse
+dagger-outline
   rotate: false
-  xy: 1, 1727
-  size: 320, 320
-  orig: 320, 320
-  offset: 0, 0
-  index: -1
-eclipse-cell
-  rotate: false
-  xy: 1, 1405
-  size: 320, 320
-  orig: 320, 320
-  offset: 0, 0
-  index: -1
-eradicator
-  rotate: false
-  xy: 509, 21
-  size: 152, 124
-  orig: 152, 124
-  offset: 0, 0
-  index: -1
-eradicator-base
-  rotate: false
-  xy: 1139, 113
-  size: 152, 124
-  orig: 152, 124
-  offset: 0, 0
-  index: -1
-eradicator-cell
-  rotate: false
-  xy: 1293, 113
-  size: 152, 124
-  orig: 152, 124
-  offset: 0, 0
-  index: -1
-eradicator-leg
-  rotate: false
-  xy: 1447, 113
-  size: 152, 124
-  orig: 152, 124
-  offset: 0, 0
-  index: -1
-flare
-  rotate: false
-  xy: 2128, 18
+  xy: 2211, 1836
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-fortress
+dagger-wreck0
   rotate: false
-  xy: 727, 549
-  size: 100, 80
-  orig: 100, 80
+  xy: 2211, 1786
+  size: 48, 48
+  orig: 48, 48
   offset: 0, 0
   index: -1
-fortress-base
+dagger-wreck1
   rotate: false
-  xy: 3625, 707
-  size: 64, 64
-  orig: 64, 64
+  xy: 2211, 1736
+  size: 48, 48
+  orig: 48, 48
   offset: 0, 0
   index: -1
-fortress-cell
+dagger-wreck2
   rotate: false
-  xy: 2265, 1061
-  size: 100, 80
-  orig: 100, 80
+  xy: 2211, 1686
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+duo
+  rotate: false
+  xy: 3211, 2385
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+eclipse-outline
+  rotate: false
+  xy: 1, 2167
+  size: 320, 320
+  orig: 320, 320
+  offset: 0, 0
+  index: -1
+eclipse-wreck0
+  rotate: false
+  xy: 403, 2621
+  size: 320, 320
+  orig: 320, 320
+  offset: 0, 0
+  index: -1
+eclipse-wreck1
+  rotate: false
+  xy: 1529, 3775
+  size: 320, 320
+  orig: 320, 320
+  offset: 0, 0
+  index: -1
+eclipse-wreck2
+  rotate: false
+  xy: 1, 1845
+  size: 320, 320
+  orig: 320, 320
+  offset: 0, 0
+  index: -1
+eruption-outline
+  rotate: false
+  xy: 2267, 372
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+flamethrower-outline
+  rotate: false
+  xy: 2273, 206
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+flare-outline
+  rotate: false
+  xy: 2211, 1528
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+flare-wreck0
+  rotate: false
+  xy: 2207, 1478
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+flare-wreck1
+  rotate: false
+  xy: 2285, 2186
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+flare-wreck2
+  rotate: false
+  xy: 2275, 2136
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+foreshadow
+  rotate: false
+  xy: 3653, 3079
+  size: 128, 128
+  orig: 128, 128
   offset: 0, 0
   index: -1
 fortress-leg
   rotate: false
-  xy: 509, 633
+  xy: 3829, 2940
   size: 80, 60
   orig: 80, 60
   offset: 0, 0
   index: -1
-gamma
+fortress-outline
   rotate: false
-  xy: 1861, 354
-  size: 56, 56
-  orig: 56, 56
+  xy: 2649, 3225
+  size: 100, 80
+  orig: 100, 80
   offset: 0, 0
   index: -1
-gamma-cell
+fortress-wreck0
   rotate: false
-  xy: 1920, 502
-  size: 56, 56
-  orig: 56, 56
+  xy: 1440, 2672
+  size: 100, 80
+  orig: 100, 80
   offset: 0, 0
   index: -1
-horizon
+fortress-wreck1
   rotate: false
-  xy: 3489, 905
+  xy: 1985, 26
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+fortress-wreck2
+  rotate: false
+  xy: 2087, 26
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+fuse
+  rotate: false
+  xy: 1657, 2545
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+gamma-outline
+  rotate: false
+  xy: 1817, 770
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+gamma-wreck0
+  rotate: false
+  xy: 2617, 2377
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+gamma-wreck1
+  rotate: false
+  xy: 1897, 2278
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+gamma-wreck2
+  rotate: false
+  xy: 1967, 2278
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+hail
+  rotate: false
+  xy: 3245, 2391
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+heal-shotgun-weapon-outline
+  rotate: false
+  xy: 2820, 2889
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+heal-weapon-mount-outline
+  rotate: false
+  xy: 2261, 1986
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+heal-weapon-outline
+  rotate: false
+  xy: 2261, 1936
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+horizon-outline
+  rotate: false
+  xy: 323, 2341
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
-horizon-cell
+horizon-wreck0
   rotate: false
-  xy: 3563, 905
+  xy: 3993, 2841
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
-mace
+horizon-wreck1
   rotate: false
-  xy: 3691, 583
+  xy: 3734, 2682
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+horizon-wreck2
+  rotate: false
+  xy: 3225, 2425
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+item-blast-compound-large
+  rotate: false
+  xy: 2273, 1236
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-blast-compound-medium
+  rotate: false
+  xy: 3313, 2357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-blast-compound-small
+  rotate: false
+  xy: 693, 2331
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-blast-compound-tiny
+  rotate: false
+  xy: 3187, 2283
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-blast-compound-xlarge
+  rotate: false
+  xy: 2261, 1886
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-coal-large
+  rotate: false
+  xy: 758, 3251
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-coal-medium
+  rotate: false
+  xy: 2325, 88
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-coal-small
+  rotate: false
+  xy: 1601, 3441
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-coal-tiny
+  rotate: false
+  xy: 1569, 3307
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-coal-xlarge
+  rotate: false
+  xy: 2261, 1836
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-copper-large
+  rotate: false
+  xy: 1016, 3073
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-copper-medium
+  rotate: false
+  xy: 2325, 20
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-copper-small
+  rotate: false
+  xy: 691, 1
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-copper-tiny
+  rotate: false
+  xy: 1151, 2625
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-copper-xlarge
+  rotate: false
+  xy: 2261, 1786
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-graphite-large
+  rotate: false
+  xy: 983, 2601
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-graphite-medium
+  rotate: false
+  xy: 2413, 1050
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-graphite-small
+  rotate: false
+  xy: 3347, 2399
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-graphite-tiny
+  rotate: false
+  xy: 1169, 2625
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-graphite-xlarge
+  rotate: false
+  xy: 2261, 1736
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-lead-large
+  rotate: false
+  xy: 1440, 2630
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-lead-medium
+  rotate: false
+  xy: 2413, 982
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-lead-small
+  rotate: false
+  xy: 719, 2331
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-lead-tiny
+  rotate: false
+  xy: 4079, 3061
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-lead-xlarge
+  rotate: false
+  xy: 2261, 1686
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-metaglass-large
+  rotate: false
+  xy: 1063, 3215
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-metaglass-medium
+  rotate: false
+  xy: 2413, 914
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-metaglass-small
+  rotate: false
+  xy: 1601, 3415
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-metaglass-tiny
+  rotate: false
+  xy: 4079, 3043
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-metaglass-xlarge
+  rotate: false
+  xy: 2261, 1636
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-phase-fabric-large
+  rotate: false
+  xy: 1554, 2957
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-phase-fabric-medium
+  rotate: false
+  xy: 2413, 846
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-phase-fabric-small
+  rotate: false
+  xy: 717, 1
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-phase-fabric-tiny
+  rotate: false
+  xy: 4079, 3025
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-phase-fabric-xlarge
+  rotate: false
+  xy: 2261, 1586
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-plastanium-large
+  rotate: false
+  xy: 2273, 114
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-plastanium-medium
+  rotate: false
+  xy: 2405, 778
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-plastanium-small
+  rotate: false
+  xy: 3347, 2373
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-plastanium-tiny
+  rotate: false
+  xy: 4079, 3007
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-plastanium-xlarge
+  rotate: false
+  xy: 2261, 1536
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-pyratite-large
+  rotate: false
+  xy: 2273, 1194
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-pyratite-medium
+  rotate: false
+  xy: 2415, 710
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-pyratite-small
+  rotate: false
+  xy: 745, 2331
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-pyratite-tiny
+  rotate: false
+  xy: 1187, 2625
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-pyratite-xlarge
+  rotate: false
+  xy: 2335, 2193
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-sand-large
+  rotate: false
+  xy: 2227, 850
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-sand-medium
+  rotate: false
+  xy: 2415, 642
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-sand-small
+  rotate: false
+  xy: 1601, 3389
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-sand-tiny
+  rotate: false
+  xy: 4079, 2989
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-sand-xlarge
+  rotate: false
+  xy: 2385, 2193
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-scrap-large
+  rotate: false
+  xy: 758, 3209
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-scrap-medium
+  rotate: false
+  xy: 2415, 574
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-scrap-small
+  rotate: false
+  xy: 743, 1
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-scrap-tiny
+  rotate: false
+  xy: 2279, 752
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-scrap-xlarge
+  rotate: false
+  xy: 2435, 2193
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-silicon-large
+  rotate: false
+  xy: 1025, 2601
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-silicon-medium
+  rotate: false
+  xy: 2415, 506
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-silicon-small
+  rotate: false
+  xy: 771, 2331
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-silicon-tiny
+  rotate: false
+  xy: 3151, 2351
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-silicon-xlarge
+  rotate: false
+  xy: 2485, 2193
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-spore-pod-large
+  rotate: false
+  xy: 1482, 2630
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-spore-pod-medium
+  rotate: false
+  xy: 2419, 404
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-spore-pod-small
+  rotate: false
+  xy: 1601, 3363
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-spore-pod-tiny
+  rotate: false
+  xy: 693, 2603
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-spore-pod-xlarge
+  rotate: false
+  xy: 2535, 2193
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-surge-alloy-large
+  rotate: false
+  xy: 1596, 2957
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-surge-alloy-medium
+  rotate: false
+  xy: 3177, 2335
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-surge-alloy-small
+  rotate: false
+  xy: 797, 2331
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-surge-alloy-tiny
+  rotate: false
+  xy: 2595, 3547
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-surge-alloy-xlarge
+  rotate: false
+  xy: 3161, 2369
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-thorium-large
+  rotate: false
+  xy: 2315, 1194
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-thorium-medium
+  rotate: false
+  xy: 3211, 2317
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-thorium-small
+  rotate: false
+  xy: 1601, 3337
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-thorium-tiny
+  rotate: false
+  xy: 983, 2839
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-thorium-xlarge
+  rotate: false
+  xy: 2215, 1428
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+item-titanium-large
+  rotate: false
+  xy: 2227, 808
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+item-titanium-medium
+  rotate: false
+  xy: 3279, 2323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-titanium-small
+  rotate: false
+  xy: 823, 2331
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+item-titanium-tiny
+  rotate: false
+  xy: 1353, 3419
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+item-titanium-xlarge
+  rotate: false
+  xy: 2215, 1378
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+lancer
+  rotate: false
+  xy: 2013, 1750
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-mace-base
+large-artillery-outline
   rotate: false
-  xy: 3757, 735
-  size: 64, 64
-  orig: 64, 64
+  xy: 2215, 1242
+  size: 48, 66
+  orig: 48, 66
   offset: 0, 0
   index: -1
-mace-cell
+large-bullet-mount-outline
   rotate: false
-  xy: 3757, 669
-  size: 64, 64
-  orig: 64, 64
+  xy: 1969, 2348
+  size: 70, 97
+  orig: 70, 97
+  offset: 0, 0
+  index: -1
+large-laser-mount-outline
+  rotate: false
+  xy: 1853, 2449
+  size: 96, 192
+  orig: 96, 192
+  offset: 0, 0
+  index: -1
+large-purple-mount-outline
+  rotate: false
+  xy: 2113, 2348
+  size: 70, 97
+  orig: 70, 97
+  offset: 0, 0
+  index: -1
+large-weapon-outline
+  rotate: false
+  xy: 2257, 1478
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+liquid-cryofluid-large
+  rotate: false
+  xy: 758, 3167
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+liquid-cryofluid-medium
+  rotate: false
+  xy: 3279, 2289
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-cryofluid-small
+  rotate: false
+  xy: 849, 2331
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+liquid-cryofluid-tiny
+  rotate: false
+  xy: 1229, 876
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+liquid-cryofluid-xlarge
+  rotate: false
+  xy: 2265, 1428
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+liquid-oil-large
+  rotate: false
+  xy: 1067, 2601
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+liquid-oil-medium
+  rotate: false
+  xy: 3153, 2233
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-oil-small
+  rotate: false
+  xy: 1601, 3311
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+liquid-oil-tiny
+  rotate: false
+  xy: 1401, 786
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+liquid-oil-xlarge
+  rotate: false
+  xy: 2265, 1378
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+liquid-slag-large
+  rotate: false
+  xy: 2227, 766
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+liquid-slag-medium
+  rotate: false
+  xy: 3255, 2221
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-slag-small
+  rotate: false
+  xy: 725, 2917
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+liquid-slag-tiny
+  rotate: false
+  xy: 1663, 1106
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+liquid-slag-xlarge
+  rotate: false
+  xy: 2265, 1328
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+liquid-water-large
+  rotate: false
+  xy: 758, 3125
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+liquid-water-medium
+  rotate: false
+  xy: 3323, 2221
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-water-small
+  rotate: false
+  xy: 2495, 3781
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+liquid-water-tiny
+  rotate: false
+  xy: 3945, 3863
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+liquid-water-xlarge
+  rotate: false
+  xy: 2265, 1278
+  size: 48, 48
+  orig: 48, 48
   offset: 0, 0
   index: -1
 mace-leg
   rotate: false
-  xy: 3823, 735
+  xy: 2033, 1354
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-mega
+mace-outline
   rotate: false
-  xy: 2469, 1041
+  xy: 2033, 1288
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-wreck0
+  rotate: false
+  xy: 2033, 1222
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-wreck1
+  rotate: false
+  xy: 2025, 1156
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-wreck2
+  rotate: false
+  xy: 2029, 1090
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mass-driver
+  rotate: false
+  xy: 2441, 2643
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+mega-outline
+  rotate: false
+  xy: 3179, 2871
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-mega-cell
+mega-wreck0
   rotate: false
-  xy: 2571, 1041
+  xy: 3077, 2769
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-minke
+mega-wreck1
   rotate: false
-  xy: 3251, 1273
+  xy: 3179, 2769
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+mega-wreck2
+  rotate: false
+  xy: 1542, 2853
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+meltdown
+  rotate: false
+  xy: 1833, 3035
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-minke-cell
+minke-outline
   rotate: false
-  xy: 3251, 1143
-  size: 128, 128
-  orig: 128, 128
+  xy: 3477, 2796
+  size: 88, 101
+  orig: 88, 101
   offset: 0, 0
   index: -1
-mono
+minke-wreck0
   rotate: false
-  xy: 2452, 353
+  xy: 3567, 2899
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+minke-wreck1
+  rotate: false
+  xy: 3477, 2693
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+minke-wreck2
+  rotate: false
+  xy: 3567, 2796
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+missiles-mount-outline
+  rotate: false
+  xy: 2311, 2036
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-mono-cell
+mono-outline
   rotate: false
-  xy: 2502, 353
+  xy: 2311, 1886
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-nova
+mono-wreck0
   rotate: false
-  xy: 1978, 444
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-nova-base
-  rotate: false
-  xy: 2802, 353
+  xy: 2311, 1836
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-nova-cell
+mono-wreck1
   rotate: false
-  xy: 2036, 444
-  size: 56, 56
-  orig: 56, 56
+  xy: 2311, 1786
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mono-wreck2
+  rotate: false
+  xy: 2311, 1736
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mount-purple-weapon-outline
+  rotate: false
+  xy: 2311, 1636
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mount-weapon-outline
+  rotate: false
+  xy: 2311, 1536
+  size: 48, 48
+  orig: 48, 48
   offset: 0, 0
   index: -1
 nova-leg
   rotate: false
-  xy: 2852, 353
+  xy: 2425, 2143
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-poly
+nova-outline
   rotate: false
-  xy: 1919, 328
+  xy: 1063, 3257
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
-poly-cell
+nova-wreck0
   rotate: false
-  xy: 1977, 328
+  xy: 2358, 2243
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
-power-cell
+nova-wreck1
   rotate: false
-  xy: 1977, 270
+  xy: 2416, 2243
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
-pulsar
+nova-wreck2
   rotate: false
-  xy: 1745, 573
-  size: 58, 48
-  orig: 58, 48
+  xy: 2474, 2243
+  size: 56, 56
+  orig: 56, 56
   offset: 0, 0
   index: -1
-pulsar-base
+oct-outline
   rotate: false
-  xy: 2902, 353
-  size: 48, 48
-  orig: 48, 48
+  xy: 403, 3695
+  size: 400, 400
+  orig: 400, 400
   offset: 0, 0
   index: -1
-pulsar-cell
+oct-wreck0
   rotate: false
-  xy: 2203, 892
-  size: 58, 48
-  orig: 58, 48
+  xy: 1, 2891
+  size: 400, 400
+  orig: 400, 400
   offset: 0, 0
   index: -1
-pulsar-leg
+oct-wreck1
   rotate: false
-  xy: 4021, 736
+  xy: 403, 3293
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+oct-wreck2
+  rotate: false
+  xy: 805, 3695
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+omura-cannon-outline
+  rotate: false
+  xy: 1057, 894
+  size: 192, 277
+  orig: 192, 277
+  offset: 0, 0
+  index: -1
+omura-outline
+  rotate: false
+  xy: 291, 545
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+omura-wreck0
+  rotate: false
+  xy: 291, 143
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+omura-wreck1
+  rotate: false
+  xy: 613, 1929
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+omura-wreck2
+  rotate: false
+  xy: 613, 1527
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+parallax
+  rotate: false
+  xy: 2095, 958
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-quasar
+poly-outline
   rotate: false
-  xy: 4003, 1449
-  size: 80, 80
-  orig: 80, 80
+  xy: 1623, 3107
+  size: 56, 56
+  orig: 56, 56
   offset: 0, 0
   index: -1
-quasar-base
+poly-wreck0
   rotate: false
-  xy: 1600, 15
-  size: 80, 80
-  orig: 80, 80
+  xy: 2149, 1504
+  size: 56, 56
+  orig: 56, 56
   offset: 0, 0
   index: -1
-quasar-cell
+poly-wreck1
   rotate: false
-  xy: 1682, 15
-  size: 80, 80
-  orig: 80, 80
+  xy: 2149, 1446
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+poly-wreck2
+  rotate: false
+  xy: 1565, 3049
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+pulsar-leg
+  rotate: false
+  xy: 2845, 2199
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+pulsar-outline
+  rotate: false
+  xy: 2037, 2288
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+pulsar-wreck0
+  rotate: false
+  xy: 2107, 2288
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+pulsar-wreck1
+  rotate: false
+  xy: 1801, 2235
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+pulsar-wreck2
+  rotate: false
+  xy: 2687, 2387
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+quad-outline
+  rotate: false
+  xy: 831, 7
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quad-wreck0
+  rotate: false
+  xy: 2757, 3343
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quad-wreck1
+  rotate: false
+  xy: 2979, 3359
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quad-wreck2
+  rotate: false
+  xy: 3201, 3359
+  size: 220, 220
+  orig: 220, 220
   offset: 0, 0
   index: -1
 quasar-leg
   rotate: false
-  xy: 1764, 15
+  xy: 1307, 12
   size: 80, 80
   orig: 80, 80
   offset: 0, 0
   index: -1
-risse
+quasar-outline
   rotate: false
-  xy: 2725, 453
+  xy: 3519, 2529
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-wreck0
+  rotate: false
+  xy: 3997, 2997
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-wreck1
+  rotate: false
+  xy: 3993, 2915
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-wreck2
+  rotate: false
+  xy: 3829, 2858
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+reign-leg
+  rotate: false
+  xy: 1663, 1534
+  size: 152, 124
+  orig: 152, 124
+  offset: 0, 0
+  index: -1
+reign-outline
+  rotate: false
+  xy: 1353, 3183
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+reign-weapon-outline
+  rotate: false
+  xy: 3657, 2759
+  size: 83, 138
+  orig: 83, 138
+  offset: 0, 0
+  index: -1
+reign-wreck0
+  rotate: false
+  xy: 1569, 3165
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+reign-wreck1
+  rotate: false
+  xy: 1785, 3165
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+reign-wreck2
+  rotate: false
+  xy: 2001, 3165
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+repair-point
+  rotate: false
+  xy: 3493, 2269
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ripple
+  rotate: false
+  xy: 2735, 2451
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-cell
+risso-outline
   rotate: false
-  xy: 2823, 453
-  size: 96, 96
-  orig: 96, 96
+  xy: 2257, 2367
+  size: 70, 78
+  orig: 70, 78
   offset: 0, 0
   index: -1
-spiroct
+risso-wreck0
   rotate: false
-  xy: 1615, 740
-  size: 94, 75
-  orig: 94, 75
+  xy: 2329, 2367
+  size: 70, 78
+  orig: 70, 78
   offset: 0, 0
   index: -1
-spiroct-cell
+risso-wreck1
   rotate: false
-  xy: 1941, 560
-  size: 94, 75
-  orig: 94, 75
+  xy: 2401, 2367
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+risso-wreck2
+  rotate: false
+  xy: 2473, 2367
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+salvo
+  rotate: false
+  xy: 2079, 1750
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scatter
+  rotate: false
+  xy: 2079, 1618
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+scepter-leg
+  rotate: false
+  xy: 2483, 3035
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+vela-leg
+  rotate: false
+  xy: 2483, 3035
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+scepter-outline
+  rotate: false
+  xy: 1251, 946
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scepter-weapon-outline
+  rotate: false
+  xy: 2977, 2199
+  size: 56, 102
+  orig: 56, 102
+  offset: 0, 0
+  index: -1
+scepter-wreck0
+  rotate: false
+  xy: 1057, 610
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scepter-wreck1
+  rotate: false
+  xy: 1053, 468
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scepter-wreck2
+  rotate: false
+  xy: 1053, 326
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scorch
+  rotate: false
+  xy: 3459, 2167
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+segment
+  rotate: false
+  xy: 2099, 1288
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+sei-launcher-outline
+  rotate: false
+  xy: 3747, 2838
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+sei-outline
+  rotate: false
+  xy: 1627, 3533
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+sei-wreck0
+  rotate: false
+  xy: 1869, 3533
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+sei-wreck1
+  rotate: false
+  xy: 2111, 3533
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+sei-wreck2
+  rotate: false
+  xy: 2353, 3533
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+small-basic-weapon-outline
+  rotate: false
+  xy: 2307, 1486
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+small-mount-weapon-outline
+  rotate: false
+  xy: 2315, 1386
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+spectre
+  rotate: false
+  xy: 2743, 3071
+  size: 128, 128
+  orig: 128, 128
   offset: 0, 0
   index: -1
 spiroct-foot
   rotate: false
-  xy: 3552, 263
+  xy: 1609, 2425
   size: 46, 46
   orig: 46, 46
   offset: 0, 0
   index: -1
 spiroct-joint
   rotate: false
-  xy: 3073, 99
+  xy: 3527, 2219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spiroct-leg
   rotate: false
-  xy: 3771, 1301
+  xy: 3323, 2609
   size: 48, 34
   orig: 48, 34
   offset: 0, 0
   index: -1
 spiroct-leg-base
   rotate: false
-  xy: 3302, 362
+  xy: 4043, 3079
   size: 48, 34
   orig: 48, 34
   offset: 0, 0
   index: -1
+spiroct-outline
+  rotate: false
+  xy: 1801, 2295
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+spiroct-weapon-outline
+  rotate: false
+  xy: 2365, 1370
+  size: 48, 56
+  orig: 48, 56
+  offset: 0, 0
+  index: -1
+spiroct-wreck0
+  rotate: false
+  xy: 3523, 3002
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+spiroct-wreck1
+  rotate: false
+  xy: 3619, 3002
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+spiroct-wreck2
+  rotate: false
+  xy: 3715, 3002
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+splash-0
+  rotate: false
+  xy: 3527, 2185
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-1
+  rotate: false
+  xy: 3527, 2151
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-10
+  rotate: false
+  xy: 3595, 2183
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-11
+  rotate: false
+  xy: 3595, 2149
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-2
+  rotate: false
+  xy: 3561, 2285
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-3
+  rotate: false
+  xy: 3561, 2251
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-4
+  rotate: false
+  xy: 3561, 2217
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-5
+  rotate: false
+  xy: 3561, 2183
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-6
+  rotate: false
+  xy: 3561, 2149
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-7
+  rotate: false
+  xy: 3595, 2285
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-8
+  rotate: false
+  xy: 3595, 2251
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+splash-9
+  rotate: false
+  xy: 3595, 2217
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+swarmer
+  rotate: false
+  xy: 2089, 2090
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+toxopid-cannon-outline
+  rotate: false
+  xy: 1232, 2625
+  size: 206, 220
+  orig: 206, 220
+  offset: 0, 0
+  index: -1
+toxopid-foot
+  rotate: false
+  xy: 599, 1
+  size: 90, 90
+  orig: 90, 90
+  offset: 0, 0
+  index: -1
+toxopid-leg
+  rotate: false
+  xy: 3945, 4023
+  size: 150, 72
+  orig: 150, 72
+  offset: 0, 0
+  index: -1
+toxopid-leg-base
+  rotate: false
+  xy: 1207, 3709
+  size: 270, 64
+  orig: 270, 64
+  offset: 0, 0
+  index: -1
+toxopid-outline
+  rotate: false
+  xy: 1725, 386
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+toxopid-wreck0
+  rotate: false
+  xy: 1721, 194
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+toxopid-wreck1
+  rotate: false
+  xy: 1721, 2
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+toxopid-wreck2
+  rotate: false
+  xy: 1541, 2230
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+tsunami
+  rotate: false
+  xy: 3127, 2475
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+unit-alpha-full
+  rotate: false
+  xy: 2365, 1320
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-antumbra-full
+  rotate: false
+  xy: 895, 1389
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+unit-arkyid-full
+  rotate: false
+  xy: 2873, 2957
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+unit-atrax-full
+  rotate: false
+  xy: 181, 7
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+unit-beta-full
+  rotate: false
+  xy: 3035, 2353
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+unit-bryde-full
+  rotate: false
+  xy: 3121, 3217
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+unit-corvus-full
+  rotate: false
+  xy: 2217, 3165
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+unit-crawler-full
+  rotate: false
+  xy: 2365, 1270
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-dagger-full
+  rotate: false
+  xy: 2315, 1236
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-eclipse-full
+  rotate: false
+  xy: 1851, 3775
+  size: 320, 320
+  orig: 320, 320
+  offset: 0, 0
+  index: -1
+unit-flare-full
+  rotate: false
+  xy: 2365, 1220
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-fortress-full
+  rotate: false
+  xy: 1542, 2771
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+unit-gamma-full
+  rotate: false
+  xy: 2757, 2381
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+unit-horizon-full
+  rotate: false
+  xy: 3521, 2455
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+unit-mace-full
+  rotate: false
+  xy: 2145, 2024
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+unit-mega-full
+  rotate: false
+  xy: 1542, 2669
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+unit-minke-full
+  rotate: false
+  xy: 3657, 2899
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+unit-mono-full
+  rotate: false
+  xy: 2227, 1142
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-nova-full
+  rotate: false
+  xy: 3035, 2295
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+unit-oct-full
+  rotate: false
+  xy: 1, 2489
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+unit-omura-full
+  rotate: false
+  xy: 605, 1125
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+unit-poly-full
+  rotate: false
+  xy: 3093, 2351
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+unit-pulsar-full
+  rotate: false
+  xy: 1825, 2175
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+unit-quad-full
+  rotate: false
+  xy: 3423, 3359
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+unit-quasar-full
+  rotate: false
+  xy: 3742, 2756
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+unit-reign-full
+  rotate: false
+  xy: 2433, 3165
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+unit-risso-full
+  rotate: false
+  xy: 2545, 2367
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+unit-scepter-full
+  rotate: false
+  xy: 1053, 184
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+unit-sei-full
+  rotate: false
+  xy: 2595, 3565
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+unit-spiroct-full
+  rotate: false
+  xy: 3811, 3002
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+unit-toxopid-full
+  rotate: false
+  xy: 1663, 2038
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+unit-vela-full
+  rotate: false
+  xy: 1053, 42
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+unit-zenith-full
+  rotate: false
+  xy: 1279, 3069
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+vault-team-crux
+  rotate: false
+  xy: 1703, 2349
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+vault-team-sharded
+  rotate: false
+  xy: 1703, 2251
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+vela-outline
+  rotate: false
+  xy: 1229, 520
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+vela-wreck0
+  rotate: false
+  xy: 1225, 236
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+vela-wreck1
+  rotate: false
+  xy: 1225, 94
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+vela-wreck2
+  rotate: false
+  xy: 1423, 946
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+wave
+  rotate: false
+  xy: 2145, 1694
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+zenith-missiles-outline
+  rotate: false
+  xy: 2227, 892
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+zenith-outline
+  rotate: false
+  xy: 3003, 2973
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+zenith-wreck0
+  rotate: false
+  xy: 3117, 2973
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+zenith-wreck1
+  rotate: false
+  xy: 1527, 8
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+zenith-wreck2
+  rotate: false
+  xy: 1440, 2955
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+item-blast-compound
+  rotate: false
+  xy: 3279, 2357
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-coal
+  rotate: false
+  xy: 2315, 122
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-copper
+  rotate: false
+  xy: 2325, 54
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-graphite
+  rotate: false
+  xy: 2590, 2217
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-lead
+  rotate: false
+  xy: 2413, 1016
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-metaglass
+  rotate: false
+  xy: 2413, 948
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-phase-fabric
+  rotate: false
+  xy: 2413, 880
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-plastanium
+  rotate: false
+  xy: 2405, 812
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-pyratite
+  rotate: false
+  xy: 2405, 744
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-sand
+  rotate: false
+  xy: 2415, 676
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-scrap
+  rotate: false
+  xy: 2415, 608
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-silicon
+  rotate: false
+  xy: 2415, 540
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-spore-pod
+  rotate: false
+  xy: 2415, 438
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-surge-alloy
+  rotate: false
+  xy: 3143, 2317
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-thorium
+  rotate: false
+  xy: 3177, 2301
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+item-titanium
+  rotate: false
+  xy: 3245, 2323
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-cryofluid
+  rotate: false
+  xy: 3245, 2289
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-oil
+  rotate: false
+  xy: 3153, 2267
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-slag
+  rotate: false
+  xy: 3255, 2255
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+liquid-water
+  rotate: false
+  xy: 3323, 2255
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+blank
+  rotate: false
+  xy: 3734, 2756
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+circle
+  rotate: false
+  xy: 1153, 2422
+  size: 201, 201
+  orig: 201, 201
+  offset: 0, 0
+  index: -1
+shape-3
+  rotate: false
+  xy: 2235, 2236
+  size: 63, 63
+  orig: 63, 63
+  offset: 0, 0
+  index: -1
+alpha
+  rotate: false
+  xy: 781, 43
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+alpha-cell
+  rotate: false
+  xy: 1559, 2423
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+antumbra
+  rotate: false
+  xy: 3645, 3339
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+antumbra-cell
+  rotate: false
+  xy: 3863, 3339
+  size: 216, 240
+  orig: 216, 240
+  offset: 0, 0
+  index: -1
+arkyid
+  rotate: false
+  xy: 3967, 3751
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+arkyid-cell
+  rotate: false
+  xy: 3967, 3621
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+atrax
+  rotate: false
+  xy: 1, 7
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+atrax-base
+  rotate: false
+  xy: 1825, 2109
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+atrax-cell
+  rotate: false
+  xy: 1001, 1181
+  size: 88, 64
+  orig: 88, 64
+  offset: 0, 0
+  index: -1
+beta
+  rotate: false
+  xy: 1507, 3127
+  size: 56, 54
+  orig: 56, 54
+  offset: 0, 0
+  index: -1
+beta-cell
+  rotate: false
+  xy: 3093, 2301
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+bryde
+  rotate: false
+  xy: 1663, 1266
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+bryde-cell
+  rotate: false
+  xy: 3945, 3881
+  size: 140, 140
+  orig: 140, 140
+  offset: 0, 0
+  index: -1
+corvus
+  rotate: false
+  xy: 291, 1
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-base
+  rotate: false
+  xy: 1663, 1912
+  size: 152, 124
+  orig: 152, 124
+  offset: 0, 0
+  index: -1
+corvus-cell
+  rotate: false
+  xy: 887, 1247
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+corvus-weapon-heat
+  rotate: false
+  xy: 1063, 3069
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+crawler
+  rotate: false
+  xy: 3817, 2560
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-base
+  rotate: false
+  xy: 3817, 2510
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+crawler-cell
+  rotate: false
+  xy: 2165, 1396
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger
+  rotate: false
+  xy: 2211, 1986
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dagger-base
+  rotate: false
+  xy: 2211, 1936
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+eclipse
+  rotate: false
+  xy: 805, 3373
+  size: 320, 320
+  orig: 320, 320
+  offset: 0, 0
+  index: -1
+eclipse-cell
+  rotate: false
+  xy: 1207, 3775
+  size: 320, 320
+  orig: 320, 320
+  offset: 0, 0
+  index: -1
+flare
+  rotate: false
+  xy: 2273, 156
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+fortress
+  rotate: false
+  xy: 1883, 26
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+fortress-base
+  rotate: false
+  xy: 2013, 2014
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+fortress-cell
+  rotate: false
+  xy: 1817, 1436
+  size: 100, 80
+  orig: 100, 80
+  offset: 0, 0
+  index: -1
+gamma
+  rotate: false
+  xy: 1747, 770
+  size: 68, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+gamma-cell
+  rotate: false
+  xy: 1507, 3069
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+horizon
+  rotate: false
+  xy: 323, 2415
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+horizon-cell
+  rotate: false
+  xy: 1641, 48
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+mace
+  rotate: false
+  xy: 2023, 2080
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-base
+  rotate: false
+  xy: 2017, 1486
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mace-cell
+  rotate: false
+  xy: 2017, 1420
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+mega
+  rotate: false
+  xy: 2975, 2855
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+mega-cell
+  rotate: false
+  xy: 3077, 2871
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+minke
+  rotate: false
+  xy: 3477, 2899
+  size: 88, 101
+  orig: 88, 101
+  offset: 0, 0
+  index: -1
+minke-cell
+  rotate: false
+  xy: 2093, 3035
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+mono
+  rotate: false
+  xy: 2311, 1986
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mono-cell
+  rotate: false
+  xy: 2311, 1936
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+nova
+  rotate: false
+  xy: 2300, 2243
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+nova-base
+  rotate: false
+  xy: 2375, 2143
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+nova-cell
+  rotate: false
+  xy: 2209, 372
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+oct
+  rotate: false
+  xy: 1, 3695
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+oct-cell
+  rotate: false
+  xy: 1, 3293
+  size: 400, 400
+  orig: 400, 400
+  offset: 0, 0
+  index: -1
+omura
+  rotate: false
+  xy: 323, 1349
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+omura-cannon-heat
+  rotate: false
+  xy: 1113, 1173
+  size: 192, 277
+  orig: 192, 277
+  offset: 0, 0
+  index: -1
+omura-cell
+  rotate: false
+  xy: 291, 947
+  size: 280, 400
+  orig: 280, 400
+  offset: 0, 0
+  index: -1
+poly
+  rotate: false
+  xy: 2532, 2243
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+poly-cell
+  rotate: false
+  xy: 1565, 3107
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+power-cell
+  rotate: false
+  xy: 1623, 3049
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+pulsar
+  rotate: false
+  xy: 2649, 3165
+  size: 68, 58
+  orig: 68, 58
+  offset: 0, 0
+  index: -1
+pulsar-base
+  rotate: false
+  xy: 2475, 2143
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+pulsar-cell
+  rotate: false
+  xy: 507, 93
+  size: 58, 48
+  orig: 58, 48
+  offset: 0, 0
+  index: -1
+quad
+  rotate: false
+  xy: 831, 451
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quad-cell
+  rotate: false
+  xy: 831, 229
+  size: 220, 220
+  orig: 220, 220
+  offset: 0, 0
+  index: -1
+quasar
+  rotate: false
+  xy: 3652, 2677
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-base
+  rotate: false
+  xy: 3911, 2931
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+quasar-cell
+  rotate: false
+  xy: 1225, 12
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
+reign
+  rotate: false
+  xy: 1385, 3325
+  size: 214, 140
+  orig: 214, 140
+  offset: 0, 0
+  index: -1
+reign-base
+  rotate: false
+  xy: 1663, 1786
+  size: 152, 124
+  orig: 152, 124
+  offset: 0, 0
+  index: -1
+reign-cell
+  rotate: false
+  xy: 1663, 1660
+  size: 152, 124
+  orig: 152, 124
+  offset: 0, 0
+  index: -1
+risso
+  rotate: false
+  xy: 2185, 2367
+  size: 70, 78
+  orig: 70, 78
+  offset: 0, 0
+  index: -1
+risso-cell
+  rotate: false
+  xy: 2833, 2561
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+scepter
+  rotate: false
+  xy: 1057, 752
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+scepter-base
+  rotate: false
+  xy: 2223, 3035
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+vela-base
+  rotate: false
+  xy: 2223, 3035
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+scepter-cell
+  rotate: false
+  xy: 2353, 3035
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
+sei
+  rotate: false
+  xy: 693, 2357
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+sei-cell
+  rotate: false
+  xy: 1385, 3467
+  size: 240, 240
+  orig: 240, 240
+  offset: 0, 0
+  index: -1
+spiroct
+  rotate: false
+  xy: 3427, 3022
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+spiroct-cell
+  rotate: false
+  xy: 1801, 2372
+  size: 94, 75
+  orig: 94, 75
+  offset: 0, 0
+  index: -1
+toxopid
+  rotate: false
+  xy: 1725, 578
+  size: 160, 190
+  orig: 160, 190
+  offset: 0, 0
+  index: -1
+toxopid-cannon
+  rotate: false
+  xy: 1232, 2847
+  size: 206, 220
+  orig: 206, 220
+  offset: 0, 0
+  index: -1
+toxopid-cell
+  rotate: false
+  xy: 1663, 1408
+  size: 152, 124
+  orig: 152, 124
+  offset: 0, 0
+  index: -1
 vanguard
   rotate: false
-  xy: 3352, 269
+  xy: 2227, 1092
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-cell
   rotate: false
-  xy: 3402, 269
+  xy: 2227, 1042
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-antumbra-missiles
+vela
   rotate: false
-  xy: 4041, 884
-  size: 48, 48
-  orig: 48, 48
+  xy: 1251, 804
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+vela-cell
+  rotate: false
+  xy: 1229, 662
+  size: 170, 140
+  orig: 170, 140
+  offset: 0, 0
+  index: -1
+vela-weapon-heat
+  rotate: false
+  xy: 1225, 378
+  size: 170, 140
+  orig: 170, 140
   offset: 0, 0
   index: -1
 artillery
   rotate: false
-  xy: 4041, 826
+  xy: 4043, 3173
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 artillery-mount
   rotate: false
-  xy: 3289, 596
+  xy: 3673, 2533
   size: 70, 70
   orig: 70, 70
   offset: 0, 0
   index: -1
 beam-weapon
   rotate: false
-  xy: 1518, 31
+  xy: 3747, 2920
   size: 80, 80
   orig: 80, 80
   offset: 0, 0
   index: -1
-chaos
-  rotate: false
-  xy: 1862, 412
-  size: 56, 136
-  orig: 56, 136
-  offset: 0, 0
-  index: -1
-eclipse-weapon
-  rotate: false
-  xy: 2085, 84
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-eradication
-  rotate: false
-  xy: 1745, 623
-  size: 96, 192
-  orig: 96, 192
-  offset: 0, 0
-  index: -1
 eruption
   rotate: false
-  xy: 2135, 176
+  xy: 2211, 1578
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun
   rotate: false
-  xy: 2135, 126
+  xy: 2273, 322
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower
   rotate: false
-  xy: 2135, 68
+  xy: 2273, 264
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-shotgun-weapon
   rotate: false
-  xy: 2302, 439
-  size: 48, 48
-  orig: 48, 48
+  xy: 1251, 1121
+  size: 50, 50
+  orig: 50, 50
   offset: 0, 0
   index: -1
 heal-weapon
   rotate: false
-  xy: 2352, 439
+  xy: 2271, 2086
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 heal-weapon-mount
   rotate: false
-  xy: 2202, 389
+  xy: 2261, 2036
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 large-artillery
   rotate: false
-  xy: 3052, 385
+  xy: 2215, 1310
   size: 48, 66
   orig: 48, 66
   offset: 0, 0
   index: -1
+large-bullet-mount
+  rotate: false
+  xy: 1897, 2348
+  size: 70, 97
+  orig: 70, 97
+  offset: 0, 0
+  index: -1
+large-laser-mount
+  rotate: false
+  xy: 1755, 2449
+  size: 96, 192
+  orig: 96, 192
+  offset: 0, 0
+  index: -1
+large-purple-mount
+  rotate: false
+  xy: 2041, 2348
+  size: 70, 97
+  orig: 70, 97
+  offset: 0, 0
+  index: -1
 large-weapon
   rotate: false
-  xy: 3102, 403
+  xy: 2223, 1192
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles
   rotate: false
-  xy: 3202, 342
+  xy: 2325, 2136
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-mount
   rotate: false
-  xy: 2402, 353
+  xy: 2321, 2086
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-purple-weapon
   rotate: false
-  xy: 2702, 353
+  xy: 2311, 1686
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-weapon
   rotate: false
-  xy: 2752, 353
+  xy: 2311, 1586
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+omura-cannon
+  rotate: false
+  xy: 1307, 1367
+  size: 192, 277
+  orig: 192, 277
+  offset: 0, 0
+  index: -1
+omura-cannon-heat
+  rotate: false
+  xy: 1307, 1088
+  size: 192, 277
+  orig: 192, 277
+  offset: 0, 0
+  index: -1
+reign-weapon
+  rotate: false
+  xy: 3567, 2656
+  size: 83, 138
+  orig: 83, 138
+  offset: 0, 0
+  index: -1
+scepter-weapon
+  rotate: false
+  xy: 2977, 2303
+  size: 56, 102
+  orig: 56, 102
+  offset: 0, 0
+  index: -1
+sei-launcher
+  rotate: false
+  xy: 3911, 2849
+  size: 80, 80
+  orig: 80, 80
+  offset: 0, 0
+  index: -1
 small-basic-weapon
   rotate: false
-  xy: 3052, 335
+  xy: 2525, 2143
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-mount-weapon
   rotate: false
-  xy: 3102, 303
+  xy: 2315, 1436
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-weapon
   rotate: false
-  xy: 3152, 303
+  xy: 2315, 1336
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spiroct-weapon
   rotate: false
-  xy: 3252, 290
+  xy: 2365, 1428
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 weapon
   rotate: false
-  xy: 3452, 269
+  xy: 2227, 992
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 zenith-missiles
   rotate: false
-  xy: 3502, 269
+  xy: 2227, 942
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 zenith
   rotate: false
-  xy: 3983, 1207
+  xy: 1393, 3069
   size: 112, 112
   orig: 112, 112
   offset: 0, 0
   index: -1
 zenith-cell
   rotate: false
-  xy: 163, 67
+  xy: 887, 1133
   size: 112, 112
   orig: 112, 112
   offset: 0, 0
@@ -6715,863 +7842,954 @@ size: 4096,256
 format: rgba8888
 filter: nearest,nearest
 repeat: none
-char1
-  rotate: false
-  xy: 2311, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-char2
-  rotate: false
-  xy: 101, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-char3
-  rotate: false
-  xy: 2345, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cliff
-  rotate: false
-  xy: 135, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cliffs1
-  rotate: false
-  xy: 2379, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-coal1
-  rotate: false
-  xy: 169, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-coal2
-  rotate: false
-  xy: 2413, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-coal3
-  rotate: false
-  xy: 203, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-copper1
-  rotate: false
-  xy: 2447, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-copper2
-  rotate: false
-  xy: 237, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-copper3
-  rotate: false
-  xy: 2481, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters1
-  rotate: false
-  xy: 271, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters2
-  rotate: false
-  xy: 2515, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters3
-  rotate: false
-  xy: 305, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters4
-  rotate: false
-  xy: 2549, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters5
-  rotate: false
-  xy: 339, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-craters6
-  rotate: false
-  xy: 2583, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-metal-large
-  rotate: false
-  xy: 1569, 83
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-dark-metal1
-  rotate: false
-  xy: 373, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-metal2
-  rotate: false
-  xy: 2617, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-panel-1
-  rotate: false
-  xy: 407, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-panel-1-edge
+basalt-edge
   rotate: false
   xy: 1, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-dark-panel-2
+basalt1
   rotate: false
-  xy: 2651, 213
+  xy: 2541, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-2-edge
+basalt2
+  rotate: false
+  xy: 101, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+basalt3
+  rotate: false
+  xy: 2575, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+char1
+  rotate: false
+  xy: 135, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+char2
+  rotate: false
+  xy: 2609, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+char3
+  rotate: false
+  xy: 169, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+cliff
+  rotate: false
+  xy: 2643, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+coal1
+  rotate: false
+  xy: 203, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+coal2
+  rotate: false
+  xy: 2677, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+coal3
+  rotate: false
+  xy: 237, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+copper1
+  rotate: false
+  xy: 2711, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+copper2
+  rotate: false
+  xy: 271, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+copper3
+  rotate: false
+  xy: 2745, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+craters1
+  rotate: false
+  xy: 305, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+craters2
+  rotate: false
+  xy: 2779, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+craters3
+  rotate: false
+  xy: 339, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+craters4
+  rotate: false
+  xy: 2813, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+craters5
+  rotate: false
+  xy: 373, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+craters6
+  rotate: false
+  xy: 2847, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dacite-edge
   rotate: false
   xy: 1, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-dark-panel-3
+dacite-wall-large
   rotate: false
-  xy: 441, 17
+  xy: 1667, 83
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+dacite-wall1
+  rotate: false
+  xy: 2915, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-3-edge
-  rotate: false
-  xy: 99, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dark-panel-4
-  rotate: false
-  xy: 2685, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-dark-panel-4-edge
-  rotate: false
-  xy: 99, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dark-panel-5
+dacite-wall2
   rotate: false
   xy: 475, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-5-edge
+dacite1
   rotate: false
-  xy: 197, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-dark-panel-6
-  rotate: false
-  xy: 2719, 213
+  xy: 407, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dark-panel-6-edge
+dacite2
   rotate: false
-  xy: 197, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-darksand-edge
-  rotate: false
-  xy: 295, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-darksand-tainted-water
-  rotate: false
-  xy: 2787, 213
+  xy: 2881, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-tainted-water-edge
+dacite3
   rotate: false
-  xy: 295, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-darksand-tainted-water1
-  rotate: false
-  xy: 577, 17
+  xy: 441, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-tainted-water2
+dark-metal-large
   rotate: false
-  xy: 2821, 213
+  xy: 1765, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+dark-metal1
+  rotate: false
+  xy: 2949, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand-tainted-water3
-  rotate: false
-  xy: 611, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-darksand-water
-  rotate: false
-  xy: 2855, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-darksand-water-edge
-  rotate: false
-  xy: 393, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-darksand-water1
-  rotate: false
-  xy: 645, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-darksand-water2
-  rotate: false
-  xy: 2889, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-darksand-water3
-  rotate: false
-  xy: 679, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-darksand1
+dark-metal2
   rotate: false
   xy: 509, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand2
+dark-panel-1
   rotate: false
-  xy: 2753, 213
+  xy: 2983, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-darksand3
+dark-panel-1-edge
+  rotate: false
+  xy: 99, 149
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-2
   rotate: false
   xy: 543, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-deepwater
+dark-panel-2-edge
   rotate: false
-  xy: 2923, 213
+  xy: 99, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-3
+  rotate: false
+  xy: 3017, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-deepwater-edge
+dark-panel-3-edge
+  rotate: false
+  xy: 197, 149
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-4
+  rotate: false
+  xy: 577, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dark-panel-4-edge
+  rotate: false
+  xy: 197, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-5
+  rotate: false
+  xy: 3051, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dark-panel-5-edge
+  rotate: false
+  xy: 295, 149
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dark-panel-6
+  rotate: false
+  xy: 611, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dark-panel-6-edge
+  rotate: false
+  xy: 295, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+darksand-edge
+  rotate: false
+  xy: 393, 149
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+darksand-tainted-water
+  rotate: false
+  xy: 679, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-tainted-water-edge
   rotate: false
   xy: 393, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-dunerocks-large
+darksand-tainted-water1
   rotate: false
-  xy: 1667, 181
-  size: 64, 64
-  orig: 64, 64
+  xy: 3153, 213
+  size: 32, 32
+  orig: 32, 32
   offset: 0, 0
   index: -1
-dunerocks1
+darksand-tainted-water2
   rotate: false
   xy: 713, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-dunerocks2
+darksand-tainted-water3
   rotate: false
-  xy: 2957, 213
+  xy: 3187, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-edge
+darksand-water
   rotate: false
   xy: 747, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-edge-stencil
+darksand-water-edge
   rotate: false
   xy: 491, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-edgier
+darksand-water1
   rotate: false
-  xy: 2991, 213
+  xy: 3221, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-grass-edge
-  rotate: false
-  xy: 491, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-grass1
+darksand-water2
   rotate: false
   xy: 781, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-grass2
+darksand-water3
   rotate: false
-  xy: 3025, 213
+  xy: 3255, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-grass3
+darksand1
+  rotate: false
+  xy: 3085, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand2
+  rotate: false
+  xy: 645, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand3
+  rotate: false
+  xy: 3119, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+deepwater
   rotate: false
   xy: 815, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-holostone-edge
+deepwater-edge
+  rotate: false
+  xy: 491, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+dirt-edge
   rotate: false
   xy: 589, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-holostone1
+dirt-wall-large
   rotate: false
-  xy: 3059, 213
-  size: 32, 32
-  orig: 32, 32
+  xy: 1831, 181
+  size: 64, 64
+  orig: 64, 64
   offset: 0, 0
   index: -1
-holostone2
-  rotate: false
-  xy: 849, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-holostone3
-  rotate: false
-  xy: 3093, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-hotrock1
+dirt-wall1
   rotate: false
   xy: 883, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-hotrock2
+dirt-wall2
   rotate: false
-  xy: 3127, 213
+  xy: 3357, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-hotrock3
+dirt1
+  rotate: false
+  xy: 3289, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt2
+  rotate: false
+  xy: 849, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt3
+  rotate: false
+  xy: 3323, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dune-wall-large
+  rotate: false
+  xy: 1897, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+dune-wall1
   rotate: false
   xy: 917, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ice-edge
+dune-wall2
   rotate: false
-  xy: 589, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-ice-snow-edge
-  rotate: false
-  xy: 687, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-ice-snow1
-  rotate: false
-  xy: 985, 17
+  xy: 3391, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ice-snow2
-  rotate: false
-  xy: 3229, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice-snow3
-  rotate: false
-  xy: 1019, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice1
-  rotate: false
-  xy: 3161, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice2
+edge
   rotate: false
   xy: 951, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ice3
+edge-stencil
   rotate: false
-  xy: 3195, 213
+  xy: 589, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+edgier
+  rotate: false
+  xy: 3425, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-icerocks-large
+grass-edge
   rotate: false
-  xy: 1733, 181
-  size: 64, 64
-  orig: 64, 64
+  xy: 687, 149
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
-icerocks1
+grass1
   rotate: false
-  xy: 3263, 213
+  xy: 985, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-icerocks2
+grass2
+  rotate: false
+  xy: 3459, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+grass3
+  rotate: false
+  xy: 1019, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+hotrock1
+  rotate: false
+  xy: 3493, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+hotrock2
   rotate: false
   xy: 1053, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ignarock-edge
+hotrock3
+  rotate: false
+  xy: 3527, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-edge
   rotate: false
   xy: 687, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-ignarock1
-  rotate: false
-  xy: 3297, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ignarock2
-  rotate: false
-  xy: 1087, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ignarock3
-  rotate: false
-  xy: 3331, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-lead1
-  rotate: false
-  xy: 1121, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-lead2
-  rotate: false
-  xy: 3365, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-lead3
-  rotate: false
-  xy: 1155, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-magmarock1
-  rotate: false
-  xy: 3399, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-magmarock2
-  rotate: false
-  xy: 1189, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-magmarock3
-  rotate: false
-  xy: 3433, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor
-  rotate: false
-  xy: 1223, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-2
-  rotate: false
-  xy: 3467, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-metal-floor-2-edge
+ice-snow-edge
   rotate: false
   xy: 785, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-metal-floor-3
+ice-snow1
+  rotate: false
+  xy: 3595, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-snow2
+  rotate: false
+  xy: 1155, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-snow3
+  rotate: false
+  xy: 3629, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-wall-large
+  rotate: false
+  xy: 1963, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+ice-wall1
+  rotate: false
+  xy: 1189, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice-wall2
+  rotate: false
+  xy: 3663, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice1
+  rotate: false
+  xy: 1087, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice2
+  rotate: false
+  xy: 3561, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ice3
+  rotate: false
+  xy: 1121, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+lead1
+  rotate: false
+  xy: 1223, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+lead2
+  rotate: false
+  xy: 3697, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+lead3
   rotate: false
   xy: 1257, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-metal-floor-3-edge
+magmarock1
   rotate: false
-  xy: 785, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-metal-floor-5
-  rotate: false
-  xy: 3501, 213
+  xy: 3731, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-metal-floor-5-edge
-  rotate: false
-  xy: 883, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-metal-floor-damaged-edge
-  rotate: false
-  xy: 883, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-metal-floor-damaged1
+magmarock2
   rotate: false
   xy: 1291, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-metal-floor-damaged2
+magmarock3
   rotate: false
-  xy: 3535, 213
+  xy: 3765, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-metal-floor-damaged3
+metal-floor
   rotate: false
   xy: 1325, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-metal-floor-edge
+metal-floor-2
   rotate: false
-  xy: 981, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-moss-edge
-  rotate: false
-  xy: 981, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-moss1
-  rotate: false
-  xy: 3569, 213
+  xy: 3799, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-moss2
+metal-floor-2-edge
+  rotate: false
+  xy: 785, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+metal-floor-3
   rotate: false
   xy: 1359, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-moss3
+metal-floor-3-edge
   rotate: false
-  xy: 3603, 213
+  xy: 883, 149
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+metal-floor-5
+  rotate: false
+  xy: 3833, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-coal1
+metal-floor-5-edge
+  rotate: false
+  xy: 883, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+metal-floor-damaged-edge
+  rotate: false
+  xy: 981, 149
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+metal-floor-damaged1
   rotate: false
   xy: 1393, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-coal2
+metal-floor-damaged2
   rotate: false
-  xy: 3637, 213
+  xy: 3867, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-coal3
+metal-floor-damaged3
   rotate: false
   xy: 1427, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-copper1
+metal-floor-edge
   rotate: false
-  xy: 3671, 213
+  xy: 981, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+moss-edge
+  rotate: false
+  xy: 1079, 149
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+moss1
+  rotate: false
+  xy: 3901, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-copper2
+moss2
   rotate: false
   xy: 1461, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-copper3
+moss3
   rotate: false
-  xy: 3705, 213
+  xy: 3935, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-lead1
+mud-edge
+  rotate: false
+  xy: 1079, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+mud1
   rotate: false
   xy: 1495, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-lead2
+mud2
   rotate: false
-  xy: 3739, 213
+  xy: 3969, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-lead3
+mud3
   rotate: false
   xy: 1529, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+ore-coal1
+  rotate: false
+  xy: 4003, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-coal2
+  rotate: false
+  xy: 1563, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-coal3
+  rotate: false
+  xy: 4037, 213
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-copper1
+  rotate: false
+  xy: 1597, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-copper2
+  rotate: false
+  xy: 1631, 17
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-copper3
+  rotate: false
+  xy: 1667, 49
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-lead1
+  rotate: false
+  xy: 1733, 115
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-lead2
+  rotate: false
+  xy: 1701, 49
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-lead3
+  rotate: false
+  xy: 1665, 15
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 ore-scrap1
   rotate: false
-  xy: 3773, 213
+  xy: 1699, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap2
   rotate: false
-  xy: 3807, 213
+  xy: 2491, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap3
   rotate: false
-  xy: 3841, 213
+  xy: 2541, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium1
   rotate: false
-  xy: 3875, 213
+  xy: 2575, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium2
   rotate: false
-  xy: 3909, 213
+  xy: 2609, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium3
   rotate: false
-  xy: 3943, 213
+  xy: 2643, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium1
   rotate: false
-  xy: 3977, 213
+  xy: 2677, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium2
   rotate: false
-  xy: 4011, 213
+  xy: 2711, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium3
   rotate: false
-  xy: 4045, 213
+  xy: 2745, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles1
   rotate: false
-  xy: 1569, 49
+  xy: 2779, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles2
   rotate: false
-  xy: 1635, 115
+  xy: 2813, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles3
   rotate: false
-  xy: 1603, 49
+  xy: 2847, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7583,338 +8801,317 @@ pine
   orig: 48, 48
   offset: 0, 0
   index: -1
-rocks-large
-  rotate: false
-  xy: 1799, 181
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-rocks1
-  rotate: false
-  xy: 1563, 15
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-rocks2
-  rotate: false
-  xy: 1597, 15
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 salt
   rotate: false
-  xy: 2261, 163
+  xy: 2881, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt-edge
   rotate: false
-  xy: 1079, 149
+  xy: 1177, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-saltrocks-large
+salt-wall-large
   rotate: false
-  xy: 1865, 181
+  xy: 2029, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-saltrocks1
+salt-wall1
   rotate: false
-  xy: 2311, 179
+  xy: 2915, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-saltrocks2
+salt-wall2
   rotate: false
-  xy: 2345, 179
+  xy: 2949, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-edge
   rotate: false
-  xy: 1079, 51
+  xy: 1177, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+sand-wall-large
+  rotate: false
+  xy: 2095, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+sand-wall1
+  rotate: false
+  xy: 3085, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand-wall2
+  rotate: false
+  xy: 3119, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 sand-water
   rotate: false
-  xy: 2481, 179
+  xy: 3153, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-edge
   rotate: false
-  xy: 1177, 149
+  xy: 1275, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 sand-water1
   rotate: false
-  xy: 2515, 179
+  xy: 3187, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water2
   rotate: false
-  xy: 2549, 179
+  xy: 3221, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water3
   rotate: false
-  xy: 2583, 179
+  xy: 3255, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 2379, 179
+  xy: 2983, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 2413, 179
+  xy: 3017, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 2447, 179
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sandrocks-large
-  rotate: false
-  xy: 1931, 181
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-sandrocks1
-  rotate: false
-  xy: 2617, 179
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sandrocks2
-  rotate: false
-  xy: 2651, 179
+  xy: 3051, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 2685, 179
+  xy: 3289, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 2719, 179
+  xy: 3323, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 2753, 179
+  xy: 3357, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-edge
   rotate: false
-  xy: 1177, 51
+  xy: 1275, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+shale-wall-large
+  rotate: false
+  xy: 2161, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+shale-wall1
+  rotate: false
+  xy: 3493, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shale-wall2
+  rotate: false
+  xy: 3527, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 shale1
   rotate: false
-  xy: 2787, 179
+  xy: 3391, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale2
   rotate: false
-  xy: 2821, 179
+  xy: 3425, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale3
   rotate: false
-  xy: 2855, 179
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shalerocks-large
-  rotate: false
-  xy: 1997, 181
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-shalerocks1
-  rotate: false
-  xy: 2889, 179
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shalerocks2
-  rotate: false
-  xy: 2923, 179
+  xy: 3459, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrubs-large
   rotate: false
-  xy: 2063, 181
+  xy: 2227, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shrubs1
   rotate: false
-  xy: 2957, 179
+  xy: 3561, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrubs2
   rotate: false
-  xy: 2991, 179
+  xy: 3595, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 slag
   rotate: false
-  xy: 3025, 179
+  xy: 3629, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 slag-edge
   rotate: false
-  xy: 1275, 149
+  xy: 1373, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 snow-edge
   rotate: false
-  xy: 1275, 51
+  xy: 1373, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 snow-pine
   rotate: false
-  xy: 2261, 197
+  xy: 2491, 197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+snow-wall-large
+  rotate: false
+  xy: 2293, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+snow-wall1
+  rotate: false
+  xy: 3765, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+snow-wall2
+  rotate: false
+  xy: 3799, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 snow1
   rotate: false
-  xy: 3059, 179
+  xy: 3663, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 3093, 179
+  xy: 3697, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 3127, 179
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snowrocks-large
-  rotate: false
-  xy: 2129, 181
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-snowrocks1
-  rotate: false
-  xy: 3161, 179
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snowrocks2
-  rotate: false
-  xy: 3195, 179
+  xy: 3731, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn
   rotate: false
-  xy: 3229, 179
+  xy: 3833, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss-edge
   rotate: false
-  xy: 1373, 149
+  xy: 1471, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 spore-moss1
   rotate: false
-  xy: 3263, 179
+  xy: 3867, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss2
   rotate: false
-  xy: 3297, 179
+  xy: 3901, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss3
   rotate: false
-  xy: 3331, 179
+  xy: 3935, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7926,156 +9123,177 @@ spore-pine
   orig: 48, 48
   offset: 0, 0
   index: -1
-sporerocks-large
+spore-wall-large
   rotate: false
-  xy: 2195, 181
+  xy: 2359, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-sporerocks1
+spore-wall1
   rotate: false
-  xy: 3365, 179
+  xy: 3969, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-sporerocks2
+spore-wall2
   rotate: false
-  xy: 3399, 179
+  xy: 4003, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-edge
   rotate: false
-  xy: 1373, 51
+  xy: 1471, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+stone-wall-large
+  rotate: false
+  xy: 2425, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+stone-wall1
+  rotate: false
+  xy: 1801, 147
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+stone-wall2
+  rotate: false
+  xy: 1835, 147
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 stone1
   rotate: false
-  xy: 3433, 179
+  xy: 4037, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 3467, 179
+  xy: 1733, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 3501, 179
+  xy: 1767, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water
   rotate: false
-  xy: 3535, 179
+  xy: 1869, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water-edge
   rotate: false
-  xy: 1471, 149
+  xy: 1569, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 3569, 179
+  xy: 1903, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-edge
   rotate: false
-  xy: 1471, 51
+  xy: 1569, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 tendrils1
   rotate: false
-  xy: 3603, 179
+  xy: 1937, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tendrils2
   rotate: false
-  xy: 3637, 179
+  xy: 1971, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tendrils3
   rotate: false
-  xy: 3671, 179
+  xy: 2005, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 3705, 179
+  xy: 2039, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 3739, 179
+  xy: 2073, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 3773, 179
+  xy: 2107, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 3807, 179
+  xy: 2141, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 3841, 179
+  xy: 2175, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 3875, 179
+  xy: 2209, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 3909, 179
+  xy: 2243, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-edge
   rotate: false
-  xy: 1569, 149
+  xy: 1667, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -8088,2107 +9306,2247 @@ filter: nearest,nearest
 repeat: none
 additive-reconstructor-icon-editor
   rotate: false
-  xy: 1973, 389
+  xy: 2297, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 air-factory-icon-editor
   rotate: false
-  xy: 2071, 389
+  xy: 2395, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 alloy-smelter-icon-editor
   rotate: false
-  xy: 2169, 389
+  xy: 2493, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 arc-icon-editor
   rotate: false
-  xy: 1085, 227
+  xy: 4061, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-icon-editor
   rotate: false
-  xy: 1565, 225
+  xy: 205, 9
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+basalt-icon-editor
+  rotate: false
+  xy: 4061, 427
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-basalt1
+  rotate: false
+  xy: 4061, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-icon-editor
   rotate: false
-  xy: 1119, 227
+  xy: 239, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-large-icon-editor
   rotate: false
-  xy: 2267, 389
+  xy: 2591, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 blast-drill-icon-editor
   rotate: false
-  xy: 163, 35
+  xy: 163, 43
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-mixer-icon-editor
   rotate: false
-  xy: 4031, 421
+  xy: 1749, 299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border-editor
   rotate: false
-  xy: 1599, 225
+  xy: 273, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-forge-icon-editor
   rotate: false
-  xy: 2365, 389
+  xy: 2689, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-loader-icon-editor
   rotate: false
-  xy: 2463, 389
+  xy: 2787, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-unloader-icon-editor
   rotate: false
-  xy: 2561, 389
+  xy: 2885, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+boulder-icon-editor
+  rotate: false
+  xy: 1423, 185
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 bridge-conduit-icon-editor
   rotate: false
-  xy: 1633, 225
+  xy: 307, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-icon-editor
   rotate: false
-  xy: 1667, 225
+  xy: 341, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char-icon-editor
   rotate: false
-  xy: 1701, 225
+  xy: 375, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char1
   rotate: false
-  xy: 1701, 225
+  xy: 375, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 clear-editor
   rotate: false
-  xy: 645, 194
+  xy: 645, 202
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 cliff-icon-editor
   rotate: false
-  xy: 1735, 225
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cliffs-icon-editor
-  rotate: false
-  xy: 1769, 225
+  xy: 409, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal-centrifuge-icon-editor
   rotate: false
-  xy: 4031, 355
+  xy: 1815, 299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 combustion-generator-icon-editor
   rotate: false
-  xy: 1803, 225
+  xy: 443, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+command-center-icon-editor
+  rotate: false
+  xy: 1881, 299
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 conduit-icon-editor
   rotate: false
-  xy: 1847, 257
+  xy: 477, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 container-icon-editor
   rotate: false
-  xy: 1847, 291
+  xy: 1947, 299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 conveyor-icon-editor
   rotate: false
-  xy: 1881, 257
+  xy: 511, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-icon-editor
   rotate: false
-  xy: 1915, 257
+  xy: 1423, 151
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-large-icon-editor
   rotate: false
-  xy: 1913, 291
+  xy: 2013, 299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 core-foundation-icon-editor
   rotate: false
-  xy: 1323, 357
+  xy: 1517, 365
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 core-nucleus-icon-editor
   rotate: false
-  xy: 1, 3
+  xy: 1, 11
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 core-shard-icon-editor
   rotate: false
-  xy: 2659, 389
+  xy: 2983, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 craters-icon-editor
   rotate: false
-  xy: 1979, 289
+  xy: 1457, 151
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters1
   rotate: false
-  xy: 1979, 289
+  xy: 1457, 151
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-cryofluidmixer-icon-editor
+cryofluid-mixer-icon-editor
   rotate: false
-  xy: 1979, 323
+  xy: 2079, 299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-icon-editor
   rotate: false
-  xy: 2045, 323
+  xy: 2145, 299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cyclone-icon-editor
   rotate: false
-  xy: 2757, 389
+  xy: 3081, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+dacite-boulder-icon-editor
+  rotate: false
+  xy: 1473, 185
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+dacite-icon-editor
+  rotate: false
+  xy: 1491, 151
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dacite1
+  rotate: false
+  xy: 1491, 151
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dacite-wall-icon-editor
+  rotate: false
+  xy: 1337, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 dark-metal-icon-editor
   rotate: false
-  xy: 2013, 289
+  xy: 1371, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-1-icon-editor
   rotate: false
-  xy: 2047, 289
+  xy: 2277, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-1
   rotate: false
-  xy: 2047, 289
+  xy: 2277, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-2-icon-editor
   rotate: false
-  xy: 2081, 289
+  xy: 2311, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-2
   rotate: false
-  xy: 2081, 289
+  xy: 2311, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-3-icon-editor
   rotate: false
-  xy: 2115, 289
+  xy: 2345, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-3
   rotate: false
-  xy: 2115, 289
+  xy: 2345, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-4-icon-editor
   rotate: false
-  xy: 2149, 289
+  xy: 2379, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-4
   rotate: false
-  xy: 2149, 289
+  xy: 2379, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-5-icon-editor
   rotate: false
-  xy: 2183, 289
+  xy: 2413, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-5
   rotate: false
-  xy: 2183, 289
+  xy: 2413, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-6-icon-editor
   rotate: false
-  xy: 2217, 289
+  xy: 2447, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-dark-panel-6
   rotate: false
-  xy: 2217, 289
+  xy: 2447, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-icon-editor
   rotate: false
-  xy: 2251, 289
+  xy: 2481, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand1
   rotate: false
-  xy: 2251, 289
+  xy: 2481, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-tainted-water-icon-editor
   rotate: false
-  xy: 2285, 289
+  xy: 2515, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water-icon-editor
   rotate: false
-  xy: 2319, 289
+  xy: 2549, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-data-processor-icon-editor
-  rotate: false
-  xy: 2855, 389
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
 deepwater-icon-editor
   rotate: false
-  xy: 2353, 289
+  xy: 2583, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-deepwater
   rotate: false
-  xy: 2353, 289
+  xy: 2583, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 differential-generator-icon-editor
   rotate: false
-  xy: 2953, 389
+  xy: 3179, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 diode-icon-editor
   rotate: false
-  xy: 2387, 289
+  xy: 2617, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt-icon-editor
+  rotate: false
+  xy: 2651, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dirt1
+  rotate: false
+  xy: 2651, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+dirt-wall-icon-editor
+  rotate: false
+  xy: 2685, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 disassembler-icon-editor
   rotate: false
-  xy: 3051, 389
+  xy: 3277, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 distributor-icon-editor
   rotate: false
-  xy: 2111, 323
+  xy: 2211, 299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-icon-editor
   rotate: false
-  xy: 2421, 289
+  xy: 2719, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-large-icon-editor
   rotate: false
-  xy: 2177, 323
+  xy: 2297, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-dunerocks-icon-editor
+dune-wall-icon-editor
   rotate: false
-  xy: 2455, 289
+  xy: 2753, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-editor
   rotate: false
-  xy: 2489, 289
+  xy: 2787, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-basalt2
+  rotate: false
+  xy: 2821, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-basalt3
+  rotate: false
+  xy: 2855, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char2
   rotate: false
-  xy: 2523, 289
+  xy: 2889, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char3
   rotate: false
-  xy: 2557, 289
+  xy: 2923, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters2
   rotate: false
-  xy: 2591, 289
+  xy: 2957, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters3
   rotate: false
-  xy: 2625, 289
+  xy: 2991, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dacite2
+  rotate: false
+  xy: 3025, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dacite3
+  rotate: false
+  xy: 3059, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-tainted-water1
   rotate: false
-  xy: 2727, 289
+  xy: 3161, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-tainted-water2
   rotate: false
-  xy: 2761, 289
+  xy: 3195, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-tainted-water3
   rotate: false
-  xy: 2795, 289
+  xy: 3229, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-water1
   rotate: false
-  xy: 2829, 289
+  xy: 3263, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-water2
   rotate: false
-  xy: 2863, 289
+  xy: 3297, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand-water3
   rotate: false
-  xy: 2897, 289
+  xy: 3331, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand2
   rotate: false
-  xy: 2659, 289
+  xy: 3093, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-darksand3
   rotate: false
-  xy: 2693, 289
+  xy: 3127, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dirt2
+  rotate: false
+  xy: 3365, 297
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-dirt3
+  rotate: false
+  xy: 3399, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass1
   rotate: false
-  xy: 2931, 289
+  xy: 3433, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-icon-editor
   rotate: false
-  xy: 2931, 289
+  xy: 3433, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass2
   rotate: false
-  xy: 2965, 289
+  xy: 3467, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass3
   rotate: false
-  xy: 2999, 289
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-holostone1
-  rotate: false
-  xy: 3033, 289
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-holostone-icon-editor
-  rotate: false
-  xy: 3033, 289
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-holostone2
-  rotate: false
-  xy: 3067, 289
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-holostone3
-  rotate: false
-  xy: 3101, 289
+  xy: 3501, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock1
   rotate: false
-  xy: 3135, 289
+  xy: 3535, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock-icon-editor
   rotate: false
-  xy: 3135, 289
+  xy: 3535, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock2
   rotate: false
-  xy: 3169, 289
+  xy: 3569, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock3
   rotate: false
-  xy: 3203, 289
+  xy: 3603, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow1
   rotate: false
-  xy: 3339, 289
+  xy: 3739, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow-icon-editor
   rotate: false
-  xy: 3339, 289
+  xy: 3739, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow2
   rotate: false
-  xy: 3373, 289
+  xy: 3773, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow3
   rotate: false
-  xy: 3407, 289
+  xy: 3807, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice1
   rotate: false
-  xy: 3237, 289
+  xy: 3637, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-icon-editor
   rotate: false
-  xy: 3237, 289
+  xy: 3637, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice2
   rotate: false
-  xy: 3271, 289
+  xy: 3671, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice3
   rotate: false
-  xy: 3305, 289
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ignarock1
-  rotate: false
-  xy: 3441, 289
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ignarock-icon-editor
-  rotate: false
-  xy: 3441, 289
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ignarock2
-  rotate: false
-  xy: 3475, 289
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ignarock3
-  rotate: false
-  xy: 3509, 289
+  xy: 3705, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock1
   rotate: false
-  xy: 3543, 289
+  xy: 3841, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock-icon-editor
   rotate: false
-  xy: 3543, 289
+  xy: 3841, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock2
   rotate: false
-  xy: 3577, 289
+  xy: 3875, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock3
   rotate: false
-  xy: 3611, 289
+  xy: 3909, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor
   rotate: false
-  xy: 3645, 289
+  xy: 3943, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-icon-editor
   rotate: false
-  xy: 3645, 289
+  xy: 3943, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-2
   rotate: false
-  xy: 3679, 289
+  xy: 3977, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2-icon-editor
   rotate: false
-  xy: 3679, 289
+  xy: 3977, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-3
   rotate: false
-  xy: 3713, 289
+  xy: 4011, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3-icon-editor
   rotate: false
-  xy: 3713, 289
+  xy: 4011, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-5
   rotate: false
-  xy: 3747, 289
+  xy: 4045, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5-icon-editor
   rotate: false
-  xy: 3747, 289
+  xy: 4045, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged1
   rotate: false
-  xy: 3781, 289
+  xy: 1339, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-editor
   rotate: false
-  xy: 3781, 289
+  xy: 1339, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged2
   rotate: false
-  xy: 3815, 289
+  xy: 1339, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged3
   rotate: false
-  xy: 3849, 289
+  xy: 1373, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss1
   rotate: false
-  xy: 3883, 289
+  xy: 1373, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss-icon-editor
   rotate: false
-  xy: 3883, 289
+  xy: 1373, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss2
   rotate: false
-  xy: 3917, 289
+  xy: 1339, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss3
   rotate: false
-  xy: 3951, 289
+  xy: 1373, 33
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-mud1
+  rotate: false
+  xy: 915, 39
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+mud-icon-editor
+  rotate: false
+  xy: 915, 39
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-mud2
+  rotate: false
+  xy: 949, 39
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-mud3
+  rotate: false
+  xy: 983, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal1
   rotate: false
-  xy: 3985, 289
+  xy: 1017, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal2
   rotate: false
-  xy: 163, 1
+  xy: 1051, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal3
   rotate: false
-  xy: 197, 1
+  xy: 1085, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper1
   rotate: false
-  xy: 231, 1
+  xy: 1753, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper2
   rotate: false
-  xy: 265, 1
+  xy: 1753, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper3
   rotate: false
-  xy: 299, 1
+  xy: 1787, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead1
   rotate: false
-  xy: 333, 1
+  xy: 1787, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead2
   rotate: false
-  xy: 367, 1
+  xy: 1821, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead3
   rotate: false
-  xy: 401, 1
+  xy: 1821, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap1
   rotate: false
-  xy: 435, 1
+  xy: 1855, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap2
   rotate: false
-  xy: 469, 1
+  xy: 1855, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap3
   rotate: false
-  xy: 503, 1
+  xy: 1889, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium1
   rotate: false
-  xy: 915, 65
+  xy: 1889, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium2
   rotate: false
-  xy: 915, 31
+  xy: 1923, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium3
   rotate: false
-  xy: 4025, 321
+  xy: 1923, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium1
   rotate: false
-  xy: 4059, 321
+  xy: 1957, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium2
   rotate: false
-  xy: 4019, 287
+  xy: 1957, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium3
   rotate: false
-  xy: 4053, 287
+  xy: 1991, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-pebbles1
   rotate: false
-  xy: 1837, 223
+  xy: 1991, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-pebbles2
   rotate: false
-  xy: 1871, 223
+  xy: 2025, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-pebbles3
   rotate: false
-  xy: 1905, 223
+  xy: 2025, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-salt
   rotate: false
-  xy: 945, 177
+  xy: 2059, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt-icon-editor
   rotate: false
-  xy: 945, 177
+  xy: 2059, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand-water1
   rotate: false
-  xy: 979, 143
+  xy: 2127, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand-water2
   rotate: false
-  xy: 1013, 177
+  xy: 2127, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand-water3
   rotate: false
-  xy: 979, 109
+  xy: 2161, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand1
   rotate: false
-  xy: 945, 143
+  xy: 2059, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-icon-editor
   rotate: false
-  xy: 945, 143
+  xy: 2059, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand2
   rotate: false
-  xy: 979, 177
+  xy: 2093, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand3
   rotate: false
-  xy: 945, 109
+  xy: 2093, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale1
   rotate: false
-  xy: 1013, 143
+  xy: 2161, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-icon-editor
   rotate: false
-  xy: 1013, 143
+  xy: 2161, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale2
   rotate: false
-  xy: 1047, 177
+  xy: 2195, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale3
   rotate: false
-  xy: 1013, 109
+  xy: 2195, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-slag
   rotate: false
-  xy: 1047, 143
+  xy: 2229, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 slag-icon-editor
   rotate: false
-  xy: 1047, 143
+  xy: 2229, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow1
   rotate: false
-  xy: 1047, 109
+  xy: 2229, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow2
   rotate: false
-  xy: 949, 75
+  xy: 2263, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow3
   rotate: false
-  xy: 949, 41
+  xy: 2297, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spawn
   rotate: false
-  xy: 983, 75
+  xy: 2331, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss1
   rotate: false
-  xy: 983, 41
+  xy: 2365, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss-icon-editor
   rotate: false
-  xy: 983, 41
+  xy: 2365, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss2
   rotate: false
-  xy: 1017, 75
+  xy: 2399, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss3
   rotate: false
-  xy: 1017, 41
+  xy: 2433, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone1
   rotate: false
-  xy: 1051, 75
+  xy: 2467, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-icon-editor
   rotate: false
-  xy: 1051, 75
+  xy: 2467, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone2
   rotate: false
-  xy: 1051, 41
+  xy: 2501, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone3
   rotate: false
-  xy: 1423, 175
+  xy: 2535, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tainted-water
   rotate: false
-  xy: 1457, 175
+  xy: 2569, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water-icon-editor
   rotate: false
-  xy: 1457, 175
+  xy: 2569, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tar
   rotate: false
-  xy: 1491, 175
+  xy: 2603, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-icon-editor
   rotate: false
-  xy: 1491, 175
+  xy: 2603, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tendrils1
   rotate: false
-  xy: 1525, 183
+  xy: 2637, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tendrils2
   rotate: false
-  xy: 1085, 193
+  xy: 2671, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tendrils3
   rotate: false
-  xy: 1119, 193
+  xy: 2705, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-water
   rotate: false
-  xy: 1081, 159
+  xy: 2739, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-icon-editor
   rotate: false
-  xy: 1081, 159
+  xy: 2739, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 exponential-reconstructor-icon-editor
   rotate: false
-  xy: 935, 261
+  xy: 935, 269
   size: 224, 224
   orig: 224, 224
   offset: 0, 0
   index: -1
 force-projector-icon-editor
   rotate: false
-  xy: 3149, 389
+  xy: 3375, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+foreshadow-icon-editor
+  rotate: false
+  xy: 293, 43
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
 fuse-icon-editor
   rotate: false
-  xy: 3247, 389
+  xy: 3473, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 graphite-press-icon-editor
   rotate: false
-  xy: 2243, 323
+  xy: 2363, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 ground-factory-icon-editor
   rotate: false
-  xy: 3345, 389
+  xy: 3571, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 hail-icon-editor
   rotate: false
-  xy: 1081, 125
+  xy: 2773, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-icerocks-icon-editor
+hyper-processor-icon-editor
   rotate: false
-  xy: 1115, 159
+  xy: 3669, 397
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+ice-wall-icon-editor
+  rotate: false
+  xy: 2807, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-icon-editor
   rotate: false
-  xy: 1115, 125
+  xy: 2841, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 impact-reactor-icon-editor
   rotate: false
-  xy: 293, 35
+  xy: 1647, 365
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 incinerator-icon-editor
   rotate: false
-  xy: 1153, 193
+  xy: 2875, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter-icon-editor
   rotate: false
-  xy: 1149, 159
+  xy: 2909, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source-icon-editor
   rotate: false
-  xy: 1187, 193
+  xy: 2943, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void-icon-editor
   rotate: false
-  xy: 1149, 125
+  xy: 2977, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction-icon-editor
   rotate: false
-  xy: 1183, 159
+  xy: 3011, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 kiln-icon-editor
   rotate: false
-  xy: 2309, 323
+  xy: 2429, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 lancer-icon-editor
   rotate: false
-  xy: 2375, 323
+  xy: 2495, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-large-overdrive-projector-icon-editor
+large-logic-display-icon-editor
   rotate: false
-  xy: 3443, 389
-  size: 96, 96
-  orig: 96, 96
+  xy: 1161, 301
+  size: 192, 192
+  orig: 192, 192
   offset: 0, 0
   index: -1
 laser-drill-icon-editor
   rotate: false
-  xy: 3541, 389
+  xy: 3767, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launch-pad-icon-editor
   rotate: false
-  xy: 3639, 389
+  xy: 3865, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launch-pad-large-icon-editor
   rotate: false
-  xy: 1453, 357
+  xy: 423, 43
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 liquid-junction-icon-editor
   rotate: false
-  xy: 1221, 193
+  xy: 3045, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-editor
   rotate: false
-  xy: 1183, 125
+  xy: 3079, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source-icon-editor
   rotate: false
-  xy: 1217, 159
+  xy: 3113, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-tank-icon-editor
   rotate: false
-  xy: 3737, 389
+  xy: 3963, 397
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-void-icon-editor
   rotate: false
-  xy: 1255, 193
+  xy: 3147, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-mass-conveyor-icon-editor
+logic-display-icon-editor
   rotate: false
-  xy: 3835, 389
+  xy: 553, 75
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
+logic-processor-icon-editor
+  rotate: false
+  xy: 2561, 331
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 mass-driver-icon-editor
   rotate: false
-  xy: 3933, 389
+  xy: 651, 107
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mechanical-drill-icon-editor
   rotate: false
-  xy: 2441, 323
+  xy: 2627, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-pump-icon-editor
   rotate: false
-  xy: 1217, 125
+  xy: 3181, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 meltdown-icon-editor
   rotate: false
-  xy: 423, 35
+  xy: 1777, 365
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 melter-icon-editor
   rotate: false
-  xy: 1251, 159
+  xy: 3215, 263
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+memory-bank-icon-editor
+  rotate: false
+  xy: 2693, 331
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+memory-cell-icon-editor
+  rotate: false
+  xy: 3249, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mend-projector-icon-editor
   rotate: false
-  xy: 2507, 323
+  xy: 2759, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mender-icon-editor
   rotate: false
-  xy: 1289, 193
+  xy: 3283, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message-icon-editor
   rotate: false
-  xy: 1323, 193
+  xy: 3317, 263
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+micro-processor-icon-editor
+  rotate: false
+  xy: 3351, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 multi-press-icon-editor
   rotate: false
-  xy: 553, 67
+  xy: 749, 107
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 multiplicative-reconstructor-icon-editor
   rotate: false
-  xy: 1161, 325
+  xy: 1355, 333
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 naval-factory-icon-editor
   rotate: false
-  xy: 651, 99
+  xy: 847, 107
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-icon-editor
   rotate: false
-  xy: 749, 99
+  xy: 945, 171
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+overdrive-dome-icon-editor
+  rotate: false
+  xy: 1043, 171
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 overdrive-projector-icon-editor
   rotate: false
-  xy: 2573, 323
+  xy: 2825, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 overflow-gate-icon-editor
   rotate: false
-  xy: 1251, 125
+  xy: 3385, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 parallax-icon-editor
   rotate: false
-  xy: 2639, 323
+  xy: 2891, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+payload-conveyor-icon-editor
+  rotate: false
+  xy: 945, 73
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 payload-router-icon-editor
   rotate: false
-  xy: 847, 99
+  xy: 1043, 73
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 pebbles-icon-editor
   rotate: false
-  xy: 1285, 159
+  xy: 3419, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-icon-editor
   rotate: false
-  xy: 1285, 125
+  xy: 3453, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-icon-editor
   rotate: false
-  xy: 1319, 159
+  xy: 3487, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-icon-editor
   rotate: false
-  xy: 1319, 125
+  xy: 3521, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-large-icon-editor
   rotate: false
-  xy: 2705, 323
+  xy: 2957, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-icon-editor
   rotate: false
-  xy: 2771, 323
+  xy: 3023, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pine-icon-editor
   rotate: false
-  xy: 935, 211
+  xy: 1553, 217
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-editor
   rotate: false
-  xy: 2837, 323
+  xy: 3089, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-conveyor-icon-editor
   rotate: false
-  xy: 1353, 159
+  xy: 3555, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall-icon-editor
   rotate: false
-  xy: 1353, 125
+  xy: 3589, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall-large-icon-editor
   rotate: false
-  xy: 2903, 323
+  xy: 3155, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plated-conduit-icon-editor
   rotate: false
-  xy: 1387, 159
+  xy: 3623, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pneumatic-drill-icon-editor
   rotate: false
-  xy: 2969, 323
+  xy: 3221, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-node-icon-editor
   rotate: false
-  xy: 1387, 125
+  xy: 3657, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large-icon-editor
   rotate: false
-  xy: 3035, 323
+  xy: 3287, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-source-icon-editor
   rotate: false
-  xy: 1421, 141
+  xy: 3691, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void-icon-editor
   rotate: false
-  xy: 1455, 141
+  xy: 3725, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-editor
   rotate: false
-  xy: 1489, 141
+  xy: 3759, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-editor
   rotate: false
-  xy: 1085, 91
+  xy: 3793, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-editor
   rotate: false
-  xy: 3101, 323
+  xy: 3353, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 repair-point-icon-editor
   rotate: false
-  xy: 1085, 57
+  xy: 3827, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 resupply-point-icon-editor
   rotate: false
-  xy: 3167, 323
+  xy: 3419, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 ripple-icon-editor
   rotate: false
-  xy: 1161, 227
+  xy: 1161, 203
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-rock-icon-editor
-  rotate: false
-  xy: 1423, 209
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-rocks-icon-editor
-  rotate: false
-  xy: 1119, 91
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 rotary-pump-icon-editor
   rotate: false
-  xy: 3233, 323
+  xy: 3485, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 router-icon-editor
   rotate: false
-  xy: 1119, 57
+  xy: 3861, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-icon-editor
   rotate: false
-  xy: 3299, 323
+  xy: 3551, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-saltrocks-icon-editor
+salt-wall-icon-editor
   rotate: false
-  xy: 1153, 91
+  xy: 3895, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salvo-icon-editor
   rotate: false
-  xy: 3365, 323
+  xy: 3617, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sand-boulder-icon-editor
   rotate: false
-  xy: 1153, 57
+  xy: 3929, 263
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand-wall-icon-editor
+  rotate: false
+  xy: 3963, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-icon-editor
   rotate: false
-  xy: 1187, 91
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sandrocks-icon-editor
-  rotate: false
-  xy: 1187, 57
+  xy: 3997, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scatter-icon-editor
   rotate: false
-  xy: 3431, 323
+  xy: 3683, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scorch-icon-editor
   rotate: false
-  xy: 1221, 91
+  xy: 4031, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-gigantic-icon-editor
   rotate: false
-  xy: 1583, 357
+  xy: 1907, 365
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 scrap-wall-huge-icon-editor
   rotate: false
-  xy: 1259, 227
+  xy: 1259, 203
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 scrap-wall-icon-editor
   rotate: false
-  xy: 1221, 57
+  xy: 2263, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-large-icon-editor
   rotate: false
-  xy: 3497, 323
+  xy: 3749, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 segment-icon-editor
   rotate: false
-  xy: 3563, 323
+  xy: 3815, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-icon-editor
   rotate: false
-  xy: 3629, 323
+  xy: 3881, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shale-boulder-icon-editor
   rotate: false
-  xy: 1255, 91
+  xy: 2297, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-shalerocks-icon-editor
+shale-wall-icon-editor
   rotate: false
-  xy: 1255, 57
+  xy: 2331, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shock-mine-icon-editor
   rotate: false
-  xy: 1289, 91
+  xy: 2365, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrubs-icon-editor
   rotate: false
-  xy: 1289, 57
+  xy: 2399, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 silicon-crucible-icon-editor
   rotate: false
-  xy: 1357, 259
+  xy: 1141, 105
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 silicon-smelter-icon-editor
   rotate: false
-  xy: 3695, 323
+  xy: 3947, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+snow-boulder-icon-editor
+  rotate: false
+  xy: 1603, 217
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 snow-icon-editor
   rotate: false
-  xy: 1323, 91
+  xy: 2433, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-pine-icon-editor
   rotate: false
-  xy: 985, 211
+  xy: 1653, 217
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-snowrock-icon-editor
+snow-wall-icon-editor
   rotate: false
-  xy: 1473, 209
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-snowrocks-icon-editor
-  rotate: false
-  xy: 1323, 57
+  xy: 2467, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-icon-editor
   rotate: false
-  xy: 1357, 91
+  xy: 2501, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-large-icon-editor
   rotate: false
-  xy: 1455, 259
+  xy: 1239, 105
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 sorter-icon-editor
   rotate: false
-  xy: 1357, 57
+  xy: 2535, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn-icon-editor
   rotate: false
-  xy: 1391, 91
+  xy: 2569, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spectre-icon-editor
   rotate: false
-  xy: 1713, 357
+  xy: 2037, 365
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 spore-cluster-icon-editor
   rotate: false
-  xy: 1523, 217
+  xy: 163, 1
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-pine-icon-editor
   rotate: false
-  xy: 1035, 211
+  xy: 1703, 217
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-press-icon-editor
   rotate: false
-  xy: 3761, 323
+  xy: 4013, 331
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-sporerocks-icon-editor
+spore-wall-icon-editor
   rotate: false
-  xy: 1391, 57
+  xy: 2603, 229
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+steam-generator-icon-editor
+  rotate: false
+  xy: 553, 9
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+stone-wall-icon-editor
+  rotate: false
+  xy: 2637, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-tower-icon-editor
   rotate: false
-  xy: 3827, 323
+  xy: 651, 41
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 surge-wall-icon-editor
   rotate: false
-  xy: 1425, 107
+  xy: 2671, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large-icon-editor
   rotate: false
-  xy: 3893, 323
+  xy: 717, 41
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 swarmer-icon-editor
   rotate: false
-  xy: 3959, 323
+  xy: 783, 41
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+switch-icon-editor
+  rotate: false
+  xy: 2705, 229
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 tendrils-icon-editor
   rotate: false
-  xy: 1425, 73
+  xy: 2739, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tetrative-reconstructor-icon-editor
   rotate: false
-  xy: 645, 197
+  xy: 645, 205
   size: 288, 288
   orig: 288, 288
   offset: 0, 0
   index: -1
 thermal-generator-icon-editor
   rotate: false
-  xy: 553, 1
+  xy: 849, 41
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-pump-icon-editor
   rotate: false
-  xy: 1553, 259
+  xy: 1357, 235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-icon-editor
   rotate: false
-  xy: 1651, 259
+  xy: 1455, 235
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-wall-icon-editor
   rotate: false
-  xy: 1459, 107
+  xy: 2773, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-editor
   rotate: false
-  xy: 651, 33
+  xy: 1141, 39
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thruster-icon-editor
   rotate: false
-  xy: 1843, 357
+  xy: 2167, 365
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-editor
   rotate: false
-  xy: 1459, 73
+  xy: 2807, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-icon-editor
   rotate: false
-  xy: 1493, 107
+  xy: 2841, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-editor
   rotate: false
-  xy: 717, 33
+  xy: 1207, 39
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-turbine-generator-icon-editor
+tsunami-icon-editor
   rotate: false
-  xy: 783, 33
-  size: 64, 64
-  orig: 64, 64
+  xy: 1553, 267
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
 underflow-gate-icon-editor
   rotate: false
-  xy: 1493, 73
+  xy: 2875, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-icon-editor
   rotate: false
-  xy: 1085, 23
+  xy: 2909, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault-icon-editor
   rotate: false
-  xy: 1749, 259
+  xy: 1651, 267
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 water-extractor-icon-editor
   rotate: false
-  xy: 849, 33
+  xy: 1273, 39
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wave-icon-editor
   rotate: false
-  xy: 1357, 193
+  xy: 1357, 169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 white-tree-dead-icon-editor
   rotate: false
-  xy: 1, 165
+  xy: 1, 173
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 white-tree-icon-editor
   rotate: false
-  xy: 323, 165
+  xy: 323, 173
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
@@ -10201,14 +11559,14 @@ filter: nearest,nearest
 repeat: none
 alpha-bg
   rotate: false
-  xy: 1, 15
+  xy: 1, 16
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 bar
   rotate: false
-  xy: 3793, 196
+  xy: 1869, 1
   size: 27, 36
   split: 9, 9, 9, 9
   orig: 27, 36
@@ -10216,7 +11574,7 @@ bar
   index: -1
 bar-top
   rotate: false
-  xy: 3764, 196
+  xy: 1801, 1
   size: 27, 36
   split: 9, 10, 9, 10
   orig: 27, 36
@@ -10224,7147 +11582,7637 @@ bar-top
   index: -1
 block-additive-reconstructor-large
   rotate: false
-  xy: 131, 3
+  xy: 1078, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-additive-reconstructor-medium
   rotate: false
-  xy: 821, 431
+  xy: 881, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-additive-reconstructor-small
   rotate: false
-  xy: 781, 177
+  xy: 3682, 351
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-additive-reconstructor-tiny
   rotate: false
-  xy: 4079, 274
+  xy: 3640, 395
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-additive-reconstructor-xlarge
   rotate: false
-  xy: 131, 95
+  xy: 131, 96
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-air-factory-large
   rotate: false
-  xy: 173, 3
+  xy: 1120, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-air-factory-medium
   rotate: false
-  xy: 2797, 336
+  xy: 915, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-air-factory-small
   rotate: false
-  xy: 3822, 208
+  xy: 1186, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-air-factory-tiny
   rotate: false
-  xy: 4079, 256
+  xy: 3640, 377
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-air-factory-xlarge
   rotate: false
-  xy: 771, 415
+  xy: 771, 416
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-alloy-smelter-large
   rotate: false
-  xy: 215, 3
+  xy: 1162, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-alloy-smelter-medium
   rotate: false
-  xy: 2831, 336
+  xy: 3464, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-alloy-smelter-small
   rotate: false
-  xy: 915, 79
+  xy: 1898, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-alloy-smelter-tiny
   rotate: false
-  xy: 257, 27
+  xy: 1060, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-alloy-smelter-xlarge
   rotate: false
-  xy: 259, 306
+  xy: 259, 307
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-arc-large
   rotate: false
-  xy: 845, 370
+  xy: 1204, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-arc-medium
   rotate: false
-  xy: 2865, 336
+  xy: 3498, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-arc-small
   rotate: false
-  xy: 944, 142
+  xy: 1212, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-arc-tiny
   rotate: false
-  xy: 1331, 72
+  xy: 2287, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-arc-xlarge
   rotate: false
-  xy: 131, 45
+  xy: 131, 46
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-armored-conveyor-large
   rotate: false
-  xy: 887, 370
+  xy: 1246, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-armored-conveyor-medium
   rotate: false
-  xy: 2899, 336
+  xy: 3532, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-armored-conveyor-small
   rotate: false
-  xy: 3848, 208
+  xy: 1924, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-armored-conveyor-tiny
   rotate: false
-  xy: 309, 165
+  xy: 309, 160
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-armored-conveyor-xlarge
   rotate: false
-  xy: 181, 95
+  xy: 181, 96
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-basalt-large
+  rotate: false
+  xy: 1288, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-basalt-medium
+  rotate: false
+  xy: 3566, 295
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-basalt-small
+  rotate: false
+  xy: 1950, 1
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-basalt-tiny
+  rotate: false
+  xy: 2305, 193
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-basalt-xlarge
+  rotate: false
+  xy: 259, 257
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-battery-large
   rotate: false
-  xy: 929, 370
+  xy: 1330, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-battery-large-large
   rotate: false
-  xy: 971, 370
+  xy: 1372, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-battery-large-medium
   rotate: false
-  xy: 2933, 336
+  xy: 3600, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-battery-large-small
   rotate: false
-  xy: 915, 53
+  xy: 1976, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-battery-large-tiny
   rotate: false
-  xy: 257, 9
+  xy: 2323, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-battery-large-xlarge
   rotate: false
-  xy: 259, 256
+  xy: 181, 46
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-battery-medium
   rotate: false
-  xy: 2967, 336
+  xy: 2287, 211
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-battery-small
   rotate: false
-  xy: 944, 116
+  xy: 2002, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-battery-tiny
   rotate: false
-  xy: 1331, 54
+  xy: 2341, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-battery-xlarge
   rotate: false
-  xy: 181, 45
+  xy: 259, 207
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-blast-drill-large
   rotate: false
-  xy: 1013, 370
+  xy: 1414, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-blast-drill-medium
   rotate: false
-  xy: 3001, 336
+  xy: 2321, 211
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-blast-drill-small
   rotate: false
-  xy: 970, 142
+  xy: 2028, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-blast-drill-tiny
   rotate: false
-  xy: 1349, 72
+  xy: 2359, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-blast-drill-xlarge
   rotate: false
-  xy: 259, 206
+  xy: 259, 157
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-blast-mixer-large
   rotate: false
-  xy: 1055, 370
+  xy: 1456, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-blast-mixer-medium
   rotate: false
-  xy: 3035, 336
+  xy: 938, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-blast-mixer-small
   rotate: false
-  xy: 3874, 208
+  xy: 2054, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-blast-mixer-tiny
   rotate: false
-  xy: 1349, 54
+  xy: 2594, 71
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-blast-mixer-xlarge
   rotate: false
-  xy: 259, 156
+  xy: 857, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-block-forge-large
   rotate: false
-  xy: 1097, 370
+  xy: 1498, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-block-forge-medium
   rotate: false
-  xy: 3069, 336
+  xy: 972, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-block-forge-small
   rotate: false
-  xy: 915, 27
+  xy: 1830, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-block-forge-tiny
   rotate: false
-  xy: 1367, 72
+  xy: 2594, 53
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-block-forge-xlarge
   rotate: false
-  xy: 857, 462
+  xy: 907, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-block-loader-large
   rotate: false
-  xy: 1139, 370
+  xy: 1540, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-block-loader-medium
   rotate: false
-  xy: 3103, 336
+  xy: 1006, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-block-loader-small
   rotate: false
-  xy: 970, 116
+  xy: 3711, 192
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-block-loader-tiny
   rotate: false
-  xy: 1367, 54
+  xy: 2594, 35
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-block-loader-xlarge
   rotate: false
-  xy: 907, 462
+  xy: 957, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-block-unloader-large
   rotate: false
-  xy: 1181, 370
+  xy: 1582, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-block-unloader-medium
   rotate: false
-  xy: 3137, 336
+  xy: 1040, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-block-unloader-small
   rotate: false
-  xy: 996, 142
+  xy: 1238, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-block-unloader-tiny
   rotate: false
-  xy: 1385, 72
+  xy: 2491, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-block-unloader-xlarge
   rotate: false
-  xy: 957, 462
+  xy: 1007, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-boulder-large
+  rotate: false
+  xy: 1624, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-boulder-medium
+  rotate: false
+  xy: 1074, 169
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-boulder-small
+  rotate: false
+  xy: 1264, 16
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-boulder-tiny
+  rotate: false
+  xy: 3757, 345
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-boulder-xlarge
+  rotate: false
+  xy: 1057, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-bridge-conduit-large
   rotate: false
-  xy: 1223, 370
+  xy: 1666, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-bridge-conduit-medium
   rotate: false
-  xy: 3171, 336
+  xy: 1108, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-bridge-conduit-small
   rotate: false
-  xy: 3900, 208
+  xy: 1290, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-bridge-conduit-tiny
   rotate: false
-  xy: 1385, 54
+  xy: 3775, 345
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-bridge-conduit-xlarge
   rotate: false
-  xy: 1007, 462
+  xy: 1107, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-bridge-conveyor-large
   rotate: false
-  xy: 1265, 370
+  xy: 1708, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-bridge-conveyor-medium
   rotate: false
-  xy: 3205, 336
+  xy: 1142, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-bridge-conveyor-small
   rotate: false
-  xy: 996, 116
+  xy: 1316, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-bridge-conveyor-tiny
   rotate: false
-  xy: 1403, 72
+  xy: 2594, 17
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-bridge-conveyor-xlarge
   rotate: false
-  xy: 1057, 462
+  xy: 1157, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-char-large
   rotate: false
-  xy: 1307, 370
+  xy: 1750, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-char-medium
   rotate: false
-  xy: 3239, 336
+  xy: 1176, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-char-small
   rotate: false
-  xy: 1022, 142
+  xy: 1342, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-char-tiny
   rotate: false
-  xy: 1403, 54
+  xy: 2568, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-char-xlarge
   rotate: false
-  xy: 1107, 462
+  xy: 1207, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-cliff-large
   rotate: false
-  xy: 1349, 370
+  xy: 1792, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-cliff-medium
   rotate: false
-  xy: 3273, 336
+  xy: 1210, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliff-small
   rotate: false
-  xy: 3926, 208
+  xy: 1368, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-cliff-tiny
   rotate: false
-  xy: 1421, 72
+  xy: 3781, 174
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-cliff-xlarge
   rotate: false
-  xy: 1157, 462
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-cliffs-large
-  rotate: false
-  xy: 1391, 370
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-cliffs-medium
-  rotate: false
-  xy: 3307, 336
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-cliffs-small
-  rotate: false
-  xy: 1022, 116
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-cliffs-tiny
-  rotate: false
-  xy: 1421, 54
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-cliffs-xlarge
-  rotate: false
-  xy: 1207, 462
+  xy: 1257, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-coal-centrifuge-large
   rotate: false
-  xy: 1433, 370
+  xy: 1834, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-coal-centrifuge-medium
   rotate: false
-  xy: 3341, 336
+  xy: 1244, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-coal-centrifuge-small
   rotate: false
-  xy: 1048, 142
+  xy: 1394, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-coal-centrifuge-tiny
   rotate: false
-  xy: 1439, 72
+  xy: 2330, 175
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-coal-centrifuge-xlarge
   rotate: false
-  xy: 1257, 462
+  xy: 1307, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-combustion-generator-large
   rotate: false
-  xy: 1475, 370
+  xy: 1876, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-combustion-generator-medium
   rotate: false
-  xy: 3375, 336
+  xy: 1278, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-combustion-generator-small
   rotate: false
-  xy: 3952, 208
+  xy: 1420, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-combustion-generator-tiny
   rotate: false
-  xy: 1439, 54
+  xy: 2330, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-combustion-generator-xlarge
   rotate: false
-  xy: 1307, 462
+  xy: 1357, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-command-center-large
+  rotate: false
+  xy: 1918, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-command-center-medium
+  rotate: false
+  xy: 1312, 169
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-command-center-small
+  rotate: false
+  xy: 1446, 7
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-command-center-tiny
+  rotate: false
+  xy: 2348, 175
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-command-center-xlarge
+  rotate: false
+  xy: 1407, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-conduit-large
   rotate: false
-  xy: 1517, 370
+  xy: 1960, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-conduit-medium
   rotate: false
-  xy: 3409, 336
+  xy: 1346, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conduit-small
   rotate: false
-  xy: 1048, 116
+  xy: 1472, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-conduit-tiny
   rotate: false
-  xy: 1457, 72
+  xy: 2348, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-conduit-xlarge
   rotate: false
-  xy: 1357, 462
+  xy: 1457, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-container-large
   rotate: false
-  xy: 1559, 370
+  xy: 2002, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-container-medium
   rotate: false
-  xy: 3443, 336
+  xy: 1380, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-container-small
   rotate: false
-  xy: 1074, 142
+  xy: 1498, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-container-tiny
   rotate: false
-  xy: 1457, 54
+  xy: 2366, 175
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-container-xlarge
   rotate: false
-  xy: 1407, 462
+  xy: 1507, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-conveyor-large
   rotate: false
-  xy: 1601, 370
+  xy: 2044, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-conveyor-medium
   rotate: false
-  xy: 3477, 336
+  xy: 1414, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conveyor-small
   rotate: false
-  xy: 3978, 208
+  xy: 1524, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-conveyor-tiny
   rotate: false
-  xy: 1475, 72
+  xy: 2366, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-conveyor-xlarge
   rotate: false
-  xy: 1457, 462
+  xy: 1557, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-copper-wall-large
   rotate: false
-  xy: 1643, 370
+  xy: 2086, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-copper-wall-large-large
   rotate: false
-  xy: 1685, 370
+  xy: 2128, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-copper-wall-large-medium
   rotate: false
-  xy: 3511, 336
+  xy: 1448, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-large-small
   rotate: false
-  xy: 1074, 116
+  xy: 1550, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-copper-wall-large-tiny
   rotate: false
-  xy: 1475, 54
+  xy: 2384, 173
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-copper-wall-large-xlarge
   rotate: false
-  xy: 1507, 462
+  xy: 1607, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-copper-wall-medium
   rotate: false
-  xy: 3545, 336
+  xy: 1482, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-small
   rotate: false
-  xy: 1100, 142
+  xy: 1576, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-copper-wall-tiny
   rotate: false
-  xy: 1493, 72
+  xy: 2402, 173
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-copper-wall-xlarge
   rotate: false
-  xy: 1557, 462
+  xy: 1657, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-core-foundation-large
   rotate: false
-  xy: 1727, 370
+  xy: 2170, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-core-foundation-medium
   rotate: false
-  xy: 3579, 336
+  xy: 1516, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-core-foundation-small
   rotate: false
-  xy: 4004, 208
+  xy: 1602, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-core-foundation-tiny
   rotate: false
-  xy: 1493, 54
+  xy: 2420, 173
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-core-foundation-xlarge
   rotate: false
-  xy: 1607, 462
+  xy: 1707, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-core-nucleus-large
   rotate: false
-  xy: 1769, 370
+  xy: 2212, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-core-nucleus-medium
   rotate: false
-  xy: 3613, 336
+  xy: 1550, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-core-nucleus-small
   rotate: false
-  xy: 1100, 116
+  xy: 1628, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-core-nucleus-tiny
   rotate: false
-  xy: 1511, 72
+  xy: 2384, 155
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-core-nucleus-xlarge
   rotate: false
-  xy: 1657, 462
+  xy: 1757, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-core-shard-large
   rotate: false
-  xy: 1811, 370
+  xy: 2254, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-core-shard-medium
   rotate: false
-  xy: 3647, 336
+  xy: 1584, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-core-shard-small
   rotate: false
-  xy: 1126, 142
+  xy: 1654, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-core-shard-tiny
   rotate: false
-  xy: 1511, 54
+  xy: 2402, 155
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-core-shard-xlarge
   rotate: false
-  xy: 1707, 462
+  xy: 1807, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-craters-large
   rotate: false
-  xy: 1853, 370
+  xy: 2296, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-craters-medium
   rotate: false
-  xy: 3681, 336
+  xy: 1618, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-craters-small
   rotate: false
-  xy: 1126, 116
+  xy: 1680, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-craters-tiny
   rotate: false
-  xy: 1529, 72
+  xy: 2420, 155
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-craters-xlarge
   rotate: false
-  xy: 1757, 462
+  xy: 1857, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-cryofluidmixer-large
+block-cryofluid-mixer-large
   rotate: false
-  xy: 1895, 370
+  xy: 2338, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-cryofluidmixer-medium
+block-cryofluid-mixer-medium
   rotate: false
-  xy: 3715, 336
+  xy: 1652, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-cryofluidmixer-small
+block-cryofluid-mixer-small
   rotate: false
-  xy: 1152, 142
+  xy: 1706, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-cryofluidmixer-tiny
+block-cryofluid-mixer-tiny
   rotate: false
-  xy: 1529, 54
+  xy: 2509, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-cryofluidmixer-xlarge
+block-cryofluid-mixer-xlarge
   rotate: false
-  xy: 1807, 462
+  xy: 1907, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-cultivator-large
   rotate: false
-  xy: 1937, 370
+  xy: 2380, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-cultivator-medium
   rotate: false
-  xy: 3749, 336
+  xy: 1686, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cultivator-small
   rotate: false
-  xy: 1152, 116
+  xy: 3708, 339
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-cultivator-tiny
   rotate: false
-  xy: 1547, 72
+  xy: 2527, 188
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-cultivator-xlarge
   rotate: false
-  xy: 1857, 462
+  xy: 1957, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-cyclone-large
   rotate: false
-  xy: 1979, 370
+  xy: 2422, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-cyclone-medium
   rotate: false
-  xy: 3783, 336
+  xy: 1720, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cyclone-small
   rotate: false
-  xy: 1178, 142
+  xy: 3702, 313
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-cyclone-tiny
   rotate: false
-  xy: 1547, 54
+  xy: 2545, 188
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-cyclone-xlarge
   rotate: false
-  xy: 1907, 462
+  xy: 2007, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-dacite-boulder-large
+  rotate: false
+  xy: 2464, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-dacite-boulder-medium
+  rotate: false
+  xy: 1754, 169
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dacite-boulder-small
+  rotate: false
+  xy: 2123, 7
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-dacite-boulder-tiny
+  rotate: false
+  xy: 3781, 156
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-dacite-boulder-xlarge
+  rotate: false
+  xy: 2057, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-dacite-large
+  rotate: false
+  xy: 2506, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-dacite-medium
+  rotate: false
+  xy: 1788, 169
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dacite-small
+  rotate: false
+  xy: 2491, 228
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-dacite-tiny
+  rotate: false
+  xy: 3757, 327
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-dacite-wall-large
+  rotate: false
+  xy: 2548, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-dacite-wall-medium
+  rotate: false
+  xy: 1822, 169
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dacite-wall-small
+  rotate: false
+  xy: 2517, 232
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-dacite-wall-tiny
+  rotate: false
+  xy: 3775, 327
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-dacite-wall-xlarge
+  rotate: false
+  xy: 2107, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-dacite-xlarge
+  rotate: false
+  xy: 2157, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dark-metal-large
   rotate: false
-  xy: 2021, 370
+  xy: 2590, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-dark-metal-medium
   rotate: false
-  xy: 3817, 336
+  xy: 1856, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-metal-small
   rotate: false
-  xy: 1178, 116
+  xy: 2543, 232
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-dark-metal-tiny
   rotate: false
-  xy: 1565, 72
+  xy: 2080, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-dark-metal-xlarge
   rotate: false
-  xy: 1957, 462
+  xy: 2207, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dark-panel-1-large
   rotate: false
-  xy: 2063, 370
+  xy: 2632, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-dark-panel-1-medium
   rotate: false
-  xy: 3851, 336
+  xy: 1890, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-1-small
   rotate: false
-  xy: 1204, 142
+  xy: 2569, 219
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-dark-panel-1-tiny
   rotate: false
-  xy: 1565, 54
+  xy: 2098, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-dark-panel-1-xlarge
   rotate: false
-  xy: 2007, 462
+  xy: 2257, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dark-panel-2-large
   rotate: false
-  xy: 2105, 370
+  xy: 2674, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-dark-panel-2-medium
   rotate: false
-  xy: 3885, 336
+  xy: 1924, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-2-small
   rotate: false
-  xy: 1204, 116
+  xy: 2595, 219
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-dark-panel-2-tiny
   rotate: false
-  xy: 1583, 72
+  xy: 2527, 170
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-dark-panel-2-xlarge
   rotate: false
-  xy: 2057, 462
+  xy: 2307, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dark-panel-3-large
   rotate: false
-  xy: 2147, 370
+  xy: 2716, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-dark-panel-3-medium
   rotate: false
-  xy: 3919, 336
+  xy: 1958, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-3-small
   rotate: false
-  xy: 1230, 142
+  xy: 2491, 202
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-dark-panel-3-tiny
   rotate: false
-  xy: 1583, 54
+  xy: 2545, 170
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-dark-panel-3-xlarge
   rotate: false
-  xy: 2107, 462
+  xy: 2357, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dark-panel-4-large
   rotate: false
-  xy: 2189, 370
+  xy: 2758, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-dark-panel-4-medium
   rotate: false
-  xy: 3953, 336
+  xy: 1992, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-4-small
   rotate: false
-  xy: 1230, 116
+  xy: 2517, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-dark-panel-4-tiny
   rotate: false
-  xy: 1601, 72
+  xy: 2563, 175
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-dark-panel-4-xlarge
   rotate: false
-  xy: 2157, 462
+  xy: 2407, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dark-panel-5-large
   rotate: false
-  xy: 2231, 370
+  xy: 2800, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-dark-panel-5-medium
   rotate: false
-  xy: 3987, 336
+  xy: 2026, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-5-small
   rotate: false
-  xy: 1256, 142
+  xy: 2543, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-dark-panel-5-tiny
   rotate: false
-  xy: 1601, 54
+  xy: 2581, 175
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-dark-panel-5-xlarge
   rotate: false
-  xy: 2207, 462
+  xy: 2457, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dark-panel-6-large
   rotate: false
-  xy: 2273, 370
+  xy: 2842, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-dark-panel-6-medium
   rotate: false
-  xy: 2455, 278
+  xy: 2060, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-6-small
   rotate: false
-  xy: 1256, 116
+  xy: 2569, 193
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-dark-panel-6-tiny
   rotate: false
-  xy: 1619, 72
+  xy: 2599, 175
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-dark-panel-6-xlarge
   rotate: false
-  xy: 2257, 462
+  xy: 2507, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-darksand-large
   rotate: false
-  xy: 2315, 370
+  xy: 2884, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-darksand-medium
   rotate: false
-  xy: 2489, 278
+  xy: 2094, 171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-small
   rotate: false
-  xy: 1282, 142
+  xy: 2595, 193
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-large
   rotate: false
-  xy: 2357, 370
+  xy: 2926, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-medium
   rotate: false
-  xy: 2523, 278
+  xy: 2128, 177
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-small
   rotate: false
-  xy: 1282, 116
+  xy: 2621, 235
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-tiny
   rotate: false
-  xy: 1619, 54
+  xy: 2563, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-xlarge
   rotate: false
-  xy: 2307, 462
+  xy: 2557, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-darksand-tiny
   rotate: false
-  xy: 1637, 72
+  xy: 2581, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-darksand-water-large
   rotate: false
-  xy: 2399, 370
+  xy: 2968, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-darksand-water-medium
   rotate: false
-  xy: 2557, 278
+  xy: 2162, 180
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-water-small
   rotate: false
-  xy: 1308, 142
+  xy: 2621, 209
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-darksand-water-tiny
   rotate: false
-  xy: 1637, 54
+  xy: 2599, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-darksand-water-xlarge
   rotate: false
-  xy: 2357, 462
+  xy: 2607, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-darksand-xlarge
   rotate: false
-  xy: 2407, 462
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-data-processor-large
-  rotate: false
-  xy: 2441, 370
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-data-processor-medium
-  rotate: false
-  xy: 2591, 278
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-data-processor-small
-  rotate: false
-  xy: 1308, 116
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-data-processor-tiny
-  rotate: false
-  xy: 1655, 72
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-data-processor-xlarge
-  rotate: false
-  xy: 2457, 462
+  xy: 2657, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-deepwater-large
   rotate: false
-  xy: 2483, 370
+  xy: 3010, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-deepwater-medium
   rotate: false
-  xy: 2625, 278
+  xy: 2623, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-deepwater-small
   rotate: false
-  xy: 1334, 142
+  xy: 2647, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-deepwater-tiny
   rotate: false
-  xy: 1655, 54
+  xy: 2617, 165
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-deepwater-xlarge
   rotate: false
-  xy: 2507, 462
+  xy: 2707, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-differential-generator-large
   rotate: false
-  xy: 2525, 370
+  xy: 3052, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-differential-generator-medium
   rotate: false
-  xy: 2659, 278
+  xy: 2657, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-differential-generator-small
   rotate: false
-  xy: 1334, 116
+  xy: 2673, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-differential-generator-tiny
   rotate: false
-  xy: 1673, 72
+  xy: 2617, 147
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-differential-generator-xlarge
   rotate: false
-  xy: 2557, 462
+  xy: 2757, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-diode-large
   rotate: false
-  xy: 2567, 370
+  xy: 3094, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-diode-medium
   rotate: false
-  xy: 2693, 278
+  xy: 2355, 211
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-diode-small
   rotate: false
-  xy: 1360, 142
+  xy: 2699, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-diode-tiny
   rotate: false
-  xy: 1673, 54
+  xy: 2612, 129
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-diode-xlarge
   rotate: false
-  xy: 2607, 462
+  xy: 2807, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-dirt-large
+  rotate: false
+  xy: 3136, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-dirt-medium
+  rotate: false
+  xy: 2389, 217
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dirt-small
+  rotate: false
+  xy: 2647, 201
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-dirt-tiny
+  rotate: false
+  xy: 2612, 111
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-dirt-wall-large
+  rotate: false
+  xy: 3178, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-dirt-wall-medium
+  rotate: false
+  xy: 2423, 219
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-dirt-wall-small
+  rotate: false
+  xy: 2673, 201
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-dirt-wall-tiny
+  rotate: false
+  xy: 2610, 93
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-dirt-wall-xlarge
+  rotate: false
+  xy: 2857, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-dirt-xlarge
+  rotate: false
+  xy: 2907, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-disassembler-large
   rotate: false
-  xy: 2609, 370
+  xy: 3220, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-disassembler-medium
   rotate: false
-  xy: 2727, 278
+  xy: 2457, 220
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-disassembler-small
   rotate: false
-  xy: 1360, 116
+  xy: 2699, 201
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-disassembler-tiny
   rotate: false
-  xy: 1691, 72
+  xy: 2612, 75
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-disassembler-xlarge
   rotate: false
-  xy: 2657, 462
+  xy: 2957, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-distributor-large
   rotate: false
-  xy: 2651, 370
+  xy: 3262, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-distributor-medium
   rotate: false
-  xy: 2761, 278
+  xy: 2691, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-distributor-small
   rotate: false
-  xy: 1386, 142
+  xy: 2725, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-distributor-tiny
   rotate: false
-  xy: 1691, 54
+  xy: 2612, 57
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-distributor-xlarge
   rotate: false
-  xy: 2707, 462
+  xy: 3007, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-door-large
   rotate: false
-  xy: 2693, 370
+  xy: 3304, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-door-large-large
   rotate: false
-  xy: 2735, 370
+  xy: 3346, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-door-large-medium
   rotate: false
-  xy: 938, 168
+  xy: 2725, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-door-large-small
   rotate: false
-  xy: 1386, 116
+  xy: 2751, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-door-large-tiny
   rotate: false
-  xy: 1709, 72
+  xy: 2612, 39
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-door-large-xlarge
   rotate: false
-  xy: 2757, 462
+  xy: 3057, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-door-medium
   rotate: false
-  xy: 972, 168
+  xy: 2759, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-door-small
   rotate: false
-  xy: 1412, 142
+  xy: 2777, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-door-tiny
   rotate: false
-  xy: 1709, 54
+  xy: 2612, 21
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-door-xlarge
   rotate: false
-  xy: 2807, 462
+  xy: 3107, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-dunerocks-large
+block-dune-wall-large
   rotate: false
-  xy: 2777, 370
+  xy: 3388, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-dunerocks-medium
+block-dune-wall-medium
   rotate: false
-  xy: 1006, 168
+  xy: 2793, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-dunerocks-small
+block-dune-wall-small
   rotate: false
-  xy: 1412, 116
+  xy: 2803, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-dunerocks-tiny
+block-dune-wall-tiny
   rotate: false
-  xy: 1727, 72
+  xy: 2635, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-dunerocks-xlarge
+block-dune-wall-xlarge
   rotate: false
-  xy: 2857, 462
+  xy: 3157, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-duo-large
   rotate: false
-  xy: 2819, 370
+  xy: 3430, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-duo-medium
   rotate: false
-  xy: 1040, 168
+  xy: 2827, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-small
   rotate: false
-  xy: 1438, 142
+  xy: 2829, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-duo-tiny
   rotate: false
-  xy: 1727, 54
+  xy: 2653, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-duo-xlarge
   rotate: false
-  xy: 2907, 462
+  xy: 3207, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-exponential-reconstructor-large
   rotate: false
-  xy: 2861, 370
+  xy: 3472, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-exponential-reconstructor-medium
   rotate: false
-  xy: 1074, 168
+  xy: 2861, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-exponential-reconstructor-small
   rotate: false
-  xy: 1438, 116
+  xy: 2855, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-exponential-reconstructor-tiny
   rotate: false
-  xy: 1745, 72
+  xy: 2671, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-exponential-reconstructor-xlarge
   rotate: false
-  xy: 2957, 462
+  xy: 3257, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-force-projector-large
   rotate: false
-  xy: 2903, 370
+  xy: 3514, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-force-projector-medium
   rotate: false
-  xy: 1108, 168
+  xy: 2895, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-force-projector-small
   rotate: false
-  xy: 1464, 142
+  xy: 2881, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-force-projector-tiny
   rotate: false
-  xy: 1745, 54
+  xy: 2689, 157
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-force-projector-xlarge
   rotate: false
-  xy: 3007, 462
+  xy: 3307, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-foreshadow-large
+  rotate: false
+  xy: 3556, 371
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-foreshadow-medium
+  rotate: false
+  xy: 2929, 266
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-foreshadow-small
+  rotate: false
+  xy: 2907, 206
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-foreshadow-tiny
+  rotate: false
+  xy: 2707, 157
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-foreshadow-xlarge
+  rotate: false
+  xy: 3357, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-fuse-large
   rotate: false
-  xy: 2945, 370
+  xy: 3598, 371
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-fuse-medium
   rotate: false
-  xy: 1142, 168
+  xy: 2963, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-fuse-small
   rotate: false
-  xy: 1464, 116
+  xy: 2933, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-fuse-tiny
   rotate: false
-  xy: 1763, 72
+  xy: 2635, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-fuse-xlarge
   rotate: false
-  xy: 3057, 462
+  xy: 3407, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-graphite-press-large
   rotate: false
-  xy: 2987, 370
+  xy: 4009, 281
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-graphite-press-medium
   rotate: false
-  xy: 1176, 168
+  xy: 2997, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-graphite-press-small
   rotate: false
-  xy: 1490, 142
+  xy: 2959, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-graphite-press-tiny
   rotate: false
-  xy: 1763, 54
+  xy: 2653, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-graphite-press-xlarge
   rotate: false
-  xy: 3107, 462
+  xy: 3457, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-grass-large
   rotate: false
-  xy: 3029, 370
+  xy: 1078, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-grass-medium
   rotate: false
-  xy: 1210, 168
+  xy: 3031, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-grass-small
   rotate: false
-  xy: 1490, 116
+  xy: 2985, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-grass-tiny
   rotate: false
-  xy: 1781, 72
+  xy: 2671, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-grass-xlarge
   rotate: false
-  xy: 3157, 462
+  xy: 3507, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ground-factory-large
   rotate: false
-  xy: 3071, 370
+  xy: 1120, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ground-factory-medium
   rotate: false
-  xy: 1244, 168
+  xy: 3065, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ground-factory-small
   rotate: false
-  xy: 1516, 142
+  xy: 3011, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ground-factory-tiny
   rotate: false
-  xy: 1781, 54
+  xy: 2689, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ground-factory-xlarge
   rotate: false
-  xy: 3207, 462
+  xy: 3557, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-hail-large
   rotate: false
-  xy: 3113, 370
+  xy: 1162, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-hail-medium
   rotate: false
-  xy: 1278, 168
+  xy: 3099, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hail-small
   rotate: false
-  xy: 1516, 116
+  xy: 3037, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-hail-tiny
   rotate: false
-  xy: 1799, 72
+  xy: 2707, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-hail-xlarge
   rotate: false
-  xy: 3257, 462
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-holostone-large
-  rotate: false
-  xy: 3155, 370
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-holostone-medium
-  rotate: false
-  xy: 1312, 168
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-holostone-small
-  rotate: false
-  xy: 1542, 142
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-holostone-tiny
-  rotate: false
-  xy: 1799, 54
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-holostone-xlarge
-  rotate: false
-  xy: 3307, 462
+  xy: 3607, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-hotrock-large
   rotate: false
-  xy: 3197, 370
+  xy: 1204, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-hotrock-medium
   rotate: false
-  xy: 1346, 168
+  xy: 3133, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-small
   rotate: false
-  xy: 1542, 116
+  xy: 3063, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-hotrock-tiny
   rotate: false
-  xy: 1817, 72
+  xy: 2725, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-hotrock-xlarge
   rotate: false
-  xy: 3357, 462
+  xy: 3657, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-hyper-processor-large
+  rotate: false
+  xy: 1246, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-hyper-processor-medium
+  rotate: false
+  xy: 3167, 266
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-hyper-processor-small
+  rotate: false
+  xy: 3089, 206
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-hyper-processor-tiny
+  rotate: false
+  xy: 2743, 136
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-hyper-processor-xlarge
+  rotate: false
+  xy: 3707, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ice-large
   rotate: false
-  xy: 3239, 370
+  xy: 1288, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ice-medium
   rotate: false
-  xy: 1380, 168
+  xy: 3201, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-small
   rotate: false
-  xy: 1568, 142
+  xy: 3115, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ice-snow-large
   rotate: false
-  xy: 3281, 370
+  xy: 1330, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ice-snow-medium
   rotate: false
-  xy: 1414, 168
+  xy: 3235, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-small
   rotate: false
-  xy: 1568, 116
+  xy: 3141, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ice-snow-tiny
   rotate: false
-  xy: 1817, 54
+  xy: 2761, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ice-snow-xlarge
   rotate: false
-  xy: 3407, 462
+  xy: 3757, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ice-tiny
   rotate: false
-  xy: 1835, 72
+  xy: 2779, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+block-ice-wall-large
+  rotate: false
+  xy: 1372, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-ice-wall-medium
+  rotate: false
+  xy: 3269, 266
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-ice-wall-small
+  rotate: false
+  xy: 3167, 206
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-ice-wall-tiny
+  rotate: false
+  xy: 2797, 136
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-ice-wall-xlarge
+  rotate: false
+  xy: 3807, 463
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 block-ice-xlarge
   rotate: false
-  xy: 3457, 462
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-icerocks-large
-  rotate: false
-  xy: 3323, 370
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-icerocks-medium
-  rotate: false
-  xy: 1448, 168
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-icerocks-small
-  rotate: false
-  xy: 1594, 142
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-icerocks-tiny
-  rotate: false
-  xy: 1835, 54
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-icerocks-xlarge
-  rotate: false
-  xy: 3507, 462
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-ignarock-large
-  rotate: false
-  xy: 3365, 370
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-ignarock-medium
-  rotate: false
-  xy: 1482, 168
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-ignarock-small
-  rotate: false
-  xy: 1594, 116
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-ignarock-tiny
-  rotate: false
-  xy: 1853, 72
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-ignarock-xlarge
-  rotate: false
-  xy: 3557, 462
+  xy: 3857, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-illuminator-large
   rotate: false
-  xy: 3407, 370
+  xy: 1414, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-illuminator-medium
   rotate: false
-  xy: 1516, 168
+  xy: 3303, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-illuminator-small
   rotate: false
-  xy: 1620, 142
+  xy: 3193, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-illuminator-tiny
   rotate: false
-  xy: 1853, 54
+  xy: 2815, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-illuminator-xlarge
   rotate: false
-  xy: 3607, 462
+  xy: 3907, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-impact-reactor-large
   rotate: false
-  xy: 3449, 370
+  xy: 1456, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-impact-reactor-medium
   rotate: false
-  xy: 1550, 168
+  xy: 3337, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-impact-reactor-small
   rotate: false
-  xy: 1620, 116
+  xy: 3219, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-impact-reactor-tiny
   rotate: false
-  xy: 1871, 72
+  xy: 2833, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-impact-reactor-xlarge
   rotate: false
-  xy: 3657, 462
+  xy: 3957, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-incinerator-large
   rotate: false
-  xy: 3491, 370
+  xy: 1498, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-incinerator-medium
   rotate: false
-  xy: 1584, 168
+  xy: 3371, 266
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-incinerator-small
   rotate: false
-  xy: 1646, 142
+  xy: 3245, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-incinerator-tiny
   rotate: false
-  xy: 1871, 54
+  xy: 2851, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-incinerator-xlarge
   rotate: false
-  xy: 3707, 462
+  xy: 4007, 463
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-inverted-sorter-large
   rotate: false
-  xy: 3533, 370
+  xy: 1540, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-inverted-sorter-medium
   rotate: false
-  xy: 1618, 168
+  xy: 918, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-inverted-sorter-small
   rotate: false
-  xy: 1646, 116
+  xy: 3271, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-inverted-sorter-tiny
   rotate: false
-  xy: 1889, 72
+  xy: 2869, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-inverted-sorter-xlarge
   rotate: false
-  xy: 3757, 462
+  xy: 345, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-item-source-large
   rotate: false
-  xy: 3575, 370
+  xy: 1582, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-item-source-medium
   rotate: false
-  xy: 1652, 168
+  xy: 917, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-source-small
   rotate: false
-  xy: 1672, 142
+  xy: 3297, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-item-source-tiny
   rotate: false
-  xy: 1889, 54
+  xy: 2887, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-item-source-xlarge
   rotate: false
-  xy: 3807, 462
+  xy: 395, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-item-void-large
   rotate: false
-  xy: 3617, 370
+  xy: 1624, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-item-void-medium
   rotate: false
-  xy: 1686, 168
+  xy: 952, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-void-small
   rotate: false
-  xy: 1672, 116
+  xy: 3323, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-item-void-tiny
   rotate: false
-  xy: 1907, 72
+  xy: 2905, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-item-void-xlarge
   rotate: false
-  xy: 3857, 462
+  xy: 445, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-junction-large
   rotate: false
-  xy: 3659, 370
+  xy: 1666, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-junction-medium
   rotate: false
-  xy: 1720, 168
+  xy: 951, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-junction-small
   rotate: false
-  xy: 1698, 142
+  xy: 3349, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-junction-tiny
   rotate: false
-  xy: 1907, 54
+  xy: 2923, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-junction-xlarge
   rotate: false
-  xy: 3907, 462
+  xy: 495, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-kiln-large
   rotate: false
-  xy: 3701, 370
+  xy: 1708, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-kiln-medium
   rotate: false
-  xy: 1754, 168
+  xy: 986, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-kiln-small
   rotate: false
-  xy: 1698, 116
+  xy: 3375, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-kiln-tiny
   rotate: false
-  xy: 1925, 72
+  xy: 2941, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-kiln-xlarge
   rotate: false
-  xy: 3957, 462
+  xy: 545, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-lancer-large
   rotate: false
-  xy: 3743, 370
+  xy: 1750, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-lancer-medium
   rotate: false
-  xy: 1788, 168
+  xy: 985, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-lancer-small
   rotate: false
-  xy: 1724, 142
+  xy: 2621, 183
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-lancer-tiny
   rotate: false
-  xy: 1925, 54
+  xy: 2959, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-lancer-xlarge
   rotate: false
-  xy: 4007, 462
+  xy: 595, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-large-overdrive-projector-large
+block-large-logic-display-large
   rotate: false
-  xy: 3785, 370
+  xy: 1792, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-large-overdrive-projector-medium
+block-large-logic-display-medium
   rotate: false
-  xy: 1822, 168
+  xy: 1020, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-large-overdrive-projector-small
+block-large-logic-display-small
   rotate: false
-  xy: 1724, 116
+  xy: 2647, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-large-overdrive-projector-tiny
+block-large-logic-display-tiny
   rotate: false
-  xy: 1943, 72
+  xy: 2977, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-large-overdrive-projector-xlarge
+block-large-logic-display-xlarge
   rotate: false
-  xy: 345, 353
+  xy: 645, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-laser-drill-large
   rotate: false
-  xy: 3827, 370
+  xy: 1834, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-laser-drill-medium
   rotate: false
-  xy: 1856, 168
+  xy: 1019, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-laser-drill-small
   rotate: false
-  xy: 1750, 142
+  xy: 2673, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-laser-drill-tiny
   rotate: false
-  xy: 1943, 54
+  xy: 2995, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-laser-drill-xlarge
   rotate: false
-  xy: 395, 353
+  xy: 695, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-launch-pad-large
   rotate: false
-  xy: 3869, 370
+  xy: 1876, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-launch-pad-large-large
   rotate: false
-  xy: 3911, 370
+  xy: 1918, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-launch-pad-large-medium
   rotate: false
-  xy: 1890, 168
+  xy: 1054, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-launch-pad-large-small
   rotate: false
-  xy: 1750, 116
+  xy: 2699, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-launch-pad-large-tiny
   rotate: false
-  xy: 1961, 72
+  xy: 3013, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-launch-pad-large-xlarge
   rotate: false
-  xy: 445, 353
+  xy: 231, 96
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-launch-pad-medium
   rotate: false
-  xy: 1924, 168
+  xy: 1053, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-launch-pad-small
   rotate: false
-  xy: 1776, 142
+  xy: 2725, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-launch-pad-tiny
   rotate: false
-  xy: 1961, 54
+  xy: 3031, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-launch-pad-xlarge
   rotate: false
-  xy: 495, 353
+  xy: 231, 46
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-liquid-junction-large
   rotate: false
-  xy: 3953, 370
+  xy: 1960, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-liquid-junction-medium
   rotate: false
-  xy: 1958, 168
+  xy: 1088, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-junction-small
   rotate: false
-  xy: 1776, 116
+  xy: 2751, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-liquid-junction-tiny
   rotate: false
-  xy: 1979, 72
+  xy: 3049, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-liquid-junction-xlarge
   rotate: false
-  xy: 545, 353
+  xy: 745, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-liquid-router-large
   rotate: false
-  xy: 3995, 370
+  xy: 2002, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-liquid-router-medium
   rotate: false
-  xy: 1992, 168
+  xy: 1122, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-router-small
   rotate: false
-  xy: 1802, 142
+  xy: 2777, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-liquid-router-tiny
   rotate: false
-  xy: 1979, 54
+  xy: 3067, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-liquid-router-xlarge
   rotate: false
-  xy: 595, 353
+  xy: 281, 107
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-liquid-source-large
   rotate: false
-  xy: 859, 328
+  xy: 2044, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-liquid-source-medium
   rotate: false
-  xy: 2026, 168
+  xy: 1156, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-source-small
   rotate: false
-  xy: 1802, 116
+  xy: 2803, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-liquid-source-tiny
   rotate: false
-  xy: 1997, 72
+  xy: 3085, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-liquid-source-xlarge
   rotate: false
-  xy: 645, 353
+  xy: 281, 57
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-liquid-tank-large
   rotate: false
-  xy: 859, 286
+  xy: 2086, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-liquid-tank-medium
   rotate: false
-  xy: 2060, 168
+  xy: 1190, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-tank-small
   rotate: false
-  xy: 1828, 142
+  xy: 2829, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-liquid-tank-tiny
   rotate: false
-  xy: 1997, 54
+  xy: 3103, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-liquid-tank-xlarge
   rotate: false
-  xy: 695, 353
+  xy: 795, 366
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-liquid-void-large
   rotate: false
-  xy: 901, 328
+  xy: 2128, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-liquid-void-medium
   rotate: false
-  xy: 2094, 168
+  xy: 1224, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-void-small
   rotate: false
-  xy: 1828, 116
+  xy: 2855, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-liquid-void-tiny
   rotate: false
-  xy: 2015, 72
+  xy: 3121, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-liquid-void-xlarge
   rotate: false
-  xy: 231, 95
+  xy: 309, 304
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-logic-display-large
+  rotate: false
+  xy: 2170, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-logic-display-medium
+  rotate: false
+  xy: 1258, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-logic-display-small
+  rotate: false
+  xy: 2881, 180
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-logic-display-tiny
+  rotate: false
+  xy: 3139, 136
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-logic-display-xlarge
+  rotate: false
+  xy: 309, 254
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-logic-processor-large
+  rotate: false
+  xy: 2212, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-logic-processor-medium
+  rotate: false
+  xy: 1292, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-logic-processor-small
+  rotate: false
+  xy: 2907, 180
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-logic-processor-tiny
+  rotate: false
+  xy: 3157, 136
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-logic-processor-xlarge
+  rotate: false
+  xy: 359, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-magmarock-large
   rotate: false
-  xy: 859, 244
+  xy: 2254, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-magmarock-medium
   rotate: false
-  xy: 2128, 168
+  xy: 1326, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-magmarock-small
   rotate: false
-  xy: 1854, 142
+  xy: 2933, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-magmarock-tiny
   rotate: false
-  xy: 2015, 54
+  xy: 3175, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-magmarock-xlarge
   rotate: false
-  xy: 231, 45
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-large
-  rotate: false
-  xy: 901, 286
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-medium
-  rotate: false
-  xy: 2162, 168
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-small
-  rotate: false
-  xy: 1854, 116
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-tiny
-  rotate: false
-  xy: 2033, 72
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-mass-conveyor-xlarge
-  rotate: false
-  xy: 745, 353
+  xy: 309, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-mass-driver-large
   rotate: false
-  xy: 943, 328
+  xy: 2296, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-mass-driver-medium
   rotate: false
-  xy: 2196, 168
+  xy: 1360, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-mass-driver-small
   rotate: false
-  xy: 1880, 142
+  xy: 2959, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-mass-driver-tiny
   rotate: false
-  xy: 2033, 54
+  xy: 3193, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-mass-driver-xlarge
   rotate: false
-  xy: 281, 106
+  xy: 359, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-mechanical-drill-large
   rotate: false
-  xy: 859, 202
+  xy: 2338, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-mechanical-drill-medium
   rotate: false
-  xy: 2230, 168
+  xy: 1394, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-mechanical-drill-small
   rotate: false
-  xy: 1880, 116
+  xy: 2985, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-mechanical-drill-tiny
   rotate: false
-  xy: 2051, 72
+  xy: 3211, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-mechanical-drill-xlarge
   rotate: false
-  xy: 281, 56
+  xy: 409, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-mechanical-pump-large
   rotate: false
-  xy: 901, 244
+  xy: 2380, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-mechanical-pump-medium
   rotate: false
-  xy: 2264, 168
+  xy: 1428, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-mechanical-pump-small
   rotate: false
-  xy: 1906, 142
+  xy: 3011, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-mechanical-pump-tiny
   rotate: false
-  xy: 2051, 54
+  xy: 3229, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-mechanical-pump-xlarge
   rotate: false
-  xy: 795, 365
+  xy: 359, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-meltdown-large
   rotate: false
-  xy: 943, 286
+  xy: 2422, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-meltdown-medium
   rotate: false
-  xy: 2298, 168
+  xy: 1462, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-meltdown-small
   rotate: false
-  xy: 1906, 116
+  xy: 3037, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-meltdown-tiny
   rotate: false
-  xy: 2069, 72
+  xy: 3247, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-meltdown-xlarge
   rotate: false
-  xy: 309, 303
+  xy: 409, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-melter-large
   rotate: false
-  xy: 985, 328
+  xy: 2464, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-melter-medium
   rotate: false
-  xy: 2332, 168
+  xy: 1496, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-melter-small
   rotate: false
-  xy: 1932, 142
+  xy: 3063, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-melter-tiny
   rotate: false
-  xy: 2069, 54
+  xy: 3265, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-melter-xlarge
   rotate: false
-  xy: 309, 253
+  xy: 459, 304
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-memory-bank-large
+  rotate: false
+  xy: 2506, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-memory-bank-medium
+  rotate: false
+  xy: 1530, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-memory-bank-small
+  rotate: false
+  xy: 3089, 180
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-memory-bank-tiny
+  rotate: false
+  xy: 3283, 136
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-memory-bank-xlarge
+  rotate: false
+  xy: 409, 204
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-memory-cell-large
+  rotate: false
+  xy: 2548, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-memory-cell-medium
+  rotate: false
+  xy: 1564, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-memory-cell-small
+  rotate: false
+  xy: 3115, 180
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-memory-cell-tiny
+  rotate: false
+  xy: 3301, 136
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-memory-cell-xlarge
+  rotate: false
+  xy: 459, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-mend-projector-large
   rotate: false
-  xy: 901, 202
+  xy: 2590, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-mend-projector-medium
   rotate: false
-  xy: 2797, 302
+  xy: 1598, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-mend-projector-small
   rotate: false
-  xy: 1932, 116
+  xy: 3141, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-mend-projector-tiny
   rotate: false
-  xy: 2087, 72
+  xy: 3319, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-mend-projector-xlarge
   rotate: false
-  xy: 359, 303
+  xy: 509, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-mender-large
   rotate: false
-  xy: 943, 244
+  xy: 2632, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-mender-medium
   rotate: false
-  xy: 2831, 302
+  xy: 1632, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-mender-small
   rotate: false
-  xy: 1958, 142
+  xy: 3167, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-mender-tiny
   rotate: false
-  xy: 2087, 54
+  xy: 3337, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-mender-xlarge
   rotate: false
-  xy: 309, 203
+  xy: 459, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-message-large
   rotate: false
-  xy: 985, 286
+  xy: 2674, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-message-medium
   rotate: false
-  xy: 2865, 302
+  xy: 1666, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-message-small
   rotate: false
-  xy: 1958, 116
+  xy: 3193, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-message-tiny
   rotate: false
-  xy: 2105, 72
+  xy: 3355, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-message-xlarge
   rotate: false
-  xy: 359, 253
+  xy: 509, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-metal-floor-2-large
   rotate: false
-  xy: 1027, 328
+  xy: 2716, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-metal-floor-2-medium
   rotate: false
-  xy: 2899, 302
+  xy: 1700, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-2-small
   rotate: false
-  xy: 1984, 142
+  xy: 3219, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-metal-floor-2-tiny
   rotate: false
-  xy: 2105, 54
+  xy: 3373, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-metal-floor-2-xlarge
   rotate: false
-  xy: 409, 303
+  xy: 559, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-metal-floor-3-large
   rotate: false
-  xy: 943, 202
+  xy: 2758, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-metal-floor-3-medium
   rotate: false
-  xy: 2933, 302
+  xy: 1734, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-3-small
   rotate: false
-  xy: 1984, 116
+  xy: 3245, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-metal-floor-3-tiny
   rotate: false
-  xy: 2123, 72
+  xy: 2630, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-metal-floor-3-xlarge
   rotate: false
-  xy: 359, 203
+  xy: 509, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-metal-floor-5-large
   rotate: false
-  xy: 985, 244
+  xy: 2800, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-metal-floor-5-medium
   rotate: false
-  xy: 2967, 302
+  xy: 1768, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-5-small
   rotate: false
-  xy: 2010, 142
+  xy: 3271, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-metal-floor-5-tiny
   rotate: false
-  xy: 2123, 54
+  xy: 2648, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-metal-floor-5-xlarge
   rotate: false
-  xy: 409, 253
+  xy: 559, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-large
   rotate: false
-  xy: 1027, 286
+  xy: 2842, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-medium
   rotate: false
-  xy: 3001, 302
+  xy: 1802, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-small
   rotate: false
-  xy: 2010, 116
+  xy: 3297, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-tiny
   rotate: false
-  xy: 2141, 72
+  xy: 2666, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-xlarge
   rotate: false
-  xy: 459, 303
+  xy: 609, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-metal-floor-large
   rotate: false
-  xy: 1069, 328
+  xy: 2884, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-metal-floor-medium
   rotate: false
-  xy: 3035, 302
+  xy: 1836, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-small
   rotate: false
-  xy: 2036, 142
+  xy: 3323, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-metal-floor-tiny
   rotate: false
-  xy: 2141, 54
+  xy: 2684, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-metal-floor-xlarge
   rotate: false
-  xy: 409, 203
+  xy: 559, 204
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-micro-processor-large
+  rotate: false
+  xy: 2926, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-micro-processor-medium
+  rotate: false
+  xy: 1870, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-micro-processor-small
+  rotate: false
+  xy: 3349, 180
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-micro-processor-tiny
+  rotate: false
+  xy: 2702, 121
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-micro-processor-xlarge
+  rotate: false
+  xy: 609, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-moss-large
   rotate: false
-  xy: 985, 202
+  xy: 2968, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-moss-medium
   rotate: false
-  xy: 3069, 302
+  xy: 1904, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-small
   rotate: false
-  xy: 2036, 116
+  xy: 3375, 180
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-moss-tiny
   rotate: false
-  xy: 2159, 72
+  xy: 2630, 103
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-moss-xlarge
   rotate: false
-  xy: 459, 253
+  xy: 659, 304
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-mud-large
+  rotate: false
+  xy: 3010, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-mud-medium
+  rotate: false
+  xy: 1938, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-mud-small
+  rotate: false
+  xy: 3401, 193
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-mud-tiny
+  rotate: false
+  xy: 2648, 103
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-mud-xlarge
+  rotate: false
+  xy: 609, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-multi-press-large
   rotate: false
-  xy: 1027, 244
+  xy: 3052, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-multi-press-medium
   rotate: false
-  xy: 3103, 302
+  xy: 1972, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-multi-press-small
   rotate: false
-  xy: 2062, 142
+  xy: 3427, 193
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-multi-press-tiny
   rotate: false
-  xy: 2159, 54
+  xy: 2666, 103
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-multi-press-xlarge
   rotate: false
-  xy: 509, 303
+  xy: 659, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-multiplicative-reconstructor-large
   rotate: false
-  xy: 1069, 286
+  xy: 3094, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-multiplicative-reconstructor-medium
   rotate: false
-  xy: 3137, 302
+  xy: 2006, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-multiplicative-reconstructor-small
   rotate: false
-  xy: 2062, 116
+  xy: 3401, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-multiplicative-reconstructor-tiny
   rotate: false
-  xy: 2177, 72
+  xy: 2684, 103
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-multiplicative-reconstructor-xlarge
   rotate: false
-  xy: 459, 203
+  xy: 709, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-naval-factory-large
   rotate: false
-  xy: 1111, 328
+  xy: 3136, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-naval-factory-medium
   rotate: false
-  xy: 3171, 302
+  xy: 2040, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-naval-factory-small
   rotate: false
-  xy: 2088, 142
+  xy: 3427, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-naval-factory-tiny
   rotate: false
-  xy: 2177, 54
+  xy: 2702, 103
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-naval-factory-xlarge
   rotate: false
-  xy: 509, 253
+  xy: 659, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-oil-extractor-large
   rotate: false
-  xy: 1027, 202
+  xy: 3178, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-oil-extractor-medium
   rotate: false
-  xy: 3205, 302
+  xy: 2074, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-oil-extractor-small
   rotate: false
-  xy: 2088, 116
+  xy: 2142, 83
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-oil-extractor-tiny
   rotate: false
-  xy: 2195, 72
+  xy: 2720, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-oil-extractor-xlarge
   rotate: false
-  xy: 559, 303
+  xy: 709, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-coal-large
   rotate: false
-  xy: 1069, 244
+  xy: 3220, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ore-coal-medium
   rotate: false
-  xy: 3239, 302
+  xy: 2108, 137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-coal-small
   rotate: false
-  xy: 2114, 142
+  xy: 2168, 83
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-coal-tiny
   rotate: false
-  xy: 2195, 54
+  xy: 2738, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-coal-xlarge
   rotate: false
-  xy: 509, 203
+  xy: 709, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-copper-large
   rotate: false
-  xy: 1111, 286
+  xy: 3262, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ore-copper-medium
   rotate: false
-  xy: 3273, 302
+  xy: 2142, 143
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-small
   rotate: false
-  xy: 2114, 116
+  xy: 2194, 86
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-copper-tiny
   rotate: false
-  xy: 2213, 72
+  xy: 2756, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-copper-xlarge
   rotate: false
-  xy: 559, 253
+  xy: 759, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-lead-large
   rotate: false
-  xy: 1153, 328
+  xy: 3304, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ore-lead-medium
   rotate: false
-  xy: 3307, 302
+  xy: 2176, 146
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-small
   rotate: false
-  xy: 2140, 142
+  xy: 2220, 86
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-lead-tiny
   rotate: false
-  xy: 2213, 54
+  xy: 2774, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-lead-xlarge
   rotate: false
-  xy: 609, 303
+  xy: 759, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-scrap-large
   rotate: false
-  xy: 1069, 202
+  xy: 3346, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ore-scrap-medium
   rotate: false
-  xy: 3341, 302
+  xy: 2196, 180
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-small
   rotate: false
-  xy: 2140, 116
+  xy: 2246, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-scrap-tiny
   rotate: false
-  xy: 2231, 72
+  xy: 2792, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-scrap-xlarge
   rotate: false
-  xy: 559, 203
+  xy: 759, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-thorium-large
   rotate: false
-  xy: 1111, 244
+  xy: 3388, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ore-thorium-medium
   rotate: false
-  xy: 3375, 302
+  xy: 2230, 183
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-small
   rotate: false
-  xy: 2166, 142
+  xy: 2152, 57
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-thorium-tiny
   rotate: false
-  xy: 2231, 54
+  xy: 2810, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-thorium-xlarge
   rotate: false
-  xy: 609, 253
+  xy: 809, 316
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-titanium-large
   rotate: false
-  xy: 1153, 286
+  xy: 3430, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ore-titanium-medium
   rotate: false
-  xy: 3409, 302
+  xy: 2210, 146
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-small
   rotate: false
-  xy: 2166, 116
+  xy: 2152, 31
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-titanium-tiny
   rotate: false
-  xy: 2249, 72
+  xy: 2828, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-titanium-xlarge
   rotate: false
-  xy: 659, 303
+  xy: 809, 266
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-overdrive-dome-large
+  rotate: false
+  xy: 3472, 329
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-overdrive-dome-medium
+  rotate: false
+  xy: 2244, 149
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-overdrive-dome-small
+  rotate: false
+  xy: 2149, 5
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-overdrive-dome-tiny
+  rotate: false
+  xy: 2846, 118
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-overdrive-dome-xlarge
+  rotate: false
+  xy: 809, 216
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-overdrive-projector-large
   rotate: false
-  xy: 1195, 328
+  xy: 3514, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-overdrive-projector-medium
   rotate: false
-  xy: 3443, 302
+  xy: 2573, 245
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-overdrive-projector-small
   rotate: false
-  xy: 2192, 142
+  xy: 2178, 57
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-overdrive-projector-tiny
   rotate: false
-  xy: 2249, 54
+  xy: 2864, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-overdrive-projector-xlarge
   rotate: false
-  xy: 609, 203
+  xy: 809, 166
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-overflow-gate-large
   rotate: false
-  xy: 1111, 202
+  xy: 3556, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-overflow-gate-medium
   rotate: false
-  xy: 3477, 302
+  xy: 2725, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-overflow-gate-small
   rotate: false
-  xy: 2192, 116
+  xy: 2178, 31
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-overflow-gate-tiny
   rotate: false
-  xy: 2267, 72
+  xy: 2882, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-overflow-gate-xlarge
   rotate: false
-  xy: 659, 253
+  xy: 281, 7
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-parallax-large
   rotate: false
-  xy: 1153, 244
+  xy: 3598, 329
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-parallax-medium
   rotate: false
-  xy: 3511, 302
+  xy: 2759, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-parallax-small
   rotate: false
-  xy: 2218, 142
+  xy: 2175, 5
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-parallax-tiny
   rotate: false
-  xy: 2267, 54
+  xy: 2900, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-parallax-xlarge
   rotate: false
-  xy: 709, 303
+  xy: 331, 154
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-payload-conveyor-large
+  rotate: false
+  xy: 3640, 335
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-payload-conveyor-medium
+  rotate: false
+  xy: 2793, 232
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-payload-conveyor-small
+  rotate: false
+  xy: 2204, 60
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-payload-conveyor-tiny
+  rotate: false
+  xy: 2918, 118
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-payload-conveyor-xlarge
+  rotate: false
+  xy: 331, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-payload-router-large
   rotate: false
-  xy: 1195, 286
+  xy: 4051, 281
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-payload-router-medium
   rotate: false
-  xy: 3545, 302
+  xy: 2827, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-payload-router-small
   rotate: false
-  xy: 2218, 116
+  xy: 2204, 34
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-payload-router-tiny
   rotate: false
-  xy: 2285, 72
+  xy: 2936, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-payload-router-xlarge
   rotate: false
-  xy: 659, 203
+  xy: 381, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-pebbles-large
   rotate: false
-  xy: 1237, 328
+  xy: 859, 321
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-pebbles-medium
   rotate: false
-  xy: 3579, 302
+  xy: 2861, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-small
   rotate: false
-  xy: 2244, 142
+  xy: 2230, 60
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-pebbles-tiny
   rotate: false
-  xy: 2285, 54
+  xy: 2954, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-pebbles-xlarge
   rotate: false
-  xy: 709, 253
+  xy: 331, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-phase-conduit-large
   rotate: false
-  xy: 1153, 202
+  xy: 901, 321
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-phase-conduit-medium
   rotate: false
-  xy: 3613, 302
+  xy: 2895, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conduit-small
   rotate: false
-  xy: 2244, 116
+  xy: 2230, 34
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-phase-conduit-tiny
   rotate: false
-  xy: 2303, 72
+  xy: 2972, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-phase-conduit-xlarge
   rotate: false
-  xy: 709, 203
+  xy: 381, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-phase-conveyor-large
   rotate: false
-  xy: 1195, 244
+  xy: 859, 279
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-phase-conveyor-medium
   rotate: false
-  xy: 3647, 302
+  xy: 2929, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conveyor-small
   rotate: false
-  xy: 2270, 142
+  xy: 2256, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-phase-conveyor-tiny
   rotate: false
-  xy: 2303, 54
+  xy: 2990, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-phase-conveyor-xlarge
   rotate: false
-  xy: 759, 303
+  xy: 431, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-phase-wall-large
   rotate: false
-  xy: 1237, 286
+  xy: 943, 321
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-phase-wall-large-large
   rotate: false
-  xy: 1279, 328
+  xy: 859, 237
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-phase-wall-large-medium
   rotate: false
-  xy: 3681, 302
+  xy: 2963, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-large-small
   rotate: false
-  xy: 2270, 116
+  xy: 2256, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-phase-wall-large-tiny
   rotate: false
-  xy: 2321, 72
+  xy: 3008, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-phase-wall-large-xlarge
   rotate: false
-  xy: 759, 253
+  xy: 381, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-phase-wall-medium
   rotate: false
-  xy: 3715, 302
+  xy: 2997, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-small
   rotate: false
-  xy: 2296, 142
+  xy: 2272, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-phase-wall-tiny
   rotate: false
-  xy: 2321, 54
+  xy: 3026, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-phase-wall-xlarge
   rotate: false
-  xy: 759, 203
+  xy: 431, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-phase-weaver-large
   rotate: false
-  xy: 1195, 202
+  xy: 901, 279
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-phase-weaver-medium
   rotate: false
-  xy: 3749, 302
+  xy: 3031, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-weaver-small
   rotate: false
-  xy: 2296, 116
+  xy: 2282, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-phase-weaver-tiny
   rotate: false
-  xy: 2339, 72
+  xy: 3044, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-phase-weaver-xlarge
   rotate: false
-  xy: 809, 315
+  xy: 481, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-pine-large
   rotate: false
-  xy: 1237, 244
+  xy: 985, 321
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-pine-medium
   rotate: false
-  xy: 3783, 302
+  xy: 3065, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pine-small
   rotate: false
-  xy: 2322, 142
+  xy: 2282, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-pine-tiny
   rotate: false
-  xy: 2339, 54
+  xy: 3062, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-pine-xlarge
   rotate: false
-  xy: 809, 265
+  xy: 431, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-plastanium-compressor-large
   rotate: false
-  xy: 1279, 286
+  xy: 859, 195
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-plastanium-compressor-medium
   rotate: false
-  xy: 3817, 302
+  xy: 3099, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-plastanium-compressor-small
   rotate: false
-  xy: 2322, 116
+  xy: 3677, 173
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-plastanium-compressor-tiny
   rotate: false
-  xy: 2357, 72
+  xy: 3080, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-plastanium-compressor-xlarge
   rotate: false
-  xy: 809, 215
+  xy: 481, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-plastanium-conveyor-large
   rotate: false
-  xy: 1321, 328
+  xy: 901, 237
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-plastanium-conveyor-medium
   rotate: false
-  xy: 3851, 302
+  xy: 3133, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-plastanium-conveyor-small
   rotate: false
-  xy: 4037, 370
+  xy: 3703, 166
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-plastanium-conveyor-tiny
   rotate: false
-  xy: 2357, 54
+  xy: 3098, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-plastanium-conveyor-xlarge
   rotate: false
-  xy: 809, 165
+  xy: 531, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-plastanium-wall-large
   rotate: false
-  xy: 1237, 202
+  xy: 943, 279
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-plastanium-wall-large-large
   rotate: false
-  xy: 1279, 244
+  xy: 1027, 321
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-plastanium-wall-large-medium
   rotate: false
-  xy: 3885, 302
+  xy: 3167, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-plastanium-wall-large-small
   rotate: false
-  xy: 4063, 370
+  xy: 3729, 166
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-plastanium-wall-large-tiny
   rotate: false
-  xy: 1331, 36
+  xy: 3116, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-plastanium-wall-large-xlarge
   rotate: false
-  xy: 281, 6
+  xy: 481, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-plastanium-wall-medium
   rotate: false
-  xy: 3919, 302
+  xy: 3201, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-plastanium-wall-small
   rotate: false
-  xy: 4055, 344
+  xy: 3737, 192
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-plastanium-wall-tiny
   rotate: false
-  xy: 1349, 36
+  xy: 3134, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-plastanium-wall-xlarge
   rotate: false
-  xy: 331, 153
+  xy: 531, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-plated-conduit-large
   rotate: false
-  xy: 1321, 286
+  xy: 901, 195
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-plated-conduit-medium
   rotate: false
-  xy: 3953, 302
+  xy: 3235, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-plated-conduit-small
   rotate: false
-  xy: 4055, 318
+  xy: 3755, 166
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-plated-conduit-tiny
   rotate: false
-  xy: 1367, 36
+  xy: 3152, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-plated-conduit-xlarge
   rotate: false
-  xy: 331, 103
+  xy: 581, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-pneumatic-drill-large
   rotate: false
-  xy: 1363, 328
+  xy: 943, 237
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-pneumatic-drill-medium
   rotate: false
-  xy: 3987, 302
+  xy: 3269, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pneumatic-drill-small
   rotate: false
-  xy: 915, 1
+  xy: 3728, 313
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-pneumatic-drill-tiny
   rotate: false
-  xy: 1385, 36
+  xy: 3170, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-pneumatic-drill-xlarge
   rotate: false
-  xy: 381, 153
+  xy: 531, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-power-node-large
   rotate: false
-  xy: 1279, 202
+  xy: 985, 279
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-power-node-large-large
   rotate: false
-  xy: 1321, 244
+  xy: 943, 195
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-power-node-large-medium
   rotate: false
-  xy: 881, 142
+  xy: 3303, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-node-large-small
   rotate: false
-  xy: 4030, 208
+  xy: 3711, 287
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-power-node-large-tiny
   rotate: false
-  xy: 1403, 36
+  xy: 3188, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-power-node-large-xlarge
   rotate: false
-  xy: 331, 53
+  xy: 581, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-power-node-medium
   rotate: false
-  xy: 881, 108
+  xy: 3337, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-node-small
   rotate: false
-  xy: 2348, 142
+  xy: 3737, 287
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-power-node-tiny
   rotate: false
-  xy: 1421, 36
+  xy: 3206, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-power-node-xlarge
   rotate: false
-  xy: 381, 103
+  xy: 631, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-power-source-large
   rotate: false
-  xy: 1363, 286
+  xy: 985, 237
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-power-source-medium
   rotate: false
-  xy: 881, 74
+  xy: 3371, 232
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-source-small
   rotate: false
-  xy: 2348, 116
+  xy: 3740, 261
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-power-source-tiny
   rotate: false
-  xy: 1439, 36
+  xy: 3224, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-power-source-xlarge
   rotate: false
-  xy: 431, 153
+  xy: 581, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-power-void-large
   rotate: false
-  xy: 1405, 328
+  xy: 1027, 279
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-power-void-medium
   rotate: false
-  xy: 881, 40
+  xy: 3405, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-void-small
   rotate: false
-  xy: 4055, 292
+  xy: 3740, 235
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-power-void-tiny
   rotate: false
-  xy: 1457, 36
+  xy: 3242, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-power-void-xlarge
   rotate: false
-  xy: 381, 53
+  xy: 631, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-pulse-conduit-large
   rotate: false
-  xy: 1321, 202
+  xy: 985, 195
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-pulse-conduit-medium
   rotate: false
-  xy: 881, 6
+  xy: 3439, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulse-conduit-small
   rotate: false
-  xy: 4053, 266
+  xy: 2389, 191
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-pulse-conduit-tiny
   rotate: false
-  xy: 1475, 36
+  xy: 3260, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-pulse-conduit-xlarge
   rotate: false
-  xy: 431, 103
+  xy: 681, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-pulverizer-large
   rotate: false
-  xy: 1363, 244
+  xy: 1027, 237
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-pulverizer-medium
   rotate: false
-  xy: 2795, 268
+  xy: 3473, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-small
   rotate: false
-  xy: 4049, 240
+  xy: 2415, 191
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-pulverizer-tiny
   rotate: false
-  xy: 1493, 36
+  xy: 3278, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-pulverizer-xlarge
   rotate: false
-  xy: 481, 153
+  xy: 631, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-pyratite-mixer-large
   rotate: false
-  xy: 1405, 286
+  xy: 1027, 195
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-pyratite-mixer-medium
   rotate: false
-  xy: 2829, 268
+  xy: 3507, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pyratite-mixer-small
   rotate: false
-  xy: 2374, 155
+  xy: 2441, 193
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-pyratite-mixer-tiny
   rotate: false
-  xy: 1511, 36
+  xy: 3296, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-pyratite-mixer-xlarge
   rotate: false
-  xy: 431, 53
+  xy: 681, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-repair-point-large
   rotate: false
-  xy: 1447, 328
+  xy: 1069, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-repair-point-medium
   rotate: false
-  xy: 2863, 268
+  xy: 3541, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-repair-point-small
   rotate: false
-  xy: 2374, 129
+  xy: 3453, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-repair-point-tiny
   rotate: false
-  xy: 1529, 36
+  xy: 3314, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-repair-point-xlarge
   rotate: false
-  xy: 481, 103
+  xy: 731, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-resupply-point-large
   rotate: false
-  xy: 1363, 202
+  xy: 1111, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-resupply-point-medium
   rotate: false
-  xy: 2897, 268
+  xy: 3575, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-resupply-point-small
   rotate: false
-  xy: 4056, 214
+  xy: 3479, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-resupply-point-tiny
   rotate: false
-  xy: 1547, 36
+  xy: 3332, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-resupply-point-xlarge
   rotate: false
-  xy: 531, 153
+  xy: 681, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ripple-large
   rotate: false
-  xy: 1405, 244
+  xy: 1069, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-ripple-medium
   rotate: false
-  xy: 2931, 268
+  xy: 3609, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ripple-small
   rotate: false
-  xy: 2374, 103
+  xy: 3505, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ripple-tiny
   rotate: false
-  xy: 1565, 36
+  xy: 3350, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ripple-xlarge
   rotate: false
-  xy: 481, 53
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-rock-large
-  rotate: false
-  xy: 1447, 286
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-rock-medium
-  rotate: false
-  xy: 2965, 268
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-rock-small
-  rotate: false
-  xy: 3822, 182
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-rock-tiny
-  rotate: false
-  xy: 1583, 36
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-rock-xlarge
-  rotate: false
-  xy: 531, 103
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-rocks-large
-  rotate: false
-  xy: 1489, 328
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-rocks-medium
-  rotate: false
-  xy: 2999, 268
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-rocks-small
-  rotate: false
-  xy: 3848, 182
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-rocks-tiny
-  rotate: false
-  xy: 1601, 36
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-rocks-xlarge
-  rotate: false
-  xy: 581, 153
+  xy: 731, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-rotary-pump-large
   rotate: false
-  xy: 1405, 202
+  xy: 1153, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-rotary-pump-medium
   rotate: false
-  xy: 3033, 268
+  xy: 3405, 219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-rotary-pump-small
   rotate: false
-  xy: 3874, 182
+  xy: 3531, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-rotary-pump-tiny
   rotate: false
-  xy: 1619, 36
+  xy: 3368, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-rotary-pump-xlarge
   rotate: false
-  xy: 531, 53
+  xy: 731, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-router-large
   rotate: false
-  xy: 1447, 244
+  xy: 1069, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-router-medium
   rotate: false
-  xy: 3067, 268
+  xy: 3439, 219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-router-small
   rotate: false
-  xy: 3900, 182
+  xy: 3557, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-router-tiny
   rotate: false
-  xy: 1637, 36
+  xy: 2720, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-router-xlarge
   rotate: false
-  xy: 581, 103
+  xy: 331, 4
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-rtg-generator-large
   rotate: false
-  xy: 1489, 286
+  xy: 1111, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-rtg-generator-medium
   rotate: false
-  xy: 3101, 268
+  xy: 3473, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-rtg-generator-small
   rotate: false
-  xy: 3926, 182
+  xy: 3583, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-rtg-generator-tiny
   rotate: false
-  xy: 1655, 36
+  xy: 2738, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-rtg-generator-xlarge
   rotate: false
-  xy: 631, 153
+  xy: 381, 4
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-salt-large
   rotate: false
-  xy: 1531, 328
+  xy: 1195, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-salt-medium
   rotate: false
-  xy: 3135, 268
+  xy: 3507, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-salt-small
   rotate: false
-  xy: 3952, 182
+  xy: 3609, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-salt-tiny
   rotate: false
-  xy: 1673, 36
+  xy: 2756, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-salt-xlarge
+block-salt-wall-large
   rotate: false
-  xy: 581, 53
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-saltrocks-large
-  rotate: false
-  xy: 1447, 202
+  xy: 1111, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-saltrocks-medium
+block-salt-wall-medium
   rotate: false
-  xy: 3169, 268
+  xy: 3541, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-saltrocks-small
+block-salt-wall-small
   rotate: false
-  xy: 3978, 182
+  xy: 3635, 167
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-saltrocks-tiny
+block-salt-wall-tiny
   rotate: false
-  xy: 1691, 36
+  xy: 2774, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-saltrocks-xlarge
+block-salt-wall-xlarge
   rotate: false
-  xy: 631, 103
+  xy: 431, 4
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-salt-xlarge
+  rotate: false
+  xy: 481, 4
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-salvo-large
   rotate: false
-  xy: 1489, 244
+  xy: 1153, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-salvo-medium
   rotate: false
-  xy: 3203, 268
+  xy: 3575, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-salvo-small
   rotate: false
-  xy: 4004, 182
+  xy: 1733, 12
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-salvo-tiny
   rotate: false
-  xy: 1709, 36
+  xy: 2792, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-salvo-xlarge
   rotate: false
-  xy: 681, 153
+  xy: 531, 4
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-sand-boulder-large
   rotate: false
-  xy: 1531, 286
+  xy: 1237, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-sand-boulder-medium
   rotate: false
-  xy: 3237, 268
+  xy: 3609, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-boulder-small
   rotate: false
-  xy: 4030, 182
+  xy: 1759, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-sand-boulder-tiny
   rotate: false
-  xy: 1727, 36
+  xy: 2810, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-sand-boulder-xlarge
   rotate: false
-  xy: 631, 53
+  xy: 581, 4
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-sand-large
   rotate: false
-  xy: 1573, 328
+  xy: 1153, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-sand-medium
   rotate: false
-  xy: 3271, 268
+  xy: 3634, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-small
   rotate: false
-  xy: 4056, 188
+  xy: 2725, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-sand-tiny
   rotate: false
-  xy: 1745, 36
+  xy: 2828, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+block-sand-wall-large
+  rotate: false
+  xy: 1195, 245
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-sand-wall-medium
+  rotate: false
+  xy: 3643, 261
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-sand-wall-small
+  rotate: false
+  xy: 2751, 154
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-sand-wall-tiny
+  rotate: false
+  xy: 2846, 100
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-sand-wall-xlarge
+  rotate: false
+  xy: 631, 4
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 block-sand-water-large
   rotate: false
-  xy: 1489, 202
+  xy: 1279, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-sand-water-medium
   rotate: false
-  xy: 3305, 268
+  xy: 3643, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-water-small
   rotate: false
-  xy: 944, 90
+  xy: 2777, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-sand-water-tiny
   rotate: false
-  xy: 1763, 36
+  xy: 2864, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-sand-water-xlarge
   rotate: false
-  xy: 681, 103
+  xy: 681, 4
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-sand-xlarge
   rotate: false
-  xy: 731, 153
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-sandrocks-large
-  rotate: false
-  xy: 1531, 244
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-sandrocks-medium
-  rotate: false
-  xy: 3339, 268
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-sandrocks-small
-  rotate: false
-  xy: 970, 90
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-sandrocks-tiny
-  rotate: false
-  xy: 1781, 36
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-sandrocks-xlarge
-  rotate: false
-  xy: 681, 53
+  xy: 731, 4
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-scatter-large
   rotate: false
-  xy: 1573, 286
+  xy: 1195, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-scatter-medium
   rotate: false
-  xy: 3373, 268
+  xy: 917, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scatter-small
   rotate: false
-  xy: 996, 90
+  xy: 2803, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-scatter-tiny
   rotate: false
-  xy: 1799, 36
+  xy: 2882, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-scatter-xlarge
   rotate: false
-  xy: 731, 103
+  xy: 781, 116
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-scorch-large
   rotate: false
-  xy: 1615, 328
+  xy: 1237, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-scorch-medium
   rotate: false
-  xy: 3407, 268
+  xy: 951, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scorch-small
   rotate: false
-  xy: 1022, 90
+  xy: 2829, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-scorch-tiny
   rotate: false
-  xy: 1817, 36
+  xy: 2900, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-scorch-xlarge
   rotate: false
-  xy: 731, 53
+  xy: 781, 66
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-scrap-wall-gigantic-large
   rotate: false
-  xy: 1531, 202
+  xy: 1321, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-scrap-wall-gigantic-medium
   rotate: false
-  xy: 3441, 268
+  xy: 985, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-gigantic-small
   rotate: false
-  xy: 1048, 90
+  xy: 2855, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-scrap-wall-gigantic-tiny
   rotate: false
-  xy: 1835, 36
+  xy: 2918, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-scrap-wall-gigantic-xlarge
   rotate: false
-  xy: 331, 3
+  xy: 781, 16
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-scrap-wall-huge-large
   rotate: false
-  xy: 1573, 244
+  xy: 1237, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-scrap-wall-huge-medium
   rotate: false
-  xy: 3475, 268
+  xy: 1019, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-huge-small
   rotate: false
-  xy: 1074, 90
+  xy: 2881, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-scrap-wall-huge-tiny
   rotate: false
-  xy: 1853, 36
+  xy: 2936, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-scrap-wall-huge-xlarge
   rotate: false
-  xy: 381, 3
+  xy: 831, 116
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-scrap-wall-large
   rotate: false
-  xy: 1615, 286
+  xy: 1279, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-scrap-wall-large-large
   rotate: false
-  xy: 1657, 328
+  xy: 1363, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-scrap-wall-large-medium
   rotate: false
-  xy: 3509, 268
+  xy: 1053, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-large-small
   rotate: false
-  xy: 1100, 90
+  xy: 2907, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-scrap-wall-large-tiny
   rotate: false
-  xy: 1871, 36
+  xy: 2954, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-scrap-wall-large-xlarge
   rotate: false
-  xy: 431, 3
+  xy: 831, 66
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-scrap-wall-medium
   rotate: false
-  xy: 3543, 268
+  xy: 949, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-small
   rotate: false
-  xy: 1126, 90
+  xy: 2933, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-scrap-wall-tiny
   rotate: false
-  xy: 1889, 36
+  xy: 2972, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-scrap-wall-xlarge
   rotate: false
-  xy: 481, 3
+  xy: 831, 16
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-segment-large
   rotate: false
-  xy: 1573, 202
+  xy: 1279, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-segment-medium
   rotate: false
-  xy: 3577, 268
+  xy: 983, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-segment-small
   rotate: false
-  xy: 1152, 90
+  xy: 2959, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-segment-tiny
   rotate: false
-  xy: 1907, 36
+  xy: 2990, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-segment-xlarge
   rotate: false
-  xy: 531, 3
+  xy: 859, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-separator-large
   rotate: false
-  xy: 1615, 244
+  xy: 1321, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-separator-medium
   rotate: false
-  xy: 3611, 268
+  xy: 1017, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-separator-small
   rotate: false
-  xy: 1178, 90
+  xy: 2985, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-separator-tiny
   rotate: false
-  xy: 1925, 36
+  xy: 3008, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-separator-xlarge
   rotate: false
-  xy: 581, 3
+  xy: 909, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-shale-boulder-large
   rotate: false
-  xy: 1657, 286
+  xy: 1405, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-shale-boulder-medium
   rotate: false
-  xy: 3645, 268
+  xy: 1051, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-boulder-small
   rotate: false
-  xy: 1204, 90
+  xy: 3011, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-shale-boulder-tiny
   rotate: false
-  xy: 1943, 36
+  xy: 3026, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-shale-boulder-xlarge
   rotate: false
-  xy: 631, 3
+  xy: 959, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-shale-large
   rotate: false
-  xy: 1699, 328
+  xy: 1321, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-shale-medium
   rotate: false
-  xy: 3679, 268
+  xy: 1088, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-small
   rotate: false
-  xy: 1230, 90
+  xy: 3037, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-shale-tiny
   rotate: false
-  xy: 1961, 36
+  xy: 3044, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-shale-xlarge
+block-shale-wall-large
   rotate: false
-  xy: 681, 3
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-shalerocks-large
-  rotate: false
-  xy: 1615, 202
+  xy: 1363, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-shalerocks-medium
+block-shale-wall-medium
   rotate: false
-  xy: 3713, 268
+  xy: 1122, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-shalerocks-small
+block-shale-wall-small
   rotate: false
-  xy: 1256, 90
+  xy: 3063, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-shalerocks-tiny
+block-shale-wall-tiny
   rotate: false
-  xy: 1979, 36
+  xy: 3062, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-shalerocks-xlarge
+block-shale-wall-xlarge
   rotate: false
-  xy: 731, 3
+  xy: 1009, 413
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-shale-xlarge
+  rotate: false
+  xy: 1059, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-shock-mine-large
   rotate: false
-  xy: 1657, 244
+  xy: 1447, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-shock-mine-medium
   rotate: false
-  xy: 3747, 268
+  xy: 1156, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shock-mine-small
   rotate: false
-  xy: 1282, 90
+  xy: 3089, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-shock-mine-tiny
   rotate: false
-  xy: 1997, 36
+  xy: 3080, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-shock-mine-xlarge
   rotate: false
-  xy: 781, 115
+  xy: 1109, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-shrubs-large
   rotate: false
-  xy: 1699, 286
+  xy: 1363, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-shrubs-medium
   rotate: false
-  xy: 3781, 268
+  xy: 1190, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-small
   rotate: false
-  xy: 1308, 90
+  xy: 3115, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-shrubs-tiny
   rotate: false
-  xy: 2015, 36
+  xy: 3098, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-shrubs-xlarge
   rotate: false
-  xy: 781, 65
+  xy: 1159, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-silicon-crucible-large
   rotate: false
-  xy: 1741, 328
+  xy: 1405, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-silicon-crucible-medium
   rotate: false
-  xy: 3815, 268
+  xy: 1224, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-silicon-crucible-small
   rotate: false
-  xy: 1334, 90
+  xy: 3141, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-silicon-crucible-tiny
   rotate: false
-  xy: 2033, 36
+  xy: 3116, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-silicon-crucible-xlarge
   rotate: false
-  xy: 781, 15
+  xy: 1209, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-silicon-smelter-large
   rotate: false
-  xy: 1657, 202
+  xy: 1489, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-silicon-smelter-medium
   rotate: false
-  xy: 3849, 268
+  xy: 1258, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-silicon-smelter-small
   rotate: false
-  xy: 1360, 90
+  xy: 3167, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-silicon-smelter-tiny
   rotate: false
-  xy: 2051, 36
+  xy: 3134, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-silicon-smelter-xlarge
   rotate: false
-  xy: 831, 115
+  xy: 1259, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-slag-large
   rotate: false
-  xy: 1699, 244
+  xy: 1405, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-slag-medium
   rotate: false
-  xy: 3883, 268
+  xy: 1292, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-slag-small
   rotate: false
-  xy: 1386, 90
+  xy: 3193, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-slag-tiny
   rotate: false
-  xy: 2069, 36
+  xy: 3152, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-slag-xlarge
   rotate: false
-  xy: 831, 65
+  xy: 1309, 413
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-snow-boulder-large
+  rotate: false
+  xy: 1447, 245
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-snow-boulder-medium
+  rotate: false
+  xy: 1326, 101
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-boulder-small
+  rotate: false
+  xy: 3219, 154
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-snow-boulder-tiny
+  rotate: false
+  xy: 3170, 100
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-snow-boulder-xlarge
+  rotate: false
+  xy: 1359, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snow-large
   rotate: false
-  xy: 1741, 286
+  xy: 1531, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-snow-medium
   rotate: false
-  xy: 3917, 268
+  xy: 1360, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-pine-large
   rotate: false
-  xy: 1783, 328
+  xy: 1447, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-snow-pine-medium
   rotate: false
-  xy: 3951, 268
+  xy: 1394, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-pine-small
   rotate: false
-  xy: 1412, 90
+  xy: 3245, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-snow-pine-tiny
   rotate: false
-  xy: 2087, 36
+  xy: 3188, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-snow-pine-xlarge
   rotate: false
-  xy: 831, 15
+  xy: 1409, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snow-small
   rotate: false
-  xy: 1438, 90
+  xy: 3271, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-snow-tiny
   rotate: false
-  xy: 2105, 36
+  xy: 3206, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+block-snow-wall-large
+  rotate: false
+  xy: 1489, 245
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-snow-wall-medium
+  rotate: false
+  xy: 1428, 101
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-snow-wall-small
+  rotate: false
+  xy: 3297, 154
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-snow-wall-tiny
+  rotate: false
+  xy: 3224, 100
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-snow-wall-xlarge
+  rotate: false
+  xy: 1459, 413
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 block-snow-xlarge
   rotate: false
-  xy: 859, 412
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-snowrock-large
-  rotate: false
-  xy: 1699, 202
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-snowrock-medium
-  rotate: false
-  xy: 3985, 268
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-snowrock-small
-  rotate: false
-  xy: 1464, 90
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-snowrock-tiny
-  rotate: false
-  xy: 2123, 36
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-snowrock-xlarge
-  rotate: false
-  xy: 909, 412
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-block-snowrocks-large
-  rotate: false
-  xy: 1741, 244
-  size: 40, 40
-  orig: 40, 40
-  offset: 0, 0
-  index: -1
-block-snowrocks-medium
-  rotate: false
-  xy: 2451, 244
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-snowrocks-small
-  rotate: false
-  xy: 1490, 90
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-snowrocks-tiny
-  rotate: false
-  xy: 2141, 36
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-snowrocks-xlarge
-  rotate: false
-  xy: 959, 412
+  xy: 1509, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-solar-panel-large
   rotate: false
-  xy: 1783, 286
+  xy: 1573, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-solar-panel-large-large
   rotate: false
-  xy: 1825, 328
+  xy: 1489, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-solar-panel-large-medium
   rotate: false
-  xy: 2485, 244
+  xy: 1462, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-solar-panel-large-small
   rotate: false
-  xy: 1516, 90
+  xy: 3323, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-solar-panel-large-tiny
   rotate: false
-  xy: 2159, 36
+  xy: 3242, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-solar-panel-large-xlarge
   rotate: false
-  xy: 1009, 412
+  xy: 1559, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-solar-panel-medium
   rotate: false
-  xy: 2519, 244
+  xy: 1496, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-solar-panel-small
   rotate: false
-  xy: 1542, 90
+  xy: 3349, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-solar-panel-tiny
   rotate: false
-  xy: 2177, 36
+  xy: 3260, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-solar-panel-xlarge
   rotate: false
-  xy: 1059, 412
+  xy: 1609, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-sorter-large
   rotate: false
-  xy: 1741, 202
+  xy: 1531, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-sorter-medium
   rotate: false
-  xy: 2553, 244
+  xy: 1530, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sorter-small
   rotate: false
-  xy: 1568, 90
+  xy: 3375, 154
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-sorter-tiny
   rotate: false
-  xy: 2195, 36
+  xy: 3278, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-sorter-xlarge
   rotate: false
-  xy: 1109, 412
+  xy: 1659, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-spawn-large
   rotate: false
-  xy: 1783, 244
+  xy: 1615, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spawn-medium
   rotate: false
-  xy: 2587, 244
+  xy: 1564, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spawn-small
   rotate: false
-  xy: 1594, 90
+  xy: 3401, 141
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-spawn-tiny
   rotate: false
-  xy: 2213, 36
+  xy: 3296, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-spawn-xlarge
   rotate: false
-  xy: 1159, 412
+  xy: 1709, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-spectre-large
   rotate: false
-  xy: 1825, 286
+  xy: 1531, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spectre-medium
   rotate: false
-  xy: 2621, 244
+  xy: 1598, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spectre-small
   rotate: false
-  xy: 1620, 90
+  xy: 3427, 141
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-spectre-tiny
   rotate: false
-  xy: 2231, 36
+  xy: 3314, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-spectre-xlarge
   rotate: false
-  xy: 1209, 412
+  xy: 1759, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-spore-cluster-large
   rotate: false
-  xy: 1867, 328
+  xy: 1573, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spore-cluster-medium
   rotate: false
-  xy: 2655, 244
+  xy: 1632, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-cluster-small
   rotate: false
-  xy: 1646, 90
+  xy: 3453, 141
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-spore-cluster-tiny
   rotate: false
-  xy: 2249, 36
+  xy: 3332, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-spore-cluster-xlarge
   rotate: false
-  xy: 1259, 412
+  xy: 1809, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-spore-moss-large
   rotate: false
-  xy: 1783, 202
+  xy: 1657, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spore-moss-medium
   rotate: false
-  xy: 2689, 244
+  xy: 1666, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-moss-small
   rotate: false
-  xy: 1672, 90
+  xy: 3479, 141
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-spore-moss-tiny
   rotate: false
-  xy: 2267, 36
+  xy: 3350, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-spore-moss-xlarge
   rotate: false
-  xy: 1309, 412
+  xy: 1859, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-spore-pine-large
   rotate: false
-  xy: 1825, 244
+  xy: 1573, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spore-pine-medium
   rotate: false
-  xy: 2723, 244
+  xy: 1700, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-pine-small
   rotate: false
-  xy: 1698, 90
+  xy: 3505, 141
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-spore-pine-tiny
   rotate: false
-  xy: 2285, 36
+  xy: 3368, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-spore-pine-xlarge
   rotate: false
-  xy: 1359, 412
+  xy: 1909, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-spore-press-large
   rotate: false
-  xy: 1867, 286
+  xy: 1615, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spore-press-medium
   rotate: false
-  xy: 2757, 244
+  xy: 1734, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-press-small
   rotate: false
-  xy: 1724, 90
+  xy: 3531, 141
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-spore-press-tiny
   rotate: false
-  xy: 2303, 36
+  xy: 2630, 85
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-spore-press-xlarge
   rotate: false
-  xy: 1409, 412
+  xy: 1959, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-sporerocks-large
+block-spore-wall-large
   rotate: false
-  xy: 1909, 328
+  xy: 1699, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-sporerocks-medium
+block-spore-wall-medium
   rotate: false
-  xy: 2791, 234
+  xy: 1768, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-sporerocks-small
+block-spore-wall-small
   rotate: false
-  xy: 1750, 90
+  xy: 3557, 141
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-sporerocks-tiny
+block-spore-wall-tiny
   rotate: false
-  xy: 2321, 36
+  xy: 2630, 67
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-sporerocks-xlarge
+block-spore-wall-xlarge
   rotate: false
-  xy: 1459, 412
+  xy: 2009, 413
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-steam-generator-large
+  rotate: false
+  xy: 1615, 203
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-steam-generator-medium
+  rotate: false
+  xy: 1802, 101
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-steam-generator-small
+  rotate: false
+  xy: 3583, 141
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-steam-generator-tiny
+  rotate: false
+  xy: 2648, 85
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-steam-generator-xlarge
+  rotate: false
+  xy: 2059, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-stone-large
   rotate: false
-  xy: 1825, 202
+  xy: 1657, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-stone-medium
   rotate: false
-  xy: 2825, 234
+  xy: 1836, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-small
   rotate: false
-  xy: 1776, 90
+  xy: 3609, 141
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-stone-tiny
   rotate: false
-  xy: 2339, 36
+  xy: 2630, 49
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+block-stone-wall-large
+  rotate: false
+  xy: 1741, 287
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-stone-wall-medium
+  rotate: false
+  xy: 1870, 101
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-stone-wall-small
+  rotate: false
+  xy: 3635, 141
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-stone-wall-tiny
+  rotate: false
+  xy: 2648, 67
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-stone-wall-xlarge
+  rotate: false
+  xy: 2109, 413
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 block-stone-xlarge
   rotate: false
-  xy: 1509, 412
+  xy: 2159, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-surge-tower-large
   rotate: false
-  xy: 1867, 244
+  xy: 1657, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-surge-tower-medium
   rotate: false
-  xy: 2859, 234
+  xy: 1904, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-surge-tower-small
   rotate: false
-  xy: 1802, 90
+  xy: 2278, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-surge-tower-tiny
   rotate: false
-  xy: 2357, 36
+  xy: 2666, 85
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-surge-tower-xlarge
   rotate: false
-  xy: 1559, 412
+  xy: 2209, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-surge-wall-large
   rotate: false
-  xy: 1909, 286
+  xy: 1699, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-surge-wall-large-large
   rotate: false
-  xy: 1951, 328
+  xy: 1783, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-surge-wall-large-medium
   rotate: false
-  xy: 2893, 234
+  xy: 1938, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-surge-wall-large-small
   rotate: false
-  xy: 1828, 90
+  xy: 2298, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-surge-wall-large-tiny
   rotate: false
-  xy: 1071, 20
+  xy: 2630, 31
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-surge-wall-large-xlarge
   rotate: false
-  xy: 1609, 412
+  xy: 2259, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-surge-wall-medium
   rotate: false
-  xy: 2927, 234
+  xy: 1972, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-surge-wall-small
   rotate: false
-  xy: 1854, 90
+  xy: 2304, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-surge-wall-tiny
   rotate: false
-  xy: 1089, 20
+  xy: 2648, 49
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-surge-wall-xlarge
   rotate: false
-  xy: 1659, 412
+  xy: 2309, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-swarmer-large
   rotate: false
-  xy: 1867, 202
+  xy: 1699, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-swarmer-medium
   rotate: false
-  xy: 2961, 234
+  xy: 2006, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-swarmer-small
   rotate: false
-  xy: 1880, 90
+  xy: 2308, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-swarmer-tiny
   rotate: false
-  xy: 1107, 20
+  xy: 2666, 67
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-swarmer-xlarge
   rotate: false
-  xy: 1709, 412
+  xy: 2359, 413
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+block-switch-large
+  rotate: false
+  xy: 1741, 245
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+block-switch-medium
+  rotate: false
+  xy: 2040, 101
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+block-switch-small
+  rotate: false
+  xy: 2308, 37
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+block-switch-tiny
+  rotate: false
+  xy: 2684, 85
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-switch-xlarge
+  rotate: false
+  xy: 2409, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-tainted-water-large
   rotate: false
-  xy: 1909, 244
+  xy: 1825, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-tainted-water-medium
   rotate: false
-  xy: 2995, 234
+  xy: 2074, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tainted-water-small
   rotate: false
-  xy: 1906, 90
+  xy: 2324, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-tainted-water-tiny
   rotate: false
-  xy: 1125, 20
+  xy: 2702, 85
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-tainted-water-xlarge
   rotate: false
-  xy: 1759, 412
+  xy: 2459, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-tar-large
   rotate: false
-  xy: 1951, 286
+  xy: 1741, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-tar-medium
   rotate: false
-  xy: 3029, 234
+  xy: 2108, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tar-small
   rotate: false
-  xy: 1932, 90
+  xy: 2330, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-tar-tiny
   rotate: false
-  xy: 1143, 20
+  xy: 2648, 31
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-tar-xlarge
   rotate: false
-  xy: 1809, 412
+  xy: 2509, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-tendrils-large
   rotate: false
-  xy: 1993, 328
+  xy: 1783, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-tendrils-medium
   rotate: false
-  xy: 3063, 234
+  xy: 2142, 109
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tendrils-small
   rotate: false
-  xy: 1958, 90
+  xy: 2334, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-tendrils-tiny
   rotate: false
-  xy: 1161, 20
+  xy: 2666, 49
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-tendrils-xlarge
   rotate: false
-  xy: 1859, 412
+  xy: 2559, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-tetrative-reconstructor-large
   rotate: false
-  xy: 1909, 202
+  xy: 1867, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-tetrative-reconstructor-medium
   rotate: false
-  xy: 3097, 234
+  xy: 2176, 112
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tetrative-reconstructor-small
   rotate: false
-  xy: 1984, 90
+  xy: 2334, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-tetrative-reconstructor-tiny
   rotate: false
-  xy: 1179, 20
+  xy: 2684, 67
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-tetrative-reconstructor-xlarge
   rotate: false
-  xy: 1909, 412
+  xy: 2609, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-thermal-generator-large
   rotate: false
-  xy: 1951, 244
+  xy: 1783, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-thermal-generator-medium
   rotate: false
-  xy: 3131, 234
+  xy: 2210, 112
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-thermal-generator-small
   rotate: false
-  xy: 2010, 90
+  xy: 2350, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-thermal-generator-tiny
   rotate: false
-  xy: 1197, 20
+  xy: 2666, 31
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-thermal-generator-xlarge
   rotate: false
-  xy: 1959, 412
+  xy: 2659, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-thermal-pump-large
   rotate: false
-  xy: 1993, 286
+  xy: 1825, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-thermal-pump-medium
   rotate: false
-  xy: 3165, 234
+  xy: 2244, 115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-thermal-pump-small
   rotate: false
-  xy: 2036, 90
+  xy: 2356, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-thermal-pump-tiny
   rotate: false
-  xy: 1215, 20
+  xy: 2684, 49
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-thermal-pump-xlarge
   rotate: false
-  xy: 2009, 412
+  xy: 2709, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-thorium-reactor-large
   rotate: false
-  xy: 2035, 328
+  xy: 1909, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-thorium-reactor-medium
   rotate: false
-  xy: 3199, 234
+  xy: 1087, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-thorium-reactor-small
   rotate: false
-  xy: 2062, 90
+  xy: 2360, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-thorium-reactor-tiny
   rotate: false
-  xy: 1233, 20
+  xy: 2702, 67
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-thorium-reactor-xlarge
   rotate: false
-  xy: 2059, 412
+  xy: 2759, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-thorium-wall-large
   rotate: false
-  xy: 1951, 202
+  xy: 1825, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-thorium-wall-large-large
   rotate: false
-  xy: 1993, 244
+  xy: 1867, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-thorium-wall-large-medium
   rotate: false
-  xy: 3233, 234
+  xy: 1121, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-thorium-wall-large-small
   rotate: false
-  xy: 2088, 90
+  xy: 2360, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-thorium-wall-large-tiny
   rotate: false
-  xy: 1251, 20
+  xy: 2720, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-thorium-wall-large-xlarge
   rotate: false
-  xy: 2109, 412
+  xy: 2809, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-thorium-wall-medium
   rotate: false
-  xy: 3267, 234
+  xy: 1155, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-thorium-wall-small
   rotate: false
-  xy: 2114, 90
+  xy: 2376, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-thorium-wall-tiny
   rotate: false
-  xy: 1269, 20
+  xy: 2684, 31
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-thorium-wall-xlarge
   rotate: false
-  xy: 2159, 412
+  xy: 2859, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-thruster-large
   rotate: false
-  xy: 2035, 286
+  xy: 1951, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-thruster-medium
   rotate: false
-  xy: 3301, 234
+  xy: 1189, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-thruster-small
   rotate: false
-  xy: 2140, 90
+  xy: 2382, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-thruster-tiny
   rotate: false
-  xy: 1287, 20
+  xy: 2702, 49
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-thruster-xlarge
   rotate: false
-  xy: 2209, 412
+  xy: 2909, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-titanium-conveyor-large
   rotate: false
-  xy: 2077, 328
+  xy: 1867, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-titanium-conveyor-medium
   rotate: false
-  xy: 3335, 234
+  xy: 1223, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-conveyor-small
   rotate: false
-  xy: 2166, 90
+  xy: 2386, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-titanium-conveyor-tiny
   rotate: false
-  xy: 1305, 20
+  xy: 2720, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-titanium-conveyor-xlarge
   rotate: false
-  xy: 2259, 412
+  xy: 2959, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-titanium-wall-large
   rotate: false
-  xy: 1993, 202
+  xy: 1909, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-titanium-wall-large-large
   rotate: false
-  xy: 2035, 244
+  xy: 1993, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-titanium-wall-large-medium
   rotate: false
-  xy: 3369, 234
+  xy: 1257, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-large-small
   rotate: false
-  xy: 2192, 90
+  xy: 2386, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-titanium-wall-large-tiny
   rotate: false
-  xy: 993, 4
+  xy: 2738, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-titanium-wall-large-xlarge
   rotate: false
-  xy: 2309, 412
+  xy: 3009, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-titanium-wall-medium
   rotate: false
-  xy: 3403, 234
+  xy: 1291, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-small
   rotate: false
-  xy: 2218, 90
+  xy: 2402, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-titanium-wall-tiny
   rotate: false
-  xy: 1011, 4
+  xy: 2702, 31
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-titanium-wall-xlarge
   rotate: false
-  xy: 2359, 412
+  xy: 3059, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-turbine-generator-large
+block-tsunami-large
   rotate: false
-  xy: 2077, 286
+  xy: 1909, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-block-turbine-generator-medium
+block-tsunami-medium
   rotate: false
-  xy: 3437, 234
+  xy: 1325, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-turbine-generator-small
+block-tsunami-small
   rotate: false
-  xy: 2244, 90
+  xy: 2408, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-turbine-generator-tiny
+block-tsunami-tiny
   rotate: false
-  xy: 1029, 4
+  xy: 2720, 46
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-turbine-generator-xlarge
+block-tsunami-xlarge
   rotate: false
-  xy: 2409, 412
+  xy: 3109, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-underflow-gate-large
   rotate: false
-  xy: 2119, 328
+  xy: 1951, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-underflow-gate-medium
   rotate: false
-  xy: 3471, 234
+  xy: 1359, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-underflow-gate-small
   rotate: false
-  xy: 2270, 90
+  xy: 2412, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-underflow-gate-tiny
   rotate: false
-  xy: 1047, 9
+  xy: 2738, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-underflow-gate-xlarge
   rotate: false
-  xy: 2459, 412
+  xy: 3159, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-unloader-large
   rotate: false
-  xy: 2035, 202
+  xy: 2035, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-unloader-medium
   rotate: false
-  xy: 3505, 234
+  xy: 1393, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-unloader-small
   rotate: false
-  xy: 2296, 90
+  xy: 2412, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-unloader-tiny
   rotate: false
-  xy: 1323, 18
+  xy: 2756, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-unloader-xlarge
   rotate: false
-  xy: 2509, 412
+  xy: 3209, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-vault-large
   rotate: false
-  xy: 2077, 244
+  xy: 1951, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-vault-medium
   rotate: false
-  xy: 3539, 234
+  xy: 1427, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-vault-small
   rotate: false
-  xy: 2322, 90
+  xy: 2428, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-vault-tiny
   rotate: false
-  xy: 1341, 18
+  xy: 2738, 46
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-vault-xlarge
   rotate: false
-  xy: 2559, 412
+  xy: 3259, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-water-extractor-large
   rotate: false
-  xy: 2119, 286
+  xy: 1993, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-water-extractor-medium
   rotate: false
-  xy: 3573, 234
+  xy: 1461, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-water-extractor-small
   rotate: false
-  xy: 2348, 90
+  xy: 2434, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-water-extractor-tiny
   rotate: false
-  xy: 1359, 18
+  xy: 2756, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-water-extractor-xlarge
   rotate: false
-  xy: 2609, 412
+  xy: 3309, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-water-large
   rotate: false
-  xy: 2161, 328
+  xy: 2077, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-water-medium
   rotate: false
-  xy: 3607, 234
+  xy: 1495, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-water-small
   rotate: false
-  xy: 941, 64
+  xy: 2438, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-water-tiny
   rotate: false
-  xy: 1377, 18
+  xy: 2774, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-water-xlarge
   rotate: false
-  xy: 2659, 412
+  xy: 3359, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-wave-large
   rotate: false
-  xy: 2077, 202
+  xy: 1993, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-wave-medium
   rotate: false
-  xy: 3641, 234
+  xy: 1529, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-wave-small
   rotate: false
-  xy: 941, 38
+  xy: 2438, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-wave-tiny
   rotate: false
-  xy: 1395, 18
+  xy: 2756, 46
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-wave-xlarge
   rotate: false
-  xy: 2709, 412
+  xy: 3409, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-white-tree-dead-large
   rotate: false
-  xy: 2119, 244
+  xy: 2035, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-white-tree-dead-medium
   rotate: false
-  xy: 3675, 234
+  xy: 1563, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-white-tree-dead-small
   rotate: false
-  xy: 967, 64
+  xy: 2454, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-white-tree-dead-tiny
   rotate: false
-  xy: 1413, 18
+  xy: 2774, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-white-tree-dead-xlarge
   rotate: false
-  xy: 2759, 412
+  xy: 3459, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-white-tree-large
   rotate: false
-  xy: 2161, 286
+  xy: 2119, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-white-tree-medium
   rotate: false
-  xy: 3709, 234
+  xy: 1597, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-white-tree-small
   rotate: false
-  xy: 941, 12
+  xy: 2460, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-white-tree-tiny
   rotate: false
-  xy: 1431, 18
+  xy: 2792, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-white-tree-xlarge
   rotate: false
-  xy: 2809, 412
+  xy: 3509, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 button
   rotate: false
-  xy: 2645, 341
+  xy: 3011, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17372,7 +19220,7 @@ button
   index: -1
 button-disabled
   rotate: false
-  xy: 4057, 483
+  xy: 4057, 484
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17380,7 +19228,7 @@ button-disabled
   index: -1
 button-down
   rotate: false
-  xy: 4059, 454
+  xy: 4059, 455
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17388,7 +19236,7 @@ button-down
   index: -1
 button-edge-1
   rotate: false
-  xy: 4059, 425
+  xy: 4059, 426
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17396,7 +19244,7 @@ button-edge-1
   index: -1
 button-edge-2
   rotate: false
-  xy: 4059, 396
+  xy: 4059, 397
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17404,7 +19252,7 @@ button-edge-2
   index: -1
 button-edge-3
   rotate: false
-  xy: 2455, 341
+  xy: 4059, 368
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17412,7 +19260,15 @@ button-edge-3
   index: -1
 button-edge-4
   rotate: false
-  xy: 2371, 215
+  xy: 4059, 339
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
+button-right-disabled
+  rotate: false
+  xy: 4059, 339
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17420,7 +19276,7 @@ button-edge-4
   index: -1
 button-edge-over-4
   rotate: false
-  xy: 2413, 257
+  xy: 2497, 258
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17428,7 +19284,7 @@ button-edge-over-4
   index: -1
 button-over
   rotate: false
-  xy: 2455, 312
+  xy: 2707, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17436,7 +19292,7 @@ button-over
   index: -1
 button-red
   rotate: false
-  xy: 2493, 341
+  xy: 2535, 258
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17444,7 +19300,7 @@ button-red
   index: -1
 button-right
   rotate: false
-  xy: 2531, 312
+  xy: 2821, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17452,7 +19308,7 @@ button-right
   index: -1
 button-right-down
   rotate: false
-  xy: 2493, 312
+  xy: 2745, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17460,7 +19316,7 @@ button-right-down
   index: -1
 button-right-over
   rotate: false
-  xy: 2531, 341
+  xy: 2783, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17468,7 +19324,7 @@ button-right-over
   index: -1
 button-select
   rotate: false
-  xy: 967, 38
+  xy: 2464, 63
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -17476,7 +19332,7 @@ button-select
   index: -1
 button-square
   rotate: false
-  xy: 2607, 341
+  xy: 2935, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17484,7 +19340,7 @@ button-square
   index: -1
 button-square-down
   rotate: false
-  xy: 2569, 341
+  xy: 2859, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17492,7 +19348,7 @@ button-square-down
   index: -1
 button-square-over
   rotate: false
-  xy: 2569, 312
+  xy: 2897, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17500,7 +19356,7 @@ button-square-over
   index: -1
 button-trans
   rotate: false
-  xy: 2607, 312
+  xy: 2973, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17508,77 +19364,77 @@ button-trans
   index: -1
 check-disabled
   rotate: false
-  xy: 3743, 234
+  xy: 1631, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-off
   rotate: false
-  xy: 3777, 234
+  xy: 1665, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on
   rotate: false
-  xy: 3811, 234
+  xy: 1699, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on-disabled
   rotate: false
-  xy: 3845, 234
+  xy: 1733, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 3879, 234
+  xy: 1767, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 3913, 234
+  xy: 1801, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 clear
   rotate: false
-  xy: 771, 403
+  xy: 795, 354
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 crater
   rotate: false
-  xy: 309, 183
+  xy: 3453, 199
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 cursor
   rotate: false
-  xy: 4049, 234
+  xy: 845, 366
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
   index: -1
 discord-banner
   rotate: false
-  xy: 771, 465
+  xy: 771, 466
   size: 84, 45
   orig: 84, 45
   offset: 0, 0
   index: -1
 flat-down-base
   rotate: false
-  xy: 2645, 312
+  xy: 3049, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17586,14 +19442,14 @@ flat-down-base
   index: -1
 info-banner
   rotate: false
-  xy: 259, 356
+  xy: 259, 357
   size: 84, 45
   orig: 84, 45
   offset: 0, 0
   index: -1
 inventory
   rotate: false
-  xy: 993, 48
+  xy: 2278, 141
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -17601,161 +19457,168 @@ inventory
   index: -1
 item-blast-compound-icon
   rotate: false
-  xy: 3947, 234
+  xy: 1835, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal-icon
   rotate: false
-  xy: 3981, 234
+  xy: 1869, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-icon
   rotate: false
-  xy: 4021, 336
+  xy: 1903, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-icon
   rotate: false
-  xy: 4021, 302
+  xy: 1937, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-icon
   rotate: false
-  xy: 4019, 268
+  xy: 1971, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass-icon
   rotate: false
-  xy: 4015, 234
+  xy: 2005, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-icon
   rotate: false
-  xy: 2371, 181
+  xy: 2039, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-icon
   rotate: false
-  xy: 2413, 223
+  xy: 2073, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-icon
   rotate: false
-  xy: 2447, 210
+  xy: 3473, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-icon
   rotate: false
-  xy: 2481, 210
+  xy: 3507, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-icon
   rotate: false
-  xy: 2515, 210
+  xy: 3541, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-icon
   rotate: false
-  xy: 2549, 210
+  xy: 3575, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-icon
   rotate: false
-  xy: 2583, 210
+  xy: 3609, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-icon
   rotate: false
-  xy: 2617, 210
+  xy: 3643, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-icon
   rotate: false
-  xy: 2651, 210
+  xy: 3668, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-icon
   rotate: false
-  xy: 2685, 210
+  xy: 3677, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-icon
   rotate: false
-  xy: 2719, 210
+  xy: 3677, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-icon
   rotate: false
-  xy: 2753, 210
+  xy: 3677, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-icon
   rotate: false
-  xy: 2787, 200
+  xy: 1087, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-icon
   rotate: false
-  xy: 2821, 200
+  xy: 1121, 33
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+logic-node
+  rotate: false
+  xy: 1155, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 logo
   rotate: false
-  xy: 1, 403
+  xy: 1, 404
   size: 768, 107
   orig: 768, 107
   offset: 0, 0
   index: -1
 nomap
   rotate: false
-  xy: 1, 145
+  xy: 1, 146
   size: 256, 256
   orig: 256, 256
   offset: 0, 0
   index: -1
 pane
   rotate: false
-  xy: 2683, 312
+  xy: 3125, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17763,7 +19626,7 @@ pane
   index: -1
 pane-2
   rotate: false
-  xy: 2683, 341
+  xy: 3087, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17771,7 +19634,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 1045, 53
+  xy: 2464, 26
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -17779,7 +19642,7 @@ scroll
   index: -1
 scroll-horizontal
   rotate: false
-  xy: 901, 176
+  xy: 901, 169
   size: 35, 24
   split: 6, 5, 10, 10
   orig: 35, 24
@@ -17787,70 +19650,70 @@ scroll-horizontal
   index: -1
 scroll-knob-horizontal-black
   rotate: false
-  xy: 859, 176
+  xy: 859, 169
   size: 40, 24
   orig: 40, 24
   offset: 0, 0
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 1019, 48
+  xy: 2304, 141
   size: 24, 40
   orig: 24, 40
   offset: 0, 0
   index: -1
 scroll-knob-vertical-thin
   rotate: false
-  xy: 4081, 328
+  xy: 3766, 245
   size: 12, 40
   orig: 12, 40
   offset: 0, 0
   index: -1
 selection
   rotate: false
-  xy: 941, 102
+  xy: 309, 354
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 941, 92
+  xy: 3754, 329
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 3671, 194
+  xy: 1970, 27
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 3702, 194
+  xy: 2001, 27
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 3733, 194
+  xy: 2032, 27
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-vertical
   rotate: false
-  xy: 309, 353
+  xy: 2194, 83
   size: 8, 1
   orig: 8, 1
   offset: 0, 0
   index: -1
 underline
   rotate: false
-  xy: 2759, 312
+  xy: 3315, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17858,7 +19721,7 @@ underline
   index: -1
 underline-2
   rotate: false
-  xy: 2721, 341
+  xy: 3163, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17866,7 +19729,7 @@ underline-2
   index: -1
 underline-disabled
   rotate: false
-  xy: 2721, 312
+  xy: 3201, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17874,7 +19737,15 @@ underline-disabled
   index: -1
 underline-red
   rotate: false
-  xy: 2759, 341
+  xy: 3239, 300
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
+underline-white
+  rotate: false
+  xy: 3277, 300
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -17882,854 +19753,1185 @@ underline-red
   index: -1
 unit-alpha-large
   rotate: false
-  xy: 2203, 328
+  xy: 2035, 203
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-alpha-medium
   rotate: false
-  xy: 2855, 200
+  xy: 1189, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-alpha-small
   rotate: false
-  xy: 967, 12
+  xy: 2480, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-alpha-tiny
   rotate: false
-  xy: 1449, 18
+  xy: 2774, 46
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-alpha-xlarge
   rotate: false
-  xy: 2859, 412
+  xy: 3559, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-antumbra-large
   rotate: false
-  xy: 2119, 202
-  size: 40, 40
-  orig: 40, 40
+  xy: 821, 421
+  size: 36, 40
+  orig: 36, 40
   offset: 0, 0
   index: -1
 unit-antumbra-medium
   rotate: false
-  xy: 2889, 200
-  size: 32, 32
-  orig: 32, 32
+  xy: 2063, 33
+  size: 28, 32
+  orig: 28, 32
   offset: 0, 0
   index: -1
 unit-antumbra-small
   rotate: false
-  xy: 993, 22
-  size: 24, 24
-  orig: 24, 24
+  xy: 3734, 339
+  size: 21, 24
+  orig: 21, 24
   offset: 0, 0
   index: -1
 unit-antumbra-tiny
   rotate: false
-  xy: 1467, 18
-  size: 16, 16
-  orig: 16, 16
+  xy: 2607, 261
+  size: 14, 16
+  orig: 14, 16
   offset: 0, 0
   index: -1
 unit-antumbra-xlarge
   rotate: false
-  xy: 2909, 412
-  size: 48, 48
-  orig: 48, 48
+  xy: 945, 363
+  size: 43, 48
+  orig: 43, 48
   offset: 0, 0
   index: -1
 unit-arkyid-large
   rotate: false
-  xy: 2161, 244
+  xy: 2077, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-arkyid-medium
   rotate: false
-  xy: 2923, 200
+  xy: 1223, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-arkyid-small
   rotate: false
-  xy: 1071, 64
+  xy: 2486, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-arkyid-tiny
   rotate: false
-  xy: 1485, 18
+  xy: 2792, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-arkyid-xlarge
   rotate: false
-  xy: 2959, 412
+  xy: 3609, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-atrax-large
   rotate: false
-  xy: 2203, 286
-  size: 40, 40
-  orig: 40, 40
+  xy: 2161, 298
+  size: 40, 29
+  orig: 40, 29
   offset: 0, 0
   index: -1
 unit-atrax-medium
   rotate: false
-  xy: 2957, 200
-  size: 32, 32
-  orig: 32, 32
+  xy: 1257, 42
+  size: 32, 23
+  orig: 32, 23
   offset: 0, 0
   index: -1
 unit-atrax-small
   rotate: false
-  xy: 1019, 22
-  size: 24, 24
-  orig: 24, 24
+  xy: 982, 6
+  size: 24, 17
+  orig: 24, 17
   offset: 0, 0
   index: -1
 unit-atrax-tiny
   rotate: false
-  xy: 1503, 18
-  size: 16, 16
-  orig: 16, 16
+  xy: 2707, 287
+  size: 16, 11
+  orig: 16, 11
   offset: 0, 0
   index: -1
 unit-atrax-xlarge
   rotate: false
-  xy: 3009, 412
-  size: 48, 48
-  orig: 48, 48
+  xy: 3659, 427
+  size: 48, 34
+  orig: 48, 34
   offset: 0, 0
   index: -1
 unit-beta-large
   rotate: false
-  xy: 2245, 328
-  size: 40, 40
-  orig: 40, 40
+  xy: 2077, 205
+  size: 40, 38
+  orig: 40, 38
   offset: 0, 0
   index: -1
 unit-beta-medium
   rotate: false
-  xy: 2991, 200
-  size: 32, 32
-  orig: 32, 32
+  xy: 1085, 1
+  size: 32, 30
+  orig: 32, 30
   offset: 0, 0
   index: -1
 unit-beta-small
   rotate: false
-  xy: 1045, 27
-  size: 24, 24
-  orig: 24, 24
+  xy: 2201, 1
+  size: 24, 23
+  orig: 24, 23
   offset: 0, 0
   index: -1
 unit-beta-tiny
   rotate: false
-  xy: 1521, 18
-  size: 16, 16
-  orig: 16, 16
+  xy: 2810, 83
+  size: 16, 15
+  orig: 16, 15
   offset: 0, 0
   index: -1
 unit-beta-xlarge
   rotate: false
-  xy: 3059, 412
-  size: 48, 48
-  orig: 48, 48
+  xy: 3709, 415
+  size: 48, 46
+  orig: 48, 46
   offset: 0, 0
   index: -1
 unit-bryde-large
   rotate: false
-  xy: 2161, 202
+  xy: 2119, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-bryde-medium
   rotate: false
-  xy: 3025, 200
+  xy: 1291, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-bryde-small
   rotate: false
-  xy: 1071, 38
+  xy: 2227, 8
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-bryde-tiny
   rotate: false
-  xy: 1539, 18
+  xy: 2792, 46
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-bryde-xlarge
   rotate: false
-  xy: 3109, 412
+  xy: 3759, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+unit-corvus-large
+  rotate: false
+  xy: 2203, 301
+  size: 40, 26
+  orig: 40, 26
+  offset: 0, 0
+  index: -1
+unit-corvus-medium
+  rotate: false
+  xy: 916, 37
+  size: 31, 20
+  orig: 31, 20
+  offset: 0, 0
+  index: -1
+unit-corvus-small
+  rotate: false
+  xy: 3740, 218
+  size: 24, 15
+  orig: 24, 15
+  offset: 0, 0
+  index: -1
+unit-corvus-tiny
+  rotate: false
+  xy: 771, 404
+  size: 15, 10
+  orig: 15, 10
+  offset: 0, 0
+  index: -1
+unit-corvus-xlarge
+  rotate: false
+  xy: 3809, 430
+  size: 48, 31
+  orig: 48, 31
+  offset: 0, 0
+  index: -1
 unit-crawler-large
   rotate: false
-  xy: 2203, 244
+  xy: 2161, 256
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-crawler-medium
   rotate: false
-  xy: 3059, 200
+  xy: 1325, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-crawler-small
   rotate: false
-  xy: 1097, 64
+  xy: 3763, 192
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-crawler-tiny
   rotate: false
-  xy: 1557, 18
+  xy: 2810, 65
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-crawler-xlarge
   rotate: false
-  xy: 3159, 412
+  xy: 3859, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-large
   rotate: false
-  xy: 2245, 286
+  xy: 2203, 259
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-dagger-medium
   rotate: false
-  xy: 3093, 200
+  xy: 1359, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-dagger-small
   rotate: false
-  xy: 1097, 38
+  xy: 2490, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-dagger-tiny
   rotate: false
-  xy: 1575, 18
+  xy: 2828, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-dagger-xlarge
   rotate: false
-  xy: 3209, 412
+  xy: 3909, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-eclipse-large
   rotate: false
-  xy: 2287, 328
+  xy: 2245, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-eclipse-medium
   rotate: false
-  xy: 3127, 200
+  xy: 1393, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-eclipse-small
   rotate: false
-  xy: 1123, 64
+  xy: 2490, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-eclipse-tiny
   rotate: false
-  xy: 1593, 18
+  xy: 2810, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-eclipse-xlarge
   rotate: false
-  xy: 3259, 412
+  xy: 3959, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-flare-large
   rotate: false
-  xy: 2203, 202
+  xy: 2287, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-flare-medium
   rotate: false
-  xy: 3161, 200
+  xy: 1427, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-flare-small
   rotate: false
-  xy: 1123, 38
+  xy: 2506, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-flare-tiny
   rotate: false
-  xy: 1611, 18
+  xy: 2828, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-flare-xlarge
   rotate: false
-  xy: 3309, 412
+  xy: 4009, 413
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-fortress-large
   rotate: false
-  xy: 2245, 244
-  size: 40, 40
-  orig: 40, 40
+  xy: 2119, 211
+  size: 40, 32
+  orig: 40, 32
   offset: 0, 0
   index: -1
 unit-fortress-medium
   rotate: false
-  xy: 3195, 200
-  size: 32, 32
-  orig: 32, 32
+  xy: 1119, 6
+  size: 32, 25
+  orig: 32, 25
   offset: 0, 0
   index: -1
 unit-fortress-small
   rotate: false
-  xy: 1149, 64
-  size: 24, 24
-  orig: 24, 24
+  xy: 1008, 4
+  size: 24, 19
+  orig: 24, 19
   offset: 0, 0
   index: -1
 unit-fortress-tiny
   rotate: false
-  xy: 1629, 18
-  size: 16, 16
-  orig: 16, 16
+  xy: 3754, 313
+  size: 16, 12
+  orig: 16, 12
   offset: 0, 0
   index: -1
 unit-fortress-xlarge
   rotate: false
-  xy: 3359, 412
-  size: 48, 48
-  orig: 48, 48
+  xy: 3809, 390
+  size: 48, 38
+  orig: 48, 38
   offset: 0, 0
   index: -1
 unit-gamma-large
   rotate: false
-  xy: 2287, 286
+  xy: 2161, 214
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-gamma-medium
   rotate: false
-  xy: 3229, 200
+  xy: 1461, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-gamma-small
   rotate: false
-  xy: 1149, 38
+  xy: 2512, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-gamma-tiny
   rotate: false
-  xy: 1647, 18
+  xy: 2846, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-gamma-xlarge
   rotate: false
-  xy: 3409, 412
+  xy: 3659, 377
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-horizon-large
   rotate: false
-  xy: 2329, 328
+  xy: 2203, 217
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-horizon-medium
   rotate: false
-  xy: 3263, 200
+  xy: 1495, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-horizon-small
   rotate: false
-  xy: 1175, 64
+  xy: 2516, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-horizon-tiny
   rotate: false
-  xy: 1665, 18
+  xy: 2846, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-horizon-xlarge
   rotate: false
-  xy: 3459, 412
+  xy: 3709, 365
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-mace-large
   rotate: false
-  xy: 2245, 202
+  xy: 2245, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-mace-medium
   rotate: false
-  xy: 3297, 200
+  xy: 1529, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-mace-small
   rotate: false
-  xy: 1175, 38
+  xy: 2516, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-mace-tiny
   rotate: false
-  xy: 1683, 18
+  xy: 2864, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-mace-xlarge
   rotate: false
-  xy: 3509, 412
+  xy: 3759, 363
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-mega-large
   rotate: false
-  xy: 2287, 244
+  xy: 2329, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-mega-medium
   rotate: false
-  xy: 3331, 200
+  xy: 1563, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-mega-small
   rotate: false
-  xy: 1201, 64
+  xy: 2532, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-mega-tiny
   rotate: false
-  xy: 1701, 18
+  xy: 2864, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-mega-xlarge
   rotate: false
-  xy: 3559, 412
+  xy: 3809, 340
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-minke-large
   rotate: false
-  xy: 2329, 286
-  size: 40, 40
-  orig: 40, 40
+  xy: 881, 85
+  size: 34, 40
+  orig: 34, 40
   offset: 0, 0
   index: -1
 unit-minke-medium
   rotate: false
-  xy: 3365, 200
-  size: 32, 32
-  orig: 32, 32
+  xy: 2123, 33
+  size: 27, 32
+  orig: 27, 32
   offset: 0, 0
   index: -1
 unit-minke-small
   rotate: false
-  xy: 1201, 38
-  size: 24, 24
-  orig: 24, 24
+  xy: 309, 178
+  size: 20, 24
+  orig: 20, 24
   offset: 0, 0
   index: -1
 unit-minke-tiny
   rotate: false
-  xy: 1719, 18
-  size: 16, 16
-  orig: 16, 16
+  xy: 1785, 15
+  size: 13, 16
+  orig: 13, 16
   offset: 0, 0
   index: -1
 unit-minke-xlarge
   rotate: false
-  xy: 3609, 412
-  size: 48, 48
-  orig: 48, 48
+  xy: 1035, 363
+  size: 41, 48
+  orig: 41, 48
   offset: 0, 0
   index: -1
 unit-mono-large
   rotate: false
-  xy: 2371, 328
+  xy: 2287, 245
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-mono-medium
   rotate: false
-  xy: 3399, 200
+  xy: 1597, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-mono-small
   rotate: false
-  xy: 1227, 64
+  xy: 2538, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-mono-tiny
   rotate: false
-  xy: 1737, 18
+  xy: 2882, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-mono-xlarge
   rotate: false
-  xy: 3659, 412
+  xy: 3859, 363
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-nova-large
   rotate: false
-  xy: 2287, 202
+  xy: 2371, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-nova-medium
   rotate: false
-  xy: 3433, 200
+  xy: 1631, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-nova-small
   rotate: false
-  xy: 1227, 38
+  xy: 2542, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-nova-tiny
   rotate: false
-  xy: 1755, 18
+  xy: 2882, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-nova-xlarge
   rotate: false
-  xy: 3709, 412
+  xy: 3909, 363
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+unit-oct-large
+  rotate: false
+  xy: 2329, 245
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+unit-oct-medium
+  rotate: false
+  xy: 1665, 33
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+unit-oct-small
+  rotate: false
+  xy: 2542, 37
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+unit-oct-tiny
+  rotate: false
+  xy: 2900, 82
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+unit-oct-xlarge
+  rotate: false
+  xy: 3959, 363
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+unit-omura-large
+  rotate: false
+  xy: 2093, 25
+  size: 28, 40
+  orig: 28, 40
+  offset: 0, 0
+  index: -1
+unit-omura-medium
+  rotate: false
+  xy: 2467, 186
+  size: 22, 32
+  orig: 22, 32
+  offset: 0, 0
+  index: -1
+unit-omura-small
+  rotate: false
+  xy: 3763, 287
+  size: 16, 24
+  orig: 16, 24
+  offset: 0, 0
+  index: -1
+unit-omura-tiny
+  rotate: false
+  xy: 1856, 15
+  size: 11, 16
+  orig: 11, 16
+  offset: 0, 0
+  index: -1
+unit-omura-xlarge
+  rotate: false
+  xy: 881, 35
+  size: 33, 48
+  orig: 33, 48
+  offset: 0, 0
+  index: -1
 unit-poly-large
   rotate: false
-  xy: 2329, 244
+  xy: 2413, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-poly-medium
   rotate: false
-  xy: 3467, 200
+  xy: 1699, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-poly-small
   rotate: false
-  xy: 1253, 64
+  xy: 2558, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-poly-tiny
   rotate: false
-  xy: 1773, 18
+  xy: 2900, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-poly-xlarge
   rotate: false
-  xy: 3759, 412
+  xy: 4009, 363
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-pulsar-large
   rotate: false
-  xy: 2371, 286
-  size: 40, 40
-  orig: 40, 40
+  xy: 2371, 251
+  size: 40, 34
+  orig: 40, 34
   offset: 0, 0
   index: -1
 unit-pulsar-medium
   rotate: false
-  xy: 3501, 200
-  size: 32, 32
-  orig: 32, 32
+  xy: 1733, 38
+  size: 32, 27
+  orig: 32, 27
   offset: 0, 0
   index: -1
 unit-pulsar-small
   rotate: false
-  xy: 1253, 38
-  size: 24, 24
-  orig: 24, 24
+  xy: 1034, 3
+  size: 24, 20
+  orig: 24, 20
   offset: 0, 0
   index: -1
 unit-pulsar-tiny
   rotate: false
-  xy: 1791, 18
-  size: 16, 16
-  orig: 16, 16
+  xy: 1, 1
+  size: 16, 13
+  orig: 16, 13
   offset: 0, 0
   index: -1
 unit-pulsar-xlarge
   rotate: false
-  xy: 3809, 412
+  xy: 131, 4
+  size: 48, 40
+  orig: 48, 40
+  offset: 0, 0
+  index: -1
+unit-quad-large
+  rotate: false
+  xy: 2455, 287
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+unit-quad-medium
+  rotate: false
+  xy: 1937, 34
+  size: 31, 31
+  orig: 31, 31
+  offset: 0, 0
+  index: -1
+unit-quad-small
+  rotate: false
+  xy: 2564, 115
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+unit-quad-tiny
+  rotate: false
+  xy: 2828, 47
+  size: 15, 15
+  orig: 15, 15
+  offset: 0, 0
+  index: -1
+unit-quad-xlarge
+  rotate: false
+  xy: 3859, 313
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-quasar-large
   rotate: false
-  xy: 2413, 328
+  xy: 2497, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-quasar-medium
   rotate: false
-  xy: 3535, 200
+  xy: 1767, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-quasar-small
   rotate: false
-  xy: 1279, 64
+  xy: 2568, 63
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-quasar-tiny
   rotate: false
-  xy: 1809, 18
+  xy: 2918, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-quasar-xlarge
   rotate: false
-  xy: 3859, 412
+  xy: 3909, 313
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-unit-risse-large
+unit-reign-large
   rotate: false
-  xy: 2329, 202
+  xy: 2245, 217
+  size: 40, 26
+  orig: 40, 26
+  offset: 0, 0
+  index: -1
+unit-reign-medium
+  rotate: false
+  xy: 949, 3
+  size: 31, 20
+  orig: 31, 20
+  offset: 0, 0
+  index: -1
+unit-reign-small
+  rotate: false
+  xy: 2568, 46
+  size: 24, 15
+  orig: 24, 15
+  offset: 0, 0
+  index: -1
+unit-reign-tiny
+  rotate: false
+  xy: 181, 1
+  size: 15, 10
+  orig: 15, 10
+  offset: 0, 0
+  index: -1
+unit-reign-xlarge
+  rotate: false
+  xy: 181, 13
+  size: 48, 31
+  orig: 48, 31
+  offset: 0, 0
+  index: -1
+unit-risso-large
+  rotate: false
+  xy: 881, 127
+  size: 35, 40
+  orig: 35, 40
+  offset: 0, 0
+  index: -1
+unit-risso-medium
+  rotate: false
+  xy: 2107, 67
+  size: 28, 32
+  orig: 28, 32
+  offset: 0, 0
+  index: -1
+unit-risso-small
+  rotate: false
+  xy: 2264, 191
+  size: 21, 24
+  orig: 21, 24
+  offset: 0, 0
+  index: -1
+unit-risso-tiny
+  rotate: false
+  xy: 3661, 175
+  size: 14, 16
+  orig: 14, 16
+  offset: 0, 0
+  index: -1
+unit-risso-xlarge
+  rotate: false
+  xy: 990, 363
+  size: 43, 48
+  orig: 43, 48
+  offset: 0, 0
+  index: -1
+unit-scepter-large
+  rotate: false
+  xy: 2413, 253
+  size: 40, 32
+  orig: 40, 32
+  offset: 0, 0
+  index: -1
+unit-scepter-medium
+  rotate: false
+  xy: 1801, 39
+  size: 32, 26
+  orig: 32, 26
+  offset: 0, 0
+  index: -1
+unit-scepter-small
+  rotate: false
+  xy: 2490, 16
+  size: 24, 19
+  orig: 24, 19
+  offset: 0, 0
+  index: -1
+unit-scepter-tiny
+  rotate: false
+  xy: 19, 1
+  size: 16, 13
+  orig: 16, 13
+  offset: 0, 0
+  index: -1
+unit-scepter-xlarge
+  rotate: false
+  xy: 231, 5
+  size: 48, 39
+  orig: 48, 39
+  offset: 0, 0
+  index: -1
+unit-sei-large
+  rotate: false
+  xy: 2539, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-unit-risse-medium
+unit-sei-medium
   rotate: false
-  xy: 3569, 200
+  xy: 1835, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-unit-risse-small
+unit-sei-small
   rotate: false
-  xy: 1279, 38
+  xy: 2516, 11
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-unit-risse-tiny
+unit-sei-tiny
   rotate: false
-  xy: 1827, 18
+  xy: 2918, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-unit-risse-xlarge
+unit-sei-xlarge
   rotate: false
-  xy: 3909, 412
+  xy: 3959, 313
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-spiroct-large
   rotate: false
-  xy: 2371, 244
-  size: 40, 40
-  orig: 40, 40
+  xy: 2455, 254
+  size: 40, 31
+  orig: 40, 31
   offset: 0, 0
   index: -1
 unit-spiroct-medium
   rotate: false
-  xy: 3603, 200
-  size: 32, 32
-  orig: 32, 32
+  xy: 1153, 6
+  size: 31, 25
+  orig: 31, 25
   offset: 0, 0
   index: -1
 unit-spiroct-small
   rotate: false
-  xy: 1305, 64
-  size: 24, 24
-  orig: 24, 24
+  xy: 2542, 16
+  size: 24, 19
+  orig: 24, 19
   offset: 0, 0
   index: -1
 unit-spiroct-tiny
   rotate: false
-  xy: 1845, 18
-  size: 16, 16
-  orig: 16, 16
+  xy: 3772, 313
+  size: 15, 12
+  orig: 15, 12
   offset: 0, 0
   index: -1
 unit-spiroct-xlarge
   rotate: false
-  xy: 3959, 412
-  size: 48, 48
-  orig: 48, 48
+  xy: 4009, 323
+  size: 48, 38
+  orig: 48, 38
+  offset: 0, 0
+  index: -1
+unit-toxopid-large
+  rotate: false
+  xy: 3429, 287
+  size: 33, 40
+  orig: 33, 40
+  offset: 0, 0
+  index: -1
+unit-toxopid-medium
+  rotate: false
+  xy: 781, 170
+  size: 26, 32
+  orig: 26, 32
+  offset: 0, 0
+  index: -1
+unit-toxopid-small
+  rotate: false
+  xy: 2590, 115
+  size: 20, 24
+  orig: 20, 24
+  offset: 0, 0
+  index: -1
+unit-toxopid-tiny
+  rotate: false
+  xy: 3793, 345
+  size: 13, 16
+  orig: 13, 16
+  offset: 0, 0
+  index: -1
+unit-toxopid-xlarge
+  rotate: false
+  xy: 2581, 279
+  size: 40, 48
+  orig: 40, 48
+  offset: 0, 0
+  index: -1
+unit-vela-large
+  rotate: false
+  xy: 2623, 295
+  size: 40, 32
+  orig: 40, 32
+  offset: 0, 0
+  index: -1
+unit-vela-medium
+  rotate: false
+  xy: 1869, 39
+  size: 32, 26
+  orig: 32, 26
+  offset: 0, 0
+  index: -1
+unit-vela-small
+  rotate: false
+  xy: 2568, 25
+  size: 24, 19
+  orig: 24, 19
+  offset: 0, 0
+  index: -1
+unit-vela-tiny
+  rotate: false
+  xy: 37, 1
+  size: 16, 13
+  orig: 16, 13
+  offset: 0, 0
+  index: -1
+unit-vela-xlarge
+  rotate: false
+  xy: 845, 372
+  size: 48, 39
+  orig: 48, 39
   offset: 0, 0
   index: -1
 unit-zenith-large
   rotate: false
-  xy: 2413, 286
+  xy: 2665, 287
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 unit-zenith-medium
   rotate: false
-  xy: 3637, 200
+  xy: 1903, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-zenith-small
   rotate: false
-  xy: 1305, 38
+  xy: 2584, 89
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 unit-zenith-tiny
   rotate: false
-  xy: 1863, 18
+  xy: 2936, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-zenith-xlarge
   rotate: false
-  xy: 4009, 412
+  xy: 895, 363
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+wavepane
+  rotate: false
+  xy: 3353, 300
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
+white-pane
+  rotate: false
+  xy: 3391, 300
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
 whiteui
   rotate: false
-  xy: 845, 365
+  xy: 821, 416
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
   index: -1
 window-empty
   rotate: false
-  xy: 915, 105
+  xy: 3711, 218
   size: 27, 61
   split: 4, 4, 2, 2
   orig: 27, 61
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 82523b7c54..6a698b472a 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png
index 54a7288fc8..dd7bbf01c6 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png
index 39ce589d42..6e90118bff 100644
Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ
diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png
index 0b9c292c05..1a7eeb2a5c 100644
Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ
diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png
index 7995912815..9fb3b87450 100644
Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ
diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
index 9c42f6d9ea..553c4ce2cc 100644
--- a/core/src/mindustry/ClientLauncher.java
+++ b/core/src/mindustry/ClientLauncher.java
@@ -33,6 +33,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
     @Override
     public void setup(){
+        loadLogger();
+
         loader = new LoadRenderer();
         Events.fire(new ClientCreateEvent());
 
diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index 34b4e99e8a..99d5567fda 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -37,11 +37,11 @@ public class Vars implements Loadable{
     /** Whether the logger is loaded. */
     public static boolean loadedLogger = false, loadedFileLogger = false;
     /** Maximum extra padding around deployment schematics. */
-    public static final int maxLoadoutSchematicPad = 4;
+    public static final int maxLoadoutSchematicPad = 5;
     /** Maximum schematic size.*/
     public static final int maxSchematicSize = 32;
     /** All schematic base64 starts with this string.*/
-    public static final String schematicBaseStart ="bXNjaAB";
+    public static final String schematicBaseStart ="bXNjaA";
     /** IO buffer size. */
     public static final int bufferSize = 8192;
     /** global charset, since Android doesn't support the Charsets class */
@@ -60,8 +60,10 @@ public class Vars implements Loadable{
     public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers.json";
     /** URL to the JSON file containing all the BE servers. Only queried in BE. */
     public static final String serverJsonBeURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_be.json";
+    /** URL to the JSON file containing all the BE servers. Only queried in the V6 alpha (will be removed once it's out). */
+    public static final String serverJsonV6URL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_v6.json";
     /** URL of the github issue report template.*/
-    public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?template=bug_report.md";
+    public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?labels=bug&template=bug_report.md";
     /** list of built-in servers.*/
     public static final Seq<String> defaultServers = Seq.with();
     /** maximum distance between mine and core that supports automatic transferring */
@@ -78,20 +80,24 @@ public class Vars implements Loadable{
     public static final float miningRange = 70f;
     /** range for building */
     public static final float buildingRange = 220f;
+    /** range for moving items */
+    public static final float itemTransferRange = 220f;
     /** duration of time between turns in ticks */
     public static final float turnDuration = 20 * Time.toMinutes;
     /** turns needed to destroy a sector completely */
     public static final float sectorDestructionTurns = 3f;
     /** min armor fraction damage; e.g. 0.05 = at least 5% damage */
-    public static final float minArmorDamage = 0.05f;
+    public static final float minArmorDamage = 0.1f;
     /** launch animation duration */
     public static final float launchDuration = 140f;
+    /** size of tiles in units */
+    public static final int tilesize = 8;
+    /** size of one tile payload (^2) */
+    public static final float tilePayload = tilesize * tilesize;
     /** tile used in certain situations, instead of null */
     public static Tile emptyTile;
     /** for map generator dialog */
     public static boolean updateEditorOnChange = false;
-    /** size of tiles in units */
-    public static final int tilesize = 8;
     /** all choosable player colors in join/host dialog */
     public static final Color[] playerColors = {
         Color.valueOf("82759a"),
@@ -199,8 +205,7 @@ public class Vars implements Loadable{
     public static NetServer netServer;
     public static NetClient netClient;
 
-    public static
-    Player player;
+    public static Player player;
 
     @Override
     public void loadAsync(){
diff --git a/core/src/mindustry/ai/BaseAI.java b/core/src/mindustry/ai/BaseAI.java
index df2fc26302..83f393cc83 100644
--- a/core/src/mindustry/ai/BaseAI.java
+++ b/core/src/mindustry/ai/BaseAI.java
@@ -63,6 +63,7 @@ public class BaseAI{
                 int range = 150;
 
                 Position pos = randomPosition();
+
                 //when there are no random positions, do nothing.
                 if(pos == null) return;
 
@@ -159,7 +160,10 @@ public class BaseAI{
 
     private void tryWalls(){
         Block wall = Blocks.copperWall;
-        Tile spawn = state.rules.defaultTeam.core() != null ? state.rules.defaultTeam.core().tile : data.team.core().tile;
+        Building spawnt = state.rules.defaultTeam.core() != null ? state.rules.defaultTeam.core() : data.team.core();
+        Tile spawn = spawnt == null ? null : spawnt.tile;
+
+        if(spawn == null) return;
 
         for(int wx = lastX; wx <= lastX + lastW; wx++){
             for(int wy = lastY; wy <= lastY + lastH; wy++){
diff --git a/core/src/mindustry/ai/BaseRegistry.java b/core/src/mindustry/ai/BaseRegistry.java
index 98e4744da0..cb34095a3c 100644
--- a/core/src/mindustry/ai/BaseRegistry.java
+++ b/core/src/mindustry/ai/BaseRegistry.java
@@ -1,6 +1,7 @@
 package mindustry.ai;
 
 import arc.*;
+import arc.math.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
@@ -68,7 +69,7 @@ public class BaseRegistry{
                 }
                 schem.tiles.removeAll(s -> s.block.buildVisibility == BuildVisibility.sandboxOnly);
 
-                part.tier = schem.tiles.sumf(s -> s.block.buildCost / s.block.buildCostMultiplier);
+                part.tier = schem.tiles.sumf(s -> Mathf.pow(s.block.buildCost / s.block.buildCostMultiplier, 1.2f));
 
                 if(part.core != null){
                     cores.add(part);
@@ -92,7 +93,7 @@ public class BaseRegistry{
             }
         }
 
-        cores.sort(Structs.comps(Structs.comparingFloat(b -> b.core.health), Structs.comparingFloat(b -> b.tier)));
+        cores.sort(b -> b.tier);
         parts.sort();
         reqParts.each((key, arr) -> arr.sort());
     }
diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
index 5931068c48..0f52311b88 100644
--- a/core/src/mindustry/ai/BlockIndexer.java
+++ b/core/src/mindustry/ai/BlockIndexer.java
@@ -6,6 +6,7 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.EnumSet;
 import arc.struct.*;
+import arc.util.ArcAnnotate.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -33,11 +34,11 @@ public class BlockIndexer{
     /** Maps each team ID to a quarant. A quadrant is a grid of bits, where each bit is set if and only if there is a block of that team in that quadrant. */
     private GridBits[] structQuadrants;
     /** Stores all damaged tile entities by team. */
-    private BuildingArray[] damagedTiles = new BuildingArray[Team.all.length];
+    private ObjectSet<Building>[] damagedTiles = new ObjectSet[Team.all.length];
     /** All ores available on this map. */
     private ObjectSet<Item> allOres = new ObjectSet<>();
     /** Stores teams that are present here as tiles. */
-    private Seq<Team> activeTeams = new Seq<>();
+    private Seq<Team> activeTeams = new Seq<>(Team.class);
     /** Maps teams to a map of flagged tiles by flag. */
     private TileArray[][] flagMap = new TileArray[Team.all.length][BlockFlag.all.length];
     /** Max units by team. */
@@ -52,7 +53,7 @@ public class BlockIndexer{
     private Seq<Building> breturnArray = new Seq<>();
 
     public BlockIndexer(){
-        Events.on(BuildinghangeEvent.class, event -> {
+        Events.on(TileChangeEvent.class, event -> {
             if(typeMap.get(event.tile.pos()) != null){
                 TileIndex index = typeMap.get(event.tile.pos());
                 for(BlockFlag flag : index.flags){
@@ -70,9 +71,10 @@ public class BlockIndexer{
         Events.on(WorldLoadEvent.class, event -> {
             scanOres.clear();
             scanOres.addAll(Item.getAllOres());
-            damagedTiles = new BuildingArray[Team.all.length];
+            damagedTiles = new ObjectSet[Team.all.length];
             flagMap = new TileArray[Team.all.length][BlockFlag.all.length];
             unitCaps = new int[Team.all.length];
+            activeTeams = new Seq<>(Team.class);
 
             for(int i = 0; i < flagMap.length; i++){
                 for(int j = 0; j < BlockFlag.all.length; j++){
@@ -138,16 +140,16 @@ public class BlockIndexer{
     }
 
     /** Returns all damaged tiles by team. */
-    public BuildingArray getDamaged(Team team){
-        returnArray.clear();
+    public ObjectSet<Building> getDamaged(Team team){
+        breturnArray.clear();
 
         if(damagedTiles[team.id] == null){
-            damagedTiles[team.id] = new BuildingArray();
+            damagedTiles[team.id] = new ObjectSet<>();
         }
 
-        BuildingArray set = damagedTiles[team.id];
+        ObjectSet<Building> set = damagedTiles[team.id];
         for(Building build : set){
-            if((!build.isValid() || build.team != team || !build.damaged()) || build.block instanceof BuildBlock){
+            if((!build.isValid() || build.team != team || !build.damaged()) || build.block instanceof ConstructBlock){
                 breturnArray.add(build);
             }
         }
@@ -164,6 +166,11 @@ public class BlockIndexer{
         return flagMap[team.id][type.ordinal()];
     }
 
+    @Nullable
+    public Tile findClosestFlag(float x, float y, Team team, BlockFlag flag){
+        return Geometry.findClosest(x, y, getAllied(team, flag));
+    }
+
     public boolean eachBlock(Teamc team, float range, Boolf<Building> pred, Cons<Building> cons){
         return eachBlock(team.team(), team.getX(), team.getY(), range, pred, cons);
     }
@@ -185,7 +192,7 @@ public class BlockIndexer{
 
                 if(other == null) continue;
 
-                if(other.team() == team && pred.get(other) && intSet.add(other.pos())){
+                if(other.team == team && pred.get(other) && intSet.add(other.pos())){
                     cons.get(other);
                     any = true;
                 }
@@ -212,15 +219,18 @@ public class BlockIndexer{
     }
 
     public void notifyTileDamaged(Building entity){
-        if(damagedTiles[entity.team().id] == null){
-            damagedTiles[entity.team().id] = new BuildingArray();
+        if(damagedTiles[entity.team.id] == null){
+            damagedTiles[entity.team.id] = new ObjectSet<>();
         }
 
-        damagedTiles[entity.team().id].add(entity);
+        damagedTiles[entity.team.id].add(entity);
     }
 
     public Building findEnemyTile(Team team, float x, float y, float range, Boolf<Building> pred){
-        for(Team enemy : team.enemies()){
+        for(int i = 0; i < activeTeams.size; i++){
+            Team enemy = activeTeams.items[i];
+
+            if(enemy == team) continue;
 
             Building entity = indexer.findTile(enemy, x, y, range, pred, true);
             if(entity != null){
@@ -251,15 +261,15 @@ public class BlockIndexer{
 
                         if(e == null) continue;
 
-                        if(e.team() != team || !pred.get(e) || !e.block().targetable)
+                        if(e.team != team || !pred.get(e) || !e.block.targetable)
                             continue;
 
                         float ndst = e.dst2(x, y);
                         if(ndst < range2 && (closest == null ||
                         //this one is closer, and it is at least of equal priority
-                        (ndst < dst && (!usePriority || closest.block().priority.ordinal() <= e.block().priority.ordinal())) ||
+                        (ndst < dst && (!usePriority || closest.block.priority.ordinal() <= e.block.priority.ordinal())) ||
                         //priority is used, and new block has higher priority regardless of range
-                        (usePriority && closest.block().priority.ordinal() < e.block().priority.ordinal()))){
+                        (usePriority && closest.block.priority.ordinal() < e.block.priority.ordinal()))){
                             dst = ndst;
                             closest = e;
                         }
@@ -390,7 +400,7 @@ public class BlockIndexer{
                 for(int y = quadrantY * quadrantSize; y < world.height() && y < (quadrantY + 1) * quadrantSize; y++){
                     Building result = world.build(x, y);
                     //when a targetable block is found, mark this quadrant as occupied and stop searching
-                    if(result != null && result.team() == team){
+                    if(result != null && result.team == team){
                         bits.set(quadrantX, quadrantY);
                         break outer;
                     }
@@ -472,35 +482,4 @@ public class BlockIndexer{
             return tiles.iterator();
         }
     }
-
-    //TODO copy-pasted code, generics would be nice here
-    public static class BuildingArray implements Iterable<Building>{
-        private Seq<Building> tiles = new Seq<>(false, 16);
-        private IntSet contained = new IntSet();
-
-        public void add(Building tile){
-            if(contained.add(tile.pos())){
-                tiles.add(tile);
-            }
-        }
-
-        public void remove(Building tile){
-            if(contained.remove(tile.pos())){
-                tiles.remove(tile);
-            }
-        }
-
-        public int size(){
-            return tiles.size;
-        }
-
-        public Building first(){
-            return tiles.first();
-        }
-
-        @Override
-        public Iterator<Building> iterator(){
-            return tiles.iterator();
-        }
-    }
 }
diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java
index 222cc7df74..e8199163ae 100644
--- a/core/src/mindustry/ai/Pathfinder.java
+++ b/core/src/mindustry/ai/Pathfinder.java
@@ -23,52 +23,109 @@ public class Pathfinder implements Runnable{
     private static final int impassable = -1;
     private static final int fieldTimeout = 1000 * 60 * 2;
 
+    public static final int
+        fieldCore = 0,
+        fieldRally = 1;
+
+    public static final Seq<Prov<Flowfield>> fieldTypes = Seq.with(
+        EnemyCoreField::new,
+        RallyField::new
+    );
+
+    public static final int
+        costGround = 0,
+        costLegs = 1,
+        costWater = 2;
+
+    public static final Seq<PathCost> costTypes = Seq.with(
+        //ground
+        (team, tile) -> (PathTile.team(tile) == team.id || PathTile.team(tile) == 0) && PathTile.solid(tile) ? impassable : 1 +
+            PathTile.health(tile) * 5 +
+            (PathTile.nearSolid(tile) ? 2 : 0) +
+            (PathTile.nearLiquid(tile) ? 6 : 0) +
+            (PathTile.deep(tile) ? 6000 : 0) +
+            (PathTile.damages(tile) ? 30 : 0),
+
+        //legs
+        (team, tile) -> PathTile.legSolid(tile) ? impassable : 1 +
+            (PathTile.solid(tile) ? 5 : 0),
+
+        //water
+        (team, tile) -> PathTile.solid(tile) || !PathTile.liquid(tile) ? 200 : 2 +
+            (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) +
+            (PathTile.deep(tile) ? -1 : 0) +
+            (PathTile.damages(tile) ? 35 : 0)
+    );
+
+    //maps team, cost, type to flow field
+    Flowfield[][][] cache;
+
     /** tile data, see PathTileStruct */
-    private int[][] tiles;
+    int[][] tiles = new int[0][0];
     /** unordered array of path data for iteration only. DO NOT iterate or access this in the main thread. */
-    private Seq<Flowfield> threadList = new Seq<>(), mainList = new Seq<>();
-    /** Maps team ID and target to to a flowfield.*/
-    private ObjectMap<PathTarget, Flowfield>[] fieldMap = new ObjectMap[Team.all.length];
-    /** Used field maps. */
-    private ObjectSet<PathTarget>[] fieldMapUsed = new ObjectSet[Team.all.length];
+    Seq<Flowfield> threadList = new Seq<>(), mainList = new Seq<>();
     /** handles task scheduling on the update thread. */
-    private TaskQueue queue = new TaskQueue();
-    /** Stores path target for a position. Main thread only.*/
-    private ObjectMap<Position, PathTarget> targetCache = new ObjectMap<>();
+    TaskQueue queue = new TaskQueue();
     /** Current pathfinding thread */
-    private @Nullable Thread thread;
-    private IntSeq tmpArray = new IntSeq();
+    @Nullable Thread thread;
+    IntSeq tmpArray = new IntSeq();
 
     public Pathfinder(){
+        clearCache();
+
         Events.on(WorldLoadEvent.class, event -> {
             stop();
 
             //reset and update internal tile array
             tiles = new int[world.width()][world.height()];
-            fieldMap = new ObjectMap[Team.all.length];
-            fieldMapUsed = new ObjectSet[Team.all.length];
-            targetCache = new ObjectMap<>();
             threadList = new Seq<>();
             mainList = new Seq<>();
+            clearCache();
 
             for(Tile tile : world.tiles){
                 tiles[tile.x][tile.y] = packTile(tile);
             }
 
             //special preset which may help speed things up; this is optional
-            preloadPath(state.rules.waveTeam, FlagTarget.enemyCores);
+            preloadPath(getField(state.rules.waveTeam, costGround, fieldCore));
 
             start();
         });
 
         Events.on(ResetEvent.class, event -> stop());
 
-        Events.on(BuildinghangeEvent.class, event -> updateTile(event.tile));
+        Events.on(TileChangeEvent.class, event -> updateTile(event.tile));
+    }
+
+    private void clearCache(){
+        cache = new Flowfield[256][5][5];
     }
 
     /** Packs a tile into its internal representation. */
     private int packTile(Tile tile){
-        return PathTile.get(tile.cost, (byte)tile.getTeamID(), !tile.solid() && tile.floor().drownTime <= 0f, !tile.solid() && tile.floor().isLiquid);
+        boolean nearLiquid = false, nearSolid = false, nearGround = false;
+
+        for(int i = 0; i < 4; i++){
+            Tile other = tile.getNearby(i);
+            if(other != null){
+                if(other.floor().isLiquid) nearLiquid = true;
+                if(other.solid()) nearSolid = true;
+                if(!other.floor().isLiquid) nearGround = true;
+            }
+        }
+
+        return PathTile.get(
+            tile.build == null ? 0 : Math.min((int)(tile.build.health / 40), 80),
+            tile.getTeamID(),
+            tile.solid(),
+            tile.floor().isLiquid,
+            tile.staticDarkness() >= 2,
+            nearLiquid,
+            nearGround,
+            nearSolid,
+            tile.floor().isDeep(),
+            tile.floor().damageTaken > 0.00001f
+        );
     }
 
     /** Starts or restarts the pathfinding thread. */
@@ -104,7 +161,7 @@ public class Pathfinder implements Runnable{
             if(path != null){
                 synchronized(path.targets){
                     path.targets.clear();
-                    path.target.getPositions(path.team, path.targets);
+                    path.getPositions(path.targets);
                 }
             }
         }
@@ -131,18 +188,19 @@ public class Pathfinder implements Runnable{
                         updateFrontier(data, maxUpdate / threadList.size);
 
                         //remove flowfields that have 'timed out' so they can be garbage collected and no longer waste space
-                        if(data.target.refreshRate() > 0 && Time.timeSinceMillis(data.lastUpdateTime) > fieldTimeout){
+                        if(data.refreshRate > 0 && Time.timeSinceMillis(data.lastUpdateTime) > fieldTimeout){
                             //make sure it doesn't get removed twice
                             data.lastUpdateTime = Time.millis();
 
                             Team team = data.team;
 
                             Core.app.post(() -> {
+                                //TODO ?????
                                 //remove its used state
-                                if(fieldMap[team.id] != null){
-                                    fieldMap[team.id].remove(data.target);
-                                    fieldMapUsed[team.id].remove(data.target);
-                                }
+                                //if(fieldMap[team.id] != null){
+                                //    fieldMap[team.id].remove(data.target);
+                                //    fieldMapUsed[team.id].remove(data.target);
+                                //}
                                 //remove from main thread list
                                 mainList.remove(data);
                             });
@@ -167,51 +225,49 @@ public class Pathfinder implements Runnable{
         }
     }
 
-    public @Nullable Tile getTargetTile(Tile tile, Team team, Position target){
-        return getTargetTile(tile, team, getTarget(target));
+    public Flowfield getField(Team team, int costType, int fieldType){
+        if(cache[team.id][costType][fieldType] == null){
+            Flowfield field = fieldTypes.get(fieldType).get();
+            field.team = team;
+            field.cost = costTypes.get(costType);
+            field.targets.clear();
+            field.getPositions(field.targets);
+
+            cache[team.id][costType][fieldType] = field;
+            queue.post(() -> registerPath(field));
+        }
+        return cache[team.id][costType][fieldType];
     }
 
     /** Gets next tile to travel to. Main thread only. */
-    public @Nullable Tile getTargetTile(Tile tile, Team team, PathTarget target){
+    public @Nullable Tile getTargetTile(Tile tile, Flowfield path){
         if(tile == null) return null;
 
-        if(fieldMap[team.id] == null){
-            fieldMap[team.id] = new ObjectMap<>();
-            fieldMapUsed[team.id] = new ObjectSet<>();
-        }
-
-        Flowfield data = fieldMap[team.id].get(target);
-
-        if(data == null){
-            //if this combination is not found, create it on request
-            if(fieldMapUsed[team.id].add(target)){
-                //grab targets since this is run on main thread
-                IntSeq targets = target.getPositions(team, new IntSeq());
-                queue.post(() -> createPath(team, target, targets));
-            }
+        //uninitialized flowfields are not applicable
+        if(!path.initialized){
             return tile;
         }
 
         //if refresh rate is positive, queue a refresh
-        if(target.refreshRate() > 0 && Time.timeSinceMillis(data.lastUpdateTime) > target.refreshRate()){
-            data.lastUpdateTime = Time.millis();
+        if(path.refreshRate > 0 && Time.timeSinceMillis(path.lastUpdateTime) > path.refreshRate){
+            path.lastUpdateTime = Time.millis();
 
             tmpArray.clear();
-            data.target.getPositions(data.team, tmpArray);
+            path.getPositions(tmpArray);
 
-            synchronized(data.targets){
+            synchronized(path.targets){
                 //make sure the position actually changed
-                if(!(data.targets.size == 1 && tmpArray.size == 1 && data.targets.first() == tmpArray.first())){
-                    data.targets.clear();
-                    data.target.getPositions(data.team, data.targets);
+                if(!(path.targets.size == 1 && tmpArray.size == 1 && path.targets.first() == tmpArray.first())){
+                    path.targets.clear();
+                    path.getPositions(path.targets);
 
                     //queue an update
-                    queue.post(() -> updateTargets(data));
+                    queue.post(() -> updateTargets(path));
                 }
             }
         }
 
-        int[][] values = data.weights;
+        int[][] values = path.weights;
         int value = values[tile.x][tile.y];
 
         Tile current = null;
@@ -222,8 +278,8 @@ public class Pathfinder implements Runnable{
             Tile other = world.tile(dx, dy);
             if(other == null) continue;
 
-            if(values[dx][dy] < value && (current == null || values[dx][dy] < tl) && !other.solid() && other.floor().drownTime <= 0 &&
-            !(point.x != 0 && point.y != 0 && (world.solid(tile.x + point.x, tile.y) || world.solid(tile.x, tile.y + point.y)))){ //diagonal corner trap
+            if(values[dx][dy] < value && (current == null || values[dx][dy] < tl) && path.passable(dx, dy) &&
+            !(point.x != 0 && point.y != 0 && (!path.passable(tile.x + point.x, tile.y) || !path.passable(tile.x, tile.y + point.y)))){ //diagonal corner trap
                 current = other;
                 tl = values[dx][dy];
             }
@@ -234,16 +290,6 @@ public class Pathfinder implements Runnable{
         return current;
     }
 
-    private PathTarget getTarget(Position position){
-        return targetCache.get(position, () -> new PositionTarget(position));
-    }
-
-    /** @return whether a tile can be passed through by this team. Pathfinding thread only. */
-    private boolean passable(int x, int y, Team team){
-        int tile = tiles[x][y];
-        return PathTile.passable(tile) || (PathTile.team(tile) != team.id && PathTile.team(tile) != (int)Team.derelict.id);
-    }
-
     /**
      * Clears the frontier, increments the search and sets up all flow sources.
      * This only occurs for active teams.
@@ -259,10 +305,8 @@ public class Pathfinder implements Runnable{
             return;
         }
 
-        //assign impassability to the tile
-        if(!passable(x, y, path.team)){
-            path.weights[x][y] = impassable;
-        }
+        //update cost of the tile TODO maybe only update the cost when it's not passable
+        path.weights[x][y] = path.cost.getCost(path.team, tiles[x][y]);
 
         //clear frontier to prevent contamination
         path.frontier.clear();
@@ -289,34 +333,33 @@ public class Pathfinder implements Runnable{
         }
     }
 
-    private void preloadPath(Team team, PathTarget target){
-        updateFrontier(createPath(team, target, target.getPositions(team, new IntSeq())), -1);
+    private void preloadPath(Flowfield path){
+        path.targets.clear();
+        path.getPositions(path.targets);
+        registerPath(path);
+        updateFrontier(path, -1);
     }
 
     /**
+     * TODO wrong docs
      * Created a new flowfield that aims to get to a certain target for a certain team.
      * Pathfinding thread only.
      */
-    private Flowfield createPath(Team team, PathTarget target, IntSeq targets){
-        Flowfield path = new Flowfield(team, target, world.width(), world.height());
+    private void registerPath(Flowfield path){
         path.lastUpdateTime = Time.millis();
+        path.setup(tiles.length, tiles[0].length);
 
         threadList.add(path);
 
         //add to main thread's list of paths
         Core.app.post(() -> {
             mainList.add(path);
-            if(fieldMap[team.id] != null){
-                fieldMap[team.id].put(target, path);
-            }
+            //TODO
+            //if(fieldMap[team.id] != null){
+            //    fieldMap[team.id].put(target, path);
+            //}
         });
 
-        //grab targets from passed array
-        synchronized(path.targets){
-            path.targets.clear();
-            path.targets.addAll(targets);
-        }
-
         //fill with impassables by default
         for(int x = 0; x < world.width(); x++){
             for(int y = 0; y < world.height(); y++){
@@ -330,8 +373,6 @@ public class Pathfinder implements Runnable{
             path.weights[Point2.x(pos)][Point2.y(pos)] = 0;
             path.frontier.addFirst(pos);
         }
-
-        return path;
     }
 
     /** Update the frontier for a path. Pathfinding thread only. */
@@ -353,12 +394,14 @@ public class Pathfinder implements Runnable{
                 for(Point2 point : Geometry.d4){
 
                     int dx = tile.x + point.x, dy = tile.y + point.y;
-                    Tile other = world.tile(dx, dy);
 
-                    if(other != null && (path.weights[dx][dy] > cost + other.cost || path.searches[dx][dy] < path.search) && passable(dx, dy, path.team)){
-                        if(other.cost < 0) throw new IllegalArgumentException("Tile cost cannot be negative! " + other);
+                    if(dx < 0 || dy < 0 || dx >= tiles.length || dy >= tiles[0].length) continue;
+
+                    int otherCost = path.cost.getCost(path.team, tiles[dx][dy]);
+
+                    if((path.weights[dx][dy] > cost + otherCost || path.searches[dx][dy] < path.search) && otherCost != impassable){
                         path.frontier.addFirst(Point2.pack(dx, dy));
-                        path.weights[dx][dy] = cost + other.cost;
+                        path.weights[dx][dy] = cost + otherCost;
                         path.searches[dx][dy] = (short)path.search;
                     }
                 }
@@ -366,9 +409,9 @@ public class Pathfinder implements Runnable{
         }
     }
 
-    /** A path target defines a set of targets for a path. */
-    public enum FlagTarget implements PathTarget{
-        enemyCores((team, out) -> {
+    public static class EnemyCoreField extends Flowfield{
+        @Override
+        protected void getPositions(IntSeq out){
             for(Tile other : indexer.getEnemy(team, BlockFlag.core)){
                 out.add(other.pos());
             }
@@ -379,98 +422,101 @@ public class Pathfinder implements Runnable{
                     out.add(other.pos());
                 }
             }
-        }),
-        rallyPoints((team, out) -> {
-            for(Tile other : indexer.getAllied(team, BlockFlag.rally)){
-                out.add(other.pos());
-            }
-        });
-
-        public static final FlagTarget[] all = values();
-
-        private final Cons2<Team, IntSeq> targeter;
-
-        FlagTarget(Cons2<Team, IntSeq> targeter){
-            this.targeter = targeter;
-        }
-
-        @Override
-        public IntSeq getPositions(Team team, IntSeq out){
-            targeter.get(team, out);
-            return out;
-        }
-
-        @Override
-        public int refreshRate(){
-            return 0;
         }
     }
 
-    public static class PositionTarget implements PathTarget{
+    public static class RallyField extends Flowfield{
+        @Override
+        protected void getPositions(IntSeq out){
+            for(Tile other : indexer.getAllied(team, BlockFlag.rally)){
+                out.add(other.pos());
+            }
+        }
+    }
+
+    public static class PositionTarget extends Flowfield{
         public final Position position;
 
         public PositionTarget(Position position){
             this.position = position;
+            this.refreshRate = 900;
         }
 
         @Override
-        public IntSeq getPositions(Team team, IntSeq out){
+        public void getPositions(IntSeq out){
             out.add(Point2.pack(world.toTile(position.getX()), world.toTile(position.getY())));
-            return out;
         }
 
-        @Override
-        public int refreshRate(){
-            return 900;
-        }
     }
 
-    public interface PathTarget{
-        /** Gets targets to pathfind towards. This must run on the main thread. */
-        IntSeq getPositions(Team team, IntSeq out);
+    /**
+     * Data for a flow field to some set of destinations.
+     * Concrete subclasses must specify a way to fetch costs and destinations.
+     * */
+    static abstract class Flowfield{
         /** Refresh rate in milliseconds. Return any number <= 0 to disable. */
-        int refreshRate();
-    }
+        protected int refreshRate;
+        /** Team this path is for. Set before using. */
+        protected Team team = Team.derelict;
+        /** Function for calculating path cost. Set before using. */
+        protected PathCost cost = costTypes.get(costGround);
 
-    /** Data for a specific flow field to some set of destinations. */
-    static class Flowfield{
-        /** Team this path is for. */
-        final Team team;
-        /** Flag that is being targeted. */
-        final PathTarget target;
         /** costs of getting to a specific tile */
-        final int[][] weights;
+        int[][] weights;
         /** search IDs of each position - the highest, most recent search is prioritized and overwritten */
-        final int[][] searches;
+        int[][] searches;
         /** search frontier, these are Pos objects */
-        final IntQueue frontier = new IntQueue();
+        IntQueue frontier = new IntQueue();
         /** all target positions; these positions have a cost of 0, and must be synchronized on! */
         final IntSeq targets = new IntSeq();
         /** current search ID */
         int search = 1;
         /** last updated time */
         long lastUpdateTime;
+        /** whether this flow field is ready to be used */
+        boolean initialized;
 
-        Flowfield(Team team, PathTarget target, int width, int height){
-            this.team = team;
-            this.target = target;
-
+        void setup(int width, int height){
             this.weights = new int[width][height];
             this.searches = new int[width][height];
             this.frontier.ensureCapacity((width + height) * 3);
+            this.initialized = true;
         }
+
+        protected boolean passable(int x, int y){
+            return cost.getCost(team, pathfinder.tiles[x][y]) != impassable;
+        }
+
+        /** Gets targets to pathfind towards. This must run on the main thread. */
+        protected abstract void getPositions(IntSeq out);
+    }
+
+    interface PathCost{
+        int getCost(Team traversing, int tile);
     }
 
     /** Holds a copy of tile data for a specific tile position. */
     @Struct
     class PathTileStruct{
-        //traversal cost
-        short cost;
+        //scaled block health
+        @StructField(8) int health;
         //team of block, if applicable (0 by default)
-        byte team;
-        //whether it's viable to pass this block
-        boolean passable;
-        //whether it's viable to pass this block through water
-        boolean passableWater;
+        @StructField(8) int team;
+        //general solid state
+        boolean solid;
+        //whether this block is a liquid that boats can move on
+        boolean liquid;
+        //whether this block is solid for leg units that can move over some solid blocks
+        boolean legSolid;
+        //whether this block is near liquids
+        boolean nearLiquid;
+        //whether this block is near a solid floor tile
+        boolean nearGround;
+        //whether this block is near a solid object
+        boolean nearSolid;
+        //whether this block is deep / drownable
+        boolean deep;
+        //whether the floor damages
+        boolean damages;
     }
 }
diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java
index 7f75b594af..417909a92b 100644
--- a/core/src/mindustry/ai/WaveSpawner.java
+++ b/core/src/mindustry/ai/WaveSpawner.java
@@ -3,22 +3,26 @@ package mindustry.ai;
 import arc.*;
 import arc.func.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
 public class WaveSpawner{
-    private static final float margin = 40f, coreMargin = tilesize * 3; //how far away from the edge flying units spawn
+    private static final float margin = 40f, coreMargin = tilesize * 2f, maxSteps = 30;
 
     private Seq<Tile> spawns = new Seq<>();
     private boolean spawning = false;
+    private boolean any = false;
 
     public WaveSpawner(){
         Events.on(WorldLoadEvent.class, e -> reset());
@@ -41,6 +45,8 @@ public class WaveSpawner{
         spawning = true;
 
         for(SpawnGroup group : state.rules.spawns){
+            if(group.type == null) continue;
+
             int spawned = group.getUnitsSpawned(state.wave - 1);
 
             if(group.type.flying){
@@ -87,15 +93,41 @@ public class WaveSpawner{
         if(state.rules.attackMode && state.teams.isActive(state.rules.waveTeam) && !state.teams.playerCores().isEmpty()){
             Building firstCore = state.teams.playerCores().first();
             for(Building core : state.rules.waveTeam.cores()){
-                Tmp.v1.set(firstCore).sub(core).limit(coreMargin + core.block().size * tilesize);
-                cons.accept(core.x + Tmp.v1.x, core.y + Tmp.v1.y, false);
+                Tmp.v1.set(firstCore).sub(core).limit(coreMargin + core.block.size * tilesize /2f * Mathf.sqrt2);
+
+                boolean valid = false;
+                int steps = 0;
+
+                //keep moving forward until the max step amount is reached
+                while(steps++ < maxSteps){
+                    int tx = world.toTile(core.x + Tmp.v1.x), ty = world.toTile(core.y + Tmp.v1.y);
+                    any = false;
+                    Geometry.circle(tx, ty, world.width(), world.height(), 3, (x, y) -> {
+                        if(world.solid(x, y)){
+                            any = true;
+                        }
+                    });
+
+                    //nothing is in the way, spawn it
+                    if(!any){
+                        valid = true;
+                        break;
+                    }else{
+                        //make the vector longer
+                        Tmp.v1.setLength(Tmp.v1.len() + tilesize*1.1f);
+                    }
+                }
+
+                if(valid){
+                    cons.accept(core.x + Tmp.v1.x, core.y + Tmp.v1.y, false);
+                }
             }
         }
     }
 
     private void eachFlyerSpawn(Floatc2 cons){
         for(Tile tile : spawns){
-            float angle = Angles.angle(tile.x, tile.y, world.width() / 2, world.height() / 2);
+            float angle = Angles.angle(world.width() / 2, world.height() / 2, tile.x, tile.y);
 
             float trns = Math.max(world.width(), world.height()) * Mathf.sqrt2 * tilesize;
             float spawnX = Mathf.clamp(world.width() * tilesize / 2f + Angles.trnsx(angle, trns), -margin, world.width() * tilesize + margin);
@@ -125,14 +157,18 @@ public class WaveSpawner{
     }
 
     private void spawnEffect(Unit unit){
-        Fx.unitSpawn.at(unit.x(), unit.y(), 0f, unit);
-        Time.run(30f, () -> {
-            unit.add();
-            Fx.spawn.at(unit);
-        });
+        Call.spawnEffect(unit.x, unit.y, unit.type());
+        Time.run(30f, unit::add);
     }
 
     private interface SpawnConsumer{
         void accept(float x, float y, boolean shockwave);
     }
+
+    @Remote(called = Loc.server, unreliable = true)
+    public static void spawnEffect(float x, float y, UnitType type){
+        Fx.unitSpawn.at(x, y, 0f, type);
+
+        Time.run(30f, () -> Fx.spawn.at(x, y));
+    }
 }
diff --git a/core/src/mindustry/ai/formations/FormationMember.java b/core/src/mindustry/ai/formations/FormationMember.java
index 7668f3aee6..2fdf259f62 100644
--- a/core/src/mindustry/ai/formations/FormationMember.java
+++ b/core/src/mindustry/ai/formations/FormationMember.java
@@ -11,4 +11,6 @@ import arc.math.geom.*;
 public interface FormationMember{
     /** Returns the target location of this formation member. */
     Vec3 formationPos();
+
+    float formationSize();
 }
diff --git a/core/src/mindustry/ai/formations/FormationPattern.java b/core/src/mindustry/ai/formations/FormationPattern.java
index 02f6754421..5fe84bcda9 100644
--- a/core/src/mindustry/ai/formations/FormationPattern.java
+++ b/core/src/mindustry/ai/formations/FormationPattern.java
@@ -12,6 +12,8 @@ import arc.math.geom.*;
  */
 public abstract class FormationPattern{
     public int slots;
+    /** Spacing between members. */
+    public float spacing = 20f;
 
     /** Returns the location of the given slot index. */
     public abstract Vec3 calculateSlotLocation(Vec3 out, int slot);
diff --git a/core/src/mindustry/ai/formations/patterns/CircleFormation.java b/core/src/mindustry/ai/formations/patterns/CircleFormation.java
index c658c48bf0..0988657adf 100644
--- a/core/src/mindustry/ai/formations/patterns/CircleFormation.java
+++ b/core/src/mindustry/ai/formations/patterns/CircleFormation.java
@@ -5,20 +5,14 @@ import arc.math.geom.*;
 import mindustry.ai.formations.*;
 
 public class CircleFormation extends FormationPattern{
-    /** The radius of one member. This is needed to determine how close we can pack a given number of members around circle. */
-    public float memberRadius;
     /** Angle offset. */
     public float angleOffset = 0;
 
-    public CircleFormation(float memberRadius){
-        this.memberRadius = memberRadius;
-    }
-
     @Override
     public Vec3 calculateSlotLocation(Vec3 outLocation, int slotNumber){
         if(slots > 1){
             float angle = (360f * slotNumber) / slots;
-            float radius = memberRadius / (float)Math.sin(180f / slots * Mathf.degRad);
+            float radius = spacing / (float)Math.sin(180f / slots * Mathf.degRad);
             outLocation.set(Angles.trnsx(angle, radius), Angles.trnsy(angle, radius), angle);
         }else{
             outLocation.set(0, 0, 360f * slotNumber);
diff --git a/core/src/mindustry/ai/formations/patterns/SquareFormation.java b/core/src/mindustry/ai/formations/patterns/SquareFormation.java
index 9f4b271df6..9d7ddab549 100644
--- a/core/src/mindustry/ai/formations/patterns/SquareFormation.java
+++ b/core/src/mindustry/ai/formations/patterns/SquareFormation.java
@@ -5,7 +5,6 @@ import arc.math.geom.*;
 import mindustry.ai.formations.*;
 
 public class SquareFormation extends FormationPattern{
-    public float spacing = 20;
 
     @Override
     public Vec3 calculateSlotLocation(Vec3 out, int slot){
diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java
index a606592b26..d7e7eafb11 100644
--- a/core/src/mindustry/ai/types/BuilderAI.java
+++ b/core/src/mindustry/ai/types/BuilderAI.java
@@ -1,18 +1,20 @@
 package mindustry.ai.types;
 
-import arc.math.*;
-import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.world.*;
-import mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.ConstructBlock.*;
 
 import static mindustry.Vars.*;
 
 public class BuilderAI extends AIController{
+    float buildRadius = 1500;
+    boolean found = false;
+    @Nullable Builderc following;
 
     @Override
     public void updateUnit(){
@@ -22,12 +24,29 @@ public class BuilderAI extends AIController{
             builder.lookAt(builder.vel().angle());
         }
 
-        //approach request if building
+        builder.updateBuilding(true);
+
+        if(following != null){
+            //try to follow and mimic someone
+
+            //validate follower
+            if(!following.isValid() || !following.activelyBuilding()){
+                following = null;
+                builder.plans().clear();
+                return;
+            }
+
+            //set to follower's first build plan, whatever that is
+            builder.plans().clear();
+            builder.plans().addFirst(following.buildPlan());
+        }
+
         if(builder.buildPlan() != null){
+            //approach request if building
             BuildPlan req = builder.buildPlan();
 
             boolean valid =
-                (req.tile().build instanceof BuildEntity && req.tile().<BuildEntity>bc().cblock == req.block) ||
+                (req.tile().build instanceof ConstructBuild && req.tile().<ConstructBuild>bc().cblock == req.block) ||
                 (req.breaking ?
                     Build.validBreak(unit.team(), req.x, req.y) :
                     Build.validPlace(req.block, unit.team(), req.x, req.y, req.rotation));
@@ -40,9 +59,36 @@ public class BuilderAI extends AIController{
                 builder.plans().removeFirst();
             }
         }else{
+
+            //follow someone and help them build
+            if(timer.get(timerTarget2, 60f)){
+                found = false;
+
+                Units.nearby(unit.team, unit.x, unit.y, buildRadius, u -> {
+                    if(found) return;
+
+                    if(u instanceof Builderc && u != unit && ((Builderc)u).activelyBuilding()){
+                        Builderc b = (Builderc)u;
+                        BuildPlan plan = b.buildPlan();
+
+                        Building build = world.build(plan.x, plan.y);
+                        if(build instanceof ConstructBuild){
+                            ConstructBuild cons = (ConstructBuild)build;
+                            float dist = Math.min(cons.dst(unit) - buildingRange, 0);
+
+                            //make sure you can reach the request in time
+                            if(dist / unit.type().speed < cons.buildCost * 0.9f){
+                                following = b;
+                                found = true;
+                            }
+                        }
+                    }
+                });
+            }
+
             //find new request
-            if(!unit.team().data().blocks.isEmpty()){
-                Queue<BlockPlan> blocks = unit.team().data().blocks;
+            if(!unit.team.data().blocks.isEmpty() && following == null && timer.get(timerTarget3, 60 * 2f)){
+                Queue<BlockPlan> blocks = unit.team.data().blocks;
                 BlockPlan block = blocks.first();
 
                 //check if it's already been placed
@@ -50,32 +96,14 @@ public class BuilderAI extends AIController{
                     blocks.removeFirst();
                 }else if(Build.validPlace(content.block(block.block), unit.team(), block.x, block.y, block.rotation)){ //it's valid.
                     //add build request.
-                    BuildPlan req = new BuildPlan(block.x, block.y, block.rotation, content.block(block.block));
-                    if(block.config != null){
-                        req.configure(block.config);
-                    }
-                    builder.addBuild(req);
+                    builder.addBuild(new BuildPlan(block.x, block.y, block.rotation, content.block(block.block), block.config));
                 }else{
                     //shift head of queue to tail, try something else next time
                     blocks.removeFirst();
                     blocks.addLast(block);
                 }
             }
+
         }
     }
-
-    protected void moveTo(Position target, float circleLength){
-        vec.set(target).sub(unit);
-
-        float length = circleLength <= 0.001f ? 1f : Mathf.clamp((unit.dst(target) - circleLength) / 100f, -1f, 1f);
-
-        vec.setLength(unit.type().speed * Time.delta * length);
-        if(length < -0.5f){
-            vec.rotate(180f);
-        }else if(length < 0){
-            vec.setZero();
-        }
-
-        unit.moveAt(vec);
-    }
 }
diff --git a/core/src/mindustry/ai/types/FlyingAI.java b/core/src/mindustry/ai/types/FlyingAI.java
index e71de21f7e..0758f9016a 100644
--- a/core/src/mindustry/ai/types/FlyingAI.java
+++ b/core/src/mindustry/ai/types/FlyingAI.java
@@ -1,88 +1,50 @@
 package mindustry.ai.types;
 
 import arc.math.*;
-import arc.math.geom.*;
-import arc.util.*;
-import mindustry.entities.*;
 import mindustry.entities.units.*;
+import mindustry.gen.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.*;
+
 public class FlyingAI extends AIController{
 
     @Override
-    public void updateUnit(){
-        if(unit.moving()){
-            unit.rotation(unit.vel().angle());
-        }
-
-        if(unit.isFlying()){
-            unit.wobble();
-        }
-
-        if(Units.invalidateTarget(target, unit.team(), unit.x(), unit.y())){
-            target = null;
-        }
-
-        if(retarget()){
-            targetClosest();
-
-            if(target == null) targetClosestEnemyFlag(BlockFlag.producer);
-            if(target == null) targetClosestEnemyFlag(BlockFlag.turret);
-        }
-
-        boolean shoot = false;
-
-        if(target != null && unit.hasWeapons()){
-            attack(80f);
-
-            shoot = unit.inRange(target);
-
-            if(shoot && unit.type().hasWeapons()){
-                Vec2 to = Predict.intercept(unit, target, unit.type().weapons.first().bullet.speed);
-                unit.aim(to);
+    public void updateMovement(){
+        if(target != null && unit.hasWeapons() && command() == UnitCommand.attack){
+            if(unit.type().weapons.first().rotate){
+                moveTo(target, unit.range() * 0.8f);
+                unit.lookAt(target);
+            }else{
+                attack(100f);
             }
         }
 
-        unit.controlWeapons(shoot, shoot);
+        if(target == null && command() == UnitCommand.attack && state.rules.waves && unit.team == state.rules.defaultTeam){
+            moveTo(getClosestSpawner(), state.rules.dropZoneRadius + 120f);
+        }
+
+        if(command() == UnitCommand.rally){
+            moveTo(targetFlag(unit.x, unit.y, BlockFlag.rally, false), 60f);
+        }
+    }
+
+    @Override
+    protected Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
+        Teamc result = target(x, y, range, air, ground);
+        if(result != null) return result;
+
+        if(ground) result = targetFlag(x, y, BlockFlag.producer, true);
+        if(result != null) return result;
+
+        if(ground) result = targetFlag(x, y, BlockFlag.turret, true);
+        if(result != null) return result;
+
+        return null;
     }
 
     //TODO clean up
 
-    protected void circle(float circleLength){
-        circle(circleLength, unit.type().speed);
-    }
-
-    protected void circle(float circleLength, float speed){
-        if(target == null) return;
-
-        vec.set(target).sub(unit);
-
-        if(vec.len() < circleLength){
-            vec.rotate((circleLength - vec.len()) / circleLength * 180f);
-        }
-
-        vec.setLength(speed * Time.delta);
-
-        unit.moveAt(vec);
-    }
-
-    protected void moveTo(float circleLength){
-        if(target == null) return;
-
-        vec.set(target).sub(unit);
-
-        float length = circleLength <= 0.001f ? 1f : Mathf.clamp((unit.dst(target) - circleLength) / 100f, -1f, 1f);
-
-        vec.setLength(unit.type().speed * Time.delta * length);
-        if(length < -0.5f){
-            vec.rotate(180f);
-        }else if(length < 0){
-            vec.setZero();
-        }
-
-        unit.moveAt(vec);
-    }
-
     protected void attack(float circleLength){
         vec.set(target).sub(unit);
 
@@ -95,7 +57,7 @@ public class FlyingAI extends AIController{
             vec.setAngle(Mathf.slerpDelta(unit.vel().angle(), vec.angle(), 0.6f));
         }
 
-        vec.setLength(unit.type().speed * Time.delta);
+        vec.setLength(unit.type().speed);
 
         unit.moveAt(vec);
     }
diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java
index 884dc2150c..e2680b4f2b 100644
--- a/core/src/mindustry/ai/types/FormationAI.java
+++ b/core/src/mindustry/ai/types/FormationAI.java
@@ -1,11 +1,12 @@
 package mindustry.ai.types;
 
+import arc.math.*;
 import arc.math.geom.*;
 import arc.util.ArcAnnotate.*;
-import mindustry.*;
 import mindustry.ai.formations.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 
 public class FormationAI extends AIController implements FormationMember{
     public Unit leader;
@@ -25,41 +26,56 @@ public class FormationAI extends AIController implements FormationMember{
 
     @Override
     public void updateUnit(){
+        UnitType type = unit.type();
+
         if(leader.dead){
             unit.resetController();
             return;
         }
 
-        unit.controlWeapons(leader.isRotate(), leader.isShooting);
+        if(unit.type().canBoost && unit.canPassOn()){
+            unit.elevation = Mathf.approachDelta(unit.elevation, 0f, 0.08f);
+        }
+
+        unit.controlWeapons(true, leader.isShooting);
         // unit.moveAt(Tmp.v1.set(deltaX, deltaY).limit(unit.type().speed));
-        if(leader.isShooting){
-            unit.aimLook(leader.aimX(), leader.aimY());
-        }else{
-            if(!leader.moving() || !unit.type().rotateShooting){
-                if(unit.moving()){
-                    unit.lookAt(unit.vel.angle());
-                }
-            }else{
-                unit.lookAt(leader.rotation);
-            }
+
+        unit.aim(leader.aimX(), leader.aimY());
+
+        if(unit.type().rotateShooting){
+            unit.lookAt(leader.aimX(), leader.aimY());
+        }else if(unit.moving()){
+            unit.lookAt(unit.vel.angle());
         }
 
         Vec2 realtarget = vec.set(target);
 
-        if(unit.isGrounded() && Vars.world.raycast(unit.tileX(), unit.tileY(), leader.tileX(), leader.tileY(), Vars.world::solid)){
-            realtarget.set(Vars.pathfinder.getTargetTile(unit.tileOn(), unit.team, leader));
-        }
+        float margin = 3f;
 
-        unit.moveAt(realtarget.sub(unit).limit(unit.type().speed));
+        if(unit.dst(realtarget) <= margin){
+            unit.vel.approachDelta(Vec2.ZERO, type.speed * type.accel / 2f);
+        }else{
+            unit.moveAt(realtarget.sub(unit).limit(type.speed));
+        }
     }
 
     @Override
     public void removed(Unit unit){
         if(formation != null){
             formation.removeMember(this);
+            unit.resetController();
         }
     }
 
+    @Override
+    public float formationSize(){
+        if(unit instanceof Commanderc && ((Commanderc)unit).isCommanding()){
+            //TODO return formation size
+            //eturn ((Commanderc)unit).formation().
+        }
+        return unit.hitSize * 1f;
+    }
+
     @Override
     public boolean isBeingControlled(Unit player){
         return leader == player;
diff --git a/core/src/mindustry/ai/types/GroundAI.java b/core/src/mindustry/ai/types/GroundAI.java
index 0a7384ff45..bd6b13a25c 100644
--- a/core/src/mindustry/ai/types/GroundAI.java
+++ b/core/src/mindustry/ai/types/GroundAI.java
@@ -1,89 +1,86 @@
 package mindustry.ai.types;
 
-import mindustry.ai.Pathfinder.*;
+import arc.math.*;
+import mindustry.ai.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
-import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
-import static mindustry.Vars.pathfinder;
+import java.util.*;
+
+import static mindustry.Vars.*;
 
 public class GroundAI extends AIController{
+    //static final float commandCooldown = 60f * 10;
+    //float commandTimer = 60*3;
 
     @Override
-    public void updateUnit(){
-
-        if(Units.invalidateTarget(target, unit.team(), unit.x(), unit.y(), Float.MAX_VALUE)){
-            target = null;
-        }
-
-        if(retarget()){
-            targetClosest();
-        }
+    public void updateMovement(){
 
         Building core = unit.closestEnemyCore();
 
-        if(core != null){
-            if(unit.within(core,unit.range() / 1.1f)){
-                target = core;
+        if(core != null && unit.within(core, unit.range() / 1.1f + core.block.size * tilesize / 2f)){
+            target = core;
+            Arrays.fill(targets, core);
+        }
+
+        if((core == null || !unit.within(core, unit.range() * 0.5f)) && command() == UnitCommand.attack){
+            boolean move = true;
+
+            if(state.rules.waves && unit.team == state.rules.defaultTeam){
+                Tile spawner = getClosestSpawner();
+                if(spawner != null && unit.within(spawner, state.rules.dropZoneRadius + 120f)) move = false;
             }
 
-            if(!unit.within(core, unit.range() * 0.5f)){
-                moveToCore(FlagTarget.enemyCores);
+            if(move) moveTo(Pathfinder.fieldCore);
+        }
+
+        if(command() == UnitCommand.rally){
+            Teamc target = targetFlag(unit.x, unit.y, BlockFlag.rally, false);
+
+            if(target != null && !unit.within(target, 70f)){
+                moveTo(Pathfinder.fieldRally);
             }
         }
 
-        boolean rotate = false, shoot = false;
-
-        if(!Units.invalidateTarget(target, unit, unit.range())){
-            rotate = true;
-            shoot = unit.within(target, unit.range());
+        if(unit.type().canBoost && unit.tileOn() != null && !unit.tileOn().solid()){
+            unit.elevation = Mathf.approachDelta(unit.elevation, 0f, 0.08f);
+        }
 
+        if(!Units.invalidateTarget(target, unit, unit.range()) && unit.type().rotateShooting){
             if(unit.type().hasWeapons()){
-                unit.aimLook(Predict.intercept(unit, target, unit.type().weapons.first().bullet.speed));
+                unit.lookAt(Predict.intercept(unit, target, unit.type().weapons.first().bullet.speed));
             }
         }else if(unit.moving()){
             unit.lookAt(unit.vel().angle());
         }
 
-        unit.controlWeapons(rotate, shoot);
+        //auto-command works but it's very buggy
+        /*
+        if(unit instanceof Commanderc){
+            Commanderc c = (Commanderc)unit;
+            //try to command when missing members
+            if(c.controlling().size <= unit.type().commandLimit/2){
+                commandTimer -= Time.delta;
+
+                if(commandTimer <= 0){
+                    c.commandNearby(new SquareFormation(), u -> !(u.controller() instanceof FormationAI) && !(u instanceof Commanderc));
+                    commandTimer = commandCooldown;
+                }
+            }
+        }*/
     }
 
-    protected void moveToCore(FlagTarget path){
-        Tile tile = unit.tileOn();
-        if(tile == null) return;
-        Tile targetTile = pathfinder.getTargetTile(tile, unit.team(), path);
-
-        if(tile == targetTile) return;
-
-        unit.moveAt(vec.trns(unit.angleTo(targetTile), unit.type().speed));
-    }
-
-    protected void moveAwayFromCore(){
-        Team enemy = null;
-        for(Team team : unit.team().enemies()){
-            if(team.active()){
-                enemy = team;
-                break;
-            }
-        }
-
-        if(enemy == null){
-            for(Team team : unit.team().enemies()){
-                enemy = team;
-                break;
-            }
-        }
-
-        if(enemy == null) return;
+    protected void moveTo(int pathTarget){
+        int costType = unit.pathType();
 
         Tile tile = unit.tileOn();
         if(tile == null) return;
-        Tile targetTile = pathfinder.getTargetTile(tile, enemy, FlagTarget.enemyCores);
-        Building core = unit.closestCore();
+        Tile targetTile = pathfinder.getTargetTile(tile, pathfinder.getField(unit.team, costType, pathTarget));
 
-        if(tile == targetTile || core == null || unit.within(core, 120f)) return;
+        if(tile == targetTile || (costType == Pathfinder.costWater && !targetTile.floor().isLiquid)) return;
 
         unit.moveAt(vec.trns(unit.angleTo(targetTile), unit.type().speed));
     }
diff --git a/core/src/mindustry/ai/types/MinerAI.java b/core/src/mindustry/ai/types/MinerAI.java
new file mode 100644
index 0000000000..c4e654ce29
--- /dev/null
+++ b/core/src/mindustry/ai/types/MinerAI.java
@@ -0,0 +1,83 @@
+package mindustry.ai.types;
+
+import mindustry.content.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class MinerAI extends AIController{
+    boolean mining = true;
+    Item targetItem;
+    Tile ore;
+
+    @Override
+    protected void updateMovement(){
+        Building core = unit.closestCore();
+
+        if(!(unit instanceof Minerc) || core == null) return;
+
+        Minerc miner = (Minerc)unit;
+
+        if(miner.mineTile() != null && !miner.mineTile().within(unit, unit.type().range)){
+            miner.mineTile(null);
+        }
+
+        if(mining){
+            targetItem = unit.team.data().mineItems.min(i -> indexer.hasOre(i) && miner.canMine(i), i -> core.items.get(i));
+
+            //core full of the target item, do nothing
+            if(targetItem != null && core.acceptStack(targetItem, 1, unit) == 0){
+                unit.clearItem();
+                miner.mineTile(null);
+                return;
+            }
+
+            //if inventory is full, drop it off.
+            if(unit.stack.amount >= unit.type().itemCapacity || (targetItem != null && !unit.acceptsItem(targetItem))){
+                mining = false;
+            }else{
+                if(retarget() && targetItem != null){
+                    ore = indexer.findClosestOre(unit.x, unit.y, targetItem);
+                }
+
+                if(ore != null){
+                    moveTo(ore, unit.type().range / 2f);
+
+                    if(unit.within(ore, unit.type().range)){
+                        miner.mineTile(ore);
+                    }
+
+                    if(ore.block() != Blocks.air){
+                        mining = false;
+                    }
+                }
+            }
+        }else{
+            miner.mineTile(null);
+
+            if(unit.stack.amount == 0){
+                mining = true;
+                return;
+            }
+
+            if(unit.within(core, unit.type().range)){
+                if(core.acceptStack(unit.stack.item, unit.stack.amount, unit) > 0){
+                    Call.transferItemTo(unit.stack.item, unit.stack.amount, unit.x, unit.y, core);
+                }
+
+                unit.clearItem();
+                mining = true;
+            }
+
+            circle(core, unit.type().range / 1.8f);
+        }
+    }
+
+    @Override
+    protected void updateTargeting(){
+    }
+
+}
diff --git a/core/src/mindustry/ai/types/RepairAI.java b/core/src/mindustry/ai/types/RepairAI.java
new file mode 100644
index 0000000000..84baf1c555
--- /dev/null
+++ b/core/src/mindustry/ai/types/RepairAI.java
@@ -0,0 +1,34 @@
+package mindustry.ai.types;
+
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.world.blocks.ConstructBlock.*;
+
+//note that repair AI doesn't attack anything even if it theoretically can
+public class RepairAI extends AIController{
+
+    @Override
+    protected void updateMovement(){
+        boolean shoot = false;
+
+        if(target != null){
+            if(!target.within(unit, unit.type().range * 0.8f)){
+                moveTo(target, unit.type().range * 0.8f);
+            }
+
+            if(target.within(unit, unit.type().range)){
+                unit.aim(target);
+                shoot = true;
+            }
+        }
+
+        unit.controlWeapons(shoot);
+    }
+
+    @Override
+    protected void updateTargeting(){
+        target = Units.findDamagedTile(unit.team, unit.x, unit.y);
+
+        if(target instanceof ConstructBuild) target = null;
+    }
+}
diff --git a/core/src/mindustry/ai/types/SuicideAI.java b/core/src/mindustry/ai/types/SuicideAI.java
index 57638d7597..93ab98a7c0 100644
--- a/core/src/mindustry/ai/types/SuicideAI.java
+++ b/core/src/mindustry/ai/types/SuicideAI.java
@@ -1,10 +1,12 @@
 package mindustry.ai.types;
 
 import mindustry.*;
-import mindustry.ai.Pathfinder.*;
+import mindustry.ai.*;
 import mindustry.entities.*;
+import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 public class SuicideAI extends GroundAI{
     static boolean blockedByBlock;
@@ -17,17 +19,17 @@ public class SuicideAI extends GroundAI{
         }
 
         if(retarget()){
-            targetClosest();
+            target = target(unit.x, unit.y, unit.range(), unit.type().targetAir, unit.type().targetGround);
         }
 
         Building core = unit.closestEnemyCore();
 
-        boolean rotate = false, shoot = false;
+        boolean rotate = false, shoot = false, moveToTarget = false;
 
         if(!Units.invalidateTarget(target, unit, unit.range())){
             rotate = true;
             shoot = unit.within(target, unit.type().weapons.first().bullet.range() +
-                (target instanceof Building ? ((Building)target).block().size * Vars.tilesize / 2f : ((Hitboxc)target).hitSize() / 2f));
+                (target instanceof Building ? ((Building)target).block.size * Vars.tilesize / 2f : ((Hitboxc)target).hitSize() / 2f));
 
             if(unit.type().hasWeapons()){
                 unit.aimLook(Predict.intercept(unit, target, unit.type().weapons.first().bullet.speed));
@@ -39,7 +41,7 @@ public class SuicideAI extends GroundAI{
             boolean blocked = Vars.world.raycast(unit.tileX(), unit.tileY(), target.tileX(), target.tileY(), (x, y) -> {
                 Tile tile = Vars.world.tile(x, y);
                 if(tile != null && tile.build == target) return false;
-                if(tile != null && tile.build != null && tile.build.team() != unit.team()){
+                if(tile != null && tile.build != null && tile.build.team != unit.team()){
                     blockedByBlock = true;
                     return true;
                 }else{
@@ -53,13 +55,22 @@ public class SuicideAI extends GroundAI{
             }
 
             if(!blocked){
+                moveToTarget = true;
                 //move towards target directly
                 unit.moveAt(vec.set(target).sub(unit).limit(unit.type().speed));
             }
 
-        }else{
-            if(core != null){
-                moveToCore(FlagTarget.enemyCores);
+        }
+
+        if(!moveToTarget){
+            if(command() == UnitCommand.rally){
+                Teamc target = targetFlag(unit.x, unit.y, BlockFlag.rally, false);
+
+                if(target != null && !unit.within(target, 70f)){
+                    moveTo(Pathfinder.fieldRally);
+                }
+            }else if(command() == UnitCommand.attack && core != null){
+                moveTo(Pathfinder.fieldCore);
             }
 
             if(unit.moving()) unit.lookAt(unit.vel().angle());
diff --git a/core/src/mindustry/async/PhysicsProcess.java b/core/src/mindustry/async/PhysicsProcess.java
index 46946fd3de..9a075f8f40 100644
--- a/core/src/mindustry/async/PhysicsProcess.java
+++ b/core/src/mindustry/async/PhysicsProcess.java
@@ -1,32 +1,25 @@
 package mindustry.async;
 
-import arc.*;
-import arc.box2d.*;
-import arc.box2d.BodyDef.*;
+import arc.math.*;
 import arc.math.geom.*;
+import arc.math.geom.QuadTree.*;
 import arc.struct.*;
+import mindustry.*;
 import mindustry.entities.*;
+import mindustry.async.PhysicsProcess.PhysicsWorld.*;
 import mindustry.gen.*;
 
 public class PhysicsProcess implements AsyncProcess{
-    private Physics physics;
+    private static final int
+        layers = 3,
+        layerGround = 0,
+        layerLegs = 1,
+        layerFlying = 2;
+
+    private PhysicsWorld physics;
     private Seq<PhysicRef> refs = new Seq<>(false);
-    private BodyDef def;
-
-    private EntityGroup<? extends Physicsc> group;
-    private Filter flying = new Filter(){{
-        maskBits = categoryBits = 2;
-    }}, ground = new Filter(){{
-        maskBits = categoryBits = 1;
-    }};
-
-    public PhysicsProcess(){
-        def = new BodyDef();
-        def.type = BodyType.dynamicBody;
-
-        //currently only enabled for units
-        group = Groups.unit;
-    }
+    //currently only enabled for units
+    private EntityGroup<Unit> group = Groups.unit;
 
     @Override
     public void begin(){
@@ -35,46 +28,39 @@ public class PhysicsProcess implements AsyncProcess{
         //remove stale entities
         refs.removeAll(ref -> {
             if(!ref.entity.isAdded()){
-                physics.destroyBody(ref.body);
+                physics.remove(ref.body);
+                ref.entity.physref(null);
                 return true;
             }
             return false;
         });
 
-        //find entities without bodies and assign them
-        for(Physicsc entity : group){
-            boolean grounded = entity.isGrounded();
+        //find Unit without bodies and assign them
+        for(Unit entity : group){
 
             if(entity.physref() == null){
-                //add bodies to entities that have none
-                FixtureDef fd = new FixtureDef();
-                fd.shape = new CircleShape(entity.hitSize() / 2f);
-                fd.density = 5f;
-                fd.restitution = 0.0f;
-                fd.filter.maskBits = fd.filter.categoryBits = (grounded ? ground : flying).maskBits;
-
-                def.position.set(entity);
-
-                Body body = physics.createBody(def);
-                body.createFixture(fd);
+                PhysicsBody body = new PhysicsBody();
+                body.x = entity.x();
+                body.y = entity.y();
+                body.mass = entity.mass();
+                body.radius = entity.hitSize() / 2f;
 
                 PhysicRef ref = new PhysicRef(entity, body);
                 refs.add(ref);
 
                 entity.physref(ref);
+
+                physics.add(body);
             }
 
             //save last position
             PhysicRef ref = entity.physref();
 
-            if(ref.wasGround != grounded){
-                //set correct filter
-                ref.body.getFixtureList().first().setFilterData(grounded ? ground : flying);
-                ref.wasGround = grounded;
-            }
-
-            ref.velocity.set(entity.deltaX(), entity.deltaY());
-            ref.position.set(entity);
+            ref.body.layer =
+                entity.type().allowLegStep ? layerLegs :
+                entity.isGrounded() ? layerGround : layerFlying;
+            ref.x = entity.x();
+            ref.y = entity.y();
         }
     }
 
@@ -85,26 +71,11 @@ public class PhysicsProcess implements AsyncProcess{
         //get last position vectors before step
         for(PhysicRef ref : refs){
             //force set target position
-            ref.body.setPosition(ref.position.x, ref.position.y);
-
-            //save last position for delta
-            ref.lastPosition.set(ref.body.getPosition());
-
-            //write velocity
-            ref.body.setLinearVelocity(ref.velocity);
-
-            ref.lastVelocity.set(ref.velocity);
+            ref.body.x = ref.x;
+            ref.body.y = ref.y;
         }
 
-        physics.step(Core.graphics.getDeltaTime(), 5, 8);
-
-        //get delta vectors
-        for(PhysicRef ref : refs){
-            //get delta vector
-            ref.delta.set(ref.body.getPosition()).sub(ref.lastPosition);
-
-            ref.velocity.set(ref.body.getLinearVelocity());
-        }
+        physics.update();
     }
 
     @Override
@@ -115,13 +86,8 @@ public class PhysicsProcess implements AsyncProcess{
         for(PhysicRef ref : refs){
             Physicsc entity = ref.entity;
 
-            entity.move(ref.delta.x, ref.delta.y);
-
-            //save last position
-            ref.position.set(entity);
-
-            //add delta velocity - this doesn't work very well yet
-            //entity.vel().add(ref.velocity).sub(ref.lastVelocity);
+            //move by delta
+            entity.move(ref.body.x - ref.x, ref.body.y - ref.y);
         }
     }
 
@@ -129,7 +95,6 @@ public class PhysicsProcess implements AsyncProcess{
     public void reset(){
         if(physics != null){
             refs.clear();
-            physics.dispose();
             physics = null;
         }
     }
@@ -138,18 +103,95 @@ public class PhysicsProcess implements AsyncProcess{
     public void init(){
         reset();
 
-        physics = new Physics(new Vec2(), true);
+        physics = new PhysicsWorld(Vars.world.getQuadBounds(new Rect()));
     }
 
     public static class PhysicRef{
-        Physicsc entity;
-        Body body;
-        boolean wasGround = true;
-        Vec2 lastPosition = new Vec2(), delta = new Vec2(), velocity = new Vec2(), lastVelocity = new Vec2(), position = new Vec2();
+        public Physicsc entity;
+        public PhysicsBody body;
+        public float x, y;
 
-        public PhysicRef(Physicsc entity, Body body){
+        public PhysicRef(Physicsc entity, PhysicsBody body){
             this.entity = entity;
             this.body = body;
         }
     }
+
+    //world for simulating physics in a different thread
+    public static class PhysicsWorld{
+        //how much to soften movement by
+        private static final float scl = 1.25f;
+
+        private final QuadTree<PhysicsBody>[] trees = new QuadTree[layers];
+        private final Seq<PhysicsBody> bodies = new Seq<>(false, 16, PhysicsBody.class);
+        private final Seq<PhysicsBody> seq = new Seq<>(PhysicsBody.class);
+        private final Rect rect = new Rect();
+        private final Vec2 vec = new Vec2();
+
+        public PhysicsWorld(Rect bounds){
+            for(int i = 0; i < layers; i++){
+                trees[i] = new QuadTree<>(new Rect(bounds));
+            }
+        }
+
+        public void add(PhysicsBody body){
+            bodies.add(body);
+        }
+
+        public void remove(PhysicsBody body){
+            bodies.remove(body);
+        }
+
+        public void update(){
+            for(int i = 0; i < layers; i++){
+                trees[i].clear();
+            }
+
+            for(int i = 0; i < bodies.size; i++){
+                PhysicsBody body = bodies.items[i];
+                body.collided = false;
+                trees[body.layer].insert(body);
+            }
+
+            for(int i = 0; i < bodies.size; i++){
+                PhysicsBody body = bodies.items[i];
+                body.hitbox(rect);
+
+                seq.size = 0;
+                trees[body.layer].intersect(rect, seq);
+
+                for(int j = 0; j < seq.size; j++){
+                    PhysicsBody other = seq.items[j];
+
+                    if(other == body || other.collided) continue;
+
+                    float rs = body.radius + other.radius;
+                    float dst = Mathf.dst(body.x, body.y, other.x, other.y);
+
+                    if(dst < rs){
+                        vec.set(body.x - other.x, body.y - other.y).setLength(rs - dst);
+                        float ms = body.mass + other.mass;
+                        float m1 = other.mass / ms, m2 = body.mass / ms;
+
+                        body.x += vec.x * m1 / scl;
+                        body.y += vec.y * m1 / scl;
+                        other.x -= vec.x * m2 / scl;
+                        other.y -= vec.y * m2 / scl;
+                    }
+                }
+                body.collided = true;
+            }
+        }
+
+        public static class PhysicsBody implements QuadTreeObject{
+            public float x, y, radius, mass;
+            public int layer = 0;
+            public boolean collided = false;
+
+            @Override
+            public void hitbox(Rect out){
+                out.setCentered(x, y, radius * 2, radius * 2);
+            }
+        }
+    }
 }
diff --git a/core/src/mindustry/async/TeamIndexProcess.java b/core/src/mindustry/async/TeamIndexProcess.java
index c4dbede3a7..13a234bbbc 100644
--- a/core/src/mindustry/async/TeamIndexProcess.java
+++ b/core/src/mindustry/async/TeamIndexProcess.java
@@ -5,6 +5,7 @@ import mindustry.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.type.*;
+import mindustry.world.blocks.payloads.*;
 
 import java.util.*;
 
@@ -13,7 +14,6 @@ public class TeamIndexProcess implements AsyncProcess{
     private QuadTree<Unit>[] trees = new QuadTree[Team.all.length];
     private int[] counts = new int[Team.all.length];
     private int[][] typeCounts = new int[Team.all.length][0];
-    private int[][] activeCounts = new int[Team.all.length][0];
 
     public QuadTree<Unit> tree(Team team){
         if(trees[team.id] == null) trees[team.id] = new QuadTree<>(Vars.world.getQuadBounds(new Rect()));
@@ -29,10 +29,6 @@ public class TeamIndexProcess implements AsyncProcess{
         return typeCounts[team.id].length <= type.id ? 0 : typeCounts[team.id][type.id];
     }
 
-    public int countActive(Team team, UnitType type){
-        return activeCounts[team.id].length <= type.id ? 0 : activeCounts[team.id][type.id];
-    }
-
     public void updateCount(Team team, UnitType type, int amount){
         counts[team.id] += amount;
         if(typeCounts[team.id].length <= type.id){
@@ -41,11 +37,16 @@ public class TeamIndexProcess implements AsyncProcess{
         typeCounts[team.id][type.id] += amount;
     }
 
-    public void updateActiveCount(Team team, UnitType type, int amount){
-        if(activeCounts[team.id].length <= type.id){
-            activeCounts[team.id] = new int[Vars.content.units().size];
+    private void count(Unit unit){
+        updateCount(unit.team, unit.type(), 1);
+
+        if(unit instanceof Payloadc){
+            ((Payloadc)unit).payloads().each(p -> {
+                if(p instanceof UnitPayload){
+                    count(((UnitPayload)p).unit);
+                }
+            });
         }
-        activeCounts[team.id][type.id] += amount;
     }
 
     @Override
@@ -63,7 +64,6 @@ public class TeamIndexProcess implements AsyncProcess{
             }
 
             Arrays.fill(typeCounts[team.id], 0);
-            Arrays.fill(activeCounts[team.id], 0);
         }
 
         Arrays.fill(counts, 0);
@@ -71,8 +71,7 @@ public class TeamIndexProcess implements AsyncProcess{
         for(Unit unit : Groups.unit){
             tree(unit.team).insert(unit);
 
-            updateCount(unit.team, unit.type(), 1);
-            if(!unit.deactivated) updateActiveCount(unit.team, unit.type(), 1);
+            count(unit);
         }
     }
 
diff --git a/core/src/mindustry/audio/MusicControl.java b/core/src/mindustry/audio/MusicControl.java
index afb48a8d59..1b642bc7cd 100644
--- a/core/src/mindustry/audio/MusicControl.java
+++ b/core/src/mindustry/audio/MusicControl.java
@@ -19,6 +19,7 @@ public class MusicControl{
     public Seq<Music> ambientMusic = Seq.with();
     /** darker music, used in times of conflict  */
     public Seq<Music> darkMusic = Seq.with();
+
     protected Music lastRandomPlayed;
     protected Interval timer = new Interval();
     protected @Nullable Music current;
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 33a53969be..b3ff2389c2 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -18,6 +18,7 @@ import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.experimental.*;
 import mindustry.world.blocks.legacy.*;
 import mindustry.world.blocks.liquid.*;
+import mindustry.world.blocks.logic.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.production.*;
 import mindustry.world.blocks.sandbox.*;
@@ -33,10 +34,10 @@ public class Blocks implements ContentList{
     public static Block
 
     //environment
-    air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, ice, snow, darksandTaintedWater,
-    holostone, rocks, sporerocks, icerocks, cliffs, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
-    iceSnow, sandWater, darksandWater, duneRocks, sandRocks, moss, sporeMoss, shale, shaleRocks, shaleBoulder, sandBoulder, grass, salt,
-    metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks, rock, snowrock, saltRocks,
+    air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater,
+    dacite, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
+    iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, grass, salt,
+    metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, basalt, magmarock, hotrock, snowWall, boulder, snowBoulder, saltWall,
     darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
     pebbles, tendrils,
 
@@ -48,11 +49,11 @@ public class Blocks implements ContentList{
     melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
 
     //sandbox
-    powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, message, illuminator,
+    powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, illuminator,
 
     //defense
     copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
-    phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, largeOverdriveProjector, forceProjector, shockMine,
+    phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, overdriveDome, forceProjector, shockMine,
     scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
 
     //transport
@@ -63,7 +64,7 @@ public class Blocks implements ContentList{
     mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
 
     //power
-    combustionGenerator, thermalGenerator, turbineGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
+    combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
     impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower, diode,
 
     //production
@@ -73,15 +74,19 @@ public class Blocks implements ContentList{
     coreShard, coreFoundation, coreNucleus, vault, container, unloader,
 
     //turrets
-    duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, segment, parallax,
+    duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami,
 
     //units
+    commandCenter,
     groundFactory, airFactory, navalFactory,
     additiveReconstructor, multiplicativeReconstructor, exponentialReconstructor, tetrativeReconstructor,
     repairPoint, resupplyPoint,
 
+    //logic
+    message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
+
     //campaign
-    launchPad, launchPadLarge, dataProcessor,
+    launchPad, launchPadLarge,
 
     //misc experimental
     blockForge, blockLoader, blockUnloader;
@@ -96,13 +101,12 @@ public class Blocks implements ContentList{
                 hasShadow = false;
             }
 
-            public void drawBase(Tile tile){}
-            public void load(){}
-            public void init(){}
-            public boolean isHidden(){
-                return true;
-            }
+            @Override public void drawBase(Tile tile){}
+            @Override public void load(){}
+            @Override public void init(){}
+            @Override public boolean isHidden(){ return true; }
 
+            @Override
             public TextureRegion[] variantRegions(){
                 if(variantRegions == null){
                     variantRegions = new TextureRegion[]{Core.atlas.find("clear")};
@@ -121,18 +125,20 @@ public class Blocks implements ContentList{
 
         cliff = new Cliff("cliff"){{
             inEditor = false;
+            saveData = true;
         }};
 
         //Registers build blocks
         //no reference is needed here since they can be looked up by name later
-        for(int i = 1; i <= BuildBlock.maxSize; i++){
-            new BuildBlock(i);
+        for(int i = 1; i <= ConstructBlock.maxSize; i++){
+            new ConstructBlock(i);
         }
 
         deepwater = new Floor("deepwater"){{
             speedMultiplier = 0.2f;
             variants = 0;
             liquidDrop = Liquids.water;
+            liquidMultiplier = 1.5f;
             isLiquid = true;
             status = StatusEffects.wet;
             statusDuration = 120f;
@@ -202,11 +208,14 @@ public class Blocks implements ContentList{
             liquidDrop = Liquids.slag;
             isLiquid = true;
             cacheLayer = CacheLayer.slag;
+            attributes.set(Attribute.heat, 0.85f);
+
+            emitLight = true;
+            lightRadius = 40f;
+            lightColor = Color.orange.cpy().a(0.38f);
         }};
 
-        stone = new Floor("stone"){{
-
-        }};
+        stone = new Floor("stone");
 
         craters = new Floor("craters"){{
             variants = 3;
@@ -217,14 +226,14 @@ public class Blocks implements ContentList{
             blendGroup = stone;
         }};
 
-        ignarock = new Floor("ignarock"){{
-            attributes.set(Attribute.water, -0.1f);
+        basalt = new Floor("basalt"){{
+            attributes.set(Attribute.water, -0.25f);
         }};
 
         hotrock = new Floor("hotrock"){{
             attributes.set(Attribute.heat, 0.5f);
-            attributes.set(Attribute.water, -0.2f);
-            blendGroup = ignarock;
+            attributes.set(Attribute.water, -0.5f);
+            blendGroup = basalt;
 
             emitLight = true;
             lightRadius = 30f;
@@ -233,40 +242,53 @@ public class Blocks implements ContentList{
 
         magmarock = new Floor("magmarock"){{
             attributes.set(Attribute.heat, 0.75f);
-            attributes.set(Attribute.water, -0.5f);
+            attributes.set(Attribute.water, -0.75f);
             updateEffect = Fx.magmasmoke;
-            blendGroup = ignarock;
+            blendGroup = basalt;
 
             emitLight = true;
-            lightRadius = 60f;
+            lightRadius = 50f;
             lightColor = Color.orange.cpy().a(0.3f);
         }};
 
         sand = new Floor("sand"){{
             itemDrop = Items.sand;
             playerUnmineable = true;
+            attributes.set(Attribute.oil, 0.7f);
         }};
 
         darksand = new Floor("darksand"){{
             itemDrop = Items.sand;
             playerUnmineable = true;
+            attributes.set(Attribute.oil, 1.5f);
+        }};
+
+        dirt = new Floor("dirt");
+
+        mud = new Floor("mud"){{
+            speedMultiplier = 0.6f;
+            variants = 3;
+            status = StatusEffects.muddy;
+            statusDuration = 30f;
+            attributes.set(Attribute.water, 1f);
+            cacheLayer = CacheLayer.mud;
+            albedo = 0.35f;
         }};
 
         ((ShallowLiquid)darksandTaintedWater).set(Blocks.taintedWater, Blocks.darksand);
         ((ShallowLiquid)sandWater).set(Blocks.water, Blocks.sand);
         ((ShallowLiquid)darksandWater).set(Blocks.water, Blocks.darksand);
 
-        holostone = new Floor("holostone"){{
-
-        }};
+        dacite = new Floor("dacite");
 
         grass = new Floor("grass"){{
-
+            attributes.set(Attribute.water, 0.1f);
         }};
 
         salt = new Floor("salt"){{
             variants = 0;
-            attributes.set(Attribute.water, -0.2f);
+            attributes.set(Attribute.water, -0.25f);
+            attributes.set(Attribute.oil, 0.3f);
         }};
 
         snow = new Floor("snow"){{
@@ -285,46 +307,51 @@ public class Blocks implements ContentList{
             attributes.set(Attribute.water, 0.3f);
         }};
 
-        cliffs = new StaticWall("cliffs"){{
-            variants = 1;
-            fillsTile = false;
-        }};
-
-        rocks = new StaticWall("rocks"){{
+        stoneWall = new StaticWall("stone-wall"){{
             variants = 2;
         }};
 
-        sporerocks = new StaticWall("sporerocks"){{
+        sporeWall = new StaticWall("spore-wall"){{
             variants = 2;
         }};
 
-        rock = new Rock("rock"){{
+        boulder = new Boulder("boulder"){{
             variants = 2;
         }};
 
-        snowrock = new Rock("snowrock"){{
+        snowBoulder = new Boulder("snow-boulder"){{
+            variants = 2;
+            snow.asFloor().decoration = ice.asFloor().decoration = iceSnow.asFloor().decoration = this;
+        }};
+
+        dirtWall = new StaticWall("dirt-wall"){{
             variants = 2;
         }};
 
-        icerocks = new StaticWall("icerocks"){{
+        daciteWall = new StaticWall("dacite-wall"){{
+            variants = 2;
+        }};
+
+        iceWall = new StaticWall("ice-wall"){{
             variants = 2;
             iceSnow.asFloor().wall = this;
         }};
 
-        snowrocks = new StaticWall("snowrocks"){{
+        snowWall = new StaticWall("snow-wall"){{
             variants = 2;
         }};
 
-        duneRocks = new StaticWall("dunerocks"){{
+        duneWall = new StaticWall("dune-wall"){{
             variants = 2;
+            basalt.asFloor().wall = darksandWater.asFloor().wall = darksandTaintedWater.asFloor().wall = this;
         }};
 
-        sandRocks = new StaticWall("sandrocks"){{
+        sandWall = new StaticWall("sand-wall"){{
             variants = 2;
+            sandWater.asFloor().wall = this;
         }};
 
-        saltRocks = new StaticWall("saltrocks"){{
-        }};
+        saltWall = new StaticWall("salt-wall");
 
         sporePine = new StaticTree("spore-pine"){{
             variants = 0;
@@ -338,34 +365,34 @@ public class Blocks implements ContentList{
             variants = 0;
         }};
 
-        shrubs = new StaticWall("shrubs"){{
+        shrubs = new StaticWall("shrubs");
 
-        }};
+        whiteTreeDead = new TreeBlock("white-tree-dead");
 
-        whiteTreeDead = new TreeBlock("white-tree-dead"){{
-        }};
+        whiteTree = new TreeBlock("white-tree");
 
-        whiteTree = new TreeBlock("white-tree"){{
-        }};
-
-        sporeCluster = new Rock("spore-cluster"){{
+        sporeCluster = new Boulder("spore-cluster"){{
             variants = 3;
         }};
 
         shale = new Floor("shale"){{
             variants = 3;
-            attributes.set(Attribute.oil, 0.15f);
+            attributes.set(Attribute.oil, 1f);
         }};
 
-        shaleRocks = new StaticWall("shalerocks"){{
+        shaleWall = new StaticWall("shale-wall"){{
             variants = 2;
         }};
 
-        shaleBoulder = new Rock("shale-boulder"){{
+        shaleBoulder = new Boulder("shale-boulder"){{
             variants = 2;
         }};
 
-        sandBoulder = new Rock("sand-boulder"){{
+        sandBoulder = new Boulder("sand-boulder"){{
+            variants = 2;
+        }};
+
+        daciteBoulder = new Boulder("dacite-boulder"){{
             variants = 2;
         }};
 
@@ -378,7 +405,7 @@ public class Blocks implements ContentList{
         sporeMoss = new Floor("spore-moss"){{
             variants = 3;
             attributes.set(Attribute.spores, 0.3f);
-            wall = sporerocks;
+            wall = sporeWall;
         }};
 
         metalFloor = new Floor("metal-floor"){{
@@ -497,8 +524,8 @@ public class Blocks implements ContentList{
         siliconCrucible = new AttributeSmelter("silicon-crucible"){{
             requirements(Category.crafting, with(Items.titanium, 120, Items.metaglass, 80, Items.plastanium, 35, Items.silicon, 60));
             craftEffect = Fx.smeltsmoke;
-            outputItem = new ItemStack(Items.silicon, 5);
-            craftTime = 140f;
+            outputItem = new ItemStack(Items.silicon, 8);
+            craftTime = 90f;
             size = 3;
             hasPower = true;
             hasLiquids = false;
@@ -506,7 +533,7 @@ public class Blocks implements ContentList{
             itemCapacity = 30;
             boostScale = 0.15f;
 
-            consumes.items(new ItemStack(Items.coal, 3), new ItemStack(Items.sand, 6), new ItemStack(Items.pyratite, 1));
+            consumes.items(new ItemStack(Items.coal, 4), new ItemStack(Items.sand, 6), new ItemStack(Items.pyratite, 1));
             consumes.power(4f);
         }};
 
@@ -567,7 +594,7 @@ public class Blocks implements ContentList{
             consumes.items(new ItemStack(Items.copper, 3), new ItemStack(Items.lead, 4), new ItemStack(Items.titanium, 2), new ItemStack(Items.silicon, 3));
         }};
 
-        cryofluidMixer = new LiquidConverter("cryofluidmixer"){{
+        cryofluidMixer = new LiquidConverter("cryofluid-mixer"){{
             requirements(Category.crafting, with(Items.lead, 65, Items.silicon, 40, Items.titanium, 60));
             outputLiquid = new LiquidStack(Liquids.cryofluid, 0.2f);
             craftTime = 120f;
@@ -757,14 +784,14 @@ public class Blocks implements ContentList{
         phaseWall = new Wall("phase-wall"){{
             requirements(Category.defense, with(Items.phasefabric, 6));
             health = 150 * wallHealthMultiplier;
-            flashWhite = deflect = true;
+            flashHit = deflect = true;
         }};
 
         phaseWallLarge = new Wall("phase-wall-large"){{
             requirements(Category.defense, ItemStack.mult(phaseWall.requirements, 4));
             health = 150 * 4 * wallHealthMultiplier;
             size = 2;
-            flashWhite = deflect = true;
+            flashHit = deflect = true;
         }};
 
         surgeWall = new Wall("surge-wall"){{
@@ -781,7 +808,7 @@ public class Blocks implements ContentList{
         }};
 
         door = new Door("door"){{
-            requirements(Category.defense, with(Items.graphite, 6, Items.silicon, 4));
+            requirements(Category.defense, with(Items.titanium, 6, Items.silicon, 4));
             health = 100 * wallHealthMultiplier;
         }};
 
@@ -843,7 +870,8 @@ public class Blocks implements ContentList{
             size = 2;
             reload = 250f;
             range = 85f;
-            healPercent = 14f;
+            healPercent = 11f;
+            phaseBoost = 15f;
             health = 80 * size * size;
             consumes.item(Items.phasefabric).boost();
         }};
@@ -855,8 +883,7 @@ public class Blocks implements ContentList{
             consumes.item(Items.phasefabric).boost();
         }};
 
-        //TODO better name
-        largeOverdriveProjector = new OverdriveProjector("large-overdrive-projector"){{
+        overdriveDome = new OverdriveProjector("overdrive-dome"){{
             requirements(Category.effect, with(Items.lead, 200, Items.titanium, 130, Items.silicon, 130, Items.plastanium, 80, Items.surgealloy, 120));
             consumes.power(10f);
             size = 3;
@@ -885,10 +912,10 @@ public class Blocks implements ContentList{
             requirements(Category.effect, with(Items.lead, 25, Items.silicon, 12));
             hasShadow = false;
             health = 40;
-            damage = 11;
+            damage = 23;
             tileDamage = 7f;
             length = 10;
-            tendrils = 5;
+            tendrils = 4;
         }};
 
         //endregion
@@ -899,6 +926,7 @@ public class Blocks implements ContentList{
             health = 45;
             speed = 0.03f;
             displayedSpeed = 4.2f;
+            buildCostMultiplier = 2f;
         }};
 
         titaniumConveyor = new Conveyor("titanium-conveyor"){{
@@ -911,8 +939,8 @@ public class Blocks implements ContentList{
         plastaniumConveyor = new StackConveyor("plastanium-conveyor"){{
             requirements(Category.distribution, with(Items.plastanium, 1, Items.silicon, 1, Items.graphite, 1));
             health = 75;
-            speed = 2.5f / 60f;
-            recharge = 2f;
+            speed = 4f / 60f;
+            itemCapacity = 10;
         }};
 
         armoredConveyor = new ArmoredConveyor("armored-conveyor"){{
@@ -986,12 +1014,14 @@ public class Blocks implements ContentList{
             consumes.power(1.75f);
         }};
 
-        payloadConveyor = new PayloadConveyor("mass-conveyor"){{
-            requirements(Category.distribution, with(Items.copper, 1));
+        payloadConveyor = new PayloadConveyor("payload-conveyor"){{
+            requirements(Category.distribution, with(Items.graphite, 10, Items.copper, 20));
+            canOverdrive = false;
         }};
 
         payloadRouter = new PayloadRouter("payload-router"){{
-            requirements(Category.distribution, with(Items.copper, 1));
+            requirements(Category.distribution, with(Items.graphite, 15, Items.copper, 20));
+            canOverdrive = false;
         }};
 
         //endregion
@@ -999,7 +1029,7 @@ public class Blocks implements ContentList{
 
         mechanicalPump = new Pump("mechanical-pump"){{
             requirements(Category.liquid, with(Items.copper, 15, Items.metaglass, 10));
-            pumpAmount = 0.1f;
+            pumpAmount = 0.11f;
         }};
 
         rotaryPump = new Pump("rotary-pump"){{
@@ -1074,14 +1104,14 @@ public class Blocks implements ContentList{
 
         powerNode = new PowerNode("power-node"){{
             requirements(Category.power, with(Items.copper, 1, Items.lead, 3));
-            maxNodes = 20;
+            maxNodes = 10;
             laserRange = 6;
         }};
 
         powerNodeLarge = new PowerNode("power-node-large"){{
             requirements(Category.power, with(Items.titanium, 5, Items.lead, 10, Items.silicon, 3));
             size = 2;
-            maxNodes = 30;
+            maxNodes = 15;
             laserRange = 9.5f;
         }};
 
@@ -1118,45 +1148,46 @@ public class Blocks implements ContentList{
             powerProduction = 1.8f;
             generateEffect = Fx.redgeneratespark;
             size = 2;
+            floating = true;
         }};
 
-        turbineGenerator = new BurnerGenerator("turbine-generator"){{
+        steamGenerator = new BurnerGenerator("steam-generator"){{
             requirements(Category.power, with(Items.copper, 35, Items.graphite, 25, Items.lead, 40, Items.silicon, 30));
-            powerProduction = 6f;
+            powerProduction = 5.5f;
             itemDuration = 90f;
-            consumes.liquid(Liquids.water, 0.05f);
+            consumes.liquid(Liquids.water, 0.1f);
             hasLiquids = true;
             size = 2;
         }};
 
         differentialGenerator = new SingleTypeGenerator("differential-generator"){{
             requirements(Category.power, with(Items.copper, 70, Items.titanium, 50, Items.lead, 100, Items.silicon, 65, Items.metaglass, 50));
-            powerProduction = 17f;
-            itemDuration = 200f;
+            powerProduction = 18f;
+            itemDuration = 220f;
             hasLiquids = true;
             hasItems = true;
             size = 3;
 
             consumes.item(Items.pyratite).optional(true, false);
-            consumes.liquid(Liquids.cryofluid, 0.14f);
+            consumes.liquid(Liquids.cryofluid, 0.1f);
         }};
 
         rtgGenerator = new DecayGenerator("rtg-generator"){{
             requirements(Category.power, with(Items.lead, 100, Items.silicon, 75, Items.phasefabric, 25, Items.plastanium, 75, Items.thorium, 50));
             size = 2;
-            powerProduction = 4f;
-            itemDuration = 500f;
+            powerProduction = 4.5f;
+            itemDuration = 60 * 15f;
         }};
 
         solarPanel = new SolarGenerator("solar-panel"){{
             requirements(Category.power, with(Items.lead, 10, Items.silicon, 15));
-            powerProduction = 0.06f;
+            powerProduction = 0.07f;
         }};
 
         largeSolarPanel = new SolarGenerator("solar-panel-large"){{
             requirements(Category.power, with(Items.lead, 100, Items.silicon, 145, Items.phasefabric, 15));
             size = 3;
-            powerProduction = 0.9f;
+            powerProduction = 0.95f;
         }};
 
         thoriumReactor = new NuclearReactor("thorium-reactor"){{
@@ -1164,7 +1195,7 @@ public class Blocks implements ContentList{
             size = 3;
             health = 700;
             itemDuration = 360f;
-            powerProduction = 14f;
+            powerProduction = 15f;
             consumes.item(Items.thorium);
             heating = 0.02f;
             consumes.liquid(Liquids.cryofluid, heating / coolantPower).update(false);
@@ -1244,7 +1275,7 @@ public class Blocks implements ContentList{
             rotateSpeed = 1.4f;
             attribute = Attribute.water;
 
-            consumes.power(1f);
+            consumes.power(1.5f);
         }};
 
         cultivator = new Cultivator("cultivator"){{
@@ -1257,7 +1288,7 @@ public class Blocks implements ContentList{
             hasItems = true;
 
             consumes.power(0.80f);
-            consumes.liquid(Liquids.water, 0.18f);
+            consumes.liquid(Liquids.water, 0.2f);
         }};
 
         oilExtractor = new Fracker("oil-extractor"){{
@@ -1270,6 +1301,8 @@ public class Blocks implements ContentList{
             size = 3;
             liquidCapacity = 30f;
             attribute = Attribute.oil;
+            baseEfficiency = 0f;
+            itemUseTime = 60f;
 
             consumes.item(Items.sand);
             consumes.power(3f);
@@ -1280,7 +1313,7 @@ public class Blocks implements ContentList{
         //region storage
 
         coreShard = new CoreBlock("core-shard"){{
-            requirements(Category.effect, BuildVisibility.hidden, with(Items.copper, 1000, Items.lead, 1000));
+            requirements(Category.effect, BuildVisibility.hidden, with(Items.copper, 2000, Items.lead, 1000));
             alwaysUnlocked = true;
 
             unitType = UnitTypes.alpha;
@@ -1295,39 +1328,42 @@ public class Blocks implements ContentList{
             requirements(Category.effect, with(Items.copper, 3000, Items.lead, 3000, Items.silicon, 2000));
 
             unitType = UnitTypes.beta;
-            health = 2000;
+            health = 3500;
             itemCapacity = 9000;
             size = 4;
 
-            unitCapModifier = 16;
+            unitCapModifier = 14;
         }};
 
         coreNucleus = new CoreBlock("core-nucleus"){{
-            requirements(Category.effect, with(Items.copper, 1000, Items.lead, 1000));
+            requirements(Category.effect, with(Items.copper, 8000, Items.lead, 8000, Items.silicon, 5000, Items.thorium, 4000));
 
             unitType = UnitTypes.gamma;
-            health = 4000;
+            health = 6000;
             itemCapacity = 13000;
             size = 5;
 
-            unitCapModifier = 24;
+            unitCapModifier = 20;
         }};
 
         vault = new StorageBlock("vault"){{
             requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125));
             size = 3;
             itemCapacity = 1000;
+            group = BlockGroup.storage;
         }};
 
         container = new StorageBlock("container"){{
             requirements(Category.effect, with(Items.titanium, 100));
             size = 2;
             itemCapacity = 300;
+            group = BlockGroup.storage;
         }};
 
         unloader = new Unloader("unloader"){{
             requirements(Category.effect, with(Items.titanium, 25, Items.silicon, 30));
-            speed = 7f;
+            speed = 6f;
+            group = BlockGroup.transportation;
         }};
 
         //endregion
@@ -1352,7 +1388,7 @@ public class Blocks implements ContentList{
             ammoUseEffect = Fx.shellEjectSmall;
             health = 250;
             inaccuracy = 2f;
-            rotatespeed = 10f;
+            rotateSpeed = 10f;
         }};
 
         scatter = new ItemTurret("scatter"){{
@@ -1370,7 +1406,7 @@ public class Blocks implements ContentList{
             targetGround = false;
 
             recoilAmount = 2f;
-            rotatespeed = 15f;
+            rotateSpeed = 15f;
             inaccuracy = 17f;
             shootCone = 35f;
 
@@ -1441,7 +1477,7 @@ public class Blocks implements ContentList{
             recoilAmount = 2f;
             reloadTime = 90f;
             cooldown = 0.03f;
-            powerUse = 2.5f;
+            powerUse = 6f;
             shootShake = 2f;
             shootEffect = Fx.lancerLaserShoot;
             smokeEffect = Fx.none;
@@ -1460,20 +1496,21 @@ public class Blocks implements ContentList{
                 hitSize = 4;
                 lifetime = 16f;
                 drawSize = 400f;
+                collidesAir = false;
             }};
         }};
 
         arc = new PowerTurret("arc"){{
             requirements(Category.turret, with(Items.copper, 35, Items.lead, 50));
             shootType = new LightningBulletType(){{
-                damage = 21;
+                damage = 20;
                 lightningLength = 25;
                 collidesAir = false;
             }};
             reloadTime = 35f;
             shootCone = 40f;
-            rotatespeed = 8f;
-            powerUse = 1.5f;
+            rotateSpeed = 8f;
+            powerUse = 3f;
             targetAir = false;
             range = 90f;
             shootEffect = Fx.lightningShoot;
@@ -1484,6 +1521,21 @@ public class Blocks implements ContentList{
             shootSound = Sounds.spark;
         }};
 
+        parallax = new TractorBeamTurret("parallax"){{
+            requirements(Category.turret, with(Items.silicon, 120, Items.titanium, 90, Items.graphite, 30));
+
+            hasPower = true;
+            size = 2;
+            force = 4.5f;
+            scaledForce = 5.5f;
+            range = 110f;
+            damage = 0.4f;
+            health = 160 * size * size;
+            rotateSpeed = 10;
+
+            consumes.powerCond(3f, (TractorBeamBuild e) -> e.target != null);
+        }};
+
         swarmer = new ItemTurret("swarmer"){{
             requirements(Category.turret, with(Items.graphite, 35, Items.titanium, 35, Items.plastanium, 45, Items.silicon, 30));
             ammo(
@@ -1527,6 +1579,43 @@ public class Blocks implements ContentList{
             shootSound = Sounds.shootBig;
         }};
 
+        segment = new PointDefenseTurret("segment"){{
+            requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 40));
+
+            health = 250 * size * size;
+            range = 160f;
+            hasPower = true;
+            consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null);
+            size = 2;
+            shootLength = 5f;
+            bulletDamage = 25f;
+            reloadTime = 9f;
+        }};
+
+        tsunami = new LiquidTurret("tsunami"){{
+            requirements(Category.turret, with(Items.metaglass, 100, Items.lead, 400, Items.titanium, 250, Items.thorium, 100));
+            ammo(
+                Liquids.water, Bullets.heavyWaterShot,
+                Liquids.slag, Bullets.heavySlagShot,
+                Liquids.cryofluid, Bullets.heavyCryoShot,
+                Liquids.oil, Bullets.heavyOilShot
+            );
+            size = 3;
+            recoilAmount = 0f;
+            reloadTime = 2f;
+            shots = 2;
+            velocityInaccuracy = 0.1f;
+            inaccuracy = 4f;
+            recoilAmount = 1f;
+            restitution = 0.04f;
+            shootCone = 45f;
+            liquidCapacity = 40f;
+            shootEffect = Fx.shootLiquid;
+            range = 190f;
+            health = 250 * size * size;
+            shootSound = Sounds.splash;
+        }};
+
         fuse = new ItemTurret("fuse"){{
             requirements(Category.turret, with(Items.copper, 225, Items.graphite, 225, Items.thorium, 100));
 
@@ -1543,8 +1632,10 @@ public class Blocks implements ContentList{
             health = 220 * size * size;
             shootSound = Sounds.shotgun;
 
+            float brange = range + 10f;
+
             ammo(Items.thorium, new ShrapnelBulletType(){{
-                length = range + 10f;
+                length = brange;
                 damage = 105f;
                 ammoMultiplier = 6f;
             }});
@@ -1567,6 +1658,7 @@ public class Blocks implements ContentList{
             reloadTime = 60f;
             ammoEjectBack = 5f;
             ammoUseEffect = Fx.shellEjectBig;
+            ammoPerShot = 2;
             cooldown = 0.03f;
             velocityInaccuracy = 0.2f;
             restitution = 0.02f;
@@ -1588,11 +1680,11 @@ public class Blocks implements ContentList{
             Items.surgealloy, Bullets.fragSurge
             );
             xRand = 4f;
-            reloadTime = 6f;
+            reloadTime = 8f;
             range = 200f;
             size = 3;
             recoilAmount = 3f;
-            rotatespeed = 10f;
+            rotateSpeed = 10f;
             inaccuracy = 10f;
             shootCone = 30f;
             shootSound = Sounds.shootSnap;
@@ -1600,8 +1692,50 @@ public class Blocks implements ContentList{
             health = 145 * size * size;
         }};
 
+        foreshadow = new ItemTurret("foreshadow"){{
+            float brange = range = 500f;
+
+            requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgealloy, 300, Items.plastanium, 200, Items.silicon, 600));
+            ammo(
+            Items.surgealloy, new PointBulletType(){{
+                shootEffect = Fx.instShoot;
+                hitEffect = Fx.instHit;
+                smokeEffect = Fx.smokeCloud;
+                trailEffect = Fx.instTrail;
+                despawnEffect = Fx.instBomb;
+                trailSpacing = 20f;
+                damage = 1350;
+                tileDamageMultiplier = 0.5f;
+                speed = brange;
+                hitShake = 6f;
+                ammoMultiplier = 1f;
+            }}
+            );
+
+            rotateSpeed = 2.5f;
+            reloadTime = 200f;
+            restitution = 0.2f;
+            ammoUseEffect = Fx.shellEjectBig;
+            recoilAmount = 5f;
+            restitution = 0.009f;
+            cooldown = 0.009f;
+            shootShake = 4f;
+            shots = 1;
+            size = 4;
+            shootCone = 2f;
+            shootSound = Sounds.shootBig;
+            unitSort = (u, x, y) -> -u.maxHealth;
+
+            coolantMultiplier = 0.09f;
+
+            health = 150 * size * size;
+            consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true);
+
+            consumes.powerCond(10f, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting));
+        }};
+
         spectre = new ItemTurret("spectre"){{
-            requirements(Category.turret, with(Items.copper, 350, Items.graphite, 300, Items.surgealloy, 250, Items.plastanium, 175, Items.thorium, 250));
+            requirements(Category.turret, with(Items.copper, 900, Items.graphite, 300, Items.surgealloy, 250, Items.plastanium, 175, Items.thorium, 250));
             ammo(
             Items.graphite, Bullets.standardDenseBig,
             Items.pyratite, Bullets.standardIncendiaryBig,
@@ -1622,12 +1756,12 @@ public class Blocks implements ContentList{
             shootCone = 24f;
             shootSound = Sounds.shootBig;
 
-            health = 155 * size * size;
+            health = 160 * size * size;
             consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true);
         }};
 
         meltdown = new LaserTurret("meltdown"){{
-            requirements(Category.turret, with(Items.copper, 250, Items.lead, 350, Items.graphite, 300, Items.surgealloy, 325, Items.silicon, 325));
+            requirements(Category.turret, with(Items.copper, 1200, Items.lead, 350, Items.graphite, 300, Items.surgealloy, 325, Items.silicon, 325));
             shootEffect = Fx.shootBigSmoke2;
             shootCone = 40f;
             recoilAmount = 4f;
@@ -1637,13 +1771,13 @@ public class Blocks implements ContentList{
             reloadTime = 90f;
             firingMoveFract = 0.5f;
             shootDuration = 220f;
-            powerUse = 14f;
+            powerUse = 17f;
             shootSound = Sounds.laserbig;
             activeSound = Sounds.beam;
             activeSoundVolume = 2f;
 
             shootType = new ContinuousLaserBulletType(70){{
-                length = 220f;
+                length = 200f;
                 hitEffect = Fx.hitMeltdown;
                 drawSize = 420f;
 
@@ -1656,41 +1790,20 @@ public class Blocks implements ContentList{
             consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false);
         }};
 
-        segment = new PointDefenseTurret("segment"){{
-            requirements(Category.turret, with(Items.silicon, 80, Items.thorium, 80, Items.surgealloy, 50));
-
-            hasPower = true;
-            consumes.power(3f);
-            size = 2;
-            shootLength = 5f;
-            bulletDamage = 12f;
-            reloadTime = 25f;
-            health = 190 * size * size;
-        }};
-
-        parallax = new TractorBeamTurret("parallax"){{
-            requirements(Category.turret, with(Items.silicon, 120, Items.titanium, 90));
-
-            hasPower = true;
-            size = 2;
-            force = 2.5f;
-            scaledForce = 5f;
-            range = 170f;
-            damage = 0.08f;
-            health = 160 * size * size;
-            rotateSpeed = 10;
-
-            consumes.power(3f);
-        }};
-
         //endregion
         //region units
 
+        commandCenter = new CommandCenter("command-center"){{
+            requirements(Category.units, ItemStack.with(Items.copper, 200, Items.lead, 250, Items.silicon, 250, Items.graphite, 100));
+            size = 2;
+            health = size * size * 55;
+        }};
+
         groundFactory = new UnitFactory("ground-factory"){{
             requirements(Category.units, with(Items.copper, 50, Items.lead, 120, Items.silicon, 80));
             plans = new UnitPlan[]{
-                new UnitPlan(UnitTypes.dagger, 60f * 20, with(Items.silicon, 10, Items.lead, 10)),
-                new UnitPlan(UnitTypes.crawler, 60f * 15, with(Items.silicon, 10, Items.blastCompound, 10)),
+                new UnitPlan(UnitTypes.dagger, 60f * 15, with(Items.silicon, 10, Items.lead, 10)),
+                new UnitPlan(UnitTypes.crawler, 60f * 12, with(Items.silicon, 10, Items.coal, 20)),
                 new UnitPlan(UnitTypes.nova, 60f * 40, with(Items.silicon, 30, Items.lead, 20, Items.titanium, 20)),
             };
             size = 3;
@@ -1698,9 +1811,9 @@ public class Blocks implements ContentList{
         }};
 
         airFactory = new UnitFactory("air-factory"){{
-            requirements(Category.units, with(Items.copper, 30, Items.lead, 70));
+            requirements(Category.units, with(Items.copper, 60, Items.lead, 70));
             plans = new UnitPlan[]{
-                new UnitPlan(UnitTypes.flare, 60f * 15, with(Items.silicon, 10)),
+                new UnitPlan(UnitTypes.flare, 60f * 15, with(Items.silicon, 15)),
                 new UnitPlan(UnitTypes.mono, 60f * 35, with(Items.silicon, 30, Items.lead, 15)),
             };
             size = 3;
@@ -1708,17 +1821,17 @@ public class Blocks implements ContentList{
         }};
 
         navalFactory = new UnitFactory("naval-factory"){{
-            requirements(Category.units, with(Items.copper, 30, Items.lead, 70));
+            requirements(Category.units, with(Items.copper, 150, Items.lead, 130, Items.metaglass, 120));
             plans = new UnitPlan[]{
-                new UnitPlan(UnitTypes.risse, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)),
+                new UnitPlan(UnitTypes.risso, 60f * 45f, with(Items.silicon, 20, Items.metaglass, 35)),
             };
             size = 3;
-            requiresWater = true;
             consumes.power(1.2f);
+            floating = true;
         }};
 
         additiveReconstructor = new Reconstructor("additive-reconstructor"){{
-            requirements(Category.units, with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
+            requirements(Category.units, with(Items.copper, 200, Items.lead, 120, Items.silicon, 90));
 
             size = 3;
             consumes.power(3f);
@@ -1727,21 +1840,21 @@ public class Blocks implements ContentList{
             constructTime = 60f * 10f;
 
             upgrades = new UnitType[][]{
-                {UnitTypes.nova, UnitTypes.quasar},
+                {UnitTypes.nova, UnitTypes.pulsar},
                 {UnitTypes.dagger, UnitTypes.mace},
                 {UnitTypes.crawler, UnitTypes.atrax},
                 {UnitTypes.flare, UnitTypes.horizon},
                 {UnitTypes.mono, UnitTypes.poly},
-                {UnitTypes.risse, UnitTypes.minke},
+                {UnitTypes.risso, UnitTypes.minke},
             };
         }};
 
         multiplicativeReconstructor = new Reconstructor("multiplicative-reconstructor"){{
-            requirements(Category.units, with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
+            requirements(Category.units, with(Items.lead, 650, Items.silicon, 450, Items.titanium, 350, Items.thorium, 650));
 
             size = 5;
             consumes.power(6f);
-            consumes.items(with(Items.silicon, 130, Items.titanium, 80, Items.metaglass, 30));
+            consumes.items(with(Items.silicon, 130, Items.titanium, 80, Items.metaglass, 40));
 
             constructTime = 60f * 30f;
 
@@ -1750,40 +1863,50 @@ public class Blocks implements ContentList{
                 {UnitTypes.mace, UnitTypes.fortress},
                 {UnitTypes.poly, UnitTypes.mega},
                 {UnitTypes.minke, UnitTypes.bryde},
-                {UnitTypes.quasar, UnitTypes.pulsar},
+                {UnitTypes.pulsar, UnitTypes.quasar},
                 {UnitTypes.atrax, UnitTypes.spiroct},
             };
         }};
 
         exponentialReconstructor = new Reconstructor("exponential-reconstructor"){{
-            requirements(Category.units, with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
+            requirements(Category.units, with(Items.lead, 2000, Items.silicon, 1000, Items.titanium, 2000, Items.thorium, 750, Items.plastanium, 450, Items.phasefabric, 600));
 
             size = 7;
-            consumes.power(12f);
-            consumes.items(with(Items.silicon, 200, Items.titanium, 200, Items.surgealloy, 240));
+            consumes.power(13f);
+            consumes.items(with(Items.silicon, 850, Items.titanium, 750, Items.plastanium, 650));
             consumes.liquid(Liquids.cryofluid, 1f);
 
             constructTime = 60f * 60f * 1.5f;
-            liquidCapacity = 30f;
+            liquidCapacity = 60f;
 
             upgrades = new UnitType[][]{
                 {UnitTypes.zenith, UnitTypes.antumbra},
+                {UnitTypes.spiroct, UnitTypes.arkyid},
+                {UnitTypes.fortress, UnitTypes.scepter},
+                {UnitTypes.bryde, UnitTypes.sei},
+                {UnitTypes.mega, UnitTypes.quad},
+                {UnitTypes.quasar, UnitTypes.vela},
             };
         }};
 
         tetrativeReconstructor = new Reconstructor("tetrative-reconstructor"){{
-            requirements(Category.units, with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
+            requirements(Category.units, with(Items.lead, 4000, Items.silicon, 3000, Items.thorium, 1000, Items.plastanium, 600, Items.phasefabric, 600, Items.surgealloy, 800));
 
             size = 9;
             consumes.power(25f);
-            consumes.items(with(Items.silicon, 300, Items.plastanium, 300, Items.surgealloy, 300, Items.phasefabric, 250));
+            consumes.items(with(Items.silicon, 1000, Items.plastanium, 600, Items.surgealloy, 500, Items.phasefabric, 350));
             consumes.liquid(Liquids.cryofluid, 3f);
 
             constructTime = 60f * 60f * 4;
-            liquidCapacity = 60f;
+            liquidCapacity = 180f;
 
             upgrades = new UnitType[][]{
                 {UnitTypes.antumbra, UnitTypes.eclipse},
+                {UnitTypes.arkyid, UnitTypes.toxopid},
+                {UnitTypes.scepter, UnitTypes.reign},
+                {UnitTypes.sei, UnitTypes.omura},
+                {UnitTypes.quad, UnitTypes.oct},
+                {UnitTypes.vela, UnitTypes.corvus}
             };
         }};
 
@@ -1799,6 +1922,8 @@ public class Blocks implements ContentList{
 
             size = 2;
             range = 80f;
+            itemCapacity = 20;
+            ammoAmount = 5;
 
             consumes.item(Items.copper, 1);
         }};
@@ -1836,10 +1961,6 @@ public class Blocks implements ContentList{
             alwaysUnlocked = true;
         }};
 
-        message = new MessageBlock("message"){{
-            requirements(Category.effect, with(Items.graphite, 5));
-        }};
-
         illuminator = new LightBlock("illuminator"){{
             requirements(Category.effect, BuildVisibility.lightingOnly, with(Items.graphite, 12, Items.silicon, 8));
             brightness = 0.67f;
@@ -1853,7 +1974,6 @@ public class Blocks implements ContentList{
         //looked up by name, no ref needed
         new LegacyMechPad("legacy-mech-pad");
         new LegacyUnitFactory("legacy-unit-factory");
-        new LegacyCommandCenter("legacy-command-center");
 
         //endregion
         //region campaign
@@ -1877,14 +1997,78 @@ public class Blocks implements ContentList{
             consumes.power(6f);
         }};
 
-        dataProcessor = new ResearchBlock("data-processor"){{
-            //requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 200, Items.lead, 100));
+        //endregion campaign
+        //region logic
 
-            size = 3;
-            alwaysUnlocked = true;
+        message = new MessageBlock("message"){{
+            requirements(Category.logic, with(Items.graphite, 5));
         }};
 
-        //endregion campaign
+        switchBlock = new SwitchBlock("switch"){{
+            requirements(Category.logic, with(Items.graphite, 5));
+        }};
+
+        microProcessor = new LogicBlock("micro-processor"){{
+            requirements(Category.logic, with(Items.copper, 80, Items.lead, 50, Items.silicon, 50));
+
+            instructionsPerTick = 2;
+
+            size = 1;
+        }};
+
+        logicProcessor = new LogicBlock("logic-processor"){{
+            requirements(Category.logic, with(Items.lead, 320, Items.silicon, 100, Items.graphite, 60, Items.thorium, 50));
+
+            instructionsPerTick = 8;
+
+            range = 8 * 22;
+
+            size = 2;
+        }};
+
+        hyperProcessor = new LogicBlock("hyper-processor"){{
+            requirements(Category.logic, with(Items.lead, 450, Items.silicon, 150, Items.thorium, 75, Items.surgealloy, 50));
+
+            consumes.liquid(Liquids.cryofluid, 0.08f);
+            hasLiquids = true;
+
+            instructionsPerTick = 25;
+
+            range = 8 * 42;
+
+            size = 3;
+        }};
+
+        memoryCell = new MemoryBlock("memory-cell"){{
+            requirements(Category.logic, with(Items.graphite, 30, Items.silicon, 30));
+
+            memoryCapacity = 64;
+        }};
+
+        memoryBank = new MemoryBlock("memory-bank"){{
+            requirements(Category.logic, with(Items.graphite, 80, Items.silicon, 80, Items.phasefabric, 30));
+
+            memoryCapacity = 512;
+            size = 2;
+        }};
+
+        logicDisplay = new LogicDisplay("logic-display"){{
+            requirements(Category.logic, with(Items.lead, 100, Items.silicon, 50, Items.metaglass, 50));
+
+            displaySize = 80;
+
+            size = 3;
+        }};
+
+        largeLogicDisplay = new LogicDisplay("large-logic-display"){{
+            requirements(Category.logic, with(Items.lead, 200, Items.silicon, 150, Items.metaglass, 100, Items.phasefabric, 75));
+
+            displaySize = 176;
+
+            size = 6;
+        }};
+
+        //endregion
         //region experimental
 
         blockForge = new BlockForge("block-forge"){{
diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index 6a002dd42a..9b7e5f8805 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -34,18 +34,15 @@ public class Bullets implements ContentList{
     standardGlaive, standardDenseBig, standardThoriumBig, standardIncendiaryBig,
 
     //liquid
-    waterShot, cryoShot, slagShot, oilShot,
+    waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot,
 
     //environment, misc.
-    damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig, frag,
-
-    //bombs
-    bombExplosive, bombIncendiary, bombOil;
+    damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig, frag;
 
     @Override
     public void load(){
 
-        artilleryDense = new ArtilleryBulletType(3f, 12, "shell"){{
+        artilleryDense = new ArtilleryBulletType(3f, 20, "shell"){{
             hitEffect = Fx.flakExplosion;
             knockback = 0.8f;
             lifetime = 80f;
@@ -66,7 +63,7 @@ public class Bullets implements ContentList{
             collidesAir = false;
         }};
 
-        artilleryPlastic = new ArtilleryBulletType(3.4f, 12, "shell"){{
+        artilleryPlastic = new ArtilleryBulletType(3.4f, 20, "shell"){{
             hitEffect = Fx.plasticExplosion;
             knockback = 1f;
             lifetime = 80f;
@@ -80,7 +77,7 @@ public class Bullets implements ContentList{
             frontColor = Pal.plastaniumFront;
         }};
 
-        artilleryHoming = new ArtilleryBulletType(3f, 12, "shell"){{
+        artilleryHoming = new ArtilleryBulletType(3f, 20, "shell"){{
             hitEffect = Fx.flakExplosion;
             knockback = 0.8f;
             lifetime = 80f;
@@ -94,7 +91,7 @@ public class Bullets implements ContentList{
             homingRange = 50f;
         }};
 
-        artilleryIncendiary = new ArtilleryBulletType(3f, 12, "shell"){{
+        artilleryIncendiary = new ArtilleryBulletType(3f, 20, "shell"){{
             hitEffect = Fx.blastExplosion;
             knockback = 0.8f;
             lifetime = 80f;
@@ -108,7 +105,7 @@ public class Bullets implements ContentList{
             trailEffect = Fx.incendTrail;
         }};
 
-        artilleryExplosive = new ArtilleryBulletType(2f, 12, "shell"){{
+        artilleryExplosive = new ArtilleryBulletType(2f, 20, "shell"){{
             hitEffect = Fx.blastExplosion;
             knockback = 0.8f;
             lifetime = 80f;
@@ -166,7 +163,7 @@ public class Bullets implements ContentList{
             width = 6f;
             height = 8f;
             hitEffect = Fx.flakExplosion;
-            splashDamage = 20f;
+            splashDamage = 22f;
             splashDamageRadius = 20f;
             fragBullet = flakGlassFrag;
             fragBullets = 5;
@@ -194,7 +191,7 @@ public class Bullets implements ContentList{
 
         fragGlass = new FlakBulletType(4f, 3){{
             lifetime = 70f;
-            ammoMultiplier = 5f;
+            ammoMultiplier = 3f;
             shootEffect = Fx.shootSmall;
             reloadMultiplier = 0.8f;
             width = 6f;
@@ -202,7 +199,7 @@ public class Bullets implements ContentList{
             hitEffect = Fx.flakExplosion;
             splashDamage = 18f;
             splashDamageRadius = 16f;
-            fragBullet = flakGlassFrag;
+            fragBullet = fragGlassFrag;
             fragBullets = 3;
             explodeRange = 20f;
             collidesGround = true;
@@ -224,8 +221,8 @@ public class Bullets implements ContentList{
         fragExplosive = new FlakBulletType(4f, 5){{
             shootEffect = Fx.shootBig;
             ammoMultiplier = 4f;
-            splashDamage = 15f;
-            splashDamageRadius = 34f;
+            splashDamage = 18f;
+            splashDamageRadius = 55f;
             collidesGround = true;
 
             status = StatusEffects.blasted;
@@ -233,7 +230,8 @@ public class Bullets implements ContentList{
         }};
 
         fragSurge = new FlakBulletType(4.5f, 13){{
-            splashDamage = 45f;
+            ammoMultiplier = 4f;
+            splashDamage = 50f;
             splashDamageRadius = 40f;
             lightning = 2;
             lightningLength = 7;
@@ -242,7 +240,7 @@ public class Bullets implements ContentList{
             explodeRange = 20f;
         }};
 
-        missileExplosive = new MissileBulletType(2.7f, 10, "missile"){{
+        missileExplosive = new MissileBulletType(3.7f, 10){{
             width = 8f;
             height = 8f;
             shrinkY = 0f;
@@ -250,7 +248,6 @@ public class Bullets implements ContentList{
             splashDamageRadius = 30f;
             splashDamage = 30f;
             ammoMultiplier = 4f;
-            lifetime = 150f;
             hitEffect = Fx.blastExplosion;
             despawnEffect = Fx.blastExplosion;
 
@@ -258,7 +255,7 @@ public class Bullets implements ContentList{
             statusDuration = 60f;
         }};
 
-        missileIncendiary = new MissileBulletType(2.9f, 12, "missile"){{
+        missileIncendiary = new MissileBulletType(3.7f, 12){{
             frontColor = Pal.lightishOrange;
             backColor = Pal.lightOrange;
             width = 7f;
@@ -268,26 +265,24 @@ public class Bullets implements ContentList{
             homingPower = 0.08f;
             splashDamageRadius = 20f;
             splashDamage = 20f;
-            lifetime = 160f;
             hitEffect = Fx.blastExplosion;
             status = StatusEffects.burning;
         }};
 
-        missileSurge = new MissileBulletType(4.4f, 20, "bullet"){{
+        missileSurge = new MissileBulletType(3.7f, 18){{
             width = 8f;
             height = 8f;
             shrinkY = 0f;
             drag = -0.01f;
-            splashDamageRadius = 28f;
-            splashDamage = 40f;
-            lifetime = 150f;
+            splashDamageRadius = 25f;
+            splashDamage = 25f;
             hitEffect = Fx.blastExplosion;
             despawnEffect = Fx.blastExplosion;
             lightning = 2;
-            lightningLength = 14;
+            lightningLength = 10;
         }};
 
-        standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{
+        standardCopper = new BasicBulletType(2.5f, 9){{
             width = 7f;
             height = 9f;
             lifetime = 60f;
@@ -296,7 +291,7 @@ public class Bullets implements ContentList{
             ammoMultiplier = 2;
         }};
 
-        standardDense = new BasicBulletType(3.5f, 18, "bullet"){{
+        standardDense = new BasicBulletType(3.5f, 18){{
             width = 9f;
             height = 12f;
             reloadMultiplier = 0.6f;
@@ -380,10 +375,9 @@ public class Bullets implements ContentList{
         }};
 
         //this is just a copy of the damage lightning bullet that doesn't damage air units
-        damageLightningGround = new BulletType(0.0001f, 0f){{
-            collidesAir = false;
-        }};
+        damageLightningGround = new BulletType(0.0001f, 0f){};
         JsonIO.copy(damageLightning, damageLightningGround);
+        damageLightningGround.collidesAir = false;
 
         healBullet = new HealBulletType(5.2f, 13){{
             healPercent = 3f;
@@ -433,34 +427,27 @@ public class Bullets implements ContentList{
             }
         };
 
-        basicFlame = new BulletType(3f, 15f){
-            {
-                ammoMultiplier = 3f;
-                hitSize = 7f;
-                lifetime = 42f;
-                pierce = true;
-                drag = 0.05f;
-                statusDuration = 60f * 4;
-                shootEffect = Fx.shootSmallFlame;
-                hitEffect = Fx.hitFlameSmall;
-                despawnEffect = Fx.none;
-                status = StatusEffects.burning;
-                keepVelocity = false;
-                hittable = false;
-            }
+        basicFlame = new BulletType(3.35f, 15f){{
+            ammoMultiplier = 3f;
+            hitSize = 7f;
+            lifetime = 18f;
+            pierce = true;
+            collidesAir = false;
+            statusDuration = 60f * 4;
+            shootEffect = Fx.shootSmallFlame;
+            hitEffect = Fx.hitFlameSmall;
+            despawnEffect = Fx.none;
+            status = StatusEffects.burning;
+            keepVelocity = false;
+            hittable = false;
+        }};
 
-            @Override
-            public float range(){
-                return 50f;
-            }
-        };
-
-        pyraFlame = new BulletType(3.3f, 22f){{
+        pyraFlame = new BulletType(3.35f, 22f){{
             ammoMultiplier = 4f;
             hitSize = 7f;
-            lifetime = 42f;
+            lifetime = 18f;
             pierce = true;
-            drag = 0.05f;
+            collidesAir = false;
             statusDuration = 60f * 6;
             shootEffect = Fx.shootPyraFlame;
             hitEffect = Fx.hitFlameSmall;
@@ -486,6 +473,50 @@ public class Bullets implements ContentList{
             drag = 0.03f;
         }};
 
+        heavyWaterShot = new LiquidBulletType(Liquids.water){{
+            lifetime = 49f;
+            speed = 4f;
+            knockback = 1.7f;
+            puddleSize = 8f;
+            drag = 0.001f;
+            ammoMultiplier = 2f;
+            statusDuration = 60f * 4f;
+            damage = 0.1f;
+        }};
+
+        heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{
+            lifetime = 49f;
+            speed = 4f;
+            knockback = 1.3f;
+            puddleSize = 8f;
+            drag = 0.001f;
+            ammoMultiplier = 2f;
+            statusDuration = 60f * 4f;
+            damage = 0.1f;
+        }};
+
+        heavySlagShot = new LiquidBulletType(Liquids.slag){{
+            lifetime = 49f;
+            speed = 4f;
+            knockback = 1.3f;
+            puddleSize = 8f;
+            damage = 6f;
+            drag = 0.001f;
+            ammoMultiplier = 2f;
+            statusDuration = 60f * 4f;
+        }};
+
+        heavyOilShot = new LiquidBulletType(Liquids.oil){{
+            lifetime = 49f;
+            speed = 4f;
+            knockback = 1.3f;
+            puddleSize = 8f;
+            drag = 0.001f;
+            ammoMultiplier = 2f;
+            statusDuration = 60f * 4f;
+            damage = 0.1f;
+        }};
+
         driverBolt = new MassDriverBolt();
 
         frag = new BasicBulletType(5f, 8, "bullet"){{
@@ -495,47 +526,5 @@ public class Bullets implements ContentList{
             lifetime = 50f;
             drag = 0.04f;
         }};
-
-        bombExplosive = new BombBulletType(18f, 25f, "shell"){{
-            width = 10f;
-            height = 14f;
-            hitEffect = Fx.flakExplosion;
-            shootEffect = Fx.none;
-            smokeEffect = Fx.none;
-
-            status = StatusEffects.blasted;
-            statusDuration = 60f;
-        }};
-
-        bombIncendiary = new BombBulletType(7f, 10f, "shell"){{
-            width = 8f;
-            height = 12f;
-            hitEffect = Fx.flakExplosion;
-            backColor = Pal.lightOrange;
-            frontColor = Pal.lightishOrange;
-            incendChance = 1f;
-            incendAmount = 3;
-            incendSpread = 10f;
-        }};
-
-        bombOil = new BombBulletType(2f, 3f, "shell"){
-            {
-                width = 8f;
-                height = 12f;
-                hitEffect = Fx.pulverize;
-                backColor = new Color(0x4f4f4fff);
-                frontColor = Color.gray;
-            }
-
-            @Override
-            public void hit(Bullet b, float x, float y){
-                super.hit(b, x, y);
-
-                for(int i = 0; i < 3; i++){
-                    Tile tile = world.tileWorld(x + Mathf.range(8f), y + Mathf.range(8f));
-                    Puddles.deposit(tile, Liquids.oil, 5f);
-                }
-            }
-        };
     }
 }
diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index 6cbcc79268..97d54ece50 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -26,15 +26,17 @@ public class Fx{
     none = new Effect(0, 0f, e -> {}),
 
     unitSpawn = new Effect(30f, e -> {
-        if(!(e.data instanceof Unit)) return;
+        if(!(e.data instanceof UnitType)) return;
 
         alpha(e.fin());
 
         float scl = 1f + e.fout() * 2f;
 
-        Unit unit = e.data();
-        rect(unit.type().region, e.x, e.y,
-        unit.type().region.getWidth() * Draw.scl * scl, unit.type().region.getHeight() * Draw.scl * scl, 180f);
+        UnitType unit = e.data();
+        TextureRegion region = unit.icon(Cicon.full);
+
+        rect(region, e.x, e.y,
+            region.width * Draw.scl * scl, region.height * Draw.scl * scl, 180f);
 
     }),
 
@@ -50,10 +52,11 @@ public class Fx{
         if(!(e.data instanceof Unit)) return;
 
         Unit select = e.data();
+        boolean block = select instanceof BlockUnitc;
 
         mixcol(Pal.accent, 1f);
         alpha(e.fout());
-        rect(select.type().icon(Cicon.full), select.x, select.y, select.rotation - 90f);
+        rect(block ? ((BlockUnitc)select).tile().block.icon(Cicon.full) : select.type().icon(Cicon.full), select.x, select.y, block ? 0f : select.rotation - 90f);
         alpha(1f);
         Lines.stroke(e.fslope() * 1f);
         Lines.square(select.x, select.y, e.fout() * select.hitSize * 2f, 45);
@@ -63,15 +66,15 @@ public class Fx{
     }),
 
     unitDespawn = new Effect(100f, e -> {
-        if(!(e.data instanceof Unitc)) return;
+        if(!(e.data instanceof Unit) || e.<Unit>data().type() == null) return;
 
-        Unitc select = (Unitc)e.data;
+        Unit select = e.data();
         float scl = e.fout(Interp.pow2Out);
         float p = Draw.scl;
         Draw.scl *= scl;
 
         mixcol(Pal.accent, 1f);
-        rect(select.type().icon(Cicon.full), select.x(), select.y(), select.rotation() - 90f);
+        rect(select.type().icon(Cicon.full), select.x, select.y, select.rotation - 90f);
         reset();
 
         Draw.scl = p;
@@ -96,13 +99,13 @@ public class Fx{
         Fill.square(x, y, 1f * size, 45f);
     }),
 
-    itemTransfer = new Effect(30f, e -> {
+    itemTransfer = new Effect(12f, e -> {
         if(!(e.data instanceof Position)) return;
         Position to = e.data();
         Tmp.v1.set(e.x, e.y).interpolate(Tmp.v2.set(to), e.fin(), Interp.pow3)
         .add(Tmp.v2.sub(e.x, e.y).nor().rotate90(1).scl(Mathf.randomSeedRange(e.id, 1f) * e.fslope() * 10f));
         float x = Tmp.v1.x, y = Tmp.v1.y;
-        float size = Math.min(0.8f + e.rotation / 5f, 2);
+        float size = 1f;
 
         stroke(e.fslope() * 2f * size, Pal.accent);
         Lines.circle(x, y, e.fslope() * 2f * size);
@@ -135,14 +138,15 @@ public class Fx{
         stroke(3f * e.fout());
         color(e.color, Color.white, e.fin());
 
-        beginLine();
-        lines.each(Lines::linePoint);
-        linePoint(e.x, e.y);
-        endLine();
+        for(int i = 0; i < lines.size - 1; i++){
+            Vec2 cur = lines.get(i);
+            Vec2 next = lines.get(i + 1);
+
+            Lines.line(cur.x, cur.y, next.x, next.y, false);
+        }
 
-        int i = 0;
         for(Vec2 p : lines){
-            Fill.square(p.x, p.y, (5f - (float)i++ / lines.size * 2f) * e.fout(), 45);
+            Fill.circle(p.x, p.y, Lines.getStroke() / 2f);
         }
     }),
 
@@ -287,6 +291,50 @@ public class Fx{
         Lines.spikes(e.x, e.y, 1f + e.fin() * 6f, e.fout() * 4f, 6);
     }),
 
+    greenBomb = new Effect(40f, 100f, e -> {
+        color(Pal.heal);
+        stroke(e.fout() * 2f);
+        Lines.circle(e.x, e.y, 4f + e.finpow() * 65f);
+
+        color(Pal.heal);
+        for(int i = 0; i < 4; i++){
+            Drawf.tri(e.x, e.y, 6f, 100f * e.fout(), i*90);
+        }
+
+        color();
+        for(int i = 0; i < 4; i++){
+            Drawf.tri(e.x, e.y, 3f, 35f * e.fout(), i*90);
+        }
+    }),
+
+    greenLaserCharge = new Effect(80f, 100f, e -> {
+        color(Pal.heal);
+        stroke(e.fin() * 2f);
+        Lines.circle(e.x, e.y, 4f + e.fout() * 100f);
+
+        Fill.circle(e.x, e.y, e.fin() * 20);
+
+        randLenVectors(e.id, 20, 40f * e.fout(), (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fin() * 5f);
+        });
+
+        color();
+
+        Fill.circle(e.x, e.y, e.fin() * 10);
+    }),
+
+    greenLaserChargeSmall = new Effect(40f, 100f, e -> {
+        color(Pal.heal);
+        stroke(e.fin() * 2f);
+        Lines.circle(e.x, e.y, e.fout() * 50f);
+    }),
+
+    healWaveDynamic = new Effect(22, e -> {
+        color(Pal.heal);
+        stroke(e.fout() * 2f);
+        Lines.circle(e.x, e.y, 4f + e.finpow() * e.rotation);
+    }),
+
     healWave = new Effect(22, e -> {
         color(Pal.heal);
         stroke(e.fout() * 2f);
@@ -369,7 +417,7 @@ public class Fx{
     hitLiquid = new Effect(16, e -> {
         color(e.color);
 
-        randLenVectors(e.id, 5, e.fin() * 15f, e.rotation + 180f, 60f, (x, y) -> {
+        randLenVectors(e.id, 5, e.fin() * 15f, e.rotation, 60f, (x, y) -> {
             Fill.circle(e.x + x, e.y + y, e.fout() * 2f);
         });
 
@@ -397,6 +445,90 @@ public class Fx{
 
     }),
 
+    hitMeltHeal = new Effect(12, e -> {
+        color(Pal.heal);
+        stroke(e.fout() * 2f);
+
+        randLenVectors(e.id, 6, e.finpow() * 18f, e.rotation, 360f, (x, y) -> {
+            float ang = Mathf.angle(x, y);
+            lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f);
+        });
+
+    }),
+
+    instBomb = new Effect(15f, 100f, e -> {
+        color(Pal.bulletYellowBack);
+        stroke(e.fout() * 4f);
+        Lines.circle(e.x, e.y, 4f + e.finpow() * 20f);
+
+        for(int i = 0; i < 4; i++){
+            Drawf.tri(e.x, e.y, 6f, 80f * e.fout(), i*90 + 45);
+        }
+
+        color();
+        for(int i = 0; i < 4; i++){
+            Drawf.tri(e.x, e.y, 3f, 30f * e.fout(), i*90 + 45);
+        }
+    }),
+
+    instTrail = new Effect(30, e -> {
+        for(int i = 0; i < 2; i++){
+            color(i == 0 ? Pal.bulletYellowBack : Pal.bulletYellow);
+
+            float m = i == 0 ? 1f : 0.5f;
+
+            float rot = e.rotation + 180f;
+            float w = 15f * e.fout() * m;
+            Drawf.tri(e.x, e.y, w, (30f + Mathf.randomSeedRange(e.id, 15f)) * m, rot);
+            Drawf.tri(e.x, e.y, w, 10f * m, rot + 180f);
+        }
+    }),
+
+    instShoot = new Effect(24f, e -> {
+        e.scaled(10f, b -> {
+            color(Color.white, Pal.bulletYellowBack, b.fin());
+            stroke(b.fout() * 3f + 0.2f);
+            Lines.circle(b.x, b.y, b.fin() * 50f);
+        });
+
+        color(Pal.bulletYellowBack);
+
+        for(int i : Mathf.signs){
+            Drawf.tri(e.x, e.y, 13f * e.fout(), 85f, e.rotation + 90f * i);
+            Drawf.tri(e.x, e.y, 13f * e.fout(), 50f, e.rotation + 20f * i);
+        }
+    }),
+
+    instHit = new Effect(20f, 200f, e -> {
+        color(Pal.bulletYellowBack);
+
+        for(int i = 0; i < 2; i++){
+            color(i == 0 ? Pal.bulletYellowBack : Pal.bulletYellow);
+
+            float m = i == 0 ? 1f : 0.5f;
+
+            for(int j = 0; j < 5; j++){
+                float rot = e.rotation + Mathf.randomSeedRange(e.id + j, 50f);
+                float w = 23f * e.fout() * m;
+                Drawf.tri(e.x, e.y, w, (80f + Mathf.randomSeedRange(e.id + j, 40f)) * m, rot);
+                Drawf.tri(e.x, e.y, w, 20f * m, rot + 180f);
+            }
+        }
+
+        e.scaled(10f, c -> {
+            color(Pal.bulletYellow);
+            stroke(c.fout() * 2f + 0.2f);
+            Lines.circle(e.x, e.y, c.fin() * 30f);
+        });
+
+        e.scaled(12f, c -> {
+            color(Pal.bulletYellowBack);
+            randLenVectors(e.id, 25, 5f + e.fin() * 80f, e.rotation, 60f, (x, y) -> {
+                Fill.square(e.x + x, e.y + y, c.fout() * 3f, 45f);
+            });
+        });
+    }),
+
     hitLaser = new Effect(8, e -> {
         color(Color.white, Pal.heal, e.fin());
         stroke(0.5f + e.fout());
@@ -512,6 +644,29 @@ public class Fx{
 
     }),
 
+    sapExplosion = new Effect(25, e -> {
+
+        color(Pal.sapBullet);
+        e.scaled(6, i -> {
+            stroke(3f * i.fout());
+            Lines.circle(e.x, e.y, 3f + i.fin() * 80f);
+        });
+
+        color(Color.gray);
+
+        randLenVectors(e.id, 9, 2f + 70 * e.finpow(), (x, y) -> {
+            Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f);
+        });
+
+        color(Pal.sapBulletBack);
+        stroke(1f * e.fout());
+
+        randLenVectors(e.id + 1, 8, 1f + 60f * e.finpow(), (x, y) -> {
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f);
+        });
+
+    }),
+
     massiveExplosion = new Effect(30, e -> {
 
         color(Pal.missileYellow);
@@ -654,13 +809,18 @@ public class Fx{
 
     }),
 
-    wet = new Effect(40f, e -> {
+    wet = new Effect(80f, e -> {
         color(Liquids.water.color);
+        alpha(Mathf.clamp(e.fin() * 2f));
 
-        randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> {
-            Fill.circle(e.x + x, e.y + y, e.fout() * 1f);
-        });
+        Fill.circle(e.x, e.y, e.fout() * 1f);
+    }),
+	
+    muddy = new Effect(80f, e -> {
+        color(Color.valueOf("432722"));
+        alpha(Mathf.clamp(e.fin() * 2f));
 
+        Fill.circle(e.x, e.y, e.fout() * 1f);
     }),
 
     sapped = new Effect(40f, e -> {
@@ -672,6 +832,12 @@ public class Fx{
 
     }),
 
+    sporeSlowed = new Effect(40f, e -> {
+        color(Pal.spore);
+
+        Fill.circle(e.x, e.y, e.fslope() * 1.1f);
+    }),
+
     oily = new Effect(42f, e -> {
         color(Liquids.oil.color);
 
@@ -871,7 +1037,7 @@ public class Fx{
 
     }),
 
-    shootSmallFlame = new Effect(32f, e -> {
+    shootSmallFlame = new Effect(32f, 80f, e -> {
         color(Pal.lightFlame, Pal.darkFlame, Color.gray, e.fin());
 
         randLenVectors(e.id, 8, e.finpow() * 60f, e.rotation, 10f, (x, y) -> {
@@ -880,7 +1046,7 @@ public class Fx{
 
     }),
 
-    shootPyraFlame = new Effect(33f, e -> {
+    shootPyraFlame = new Effect(33f, 80f, e -> {
         color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.gray, e.fin());
 
         randLenVectors(e.id, 10, e.finpow() * 70f, e.rotation, 10f, (x, y) -> {
@@ -889,7 +1055,7 @@ public class Fx{
 
     }),
 
-    shootLiquid = new Effect(40f, e -> {
+    shootLiquid = new Effect(40f, 80f, e -> {
         color(e.color, Color.white, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f));
 
         randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> {
@@ -959,6 +1125,36 @@ public class Fx{
 
     }).ground(400f),
 
+    railShoot = new Effect(24f, e -> {
+        e.scaled(10f, b -> {
+            color(Color.white, Color.lightGray, b.fin());
+            stroke(b.fout() * 3f + 0.2f);
+            Lines.circle(b.x, b.y, b.fin() * 50f);
+        });
+
+        color(Pal.orangeSpark);
+
+        for(int i : Mathf.signs){
+            Drawf.tri(e.x, e.y, 13f * e.fout(), 85f, e.rotation + 90f * i);
+        }
+    }),
+
+    railTrail = new Effect(16f, e -> {
+        color(Pal.orangeSpark);
+
+        for(int i : Mathf.signs){
+            Drawf.tri(e.x, e.y, 10f * e.fout(), 24f, e.rotation + 90 + 90f * i);
+        }
+    }),
+
+    railHit = new Effect(18f, 200f, e -> {
+        color(Pal.orangeSpark);
+
+        for(int i : Mathf.signs){
+            Drawf.tri(e.x, e.y, 10f * e.fout(), 60f, e.rotation + 140f * i);
+        }
+    }),
+
     lancerLaserShoot = new Effect(21f, e -> {
         color(Pal.lancerLaser);
 
@@ -970,7 +1166,7 @@ public class Fx{
 
     lancerLaserShootSmoke = new Effect(26f, e -> {
         color(Color.white);
-        float length = e.data == null ? 70f : (Float)e.data;
+        float length = !(e.data instanceof Float) ? 70f : (Float)e.data;
 
         randLenVectors(e.id, 7, length, e.rotation, 0f, (x, y) -> {
             lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fout() * 9f);
@@ -1040,6 +1236,15 @@ public class Fx{
         });
     }),
 
+    cloudsmoke = new Effect(70, e -> {
+        randLenVectors(e.id, 12, 15f + e.fin() * 45f, (x, y) -> {
+            float size = e.fslope() * 2f;
+            color(Color.gray);
+            alpha(e.fslope());
+            Fill.circle(e.x + x, e.y + y, size);
+        });
+    }),
+
     nuclearcloud = new Effect(90, 200f, e -> {
         randLenVectors(e.id, 10, e.finpow() * 90f, (x, y) -> {
             float size = e.fout() * 14f;
@@ -1136,6 +1341,14 @@ public class Fx{
             Fill.square(e.x + x, e.y + y, 1f + e.fout() * 3f, 45);
         });
     }),
+
+    smokeCloud = new Effect(70, e -> {
+        randLenVectors(e.id, e.fin(), 30, 30f, (x, y, fin, fout) -> {
+            color(Color.gray);
+            alpha((0.5f - Math.abs(fin - 0.5f)) * 2f);
+            Fill.circle(e.x + x, e.y + y, 0.5f + fout * 4f);
+        });
+    }),
     
     smeltsmoke = new Effect(15, e -> {
         randLenVectors(e.id, 6, 4f + e.fin() * 5f, (x, y) -> {
@@ -1265,10 +1478,11 @@ public class Fx{
 
     }),
 
-    //TODO fix false in constructor
     ripple = new Effect(30, e -> {
+        e.lifetime = 30f*e.rotation;
+
         color(Tmp.c1.set(e.color).mul(1.5f));
-        stroke(e.fout() + 0.4f);
+        stroke(e.fout() * 1.4f);
         Lines.circle(e.x, e.y, (2f + e.fin() * 4f) * e.rotation);
     }).ground(),
 
diff --git a/core/src/mindustry/content/Items.java b/core/src/mindustry/content/Items.java
index a671f25b57..e16784a61b 100644
--- a/core/src/mindustry/content/Items.java
+++ b/core/src/mindustry/content/Items.java
@@ -31,7 +31,7 @@ public class Items implements ContentList{
         }};
 
         sand = new Item("sand", Color.valueOf("f7cba4")){{
-
+            alwaysUnlocked = true;
         }};
 
         coal = new Item("coal", Color.valueOf("272727")){{
@@ -84,7 +84,7 @@ public class Items implements ContentList{
         }};
 
         pyratite = new Item("pyratite", Color.valueOf("ffaa5f")){{
-            flammability = 1.5f;
+            flammability = 1.4f;
             explosiveness = 0.4f;
         }};
     }
diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java
index 56d3e481ab..aaced53394 100644
--- a/core/src/mindustry/content/Liquids.java
+++ b/core/src/mindustry/content/Liquids.java
@@ -13,6 +13,7 @@ public class Liquids implements ContentList{
         water = new Liquid("water", Color.valueOf("596ab8")){{
             heatCapacity = 0.4f;
             effect = StatusEffects.wet;
+            alwaysUnlocked = true;
         }};
 
         slag = new Liquid("slag", Color.valueOf("ffa166")){{
diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java
index e04c4bed27..873ba1c054 100644
--- a/core/src/mindustry/content/Planets.java
+++ b/core/src/mindustry/content/Planets.java
@@ -9,7 +9,7 @@ import mindustry.type.*;
 public class Planets implements ContentList{
     public static Planet
     sun,
-    starter; //TODO rename
+    serpulo;
 
     @Override
     public void load(){
@@ -31,11 +31,11 @@ public class Planets implements ContentList{
             );
         }};
 
-        //TODO rename
-        starter = new Planet("TODO", sun, 3, 1){{
-            generator = new TODOPlanetGenerator();
+        serpulo = new Planet("serpulo", sun, 3, 1){{
+            generator = new SerpuloPlanetGenerator();
             meshLoader = () -> new HexMesh(this, 6);
             atmosphereColor = Color.valueOf("3c1b8f");
+            startSector = 15;
         }};
     }
 }
diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java
index c979bc9dda..3b76795c1d 100644
--- a/core/src/mindustry/content/SectorPresets.java
+++ b/core/src/mindustry/content/SectorPresets.java
@@ -1,162 +1,64 @@
 package mindustry.content;
 
 import mindustry.ctype.*;
-import mindustry.game.Objectives.*;
 import mindustry.type.*;
 
-import static arc.struct.Seq.*;
 import static mindustry.content.Planets.*;
 
 public class SectorPresets implements ContentList{
     public static SectorPreset
     groundZero,
     craters, frozenForest, ruinousShores, stainedMountains, tarFields, fungalPass,
-    saltFlats, overgrowth, impact0078, crags,
+    saltFlats, overgrowth,
     desolateRift, nuclearComplex;
 
     @Override
     public void load(){
 
-        groundZero = new SectorPreset("groundZero", starter, 15){{
+        groundZero = new SectorPreset("groundZero", serpulo, 15){{
             alwaysUnlocked = true;
-            conditionWave = 5;
-            launchPeriod = 5;
-            rules = r -> {
-                r.winWave = 30;
-            };
+            captureWave = 10;
         }};
 
-        saltFlats = new SectorPreset("saltFlats", starter, 101){{
-            conditionWave = 10;
-            launchPeriod = 5;
-            requirements = with(
-            new SectorWave(groundZero, 60),
-            //new Unlock(Blocks.daggerFactory),
-            //new Unlock(Blocks.draugFactory),
-            new Unlock(Blocks.door),
-            new Unlock(Blocks.waterExtractor)
-            );
+        saltFlats = new SectorPreset("saltFlats", serpulo, 101){{
+
         }};
 
-        frozenForest = new SectorPreset("frozenForest", starter, 86){{
-            conditionWave = 10;
-            requirements = with(
-            new SectorWave(groundZero, 10),
-            new Unlock(Blocks.junction),
-            new Unlock(Blocks.router)
-            );
+        frozenForest = new SectorPreset("frozenForest", serpulo, 86){{
+            captureWave = 40;
         }};
 
-        craters = new SectorPreset("craters", starter, 18){{
-            conditionWave = 10;
-            requirements = with(
-            new SectorWave(frozenForest, 10),
-            new Unlock(Blocks.mender),
-            new Unlock(Blocks.combustionGenerator)
-            );
+        craters = new SectorPreset("craters", serpulo, 18){{
+            captureWave = 40;
         }};
 
-        ruinousShores = new SectorPreset("ruinousShores", starter, 19){{
-            conditionWave = 20;
-            launchPeriod = 20;
-            requirements = with(
-            new SectorWave(groundZero, 20),
-            new SectorWave(craters, 15),
-            new Unlock(Blocks.graphitePress),
-            new Unlock(Blocks.combustionGenerator),
-            new Unlock(Blocks.kiln),
-            new Unlock(Blocks.mechanicalPump)
-            );
+        ruinousShores = new SectorPreset("ruinousShores", serpulo, 19){{
+            captureWave = 40;
         }};
 
-        stainedMountains = new SectorPreset("stainedMountains", starter, 20){{
-            conditionWave = 10;
-            launchPeriod = 10;
-            requirements = with(
-            new SectorWave(frozenForest, 15),
-            new Unlock(Blocks.pneumaticDrill),
-            new Unlock(Blocks.powerNode),
-            new Unlock(Blocks.turbineGenerator)
-            );
+        stainedMountains = new SectorPreset("stainedMountains", serpulo, 20){{
+            captureWave = 30;
         }};
 
-        fungalPass = new SectorPreset("fungalPass", starter, 21){{
-            requirements = with(
-            new SectorWave(stainedMountains, 15),
-            //new Unlock(Blocks.daggerFactory),
-            //new Unlock(Blocks.crawlerFactory),
-            new Unlock(Blocks.door),
-            new Unlock(Blocks.siliconSmelter)
-            );
+        fungalPass = new SectorPreset("fungalPass", serpulo, 21){{
+
         }};
 
-        overgrowth = new SectorPreset("overgrowth", starter, 22){{
-            conditionWave = 12;
-            launchPeriod = 4;
-            requirements = with(
-            new SectorWave(craters, 40),
-            new Launched(fungalPass),
-            new Unlock(Blocks.cultivator),
-            new Unlock(Blocks.sporePress)
-            //new Unlock(Blocks.titanFactory),
-            //new Unlock(Blocks.wraithFactory)
-            );
+        overgrowth = new SectorPreset("overgrowth", serpulo, 22){{
+
         }};
 
-        tarFields = new SectorPreset("tarFields", starter, 23){{
-            conditionWave = 15;
-            launchPeriod = 10;
-            requirements = with(
-            new SectorWave(ruinousShores, 20),
-            new Unlock(Blocks.coalCentrifuge),
-            new Unlock(Blocks.conduit),
-            new Unlock(Blocks.wave)
-            );
+        tarFields = new SectorPreset("tarFields", serpulo, 23){{
+            captureWave = 40;
         }};
 
-        desolateRift = new SectorPreset("desolateRift", starter, 123){{
-            conditionWave = 3;
-            launchPeriod = 2;
-            requirements = with(
-            new SectorWave(tarFields, 20),
-            new Unlock(Blocks.thermalGenerator),
-            new Unlock(Blocks.thoriumReactor)
-            );
+        desolateRift = new SectorPreset("desolateRift", serpulo, 123){{
+            captureWave = 40;
         }};
 
 
-        nuclearComplex = new SectorPreset("nuclearComplex", starter, 130){{
-            conditionWave = 30;
-            launchPeriod = 15;
-            requirements = with(
-            new Launched(fungalPass),
-            new Unlock(Blocks.thermalGenerator),
-            new Unlock(Blocks.laserDrill)
-            );
+        nuclearComplex = new SectorPreset("nuclearComplex", serpulo, 130){{
+            captureWave = 60;
         }};
-
-        /*
-        crags = new Zone("crags", new MapGenerator("crags").dist(2f)){{
-            loadout = Loadouts.basicFoundation;
-            baseLaunchCost = ItemStack.with();
-            startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 2000, Items.graphite, 500, Items.titanium, 500, Items.silicon, 500);
-            conditionWave = 3;
-            launchPeriod = 2;
-            requirements = with(stainedMountains, 40);
-            blockRequirements = new Block[]{Blocks.thermalGenerator};
-            resources = Array.with(Items.copper, Items.scrap, Items.lead, Items.coal, Items.sand};
-        }};
-
-        
-        impact0078 = new SectorPreset("impact0078"){{
-            loadout = Loadouts.basicNucleus;
-            baseLaunchCost = ItemStack.list();
-            startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 2000, Items.graphite, 500, Items.titanium, 500, Items.silicon, 500);
-            conditionWave = 3;
-            launchPeriod = 2;
-            //requirements = with(nuclearComplex, 40);
-            //blockRequirements = new Block[]{Blocks.thermalGenerator};
-            //resources = Array.with(Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium};
-        }};*/
     }
 }
diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java
index 8f2c4bae71..7dc957a344 100644
--- a/core/src/mindustry/content/StatusEffects.java
+++ b/core/src/mindustry/content/StatusEffects.java
@@ -9,7 +9,7 @@ import mindustry.type.StatusEffect;
 import static mindustry.Vars.*;
 
 public class StatusEffects implements ContentList{
-    public static StatusEffect none, burning, freezing, wet, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss;
+    public static StatusEffect none, burning, freezing, unmoving, slow, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed;
 
     @Override
     public void load(){
@@ -17,7 +17,7 @@ public class StatusEffects implements ContentList{
         none = new StatusEffect("none");
 
         burning = new StatusEffect("burning"){{
-            damage = 0.08f; //over 10 seconds, this would be 48 damage
+            damage = 0.12f; //over 8 seconds, this would be 60 damage
             effect = Fx.burning;
 
             init(() -> {
@@ -45,14 +45,23 @@ public class StatusEffects implements ContentList{
             });
         }};
 
+        unmoving = new StatusEffect("unmoving"){{
+            speedMultiplier = 0.001f;
+        }};
+
+        slow = new StatusEffect("slow"){{
+            speedMultiplier = 0.4f;
+        }};
+
         wet = new StatusEffect("wet"){{
             color = Color.royal;
-            speedMultiplier = 0.9f;
+            speedMultiplier = 0.94f;
             effect = Fx.wet;
+            effectChance = 0.09f;
 
             init(() -> {
                 trans(shocked, ((unit, time, newTime, result) -> {
-                    unit.damagePierce(20f);
+                    unit.damagePierce(14f);
                     if(unit.team() == state.rules.waveTeam){
                         Events.fire(Trigger.shock);
                     }
@@ -61,6 +70,13 @@ public class StatusEffects implements ContentList{
                 opposite(burning);
             });
         }};
+		
+        muddy = new StatusEffect("muddy"){{
+            color = Color.valueOf("46382a");
+            speedMultiplier = 0.94f;
+            effect = Fx.muddy;
+            effectChance = 0.09f;
+        }};
 
         melting = new StatusEffect("melting"){{
             speedMultiplier = 0.8f;
@@ -81,6 +97,12 @@ public class StatusEffects implements ContentList{
             effectChance = 0.1f;
         }};
 
+        sporeSlowed = new StatusEffect("spore-slowed"){{
+            speedMultiplier = 0.8f;
+            effect = Fx.sapped;
+            effectChance = 0.04f;
+        }};
+
         tarred = new StatusEffect("tarred"){{
             speedMultiplier = 0.6f;
             effect = Fx.oily;
@@ -114,13 +136,14 @@ public class StatusEffects implements ContentList{
 
         boss = new StatusEffect("boss"){{
             permanent = true;
+            damageMultiplier = 1.5f;
+            armorMultiplier = 1.5f;
         }};
 
         shocked = new StatusEffect("shocked");
 
         blasted = new StatusEffect("blasted");
 
-        //no effects, just small amounts of damage.
         corroded = new StatusEffect("corroded"){{
             damage = 0.1f;
         }};
diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index e95785d9a8..0d7a66eec9 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -1,27 +1,27 @@
 package mindustry.content;
 
 import arc.*;
-import arc.math.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.ctype.*;
 import mindustry.game.Objectives.*;
 import mindustry.type.*;
-import mindustry.world.*;
 
 import static mindustry.content.Blocks.*;
+import static mindustry.content.SectorPresets.craters;
+import static mindustry.content.SectorPresets.*;
+import static mindustry.content.UnitTypes.*;
+import static mindustry.type.ItemStack.*;
 
 public class TechTree implements ContentList{
-    private static ObjectMap<UnlockableContent, TechNode> map = new ObjectMap<>();
+    static ObjectMap<UnlockableContent, TechNode> map = new ObjectMap<>();
 
     public static Seq<TechNode> all;
     public static TechNode root;
 
     @Override
     public void load(){
-        TechNode.context = null;
-        map = new ObjectMap<>();
-        all = new Seq<>();
+        setup();
 
         root = node(coreShard, () -> {
 
@@ -30,15 +30,11 @@ public class TechTree implements ContentList{
                 node(junction, () -> {
                     node(router, () -> {
                         node(launchPad, () -> {
-                            node(launchPadLarge, () -> {
-
-                            });
                         });
 
                         node(distributor);
                         node(sorter, () -> {
                             node(invertedSorter);
-                            node(message);
                             node(overflowGate, () -> {
                                 node(underflowGate);
                             });
@@ -58,12 +54,16 @@ public class TechTree implements ContentList{
                                     });
                                 });
 
-                                node(plastaniumConveyor, () -> {
+                                node(payloadConveyor, () -> {
+                                    node(payloadRouter, () -> {
 
+                                    });
                                 });
 
                                 node(armoredConveyor, () -> {
+                                    node(plastaniumConveyor, () -> {
 
+                                    });
                                 });
                             });
                         });
@@ -77,47 +77,221 @@ public class TechTree implements ContentList{
                 });
             });
 
-            node(duo, () -> {
-                node(scatter, () -> {
-                    node(hail, () -> {
+            node(mechanicalDrill, () -> {
 
-                        node(salvo, () -> {
-                            node(swarmer, () -> {
-                                node(cyclone, () -> {
-                                    node(spectre, () -> {
+                node(mechanicalPump, () -> {
+                    node(conduit, () -> {
+                        node(liquidJunction, () -> {
+                            node(liquidRouter, () -> {
+                                node(liquidTank);
+
+                                node(bridgeConduit);
+
+                                node(pulseConduit, () -> {
+                                    node(phaseConduit, () -> {
+
+                                    });
+
+                                    node(platedConduit, () -> {
+
+                                    });
+                                });
+
+                                node(rotaryPump, () -> {
+                                    node(thermalPump, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(Items.coal, with(Items.lead, 3000), () -> {
+                    node(Items.graphite, with(Items.coal, 1000), () -> {
+                        node(illuminator, () -> {
+                        });
+
+                        node(graphitePress, () -> {
+                            node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> {
+                                node(pneumaticDrill, () -> {
+                                    node(Items.sporePod, with(Items.coal, 5000, Items.graphite, 5000, Items.lead, 5000), () -> {
+                                        node(cultivator, () -> {
+
+                                        });
+                                    });
+
+                                    node(Items.thorium, with(Items.titanium, 10000, Items.lead, 15000, Items.copper, 30000), () -> {
+                                        node(laserDrill, () -> {
+                                            node(blastDrill, () -> {
+
+                                            });
+
+                                            node(waterExtractor, () -> {
+                                                node(oilExtractor, () -> {
+
+                                                });
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+
+                            node(Items.pyratite, with(Items.coal, 6000, Items.lead, 10000, Items.sand, 5000), () -> {
+                                node(pyratiteMixer, () -> {
+                                    node(Items.blastCompound, with(Items.pyratite, 3000, Items.sporePod, 3000), () -> {
+                                        node(blastMixer, () -> {
+
+                                        });
+                                    });
+                                });
+                            });
+
+                            node(Items.silicon, with(Items.coal, 4000, Items.sand, 4000), () -> {
+                                node(siliconSmelter, () -> {
+
+                                    node(Liquids.oil, with(Items.coal, 8000, Items.pyratite, 6000, Items.sand, 20000), () -> {
+                                        node(sporePress, () -> {
+                                            node(coalCentrifuge, () -> {
+                                                node(multiPress, () -> {
+                                                    node(siliconCrucible, () -> {
+
+                                                    });
+                                                });
+                                            });
+
+                                            node(Items.plastanium, with(Items.titanium, 10000, Items.silicon, 10000), () -> {
+                                                node(plastaniumCompressor, () -> {
+                                                    node(Items.phasefabric, with(Items.thorium, 15000, Items.sand, 30000, Items.silicon, 5000), () -> {
+                                                        node(phaseWeaver, () -> {
+
+                                                        });
+                                                    });
+                                                });
+                                            });
+                                        });
+                                    });
+
+                                    node(Items.metaglass, with(Items.sand, 6000, Items.lead, 10000), () -> {
+                                        node(kiln, () -> {
+                                            node(incinerator, () -> {
+                                                node(Items.scrap, with(Items.copper, 20000, Items.sand, 10000), () -> {
+                                                    node(Liquids.slag, with(Items.scrap, 4000), () -> {
+                                                        node(melter, () -> {
+                                                            node(Items.surgealloy, with(Items.thorium, 20000, Items.silicon, 30000, Items.lead, 40000), () -> {
+                                                                node(surgeSmelter, () -> {
+
+                                                                });
+                                                            });
+
+                                                            node(separator, () -> {
+                                                                node(pulverizer, () -> {
+                                                                    node(disassembler, () -> {
+
+                                                                    });
+                                                                });
+                                                            });
+
+                                                            node(Liquids.cryofluid, with(Items.titanium, 8000, Items.metaglass, 5000), () -> {
+                                                                node(cryofluidMixer, () -> {
+
+                                                                });
+                                                            });
+                                                        });
+                                                    });
+                                                });
+                                            });
+                                        });
+                                    });
+
+                                    node(microProcessor, () -> {
+                                        node(switchBlock, () -> {
+                                            node(message, () -> {
+                                                node(logicDisplay, () -> {
+                                                    node(largeLogicDisplay, () -> {
+
+                                                    });
+                                                });
+
+                                                node(memoryCell, () -> {
+                                                    node(memoryBank, () -> {
+
+                                                    });
+                                                });
+                                            });
+
+                                            node(logicProcessor, () -> {
+                                                node(hyperProcessor, () -> {
+
+                                                });
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+
+
+                    node(combustionGenerator, () -> {
+                        node(powerNode, () -> {
+                            node(powerNodeLarge, () -> {
+                                node(diode, () -> {
+                                    node(surgeTower, () -> {
 
                                     });
                                 });
                             });
 
-                            node(ripple, () -> {
-                                node(fuse, () -> {
+                            node(battery, () -> {
+                                node(batteryLarge, () -> {
+
+                                });
+                            });
+
+                            node(mender, () -> {
+                                node(mendProjector, () -> {
+                                    node(forceProjector, () -> {
+                                        node(overdriveProjector, () -> {
+                                            node(overdriveDome, () -> {
+
+                                            });
+                                        });
+                                    });
+
+                                    node(repairPoint, () -> {
+
+                                    });
+                                });
+                            });
+
+                            node(steamGenerator, () -> {
+                                node(thermalGenerator, () -> {
+                                    node(differentialGenerator, () -> {
+                                        node(thoriumReactor, Seq.with(new Research(Liquids.cryofluid)), () -> {
+                                            node(impactReactor, () -> {
+
+                                            });
+
+                                            node(rtgGenerator, () -> {
+
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+
+                            node(solarPanel, () -> {
+                                node(largeSolarPanel, () -> {
 
                                 });
                             });
                         });
                     });
                 });
+            });
 
-                node(scorch, () -> {
-                    node(arc, () -> {
-                        node(wave, () -> {
-
-                        });
-
-                        node(lancer, () -> {
-                            node(meltdown, () -> {
-
-                            });
-
-                            node(shockMine, () -> {
-
-                            });
-                        });
-                    });
-                });
-
-
+            node(duo, () -> {
                 node(copperWall, () -> {
                     node(copperWallLarge, () -> {
                         node(titaniumWall, () -> {
@@ -143,31 +317,129 @@ public class TechTree implements ContentList{
                         });
                     });
                 });
+
+                node(scatter, () -> {
+                    node(hail, () -> {
+
+                        node(salvo, () -> {
+                            node(swarmer, () -> {
+                                node(cyclone, () -> {
+                                    node(spectre, () -> {
+
+                                    });
+                                });
+                            });
+
+                            node(ripple, () -> {
+                                node(fuse, () -> {
+
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(scorch, () -> {
+                    node(arc, () -> {
+                        node(wave, () -> {
+                            node(parallax, () -> {
+                                node(segment, () -> {
+
+                                });
+                            });
+
+                            node(tsunami, () -> {
+
+                            });
+                        });
+
+                        node(lancer, () -> {
+                            node(foreshadow, () -> {
+                                node(meltdown, () -> {
+
+                                });
+                            });
+
+                            node(shockMine, () -> {
+
+                            });
+                        });
+                    });
+                });
             });
 
-            node(mechanicalDrill, () -> {
+            node(groundFactory, () -> {
+                node(commandCenter, () -> {
 
-                node(Liquids.water, () -> {
-                    node(mechanicalPump, () -> {
-                        node(conduit, () -> {
-                            node(liquidJunction, () -> {
-                                node(liquidRouter, () -> {
-                                    node(liquidTank);
+                });
 
-                                    node(bridgeConduit);
+                node(dagger, () -> {
+                    node(mace, () -> {
+                        node(fortress, () -> {
+                            node(scepter, () -> {
+                                node(reign, () -> {
 
-                                    node(pulseConduit, () -> {
-                                        node(phaseConduit, () -> {
+                                });
+                            });
+                        });
+                    });
 
-                                        });
+                    node(nova, () -> {
+                        node(pulsar, () -> {
+                            node(quasar, () -> {
+                                node(vela, () -> {
+                                    node(corvus, () -> {
 
-                                        node(platedConduit, () -> {
+                                    });
+                                });
+                            });
+                        });
+                    });
+
+                    node(crawler, () -> {
+                        node(atrax, () -> {
+                            node(spiroct, () -> {
+                                node(arkyid, () -> {
+                                    node(toxopid, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+
+                node(airFactory, () -> {
+                    node(flare, () -> {
+                        node(horizon, () -> {
+                            node(zenith, () -> {
+                                node(antumbra, () -> {
+                                    node(eclipse, () -> {
+
+                                    });
+                                });
+                            });
+                        });
+
+                        node(mono, () -> {
+                            node(poly, () -> {
+                                node(mega, () -> {
+                                    node(quad, () -> {
+                                        node(oct, () -> {
 
                                         });
                                     });
+                                });
+                            });
+                        });
+                    });
 
-                                    node(rotaryPump, () -> {
-                                        node(thermalPump, () -> {
+                    node(navalFactory, () -> {
+                        node(risso, () -> {
+                            node(minke, () -> {
+                                node(bryde, () -> {
+                                    node(sei, () -> {
+                                        node(omura, () -> {
 
                                         });
                                     });
@@ -177,121 +449,91 @@ public class TechTree implements ContentList{
                     });
                 });
 
-                node(Items.coal, () -> {
-                    node(graphitePress, () -> {
-                        node(pneumaticDrill, () -> {
-                            node(cultivator, () -> {
-
-                            });
-
-                            node(laserDrill, () -> {
-                                node(blastDrill, () -> {
-
-                                });
-
-                                node(waterExtractor, () -> {
-                                    node(oilExtractor, () -> {
-
-                                    });
-                                });
-                            });
-                        });
-
-                        node(pyratiteMixer, () -> {
-                            node(blastMixer, () -> {
-
-                            });
-                        });
-
-                        node(siliconSmelter, () -> {
-
-                            node(sporePress, () -> {
-                                node(coalCentrifuge, () -> {
-
-                                });
-                                node(multiPress, () -> {
-
-                                });
-
-                                node(plastaniumCompressor, () -> {
-                                    node(phaseWeaver, () -> {
-
-                                    });
-                                });
-                            });
-
-                            node(kiln, () -> {
-                                node(incinerator, () -> {
-                                    node(melter, () -> {
-                                        node(surgeSmelter, () -> {
-
-                                        });
-
-                                        node(separator, () -> {
-                                            node(pulverizer, () -> {
-
-                                            });
-                                        });
-
-                                        node(cryofluidMixer, () -> {
-
-                                        });
-                                    });
-                                });
+                node(additiveReconstructor, () -> {
+                    node(multiplicativeReconstructor, () -> {
+                        node(exponentialReconstructor, () -> {
+                            node(tetrativeReconstructor, () -> {
                             });
                         });
                     });
+                });
+            });
 
-                    node(combustionGenerator, () -> {
-                        node(powerNode, () -> {
-                            node(powerNodeLarge, () -> {
-                                node(diode, () -> {
-                                    node(surgeTower, () -> {
+            node(groundZero, () -> {
+                node(frozenForest, Seq.with(
+                    new SectorComplete(groundZero),
+                    new Research(junction),
+                    new Research(router)
+                ), () -> {
+                    node(craters, Seq.with(
+                        new SectorComplete(frozenForest),
+                        new Research(mender),
+                        new Research(combustionGenerator)
+                    ), () -> {
+                        node(ruinousShores, Seq.with(
+                            new SectorComplete(craters),
+                            new Research(graphitePress),
+                            new Research(combustionGenerator),
+                            new Research(kiln),
+                            new Research(mechanicalPump)
+                        ), () -> {
 
-                                    });
-                                });
-                            });
-
-                            node(battery, () -> {
-                                node(batteryLarge, () -> {
+                            node(tarFields, Seq.with(
+                                new SectorComplete(ruinousShores),
+                                new Research(coalCentrifuge),
+                                new Research(conduit),
+                                new Research(wave)
+                            ), () -> {
+                                node(desolateRift, Seq.with(
+                                    new SectorComplete(tarFields),
+                                    new Research(thermalGenerator),
+                                    new Research(thoriumReactor)
+                                ), () -> {
 
                                 });
                             });
 
-                            node(mender, () -> {
-                                node(mendProjector, () -> {
-                                    node(forceProjector, () -> {
-                                        node(overdriveProjector, () -> {
+                            node(saltFlats, Seq.with(
+                                new SectorComplete(ruinousShores),
+                                new Research(groundFactory),
+                                new Research(airFactory),
+                                new Research(door),
+                                new Research(waterExtractor)
+                            ), () -> {
 
-                                        });
-                                    });
-
-                                    node(repairPoint, () -> {
-
-                                    });
-                                });
                             });
+                        });
 
-                            node(turbineGenerator, () -> {
-                                node(thermalGenerator, () -> {
-                                    node(differentialGenerator, () -> {
-                                        node(thoriumReactor, () -> {
-                                            node(impactReactor, () -> {
+                        node(overgrowth, Seq.with(
+                            new SectorComplete(craters),
+                            new SectorComplete(fungalPass),
+                            new Research(cultivator),
+                            new Research(sporePress),
+                            new Research(UnitTypes.mace),
+                            new Research(UnitTypes.flare)
+                        ), () -> {
 
-                                            });
+                        });
+                    });
 
-                                            node(rtgGenerator, () -> {
+                    node(stainedMountains, Seq.with(
+                        new SectorComplete(frozenForest),
+                        new Research(pneumaticDrill),
+                        new Research(powerNode),
+                        new Research(steamGenerator)
+                    ), () -> {
+                        node(fungalPass, Seq.with(
+                            new SectorComplete(stainedMountains),
+                            new Research(groundFactory),
+                            new Research(door),
+                            new Research(siliconSmelter)
+                        ), () -> {
+                            node(nuclearComplex, Seq.with(
+                                new SectorComplete(fungalPass),
+                                new Research(thermalGenerator),
+                                new Research(laserDrill)
+                            ), () -> {
 
-                                            });
-                                        });
-                                    });
-                                });
-                            });
-
-                            node(solarPanel, () -> {
-                                node(largeSolarPanel, () -> {
-
-                                });
                             });
                         });
                     });
@@ -300,24 +542,27 @@ public class TechTree implements ContentList{
         });
     }
 
-    private static TechNode node(UnlockableContent content, Runnable children){
-        ItemStack[] requirements;
+    public static void setup(){
+        TechNode.context = null;
+        map = new ObjectMap<>();
+        all = new Seq<>();
+    }
 
-        if(content instanceof Block){
-            Block block = (Block)content;
-
-            requirements = new ItemStack[block.requirements.length];
-            for(int i = 0; i < requirements.length; i++){
-                requirements[i] = new ItemStack(block.requirements[i].item, 40 + Mathf.round(Mathf.pow(block.requirements[i].amount, 1.25f) * 20, 10));
-            }
-        }else{
-            requirements = ItemStack.empty;
-        }
+    public static TechNode node(UnlockableContent content, Runnable children){
+        return node(content, content.researchRequirements(), children);
+    }
 
+    public static TechNode node(UnlockableContent content, ItemStack[] requirements, Runnable children){
         return new TechNode(content, requirements, children);
     }
 
-    private static TechNode node(UnlockableContent block){
+    public static TechNode node(UnlockableContent content, Seq<Objective> objectives, Runnable children){
+        TechNode node = new TechNode(content, content.researchRequirements(), children);
+        node.objectives = objectives;
+        return node;
+    }
+
+    public static TechNode node(UnlockableContent block){
         return node(block, () -> {});
     }
 
@@ -335,7 +580,7 @@ public class TechTree implements ContentList{
     }
 
     public static class TechNode{
-        private static TechNode context;
+        static TechNode context;
 
         /** Depth in tech tree. */
         public int depth;
@@ -345,25 +590,32 @@ public class TechTree implements ContentList{
         public UnlockableContent content;
         /** Item requirements for this content. */
         public ItemStack[] requirements;
-        /** Extra objectives needed to research this. TODO implement */
-        public Objective[] objectives = {};
+        /** Requirements that have been fulfilled. Always the same length as the requirement array. */
+        public final ItemStack[] finishedRequirements;
+        /** Extra objectives needed to research this. */
+        public Seq<Objective> objectives = new Seq<>();
         /** Time required to research this content, in seconds. */
-        public float time = 60;
+        public float time;
         /** Nodes that depend on this node. */
         public final Seq<TechNode> children = new Seq<>();
-        /** Research progress, in seconds. */
-        public float progress;
 
         TechNode(@Nullable TechNode ccontext, UnlockableContent content, ItemStack[] requirements, Runnable children){
-            if(ccontext != null){
-                ccontext.children.add(this);
-            }
+            if(ccontext != null) ccontext.children.add(this);
 
             this.parent = ccontext;
             this.content = content;
             this.requirements = requirements;
             this.depth = parent == null ? 0 : parent.depth + 1;
-            this.progress = Core.settings == null ? 0 : Core.settings.getFloat("research-" + content.name, 0f);
+            this.time = Seq.with(requirements).mapFloat(i -> i.item.cost * i.amount).sum() * 10;
+            this.finishedRequirements = new ItemStack[requirements.length];
+
+            //load up the requirements that have been finished if settings are available
+            for(int i = 0; i < requirements.length; i++){
+                finishedRequirements[i] = new ItemStack(requirements[i].item, Core.settings == null ? 0 : Core.settings.getInt("req-" + content.name + "-" + requirements[i].item.name));
+            }
+
+            //add dependencies as objectives.
+            content.getDependencies(d -> objectives.add(new Research(d)));
 
             map.put(content, this);
             context = this;
@@ -378,7 +630,11 @@ public class TechTree implements ContentList{
 
         /** Flushes research progress to settings. */
         public void save(){
-            Core.settings.put("research-" + content.name, progress);
+
+            //save finished requirements by item type
+            for(ItemStack stack : finishedRequirements){
+                Core.settings.put("req-" + content.name + "-" + stack.item.name, stack.amount);
+            }
         }
     }
 }
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 09784f50a4..3fd037f208 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -11,23 +11,28 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
 
+import static mindustry.Vars.*;
+
 public class UnitTypes implements ContentList{
     //region definitions
 
-    //ground
-    public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, vestige, cataclyst;
+    //mech
+    public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, scepter, reign;
 
-    //ground + builder
-    public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType nova;
+    //mech + builder + miner + commander
+    public static @EntityDef({Unitc.class, Mechc.class, Builderc.class, Minerc.class, Commanderc.class}) UnitType nova, pulsar, quasar;
 
-    //ground + builder + miner + commander
-    public static @EntityDef({Unitc.class, Mechc.class, Builderc.class, Minerc.class, Commanderc.class}) UnitType pulsar, quasar;
+    //mech + commander
+    public static @EntityDef({Unitc.class, Mechc.class, Commanderc.class}) UnitType vela;
+
+    //legs + commander
+    public static @EntityDef({Unitc.class, Legsc.class, Commanderc.class}) UnitType corvus;
 
     //legs
     public static @EntityDef({Unitc.class, Legsc.class}) UnitType atrax;
 
     //legs + building
-    public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType spiroct, arkyid;
+    public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType spiroct, arkyid, toxopid;
 
     //air (no special traits)
     public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra;
@@ -41,11 +46,17 @@ public class UnitTypes implements ContentList{
     //air + building + mining + payload
     public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType mega;
 
-    //air + building + mining
-    public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Trailc.class}) UnitType alpha, beta, gamma;
+    //air + building + payload
+    public static @EntityDef({Unitc.class, Builderc.class, Payloadc.class}) UnitType quad;
 
-    //water
-    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke, bryde;
+    //air + building + payload + command
+    public static @EntityDef({Unitc.class, Builderc.class, Payloadc.class, Commanderc.class, AmmoDistributec.class}) UnitType oct;
+
+    //air + building + mining
+    public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma;
+
+    //water + commander
+    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risso, minke, bryde, sei, omura;
 
     //special block unit type
     public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
@@ -58,12 +69,13 @@ public class UnitTypes implements ContentList{
 
         dagger = new UnitType("dagger"){{
             speed = 0.5f;
-            hitsize = 8f;
+            hitSize = 8f;
             health = 140;
             weapons.add(new Weapon("large-weapon"){{
                 reload = 14f;
                 x = 4f;
                 y = 2f;
+                top = false;
                 ejectEffect = Fx.shellEjectSmall;
                 bullet = Bullets.standardCopper;
             }});
@@ -71,25 +83,24 @@ public class UnitTypes implements ContentList{
 
         mace = new UnitType("mace"){{
             speed = 0.4f;
-            hitsize = 9f;
-            range = 10f;
+            hitSize = 9f;
             health = 500;
-            armor = 3f;
+            armor = 4f;
 
             immunities.add(StatusEffects.burning);
 
             weapons.add(new Weapon("flamethrower"){{
+                top = false;
                 shootSound = Sounds.flame;
                 shootY = 2f;
                 reload = 14f;
                 recoil = 1f;
                 ejectEffect = Fx.none;
-                bullet = new BulletType(3f, 30f){{
+                bullet = new BulletType(3.9f, 30f){{
                     ammoMultiplier = 3f;
                     hitSize = 7f;
-                    lifetime = 42f;
+                    lifetime = 12f;
                     pierce = true;
-                    drag = 0.05f;
                     statusDuration = 60f * 4;
                     shootEffect = Fx.shootSmallFlame;
                     hitEffect = Fx.hitFlameSmall;
@@ -103,13 +114,15 @@ public class UnitTypes implements ContentList{
 
         fortress = new UnitType("fortress"){{
             speed = 0.38f;
-            hitsize = 13f;
+            hitSize = 13f;
             rotateSpeed = 3f;
             targetAir = false;
             health = 790;
-            armor = 8f;
+            armor = 9f;
+            mechFrontSway = 0.55f;
 
             weapons.add(new Weapon("artillery"){{
+                top = false;
                 y = 1f;
                 x = 9f;
                 reload = 60f;
@@ -132,6 +145,123 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        scepter = new UnitType("scepter"){{
+            speed = 0.35f;
+            hitSize = 20f;
+            rotateSpeed = 2.1f;
+            health = 9000;
+            armor = 11f;
+            canDrown = false;
+            mechFrontSway = 1f;
+
+            mechStepParticles = true;
+            mechStepShake = 0.15f;
+            singleTarget = true;
+
+            weapons.add(
+            new Weapon("scepter-weapon"){{
+                top = false;
+                y = 1f;
+                x = 16f;
+                shootY = 8f;
+                reload = 50f;
+                recoil = 5f;
+                shake = 2f;
+                ejectEffect = Fx.shellEjectBig;
+                shootSound = Sounds.artillery;
+                shots = 3;
+                inaccuracy = 3f;
+                shotDelay = 4f;
+
+                bullet = new BasicBulletType(7f, 45){{
+                    width = 11f;
+                    height = 20f;
+                    lifetime = 25f;
+                    shootEffect = Fx.shootBig;
+                    lightning = 2;
+                    lightningLength = 6;
+                    lightningColor = Pal.surge;
+                    //standard bullet damage is far too much for lightning
+                    lightningDamage = 25;
+                }};
+            }},
+
+            new Weapon("mount-weapon"){{
+                reload = 13f;
+                x = 8.5f;
+                y = 6f;
+                rotate = true;
+                ejectEffect = Fx.shellEjectSmall;
+                bullet = Bullets.standardCopper;
+            }},
+            new Weapon("mount-weapon"){{
+                reload = 16f;
+                x = 8.5f;
+                y = -7f;
+                rotate = true;
+                ejectEffect = Fx.shellEjectSmall;
+                bullet = Bullets.standardCopper;
+            }}
+
+            );
+        }};
+
+        reign = new UnitType("reign"){{
+            speed = 0.35f;
+            hitSize = 26f;
+            rotateSpeed = 1.65f;
+            health = 24000;
+            armor = 14f;
+            mechStepParticles = true;
+            mechStepShake = 0.75f;
+            canDrown = false;
+            mechFrontSway = 1.9f;
+            mechSideSway = 0.6f;
+
+            weapons.add(
+            new Weapon("reign-weapon"){{
+                top = false;
+                y = 1f;
+                x = 21.5f;
+                shootY = 11f;
+                reload = 9f;
+                recoil = 5f;
+                shake = 2f;
+                ejectEffect = Fx.shellEjectBig;
+                shootSound = Sounds.artillery;
+
+                bullet = new BasicBulletType(13f, 55){{
+                    pierce = true;
+                    width = 14f;
+                    height = 33f;
+                    lifetime = 15f;
+                    shootEffect = Fx.shootBig;
+                    fragVelocityMin = 0.4f;
+
+                    hitEffect = Fx.blastExplosion;
+                    splashDamage = 18f;
+                    splashDamageRadius = 30f;
+
+                    fragBullets = 2;
+                    fragLifeMin = 0f;
+                    fragCone = 30f;
+
+                    fragBullet = new BasicBulletType(9f, 15){{
+                        width = 10f;
+                        height = 10f;
+                        pierce = true;
+
+                        lifetime = 20f;
+                        hitEffect = Fx.flakExplosion;
+                        splashDamage = 15f;
+                        splashDamageRadius = 15f;
+                    }};
+                }};
+            }}
+
+            );
+        }};
+
         //endregion
         //region ground support
 
@@ -139,15 +269,18 @@ public class UnitTypes implements ContentList{
             itemCapacity = 60;
             canBoost = true;
             boostMultiplier = 1.5f;
-            speed = 0.52f;
-            hitsize = 8f;
+            speed = 0.55f;
+            hitSize = 8f;
             health = 110f;
             buildSpeed = 0.8f;
             armor = 1f;
+            commandLimit = 8;
 
             abilities.add(new HealFieldAbility(10f, 60f * 4, 60f));
+            ammoType = AmmoTypes.power;
 
             weapons.add(new Weapon("heal-weapon"){{
+                top = false;
                 shootY = 2f;
                 reload = 24f;
                 x = 4.5f;
@@ -163,9 +296,9 @@ public class UnitTypes implements ContentList{
             itemCapacity = 60;
             canBoost = true;
             boostMultiplier = 1.5f;
-            speed = 0.48f;
-            hitsize = 10f;
-            health = 300f;
+            speed = 0.65f;
+            hitSize = 10f;
+            health = 320f;
             buildSpeed = 0.9f;
             armor = 4f;
 
@@ -173,9 +306,11 @@ public class UnitTypes implements ContentList{
             mineSpeed = 5f;
             commandLimit = 8;
 
-            abilities.add(new ShieldFieldAbility(15f, 30f, 60f * 5, 60f));
+            abilities.add(new ShieldFieldAbility(20f, 40f, 60f * 5, 60f));
+            ammoType = AmmoTypes.power;
 
             weapons.add(new Weapon("heal-shotgun-weapon"){{
+                top = false;
                 x = 5f;
                 shake = 2.2f;
                 y = 0.5f;
@@ -193,7 +328,7 @@ public class UnitTypes implements ContentList{
 
                 bullet = new LightningBulletType(){{
                     lightningColor = hitColor = Pal.heal;
-                    damage = 11f;
+                    damage = 15f;
                     lightningLength = 7;
                     lightningLengthRand = 7;
                     shootEffect = Fx.shootHeal;
@@ -203,25 +338,30 @@ public class UnitTypes implements ContentList{
 
         quasar = new UnitType("quasar"){{
             mineTier = 1;
-            hitsize = 12f;
+            hitSize = 12f;
             boostMultiplier = 2f;
             itemCapacity = 80;
-            health = 640f;
+            health = 650f;
             buildSpeed = 1.7f;
             canBoost = true;
             armor = 9f;
             landShake = 2f;
 
+            commandLimit = 10;
+            mechFrontSway = 0.55f;
+            ammoType = AmmoTypes.power;
+
             speed = 0.4f;
-            hitsize = 10f;
+            hitSize = 10f;
 
             mineTier = 2;
             mineSpeed = 7f;
             drawShields = false;
 
-            abilities.add(new ForceFieldAbility(60f, 0.12f, 200f, 60f * 8));
+            abilities.add(new ForceFieldAbility(60f, 0.3f, 400f, 60f * 6));
 
             weapons.add(new Weapon("beam-weapon"){{
+                top = false;
                 shake = 2f;
                 shootY = 4f;
                 x = 6.5f;
@@ -230,7 +370,7 @@ public class UnitTypes implements ContentList{
                 shootSound = Sounds.laser;
 
                 bullet = new LaserBulletType(){{
-                    damage = 27f;
+                    damage = 40f;
                     recoil = 1f;
                     sideAngle = 45f;
                     sideWidth = 1f;
@@ -240,6 +380,139 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        vela = new UnitType("vela"){{
+            hitSize = 23f;
+
+            rotateSpeed = 1.6f;
+            canDrown = false;
+            mechFrontSway = 1f;
+
+            mechStepParticles = true;
+            mechStepShake = 0.15f;
+            ammoType = AmmoTypes.powerHigh;
+
+            speed = 0.35f;
+            boostMultiplier = 2.1f;
+            engineOffset = 12f;
+            engineSize = 6f;
+            lowAltitude = true;
+
+            health = 6500f;
+            armor = 7f;
+            canBoost = true;
+            landShake = 4f;
+
+            commandLimit = 8;
+
+            weapons.add(new Weapon("vela-weapon"){{
+                mirror = false;
+                top = false;
+                shake = 4f;
+                shootY = 13f;
+                x = y = 0f;
+
+                firstShotDelay = Fx.greenLaserChargeSmall.lifetime - 1f;
+
+                reload = 320f;
+                recoil = 0f;
+                shootSound = Sounds.laser;
+                continuous = true;
+                cooldownTime = 200f;
+
+                bullet = new ContinuousLaserBulletType(20){{
+                    length = 150f;
+                    hitEffect = Fx.hitMeltHeal;
+                    drawSize = 420f;
+                    lifetime = 160f;
+                    shake = 1f;
+                    despawnEffect = Fx.smokeCloud;
+                    smokeEffect = Fx.none;
+
+                    shootEffect = Fx.greenLaserChargeSmall;
+
+                    incendChance = 0.05f;
+                    incendSpread = 5f;
+                    incendAmount = 1;
+
+                    colors = new Color[]{Pal.heal.cpy().a(.2f), Pal.heal.cpy().a(.5f), Pal.heal.cpy().mul(1.2f), Color.white};
+                }};
+
+                shootStatus = StatusEffects.slow;
+                shootStatusDuration = bullet.lifetime + firstShotDelay;
+            }});
+        }};
+
+        corvus = new UnitType("corvus"){{
+            mineTier = 1;
+            hitSize = 29f;
+            itemCapacity = 80;
+            health = 18000f;
+            buildSpeed = 1.7f;
+            armor = 9f;
+            landShake = 1.5f;
+            rotateSpeed = 1.5f;
+
+            commandLimit = 8;
+
+            legCount = 4;
+            legLength = 14f;
+            legBaseOffset = 11f;
+            legMoveSpace = 1.5f;
+            legTrns = 0.58f;
+            hovering = true;
+            visualElevation = 0.2f;
+            allowLegStep = true;
+            ammoType = AmmoTypes.powerHigh;
+            groundLayer = Layer.legUnit;
+
+            speed = 0.3f;
+
+            mineTier = 2;
+            mineSpeed = 7f;
+            drawShields = false;
+
+            weapons.add(new Weapon("corvus-weapon"){{
+                top = false;
+                mirror = false;
+                shake = 14f;
+                shootY = 5f;
+                x = y = 0;
+                reload = 350f;
+                recoil = 0f;
+                shootSound = Sounds.laser;
+
+                cooldownTime = 350f;
+
+                shootStatusDuration = 60f * 2f;
+                shootStatus = StatusEffects.unmoving;
+                firstShotDelay = Fx.greenLaserCharge.lifetime;
+
+                bullet = new LaserBulletType(){{
+                    length = 460f;
+                    damage = 550f;
+                    width = 75f;
+
+                    lifetime = 65f;
+
+                    lightningSpacing = 35f;
+                    lightningLength = 5;
+                    lightningDelay = 1.1f;
+                    lightningLengthRand = 15;
+                    lightningDamage = 50;
+                    lightningAngleRand = 40f;
+                    largeHit = true;
+                    lightColor = lightningColor = Pal.heal;
+
+                    shootEffect = Fx.greenLaserCharge;
+
+                    sideAngle = 15f;
+                    sideWidth = 0f;
+                    sideLength = 0f;
+                    colors = new Color[]{Pal.heal.cpy().a(0.4f), Pal.heal, Color.white};
+                }};
+            }});
+        }};
+
         //endregion
         //region ground legs
 
@@ -247,9 +520,9 @@ public class UnitTypes implements ContentList{
             defaultController = SuicideAI::new;
 
             speed = 0.85f;
-            hitsize = 8f;
-            health = 170;
-            sway = 0.25f;
+            hitSize = 8f;
+            health = 180;
+            mechSideSway = 0.25f;
             range = 40f;
 
             weapons.add(new Weapon(){{
@@ -263,21 +536,24 @@ public class UnitTypes implements ContentList{
                     speed = 1f;
                     splashDamageRadius = 55f;
                     instantDisappear = true;
-                    splashDamage = 40f;
+                    splashDamage = 55f;
                     killShooter = true;
                     hittable = false;
+                    collidesAir = true;
                 }};
             }});
         }};
 
         atrax = new UnitType("atrax"){{
+            itemCapacity = 80;
             speed = 0.5f;
             drag = 0.4f;
-            hitsize = 10f;
+            hitSize = 10f;
             rotateSpeed = 3f;
             targetAir = false;
             health = 600;
             immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting);
+
             legCount = 4;
             legLength = 9f;
             legTrns = 0.6f;
@@ -290,6 +566,7 @@ public class UnitTypes implements ContentList{
             groundLayer = Layer.legUnit - 1f;
 
             weapons.add(new Weapon("eruption"){{
+                top = false;
                 shootY = 3f;
                 reload = 10f;
                 ejectEffect = Fx.none;
@@ -311,9 +588,9 @@ public class UnitTypes implements ContentList{
         spiroct = new UnitType("spiroct"){{
             speed = 0.4f;
             drag = 0.4f;
-            hitsize = 12f;
+            hitSize = 12f;
             rotateSpeed = 3f;
-            health = 600;
+            health = 760;
             immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting);
             legCount = 6;
             legLength = 13f;
@@ -322,6 +599,7 @@ public class UnitTypes implements ContentList{
             legBaseOffset = 2f;
             hovering = true;
             armor = 5f;
+            ammoType = AmmoTypes.power;
 
             buildSpeed = 0.75f;
 
@@ -349,7 +627,7 @@ public class UnitTypes implements ContentList{
                     despawnEffect = Fx.none;
                     width = 0.54f;
                     lifetime = 35f;
-                    knockback = -1.2f;
+                    knockback = -1.24f;
                 }};
             }});
 
@@ -362,62 +640,231 @@ public class UnitTypes implements ContentList{
                 bullet = new SapBulletType(){{
                     sapStrength = 0.65f;
                     length = 40f;
-                    damage = 12;
+                    damage = 13;
                     shootEffect = Fx.shootSmall;
                     hitColor = color = Color.valueOf("bf92f9");
                     despawnEffect = Fx.none;
                     width = 0.4f;
                     lifetime = 25f;
-                    knockback = -0.6f;
+                    knockback = -0.65f;
                 }};
             }});
         }};
 
-        //TODO implement
         arkyid = new UnitType("arkyid"){{
             drag = 0.1f;
             speed = 0.5f;
-            hitsize = 9f;
-            health = 140;
+            hitSize = 21f;
+            health = 8000;
+            armor = 6f;
+
+            rotateSpeed = 2.7f;
 
             legCount = 6;
             legMoveSpace = 1f;
             legPairOffset = 3;
-            legLength = 34f;
-            rotateShooting = false;
+            legLength = 30f;
             legExtension = -15;
             legBaseOffset = 10f;
-            landShake = 2f;
+            landShake = 1f;
             legSpeed = 0.1f;
-            legLengthScl = 1f;
+            legLengthScl = 0.96f;
             rippleScale = 2f;
             legSpeed = 0.2f;
+            ammoType = AmmoTypes.power;
+
             legSplashDamage = 32;
             legSplashRange = 30;
 
+            hovering = true;
+            allowLegStep = true;
+            visualElevation = 0.65f;
+            groundLayer = Layer.legUnit;
+
+            BulletType sapper = new SapBulletType(){{
+                sapStrength = 0.83f;
+                length = 55f;
+                damage = 34;
+                shootEffect = Fx.shootSmall;
+                hitColor = color = Color.valueOf("bf92f9");
+                despawnEffect = Fx.none;
+                width = 0.55f;
+                lifetime = 30f;
+                knockback = -1f;
+            }};
+
             weapons.add(
-            new Weapon("missiles-mount"){{
-                reload = 20f;
+            new Weapon("spiroct-weapon"){{
+                reload = 9f;
                 x = 4f;
+                y = 8f;
                 rotate = true;
-                shake = 1f;
-                bullet = new MissileBulletType(2.7f, 12, "missile"){{
-                    width = 8f;
-                    height = 8f;
-                    shrinkY = 0f;
-                    drag = -0.003f;
-                    homingRange = 60f;
-                    keepVelocity = false;
-                    splashDamageRadius = 25f;
-                    splashDamage = 10f;
-                    lifetime = 120f;
-                    trailColor = Color.gray;
-                    backColor = Pal.bulletYellowBack;
-                    frontColor = Pal.bulletYellow;
-                    hitEffect = Fx.blastExplosion;
-                    despawnEffect = Fx.blastExplosion;
-                    weaveScale = 8f;
-                    weaveMag = 2f;
+                bullet = sapper;
+            }},
+            new Weapon("spiroct-weapon"){{
+                reload = 15f;
+                x = 9f;
+                y = 6f;
+                rotate = true;
+                bullet = sapper;
+            }},
+            new Weapon("spiroct-weapon"){{
+                reload = 23f;
+                x = 14f;
+                y = 0f;
+                rotate = true;
+                bullet = sapper;
+            }},
+            new Weapon("large-purple-mount"){{
+                y = -7f;
+                x = 9f;
+                shootY = 7f;
+                reload = 45;
+                shake = 3f;
+                rotateSpeed = 2f;
+                ejectEffect = Fx.shellEjectSmall;
+                shootSound = Sounds.shootBig;
+                rotate = true;
+                occlusion = 8f;
+                recoil = 3f;
+
+                bullet = new ArtilleryBulletType(2f, 12){{
+                    hitEffect = Fx.sapExplosion;
+                    knockback = 0.8f;
+                    lifetime = 70f;
+                    width = height = 19f;
+                    collidesTiles = true;
+                    ammoMultiplier = 4f;
+                    splashDamageRadius = 95f;
+                    splashDamage = 65f;
+                    backColor = Pal.sapBulletBack;
+                    frontColor = lightningColor = Pal.sapBullet;
+                    lightning = 3;
+                    lightningLength = 10;
+                    smokeEffect = Fx.shootBigSmoke2;
+                    shake = 5f;
+
+                    status = StatusEffects.sapped;
+                    statusDuration = 60f * 10;
+                }};
+            }});
+        }};
+
+        toxopid = new UnitType("toxopid"){{
+            drag = 0.1f;
+            speed = 0.5f;
+            hitSize = 21f;
+            health = 22000;
+            armor = 13f;
+
+            rotateSpeed = 1.9f;
+
+            legCount = 8;
+            legMoveSpace = 0.8f;
+            legPairOffset = 3;
+            legLength = 75f;
+            legExtension = -20;
+            legBaseOffset = 8f;
+            landShake = 1f;
+            legSpeed = 0.1f;
+            legLengthScl = 0.93f;
+            rippleScale = 3f;
+            legSpeed = 0.19f;
+            ammoType = AmmoTypes.powerHigh;
+
+            legSplashDamage = 80;
+            legSplashRange = 60;
+
+            hovering = true;
+            allowLegStep = true;
+            visualElevation = 0.95f;
+            groundLayer = Layer.legUnit;
+
+            weapons.add(
+            new Weapon("large-purple-mount"){{
+                y = -5f;
+                x = 11f;
+                shootY = 7f;
+                reload = 30;
+                shake = 4f;
+                rotateSpeed = 2f;
+                ejectEffect = Fx.shellEjectSmall;
+                shootSound = Sounds.shootBig;
+                rotate = true;
+                occlusion = 12f;
+                recoil = 3f;
+                shots = 2;
+                spacing = 17f;
+
+                bullet = new ShrapnelBulletType(){{
+                    length = 90f;
+                    damage = 110f;
+                    width = 25f;
+                    serrationLenScl = 7f;
+                    serrationSpaceOffset = 60f;
+                    serrationFadeOffset = 0f;
+                    serrations = 10;
+                    serrationWidth = 6f;
+                    fromColor = Pal.sapBullet;
+                    toColor = Pal.sapBulletBack;
+                    shootEffect = smokeEffect = Fx.sparkShoot;
+                }};
+            }});
+
+            weapons.add(new Weapon("toxopid-cannon"){{
+                y = -14f;
+                x = 0f;
+                shootY = 22f;
+                mirror = false;
+                reload = 210;
+                shake = 10f;
+                recoil = 10f;
+                rotateSpeed = 1f;
+                ejectEffect = Fx.shellEjectBig;
+                shootSound = Sounds.shootBig;
+                rotate = true;
+                occlusion = 30f;
+
+                bullet = new ArtilleryBulletType(3f, 50){{
+                    hitEffect = Fx.sapExplosion;
+                    knockback = 0.8f;
+                    lifetime = 80f;
+                    width = height = 25f;
+                    collidesTiles = collides = true;
+                    ammoMultiplier = 4f;
+                    splashDamageRadius = 90f;
+                    splashDamage = 75f;
+                    backColor = Pal.sapBulletBack;
+                    frontColor = lightningColor = Pal.sapBullet;
+                    lightning = 5;
+                    lightningLength = 20;
+                    smokeEffect = Fx.shootBigSmoke2;
+                    hitShake = 10f;
+
+                    status = StatusEffects.sapped;
+                    statusDuration = 60f * 10;
+
+                    fragLifeMin = 0.3f;
+                    fragBullets = 9;
+
+                    fragBullet = new ArtilleryBulletType(2.3f, 30){{
+                        hitEffect = Fx.sapExplosion;
+                        knockback = 0.8f;
+                        lifetime = 90f;
+                        width = height = 20f;
+                        collidesTiles = false;
+                        splashDamageRadius = 80f;
+                        splashDamage = 40f;
+                        backColor = Pal.sapBulletBack;
+                        frontColor = lightningColor = Pal.sapBullet;
+                        lightning = 2;
+                        lightningLength = 5;
+                        smokeEffect = Fx.shootBigSmoke2;
+                        hitShake = 5f;
+
+                        status = StatusEffects.sapped;
+                        statusDuration = 60f * 10;
+                    }};
                 }};
             }});
         }};
@@ -434,10 +881,11 @@ public class UnitTypes implements ContentList{
             faceTarget = false;
             engineOffset = 5.5f;
             range = 140f;
+
             weapons.add(new Weapon(){{
                 y = 0f;
                 x = 2f;
-                reload = 15f;
+                reload = 13f;
                 ejectEffect = Fx.shellEjectSmall;
                 bullet = Bullets.standardCopper;
                 shootSound = Sounds.shoot;
@@ -445,44 +893,57 @@ public class UnitTypes implements ContentList{
         }};
 
         horizon = new UnitType("horizon"){{
-            health = 220;
+            health = 350;
             speed = 2f;
             accel = 0.08f;
             drag = 0.016f;
             flying = true;
+            hitSize = 9f;
             targetAir = false;
             engineOffset = 7.8f;
             range = 140f;
             faceTarget = false;
+            armor = 4f;
 
             weapons.add(new Weapon(){{
+                minShootVelocity = 0.75f;
                 x = 3f;
                 shootY = 0f;
-                reload = 12f;
+                reload = 11f;
                 shootCone = 180f;
                 ejectEffect = Fx.none;
                 inaccuracy = 15f;
                 ignoreRotation = true;
-                bullet = Bullets.bombExplosive;
                 shootSound = Sounds.none;
+                bullet = new BombBulletType(28f, 25f){{
+                    width = 10f;
+                    height = 14f;
+                    hitEffect = Fx.flakExplosion;
+                    shootEffect = Fx.none;
+                    smokeEffect = Fx.none;
+
+                    status = StatusEffects.blasted;
+                    statusDuration = 60f;
+                }};
             }});
         }};
 
         zenith = new UnitType("zenith"){{
-            health = 450;
-            speed = 1.9f;
+            health = 700;
+            speed = 1.7f;
             accel = 0.04f;
             drag = 0.016f;
             flying = true;
             range = 140f;
-            hitsize = 18f;
+            hitSize = 20f;
             lowAltitude = true;
+            armor = 5f;
 
             engineOffset = 12f;
             engineSize = 3f;
 
             weapons.add(new Weapon("zenith-missiles"){{
-                reload = 32f;
+                reload = 40f;
                 x = 7f;
                 rotate = true;
                 shake = 1f;
@@ -512,45 +973,151 @@ public class UnitTypes implements ContentList{
         }};
 
         antumbra = new UnitType("antumbra"){{
-            speed = 1.1f;
-            accel = 0.02f;
-            drag = 0.05f;
-            rotateSpeed = 2.5f;
+            speed = 0.8f;
+            accel = 0.04f;
+            drag = 0.04f;
+            rotateSpeed = 1.9f;
             flying = true;
             lowAltitude = true;
-            health = 75000;
-            engineOffset = 38;
-            engineSize = 7.3f;
-            hitsize = 58f;
+            health = 7000;
+            armor = 9f;
+            engineOffset = 21;
+            engineSize = 5.3f;
+            hitSize = 56f;
 
-            weapons.add(new Weapon(){{
-                y = 1.5f;
-                reload = 28f;
+            BulletType missiles = new MissileBulletType(2.7f, 10){{
+                width = 8f;
+                height = 8f;
+                shrinkY = 0f;
+                drag = -0.01f;
+                splashDamageRadius = 20f;
+                splashDamage = 30f;
+                ammoMultiplier = 4f;
+                lifetime = 50f;
+                hitEffect = Fx.blastExplosion;
+                despawnEffect = Fx.blastExplosion;
+
+                status = StatusEffects.blasted;
+                statusDuration = 60f;
+            }};
+
+            weapons.add(
+            new Weapon("missiles-mount"){{
+                y = 8f;
+                x = 17f;
+                reload = 20f;
                 ejectEffect = Fx.shellEjectSmall;
-                bullet = Bullets.standardCopper;
+                rotateSpeed = 8f;
+                bullet = missiles;
                 shootSound = Sounds.shoot;
-            }});
+                rotate = true;
+                occlusion = 6f;
+            }},
+            new Weapon("missiles-mount"){{
+                y = -8f;
+                x = 17f;
+                reload = 35;
+                rotateSpeed = 8f;
+                ejectEffect = Fx.shellEjectSmall;
+                bullet = missiles;
+                shootSound = Sounds.shoot;
+                rotate = true;
+                occlusion = 6f;
+            }},
+            new Weapon("large-bullet-mount"){{
+                y = 2f;
+                x = 10f;
+                shootY = 10f;
+                reload = 12;
+                shake = 1f;
+                rotateSpeed = 2f;
+                ejectEffect = Fx.shellEjectSmall;
+                shootSound = Sounds.shootBig;
+                rotate = true;
+                occlusion = 8f;
+                bullet = new BasicBulletType(7f, 50){{
+                    width = 12f;
+                    height = 18f;
+                    lifetime = 25f;
+                    shootEffect = Fx.shootBig;
+                }};
+            }}
+            );
         }};
 
         eclipse = new UnitType("eclipse"){{
-            speed = 1.1f;
-            accel = 0.02f;
-            drag = 0.05f;
-            rotateSpeed = 2.5f;
+            speed = 0.52f;
+            accel = 0.04f;
+            drag = 0.04f;
+            rotateSpeed = 1f;
             flying = true;
             lowAltitude = true;
-            health = 75000;
+            health = 20000;
             engineOffset = 38;
             engineSize = 7.3f;
-            hitsize = 58f;
+            hitSize = 58f;
             destructibleWreck = false;
+            armor = 13f;
 
-            weapons.add(new Weapon(){{
-                y = 1.5f;
-                reload = 28f;
+            BulletType fragBullet = new FlakBulletType(4f, 5){{
+                shootEffect = Fx.shootBig;
+                ammoMultiplier = 4f;
+                splashDamage = 42f;
+                splashDamageRadius = 25f;
+                collidesGround = true;
+                lifetime = 38f;
+
+                status = StatusEffects.blasted;
+                statusDuration = 60f;
+            }};
+
+            weapons.add(
+            new Weapon("large-laser-mount"){{
+                shake = 4f;
+                shootY = 9f;
+                x = 18f;
+                y = 5f;
+                rotateSpeed = 2f;
+                reload = 45f;
+                recoil = 4f;
+                shootSound = Sounds.laser;
+                occlusion = 20f;
+                rotate = true;
+
+                bullet = new LaserBulletType(){{
+                    damage = 90f;
+                    sideAngle = 20f;
+                    sideWidth = 1.5f;
+                    sideLength = 80f;
+                    width = 25f;
+                    length = 200f;
+                    shootEffect = Fx.shockwave;
+                    colors = new Color[]{Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white};
+                }};
+            }},
+            new Weapon("large-artillery"){{
+                x = 11f;
+                y = 27f;
+                rotateSpeed = 2f;
+                reload = 9f;
+                shootSound = Sounds.flame;
+                occlusion = 7f;
+                rotate = true;
+                recoil = 0.5f;
+
+                bullet = fragBullet;
+            }},
+            new Weapon("large-artillery"){{
+                y = -13f;
+                x = 20f;
+                reload = 12f;
                 ejectEffect = Fx.shellEjectSmall;
-                bullet = Bullets.standardCopper;
+                rotateSpeed = 7f;
+                shake = 1f;
                 shootSound = Sounds.shoot;
+                rotate = true;
+                occlusion = 12f;
+                bullet = fragBullet;
             }});
         }};
 
@@ -558,33 +1125,23 @@ public class UnitTypes implements ContentList{
         //region air support
 
         mono = new UnitType("mono"){{
+            defaultController = MinerAI::new;
+
             flying = true;
-            drag = 0.05f;
-            accel = 0.15f;
-            speed = 2f;
+            drag = 0.06f;
+            accel = 0.12f;
+            speed = 1.1f;
             health = 100;
             engineSize = 1.8f;
             engineOffset = 5.7f;
+            itemCapacity = 30;
+            range = 50f;
+            isCounted = false;
+
+            ammoType = AmmoTypes.powerLow;
 
             mineTier = 1;
             mineSpeed = 2.5f;
-
-            //no weapon, mining only
-            /*
-            weapons.add(new Weapon(){{
-                y = 1.5f;
-                x = 0f;
-
-                reload = 40f;
-                ejectEffect = Fx.none;
-                recoil = 2f;
-                shootSound = Sounds.pew;
-                mirror = false;
-
-                bullet = new HealBulletType(5.2f, 10){{
-                    healPercent = 4f;
-                }};
-            }});*/
         }};
 
         poly = new UnitType("poly"){{
@@ -592,7 +1149,7 @@ public class UnitTypes implements ContentList{
 
             flying = true;
             drag = 0.05f;
-            speed = 2f;
+            speed = 1.9f;
             rotateSpeed = 15f;
             accel = 0.1f;
             range = 70f;
@@ -600,8 +1157,11 @@ public class UnitTypes implements ContentList{
             health = 400;
             buildSpeed = 0.5f;
             engineOffset = 6.5f;
-            hitsize = 8f;
+            hitSize = 8f;
             lowAltitude = true;
+            isCounted = false;
+
+            ammoType = AmmoTypes.power;
 
             mineTier = 2;
             mineSpeed = 3.5f;
@@ -609,9 +1169,10 @@ public class UnitTypes implements ContentList{
             abilities.add(new HealFieldAbility(5f, 60f * 5, 50f));
 
             weapons.add(new Weapon("heal-weapon-mount"){{
+                top = false;
                 y = -2.5f;
                 x = 3.5f;
-                reload = 34f;
+                reload = 30f;
                 ejectEffect = Fx.none;
                 recoil = 2f;
                 shootSound = Sounds.pew;
@@ -620,11 +1181,11 @@ public class UnitTypes implements ContentList{
                 inaccuracy = 15f;
                 alternate = true;
 
-                bullet = new MissileBulletType(4f, 10){{
+                bullet = new MissileBulletType(4f, 12){{
                     homingPower = 0.08f;
                     weaveMag = 4;
                     weaveScale = 4;
-                    lifetime = 50f;
+                    lifetime = 56f;
                     keepVelocity = false;
                     shootEffect = Fx.shootHeal;
                     smokeEffect = Fx.hitLaser;
@@ -637,8 +1198,12 @@ public class UnitTypes implements ContentList{
         }};
 
         mega = new UnitType("mega"){{
+            defaultController = RepairAI::new;
 
+            mineTier = 2;
             health = 500;
+            armor = 2f;
+            armor = 5f;
             speed = 1.8f;
             accel = 0.06f;
             drag = 0.017f;
@@ -646,9 +1211,12 @@ public class UnitTypes implements ContentList{
             flying = true;
             engineOffset = 10.5f;
             rotateShooting = false;
-            hitsize = 15f;
+            hitSize = 15f;
             engineSize = 3f;
-            payloadCapacity = 3;
+            payloadCapacity = (2 * 2) * tilePayload;
+            buildSpeed = 2.5f;
+
+            ammoType = AmmoTypes.power;
 
             weapons.add(
             new Weapon("heal-weapon-mount"){{
@@ -667,18 +1235,104 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        quad = new UnitType("quad"){{
+            armor = 4f;
+            health = 6000;
+            speed = 1.2f;
+            rotateSpeed = 2f;
+            accel = 0.05f;
+            drag = 0.017f;
+            lowAltitude = false;
+            flying = true;
+            engineOffset = 12f;
+            engineSize = 6f;
+            rotateShooting = false;
+            hitSize = 32f;
+            payloadCapacity = (3 * 3) * tilePayload;
+            buildSpeed = 2.5f;
+            range = 140f;
+            targetAir = false;
+
+            ammoType = AmmoTypes.powerHigh;
+
+            weapons.add(
+            new Weapon(){{
+                x = y = 0f;
+                mirror = false;
+                reload = 60f;
+                minShootVelocity = 0.01f;
+
+                bullet = new BasicBulletType(){{
+                    sprite = "large-bomb";
+                    width = height = 120/4f;
+
+                    range = 30f;
+                    ignoreRotation = true;
+
+                    backColor = Pal.heal;
+                    frontColor = Color.white;
+                    mixColorTo = Color.white;
+
+                    shootCone = 180f;
+                    ejectEffect = Fx.none;
+                    shootSound = Sounds.none;
+                    despawnShake = 4f;
+
+                    collidesAir = false;
+
+                    lifetime = 70f;
+
+                    despawnEffect = Fx.greenBomb;
+                    hitEffect = Fx.massiveExplosion;
+                    keepVelocity = false;
+                    spin = 2f;
+
+                    shrinkX = shrinkY = 0.7f;
+
+                    speed = 0.001f;
+                    collides = false;
+
+                    splashDamage = 240f;
+                    splashDamageRadius = 115f;
+                }};
+            }});
+        }};
+
+        oct = new UnitType("oct"){{
+            armor = 16f;
+            health = 24000;
+            speed = 0.6f;
+            rotateSpeed = 1f;
+            accel = 0.04f;
+            drag = 0.018f;
+            flying = true;
+            engineOffset = 46f;
+            engineSize = 7.8f;
+            rotateShooting = false;
+            hitSize = 60f;
+            payloadCapacity = (5.3f * 5.3f) * tilePayload;
+            buildSpeed = 4f;
+            drawShields = false;
+            commandLimit = 6;
+
+            ammoCapacity = 1300;
+            ammoResupplyAmount = 20;
+
+            abilities.add(new ForceFieldAbility(140f, 4f, 7000f, 60f * 8), new HealFieldAbility(130f, 60f * 2, 140f));
+        }};
+
         //endregion
         //region naval attack
 
-        risse = new UnitType("risse"){{
+        risso = new UnitType("risso"){{
             speed = 1.1f;
             drag = 0.13f;
-            hitsize = 9f;
+            hitSize = 9f;
             health = 280;
             accel = 0.4f;
             rotateSpeed = 3.3f;
-            immunities = ObjectSet.with(StatusEffects.wet);
             trailLength = 20;
+            rotateShooting = false;
 
             armor = 2f;
 
@@ -724,11 +1378,11 @@ public class UnitTypes implements ContentList{
             health = 600;
             speed = 0.9f;
             drag = 0.15f;
-            hitsize = 11f;
+            hitSize = 11f;
             armor = 4f;
             accel = 0.3f;
             rotateSpeed = 2.6f;
-            immunities = ObjectSet.with(StatusEffects.wet);
+            rotateShooting = false;
 
             trailLength = 20;
             trailX = 5.5f;
@@ -767,16 +1421,16 @@ public class UnitTypes implements ContentList{
             accel = 0.2f;
             rotateSpeed = 1.8f;
             drag = 0.17f;
-            hitsize = 14f;
-            armor = 6f;
-            immunities = ObjectSet.with(StatusEffects.wet);
+            hitSize = 16f;
+            armor = 7f;
+            rotateShooting = false;
 
             trailLength = 22;
             trailX = 7f;
             trailY = -9f;
             trailScl = 1.5f;
 
-            abilities.add(new HealFieldAbility(22f, 60f * 4, 70f), new ShieldFieldAbility(20f, 40f, 60f * 4, 60f));
+            abilities.add(new ShieldFieldAbility(20f, 40f, 60f * 4, 60f));
 
             weapons.add(new Weapon("large-artillery"){{
                 reload = 65f;
@@ -788,11 +1442,10 @@ public class UnitTypes implements ContentList{
                 shootY = 7f;
                 shake = 5f;
                 recoil = 4f;
-                occlusion = 17f;
+                occlusion = 12f;
 
                 shots = 1;
                 inaccuracy = 3f;
-
                 ejectEffect = Fx.shellEjectBig;
 
                 bullet = new ArtilleryBulletType(3.2f, 12){{
@@ -855,11 +1508,144 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        sei = new UnitType("sei"){{
+            health = 10000;
+            armor = 12f;
+
+            speed = 0.73f;
+            drag = 0.17f;
+            hitSize = 39f;
+            accel = 0.2f;
+            rotateSpeed = 1.3f;
+            rotateShooting = false;
+
+            trailLength = 50;
+            trailX = 18f;
+            trailY = -21f;
+            trailScl = 3f;
+
+            weapons.add(new Weapon("sei-launcher"){{
+
+                x = 0f;
+                y = 0f;
+                rotate = true;
+                rotateSpeed = 4f;
+                mirror = false;
+
+                occlusion = 20f;
+
+                shootY = 2f;
+                recoil = 4f;
+                reload = 45f;
+                shots = 6;
+                spacing = 10f;
+                velocityRnd = 0.4f;
+                inaccuracy = 7f;
+                ejectEffect = Fx.none;
+                shake = 3f;
+                shootSound = Sounds.shootBig;
+                xRand = 8f;
+                shotDelay = 1f;
+
+                bullet = new MissileBulletType(4.2f, 25){{
+                    homingPower = 0.12f;
+                    width = 8f;
+                    height = 8f;
+                    shrinkX = shrinkY = 0f;
+                    drag = -0.003f;
+                    homingRange = 80f;
+                    keepVelocity = false;
+                    splashDamageRadius = 25f;
+                    splashDamage = 25f;
+                    lifetime = 56f;
+                    trailColor = Pal.bulletYellowBack;
+                    backColor = Pal.bulletYellowBack;
+                    frontColor = Pal.bulletYellow;
+                    hitEffect = Fx.blastExplosion;
+                    despawnEffect = Fx.blastExplosion;
+                    weaveScale = 8f;
+                    weaveMag = 2f;
+                }};
+            }});
+
+            weapons.add(new Weapon("large-bullet-mount"){{
+                reload = 80f;
+                cooldownTime = 90f;
+                x = 70f/4f;
+                y = -66f/4f;
+                rotateSpeed = 4f;
+                rotate = true;
+                shootY = 7f;
+                shake = 2f;
+                recoil = 3f;
+                occlusion = 12f;
+                ejectEffect = Fx.shellEjectBig;
+
+                shots = 3;
+                shotDelay = 4f;
+                inaccuracy = 1f;
+                bullet = new BasicBulletType(7f, 50){{
+                    width = 13f;
+                    height = 19f;
+                    shootEffect = Fx.shootBig;
+                    lifetime = 30f;
+                }};
+            }});
+        }};
+
+        omura = new UnitType("omura"){{
+            health = 22000;
+            speed = 0.62f;
+            drag = 0.18f;
+            hitSize = 50f;
+            armor = 16f;
+            accel = 0.19f;
+            rotateSpeed = 0.9f;
+            rotateShooting = false;
+
+            float spawnTime = 60f * 15f;
+
+            abilities.add(new UnitSpawnAbility(flare, spawnTime, 19.25f, -31.75f), new UnitSpawnAbility(flare, spawnTime, -19.25f, -31.75f));
+
+            trailLength = 70;
+            trailX = 23f;
+            trailY = -32f;
+            trailScl = 3.5f;
+
+            weapons.add(new Weapon("omura-cannon"){{
+                reload = 110f;
+                cooldownTime = 90f;
+                mirror = false;
+                x = 0f;
+                y = -3.5f;
+                rotateSpeed = 1.4f;
+                rotate = true;
+                shootY = 23f;
+                shake = 6f;
+                recoil = 10.5f;
+                occlusion = 50f;
+
+                shots = 1;
+                ejectEffect = Fx.none;
+
+                bullet = new RailBulletType(){{
+                    shootEffect = Fx.railShoot;
+                    speed = 67f;
+                    lifetime = 8f;
+                    pierceEffect = Fx.railHit;
+                    updateEffect = Fx.railTrail;
+                    hitEffect = Fx.massiveExplosion;
+                    smokeEffect = Fx.shootBig2;
+                    damage = 1250;
+                    pierceDamageFactor = 0.5f;
+                }};
+            }});
+        }};
+
         //endregion
         //region core
 
         alpha = new UnitType("alpha"){{
-            //TODO maybe these should be changed
             defaultController = BuilderAI::new;
             isCounted = false;
 
@@ -868,18 +1654,19 @@ public class UnitTypes implements ContentList{
             mineTier = 1;
             buildSpeed = 0.5f;
             drag = 0.05f;
-            speed = 2.6f;
+            speed = 2.8f;
             rotateSpeed = 15f;
             accel = 0.1f;
             itemCapacity = 30;
-            health = 80f;
+            health = 120f;
             engineOffset = 6f;
-            hitsize = 8f;
+            hitSize = 8f;
 
             weapons.add(new Weapon("small-basic-weapon"){{
-                reload = 20f;
+                reload = 17f;
                 x = 2.75f;
                 y = 1f;
+                top = false;
 
                 bullet = new BasicBulletType(2.5f, 9){{
                     width = 7f;
@@ -887,13 +1674,12 @@ public class UnitTypes implements ContentList{
                     lifetime = 60f;
                     shootEffect = Fx.shootSmall;
                     smokeEffect = Fx.shootSmallSmoke;
-                    tileDamageMultiplier = 0.1f;
+                    tileDamageMultiplier = 0.09f;
                 }};
             }});
         }};
 
         beta = new UnitType("beta"){{
-            //TODO maybe these should be changed
             defaultController = BuilderAI::new;
             isCounted = false;
 
@@ -902,17 +1688,18 @@ public class UnitTypes implements ContentList{
             mineTier = 1;
             buildSpeed = 0.75f;
             drag = 0.05f;
-            speed = 2.9f;
+            speed = 3f;
             rotateSpeed = 17f;
             accel = 0.1f;
             itemCapacity = 50;
-            health = 120f;
+            health = 150f;
             engineOffset = 6f;
-            hitsize = 9f;
+            hitSize = 9f;
             rotateShooting = false;
             lowAltitude = true;
 
             weapons.add(new Weapon("small-mount-weapon"){{
+                top = false;
                 reload = 20f;
                 x = 3f;
                 y = 0.5f;
@@ -927,13 +1714,12 @@ public class UnitTypes implements ContentList{
                     lifetime = 60f;
                     shootEffect = Fx.shootSmall;
                     smokeEffect = Fx.shootSmallSmoke;
-                    tileDamageMultiplier = 0.14f;
+                    tileDamageMultiplier = 0.1f;
                 }};
             }});
         }};
 
         gamma = new UnitType("gamma"){{
-            //TODO maybe these should be changed
             defaultController = BuilderAI::new;
             isCounted = false;
 
@@ -942,15 +1728,16 @@ public class UnitTypes implements ContentList{
             mineTier = 2;
             buildSpeed = 1f;
             drag = 0.05f;
-            speed = 3.4f;
+            speed = 3.5f;
             rotateSpeed = 19f;
             accel = 0.11f;
             itemCapacity = 70;
-            health = 160f;
+            health = 190f;
             engineOffset = 6f;
-            hitsize = 10f;
+            hitSize = 10f;
 
             weapons.add(new Weapon("small-mount-weapon"){{
+                top = false;
                 reload = 15f;
                 x = 1f;
                 y = 2f;
@@ -965,7 +1752,7 @@ public class UnitTypes implements ContentList{
                     lifetime = 70f;
                     shootEffect = Fx.shootSmall;
                     smokeEffect = Fx.shootSmallSmoke;
-                    tileDamageMultiplier = 0.15f;
+                    tileDamageMultiplier = 0.1f;
                     homingPower = 0.04f;
                 }};
             }});
@@ -977,9 +1764,10 @@ public class UnitTypes implements ContentList{
         block = new UnitType("block"){
             {
                 speed = 0f;
-                hitsize = 0f;
+                hitSize = 0f;
                 health = 1;
                 rotateSpeed = 360f;
+                itemCapacity = 0;
             }
 
             @Override
diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java
index 9c3a16ea44..a2ffbb098f 100644
--- a/core/src/mindustry/content/Weathers.java
+++ b/core/src/mindustry/content/Weathers.java
@@ -5,12 +5,12 @@ import arc.graphics.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.math.geom.*;
 import arc.util.*;
 import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -18,7 +18,8 @@ public class Weathers implements ContentList{
     public static Weather
     rain,
     snow,
-    sandstorm;
+    sandstorm,
+    sporestorm;
 
     @Override
     public void load(){
@@ -26,6 +27,10 @@ public class Weathers implements ContentList{
             TextureRegion region;
             float yspeed = 2f, xspeed = 0.25f, padding = 16f, size = 12f, density = 1200f;
 
+            {
+                attrs.set(Attribute.light, -0.15f);
+            }
+
             @Override
             public void load(){
                 super.load();
@@ -64,11 +69,16 @@ public class Weathers implements ContentList{
             }
         };
 
-        //TODO should apply wet effect
         rain = new Weather("rain"){
             float yspeed = 5f, xspeed = 1.5f, padding = 16f, size = 40f, density = 1200f;
             TextureRegion[] splashes = new TextureRegion[12];
 
+            {
+                attrs.set(Attribute.light, -0.2f);
+                attrs.set(Attribute.water, 0.2f);
+                status = StatusEffects.wet;
+            }
+
             @Override
             public void load(){
                 super.load();
@@ -159,11 +169,16 @@ public class Weathers implements ContentList{
 
         sandstorm = new Weather("sandstorm"){
             TextureRegion region;
-            float yspeed = 0.3f, xspeed = 6f, size = 140f, padding = size, invDensity = 1500f;
-            Vec2 force = new Vec2(0.45f, 0.01f);
+            float size = 140f, padding = size, invDensity = 1500f, baseSpeed = 6.1f;
+            float force = 0.4f * 0;
             Color color = Color.valueOf("f7cba4");
             Texture noise;
 
+            {
+                attrs.set(Attribute.light, -0.1f);
+                opacityMultiplier = 0.8f;
+            }
+
             @Override
             public void load(){
                 region = Core.atlas.find("circle-shadow");
@@ -179,22 +194,26 @@ public class Weathers implements ContentList{
 
             @Override
             public void update(WeatherState state){
+                float speed = force * state.intensity;
+                float windx = state.windVector.x * speed, windy = state.windVector.y * speed;
 
                 for(Unit unit : Groups.unit){
-                    unit.impulse(force.x * state.intensity(), force.y * state.intensity());
+                    unit.impulse(windx, windy);
                 }
             }
 
             @Override
             public void drawOver(WeatherState state){
                 Draw.tint(color);
+                float speed = baseSpeed * state.intensity;
+                float windx = state.windVector.x * speed, windy = state.windVector.y * speed;
 
                 float scale = 1f / 2000f;
                 float scroll = Time.time() * scale;
-                Tmp.tr1.setTexture(noise);
+                Tmp.tr1.texture = noise;
                 Core.camera.bounds(Tmp.r1);
                 Tmp.tr1.set(Tmp.r1.x*scale, Tmp.r1.y*scale, (Tmp.r1.x + Tmp.r1.width)*scale, (Tmp.r1.y + Tmp.r1.height)*scale);
-                Tmp.tr1.scroll(-xspeed * scroll, -yspeed * scroll);
+                Tmp.tr1.scroll(-windx * scroll, windy * scroll);
                 Draw.rect(Tmp.tr1, Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height);
 
                 rand.setSeed(0);
@@ -209,8 +228,8 @@ public class Weathers implements ContentList{
                     float scl = rand.random(0.5f, 1f);
                     float scl2 = rand.random(0.5f, 1f);
                     float sscl = rand.random(0.5f, 1f);
-                    float x = (rand.random(0f, world.unitWidth()) + Time.time() * xspeed * scl2);
-                    float y = (rand.random(0f, world.unitHeight()) - Time.time() * yspeed * scl);
+                    float x = (rand.random(0f, world.unitWidth()) + Time.time() * windx * scl2);
+                    float y = (rand.random(0f, world.unitHeight()) + Time.time() * windy * scl);
                     float alpha = rand.random(0.2f);
 
                     x += Mathf.sin(y, rand.random(30f, 80f), rand.random(1f, 7f));
@@ -229,5 +248,92 @@ public class Weathers implements ContentList{
                 }
             }
         };
+
+        sporestorm = new Weather("sporestorm"){
+            TextureRegion region;
+            float size = 5f, padding = size, invDensity = 2000f, baseSpeed = 4.3f, force = 0.28f * 0;
+            Color color = Color.valueOf("7457ce");
+            Texture noise;
+
+            {
+                attrs.set(Attribute.spores, 1f);
+                attrs.set(Attribute.light, -0.15f);
+                status = StatusEffects.sporeSlowed;
+                statusGround = false;
+                opacityMultiplier = 0.85f;
+            }
+
+            @Override
+            public void load(){
+                region = Core.atlas.find("circle-shadow");
+                noise = new Texture("sprites/noiseAlpha.png");
+                noise.setWrap(TextureWrap.repeat);
+                noise.setFilter(TextureFilter.linear);
+            }
+
+            @Override
+            public void update(WeatherState state){
+                float speed = force * state.intensity;
+                float windx = state.windVector.x * speed, windy = state.windVector.y * speed;
+
+                for(Unit unit : Groups.unit){
+                    unit.impulse(windx, windy);
+                }
+            }
+
+            @Override
+            public void dispose(){
+                noise.dispose();
+            }
+
+            @Override
+            public void drawOver(WeatherState state){
+                Draw.alpha(state.opacity * 0.8f);
+                Draw.tint(color);
+
+                float speed = baseSpeed * state.intensity;
+                float windx = state.windVector.x * speed, windy = state.windVector.y * speed;
+
+                float scale = 1f / 2000f;
+                float scroll = Time.time() * scale;
+                Tmp.tr1.texture = noise;
+                Core.camera.bounds(Tmp.r1);
+                Tmp.tr1.set(Tmp.r1.x*scale, Tmp.r1.y*scale, (Tmp.r1.x + Tmp.r1.width)*scale, (Tmp.r1.y + Tmp.r1.height)*scale);
+                Tmp.tr1.scroll(-windx * scroll, windy * scroll);
+                Draw.rect(Tmp.tr1, Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height);
+
+                rand.setSeed(0);
+                Tmp.r1.setCentered(Core.camera.position.x, Core.camera.position.y, Core.graphics.getWidth() / renderer.minScale(), Core.graphics.getHeight() / renderer.minScale());
+                Tmp.r1.grow(padding);
+                Core.camera.bounds(Tmp.r2);
+                int total = (int)(Tmp.r1.area() / invDensity * state.intensity());
+                Draw.tint(color);
+                float baseAlpha = state.opacity;
+                Draw.alpha(baseAlpha);
+
+                for(int i = 0; i < total; i++){
+                    float scl = rand.random(0.5f, 1f);
+                    float scl2 = rand.random(0.5f, 1f);
+                    float sscl = rand.random(0.5f, 1f);
+                    float x = (rand.random(0f, world.unitWidth()) + Time.time() * windx * scl2);
+                    float y = (rand.random(0f, world.unitHeight()) + Time.time() * windy * scl);
+                    float alpha = rand.random(0.1f, 0.8f);
+
+                    x += Mathf.sin(y, rand.random(30f, 80f), rand.random(1f, 7f));
+
+                    x -= Tmp.r1.x;
+                    y -= Tmp.r1.y;
+                    x = Mathf.mod(x, Tmp.r1.width);
+                    y = Mathf.mod(y, Tmp.r1.height);
+                    x += Tmp.r1.x;
+                    y += Tmp.r1.y;
+
+                    if(Tmp.r3.setCentered(x, y, size * sscl).overlaps(Tmp.r2)){
+                        Draw.alpha(alpha * baseAlpha);
+                        Fill.circle(x, y, size * sscl / 2f);
+                    }
+                }
+            }
+        };
     }
 }
diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java
index 604d04059c..56e46d8be2 100644
--- a/core/src/mindustry/core/ContentLoader.java
+++ b/core/src/mindustry/core/ContentLoader.java
@@ -33,13 +33,14 @@ public class ContentLoader{
         new StatusEffects(),
         new Liquids(),
         new Bullets(),
+        new AmmoTypes(),
         new UnitTypes(),
         new Blocks(),
         new Loadouts(),
-        new TechTree(),
         new Weathers(),
         new Planets(),
-        new SectorPresets()
+        new SectorPresets(),
+        new TechTree(),
     };
 
     public ContentLoader(){
@@ -243,11 +244,11 @@ public class ContentLoader{
     }
 
     public Block block(int id){
-        return (Block)getByID(ContentType.block, id);
+        return getByID(ContentType.block, id);
     }
 
     public Block block(String name){
-        return (Block)getByName(ContentType.block, name);
+        return getByName(ContentType.block, name);
     }
 
     public Seq<Item> items(){
@@ -255,7 +256,7 @@ public class ContentLoader{
     }
 
     public Item item(int id){
-        return (Item)getByID(ContentType.item, id);
+        return getByID(ContentType.item, id);
     }
 
     public Seq<Liquid> liquids(){
@@ -263,7 +264,7 @@ public class ContentLoader{
     }
 
     public Liquid liquid(int id){
-        return (Liquid)getByID(ContentType.liquid, id);
+        return getByID(ContentType.liquid, id);
     }
 
     public Seq<BulletType> bullets(){
@@ -271,7 +272,7 @@ public class ContentLoader{
     }
 
     public BulletType bullet(int id){
-        return (BulletType)getByID(ContentType.bullet, id);
+        return getByID(ContentType.bullet, id);
     }
 
     public Seq<SectorPreset> sectors(){
diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index cb6d914aa0..82cb6e3ad0 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -94,7 +94,6 @@ public class Control implements ApplicationListener, Loadable{
             tutorial.reset();
 
             hiscore = false;
-
             saves.resetSave();
         });
 
@@ -109,20 +108,24 @@ public class Control implements ApplicationListener, Loadable{
 
         Events.on(GameOverEvent.class, event -> {
             state.stats.wavesLasted = state.wave;
-            Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y);
+            Effect.shake(5, 6, Core.camera.position.x, Core.camera.position.y);
             //the restart dialog can show info for any number of scenarios
             Call.gameOver(event.winner);
         });
 
+        //add player when world loads regardless
+        Events.on(WorldLoadEvent.class, e -> {
+            player.add();
+        });
+
         //autohost for pvp maps
         Events.on(WorldLoadEvent.class, event -> app.post(() -> {
-            player.add();
             if(state.rules.pvp && !net.active()){
                 try{
                     net.host(port);
                     player.admin(true);
                 }catch(IOException e){
-                    ui.showException("$server.error", e);
+                    ui.showException("@server.error", e);
                     state.set(State.menu);
                 }
             }
@@ -152,12 +155,6 @@ public class Control implements ApplicationListener, Loadable{
             }
         });
 
-        Events.on(ZoneRequireCompleteEvent.class, e -> {
-            if(e.objective.display() != null){
-                ui.hudfrag.showToast(Core.bundle.format("zone.requirement.complete", e.zoneForMet.localizedName, e.objective.display()));
-            }
-        });
-
         //delete save on campaign game over
         Events.on(GameOverEvent.class, e -> {
             if(state.isCampaign() && !net.client() && !headless){
@@ -171,7 +168,7 @@ public class Control implements ApplicationListener, Loadable{
             }
         });
 
-        Events.on(Trigger.newGame, () -> {
+        Events.run(Trigger.newGame, () -> {
             Building core = player.closestCore();
 
             if(core == null) return;
@@ -185,10 +182,10 @@ public class Control implements ApplicationListener, Loadable{
 
             app.post(() -> ui.hudfrag.showLand());
             renderer.zoomIn(Fx.coreLand.lifetime);
-            app.post(() -> Fx.coreLand.at(core.getX(), core.getY(), 0, core.block()));
+            app.post(() -> Fx.coreLand.at(core.getX(), core.getY(), 0, core.block));
             Time.run(Fx.coreLand.lifetime, () -> {
                 Fx.launch.at(core);
-                Effects.shake(5f, 5f, core);
+                Effect.shake(5f, 5f, core);
             });
         });
 
@@ -196,7 +193,7 @@ public class Control implements ApplicationListener, Loadable{
 
     @Override
     public void loadAsync(){
-        Draw.scl = 1f / Core.atlas.find("scale_marker").getWidth();
+        Draw.scl = 1f / Core.atlas.find("scale_marker").width;
 
         Core.input.setCatch(KeyCode.back, true);
 
@@ -257,7 +254,7 @@ public class Control implements ApplicationListener, Loadable{
     }
 
     //TODO move
-    public void handleLaunch(CoreEntity tile){
+    public void handleLaunch(CoreBuild tile){
         LaunchCorec ent = LaunchCore.create();
         ent.set(tile);
         ent.block(Blocks.coreShard);
@@ -277,11 +274,13 @@ public class Control implements ApplicationListener, Loadable{
         ui.loadAnd(() -> {
             ui.planet.hide();
             SaveSlot slot = sector.save;
+            sector.planet.setLastSector(sector);
             if(slot != null && !clearSectors){
 
                 try{
                     net.reset();
                     slot.load();
+                    slot.setAutosave(true);
                     state.rules.sector = sector;
 
                     //if there is no base, simulate a new game and place the right loadout at the spawn position
@@ -311,7 +310,7 @@ public class Control implements ApplicationListener, Loadable{
                 }catch(SaveException e){
                     Log.err(e);
                     sector.save = null;
-                    Time.runTask(10f, () -> ui.showErrorMessage("$save.corrupted"));
+                    Time.runTask(10f, () -> ui.showErrorMessage("@save.corrupted"));
                     slot.delete();
                     playSector(origin, sector);
                 }
@@ -323,6 +322,7 @@ public class Control implements ApplicationListener, Loadable{
                 state.rules.sector = sector;
                 //assign origin when launching
                 state.secinfo.origin = origin;
+                state.secinfo.destination = origin;
                 logic.play();
                 control.saves.saveSector(sector);
                 Events.fire(Trigger.newGame);
@@ -331,6 +331,7 @@ public class Control implements ApplicationListener, Loadable{
     }
 
     public void playTutorial(){
+        ui.showInfo("@indev.notready");
         //TODO implement
         //ui.showInfo("death");
         /*
@@ -429,10 +430,13 @@ public class Control implements ApplicationListener, Loadable{
 
         //just a regular reminder
         if(!OS.prop("user.name").equals("anuke") && !OS.hasEnv("iknowwhatimdoing")){
-            ui.showInfo("[scarlet]6.0 is not supposed to be played.[] Go do something else.");
+            app.post(() -> app.post(() -> {
+                ui.showStartupInfo("@indev.popup");
+            }));
         }
 
-        //play tutorial on stop
+        //play tutorial on start
+        //TODO no tutorial right now
         if(!settings.getBool("playedtutorial", false)){
             //Core.app.post(() -> Core.app.post(this::playTutorial));
         }
@@ -440,7 +444,7 @@ public class Control implements ApplicationListener, Loadable{
         //display UI scale changed dialog
         if(Core.settings.getBool("uiscalechanged", false)){
             Core.app.post(() -> Core.app.post(() -> {
-                BaseDialog dialog = new BaseDialog("$confirm");
+                BaseDialog dialog = new BaseDialog("@confirm");
                 dialog.setFillParent(true);
 
                 float[] countdown = {60 * 11};
@@ -459,9 +463,9 @@ public class Control implements ApplicationListener, Loadable{
                 }).pad(10f).expand().center();
 
                 dialog.buttons.defaults().size(200f, 60f);
-                dialog.buttons.button("$uiscale.cancel", exit);
+                dialog.buttons.button("@uiscale.cancel", exit);
 
-                dialog.buttons.button("$ok", () -> {
+                dialog.buttons.button("@ok", () -> {
                     Core.settings.put("uiscalechanged", false);
                     dialog.hide();
                 });
@@ -515,7 +519,7 @@ public class Control implements ApplicationListener, Loadable{
                 platform.updateRPC();
             }
 
-            if(Core.input.keyTap(Binding.pause) && !state.isOutOfTime() && !scene.hasDialog() && !scene.hasKeyboard() && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){
+            if(Core.input.keyTap(Binding.pause) && !scene.hasDialog() && !scene.hasKeyboard() && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){
                 state.set(state.is(State.playing) ? State.paused : State.playing);
             }
 
diff --git a/core/src/mindustry/core/FileTree.java b/core/src/mindustry/core/FileTree.java
index 589809c986..f94c75eeb7 100644
--- a/core/src/mindustry/core/FileTree.java
+++ b/core/src/mindustry/core/FileTree.java
@@ -15,11 +15,16 @@ public class FileTree implements FileHandleResolver{
 
     /** Gets an asset file.*/
     public Fi get(String path){
+        return get(path, false);
+    }
+
+    /** Gets an asset file.*/
+    public Fi get(String path, boolean safe){
         if(files.containsKey(path)){
             return files.get(path);
         }else if(files.containsKey("/" + path)){
             return files.get("/" + path);
-        }else if(Core.files == null){ //headless
+        }else if(Core.files == null && !safe){ //headless
             return Fi.get(path);
         }else{
             return Core.files.internal(path);
diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java
index b006aae76f..833a4b7cc1 100644
--- a/core/src/mindustry/core/GameState.java
+++ b/core/src/mindustry/core/GameState.java
@@ -7,6 +7,7 @@ import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.maps.*;
 import mindustry.type.*;
+import mindustry.world.blocks.*;
 
 import static mindustry.Vars.*;
 
@@ -16,13 +17,15 @@ public class GameState{
     /** Wave countdown in ticks. */
     public float wavetime;
     /** Whether the game is in game over state. */
-    public boolean gameOver = false, launched = false, serverPaused = false;
+    public boolean gameOver = false, serverPaused = false, wasTimeout;
     /** Map that is currently being played on. */
-    public @NonNull Map map = emptyMap;
+    public Map map = emptyMap;
     /** The current game rules. */
     public Rules rules = new Rules();
     /** Statistics for this save/game. Displayed after game over. */
     public Stats stats = new Stats();
+    /** Global attributes of the environment, calculated by weather. */
+    public Attributes envAttrs = new Attributes();
     /** Sector information. Only valid in the campaign. */
     public SectorInfo secinfo = new SectorInfo();
     /** Team data. Gets reset every new game. */
@@ -47,11 +50,6 @@ public class GameState{
         return rules.sector != null;
     }
 
-    /** @return whether the player is in a campaign and they are out of sector time */
-    public boolean isOutOfTime(){
-        return isCampaign() && isGame() && getSector().getTimeSpent() >= turnDuration;
-    }
-
     public boolean hasSector(){
         return rules.sector != null;
     }
diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index 1371ec72a0..e03771843a 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -2,10 +2,8 @@ package mindustry.core;
 
 import arc.*;
 import arc.math.*;
-import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
 import mindustry.core.GameState.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -16,7 +14,7 @@ import mindustry.type.*;
 import mindustry.type.Weather.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
-import mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.ConstructBlock.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
 import java.util.*;
@@ -42,9 +40,9 @@ public class Logic implements ApplicationListener{
             //skip null entities or un-rebuildables, for obvious reasons; also skip client since they can't modify these requests
             if(tile.build == null || !tile.block().rebuildable || net.client()) return;
 
-            if(block instanceof BuildBlock){
+            if(block instanceof ConstructBlock){
 
-                BuildEntity entity = tile.bc();
+                ConstructBuild entity = tile.bc();
 
                 //update block to reflect the fact that something was being constructed
                 if(entity.cblock != null && entity.cblock.synthetic()){
@@ -67,7 +65,7 @@ public class Logic implements ApplicationListener{
                 }
             }
 
-            data.blocks.addFirst(new BlockPlan(tile.x, tile.y, tile.rotation(), block.id, tile.build.config()));
+            data.blocks.addFirst(new BlockPlan(tile.x, tile.y, (short)tile.build.rotation, block.id, tile.build.config()));
         });
 
         Events.on(BlockBuildEndEvent.class, event -> {
@@ -88,31 +86,27 @@ public class Logic implements ApplicationListener{
 
         //when loading a 'damaged' sector, propagate the damage
         Events.on(WorldLoadEvent.class, e -> {
-            if(state.isCampaign() && state.rules.sector.getSecondsPassed() > 0 && state.rules.sector.hasBase()){
+            if(state.isCampaign()){
                 long seconds = state.rules.sector.getSecondsPassed();
-                CoreEntity core = state.rules.defaultTeam.core();
+                CoreBuild core = state.rules.defaultTeam.core();
 
                 //apply fractional damage based on how many turns have passed for this sector
                 float turnsPassed = seconds / (turnDuration / 60f);
 
-                if(state.rules.sector.hasWaves()){
+                if(state.rules.sector.hasWaves() && turnsPassed > 0 && state.rules.sector.hasBase()){
                     SectorDamage.apply(turnsPassed / sectorDestructionTurns);
                 }
 
                 //add resources based on turns passed
                 if(state.rules.sector.save != null && core != null){
+                    //update correct storage capacity
+                    state.rules.sector.save.meta.secinfo.storageCapacity = core.storageCapacity;
 
-                    //add produced items
-                    //TODO move to received items
-                    state.rules.sector.save.meta.secinfo.production.each((item, stat) -> {
-                        core.items.add(item, (int)(stat.mean * seconds));
-                    });
-
-                    //add received items
-                    state.rules.sector.getReceivedItems().each(stack -> core.items.add(stack.item, stack.amount));
+                    //add new items received
+                    state.rules.sector.calculateReceivedItems().each((item, amount) -> core.items.add(item, amount));
 
                     //clear received items
-                    state.rules.sector.setReceivedItems(new Seq<>());
+                    state.rules.sector.setExtraItems(new ItemSeq());
 
                     //validation
                     for(Item item : content.items()){
@@ -183,7 +177,7 @@ public class Logic implements ApplicationListener{
     public void runWave(){
         spawner.spawnEnemies();
         state.wave++;
-        state.wavetime = state.hasSector() && state.getSector().isLaunchWave(state.wave) ? state.rules.waveSpacing * state.rules.launchWaveMultiplier : state.rules.waveSpacing;
+        state.wavetime = state.rules.waveSpacing;
 
         Events.fire(new WaveEvent());
     }
@@ -192,7 +186,7 @@ public class Logic implements ApplicationListener{
         //campaign maps do not have a 'win' state!
         if(state.isCampaign()){
             //gameover only when cores are dead
-            if(!state.rules.attackMode && state.teams.playerCores().size == 0 && !state.gameOver){
+            if(state.teams.playerCores().size == 0 && !state.gameOver){
                 state.gameOver = true;
                 Events.fire(new GameOverEvent(state.rules.waveTeam));
             }
@@ -250,61 +244,15 @@ public class Logic implements ApplicationListener{
             if(entry.cooldown < 0 && !entry.weather.isActive()){
                 float duration = Mathf.random(entry.minDuration, entry.maxDuration);
                 entry.cooldown = duration + Mathf.random(entry.minFrequency, entry.maxFrequency);
-                Call.createWeather(entry.weather, entry.intensity, duration);
+                Tmp.v1.setToRandomDirection();
+                Call.createWeather(entry.weather, entry.intensity, duration, Tmp.v1.x, Tmp.v1.y);
             }
         }
     }
 
     @Remote(called = Loc.both)
-    public static void launchZone(){
-        if(!state.isCampaign()) return;
-
-        if(!headless){
-            ui.hudfrag.showLaunch();
-        }
-
-        //TODO better core launch effect
-        for(Building tile : state.teams.playerCores()){
-            Fx.launch.at(tile);
-        }
-
-        Sector sector = state.rules.sector;
-
-        //TODO containers must be launched too
-        Time.runTask(30f, () -> {
-            Sector origin = sector.save.meta.secinfo.origin;
-            if(origin != null){
-                Seq<ItemStack> stacks = origin.getReceivedItems();
-
-                //add up all items into list
-                for(Building entity : state.teams.playerCores()){
-                    entity.items.each((item, amount) -> ItemStack.insert(stacks, item, amount));
-                }
-
-                //save received items
-                origin.setReceivedItems(stacks);
-            }
-
-            //remove all the cores
-            state.teams.playerCores().each(b -> b.tile.remove());
-
-            state.launched = true;
-            state.gameOver = true;
-
-            //save over the data w/o the cores
-            sector.save.save();
-
-            //run a turn, since launching takes up a turn
-            universe.runTurn();
-
-            //TODO apply extra damage to sector
-            //sector.setTurnsPassed(sector.getTurnsPassed() + 3);
-
-            //TODO load the sector that was launched from
-            Events.fire(new LaunchEvent());
-            //manually fire game over event now
-            Events.fire(new GameOverEvent(state.rules.defaultTeam));
-        });
+    public static void updateGameOver(Team winner){
+        state.gameOver = true;
     }
 
     @Remote(called = Loc.both)
@@ -325,18 +273,19 @@ public class Logic implements ApplicationListener{
         Events.fire(Trigger.update);
         universe.updateGlobal();
 
+        if(Core.settings.modified() && !state.isPlaying()){
+            Core.settings.forceSave();
+        }
+
         if(state.isGame()){
             if(!net.client()){
                 state.enemies = Groups.unit.count(u -> u.team() == state.rules.waveTeam && u.type().isCounted);
             }
 
-            //force pausing when the player is out of sector time
-            if(state.isOutOfTime()){
-                state.set(State.paused);
-            }
-
             if(!state.isPaused()){
-                state.secinfo.update();
+                if(state.isCampaign()){
+                    state.secinfo.update();
+                }
 
                 if(state.isCampaign()){
                     universe.update();
@@ -364,6 +313,10 @@ public class Logic implements ApplicationListener{
                     runWave();
                 }
 
+                //apply weather attributes
+                state.envAttrs.clear();
+                Groups.weather.each(w -> state.envAttrs.add(w.weather.attrs, w.opacity));
+
                 Groups.update();
             }
 
diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index 01f663f8ab..ae8c7d9a7c 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -2,6 +2,7 @@ package mindustry.core;
 
 import arc.*;
 import arc.func.*;
+import arc.graphics.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
@@ -11,6 +12,7 @@ import arc.util.serialization.*;
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.core.GameState.*;
+import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -63,7 +65,7 @@ public class NetClient implements ApplicationListener{
             reset();
 
             ui.loadfrag.hide();
-            ui.loadfrag.show("$connecting.data");
+            ui.loadfrag.show("@connecting.data");
 
             ui.loadfrag.setButton(() -> {
                 ui.loadfrag.hide();
@@ -80,7 +82,7 @@ public class NetClient implements ApplicationListener{
             c.uuid = platform.getUUID();
 
             if(c.uuid == null){
-                ui.showErrorMessage("$invalidid");
+                ui.showErrorMessage("@invalidid");
                 ui.loadfrag.hide();
                 disconnectQuietly();
                 return;
@@ -103,15 +105,13 @@ public class NetClient implements ApplicationListener{
             Time.runTask(3f, ui.loadfrag::hide);
 
             if(packet.reason != null){
-                if(packet.reason.equals("closed")){
-                    ui.showSmall("$disconnect", "$disconnect.closed");
-                }else if(packet.reason.equals("timeout")){
-                    ui.showSmall("$disconnect", "$disconnect.timeout");
-                }else if(packet.reason.equals("error")){
-                    ui.showSmall("$disconnect", "$disconnect.error");
+                switch(packet.reason){
+                    case "closed" -> ui.showSmall("@disconnect", "@disconnect.closed");
+                    case "timeout" -> ui.showSmall("@disconnect", "@disconnect.timeout");
+                    case "error" -> ui.showSmall("@disconnect", "@disconnect.error");
                 }
             }else{
-                ui.showErrorMessage("$disconnect");
+                ui.showErrorMessage("@disconnect");
             }
         });
 
@@ -261,7 +261,7 @@ public class NetClient implements ApplicationListener{
             if(reason.extraText() != null){
                 ui.showText(reason.toString(), reason.extraText());
             }else{
-                ui.showText("$disconnect", reason.toString());
+                ui.showText("@disconnect", reason.toString());
             }
         }
         ui.loadfrag.hide();
@@ -271,7 +271,7 @@ public class NetClient implements ApplicationListener{
     public static void kick(String reason){
         netClient.disconnectQuietly();
         logic.reset();
-        ui.showText("$disconnect", reason, Align.left);
+        ui.showText("@disconnect", reason, Align.left);
         ui.loadfrag.hide();
     }
 
@@ -314,7 +314,6 @@ public class NetClient implements ApplicationListener{
         ui.showLabel(message, duration, worldx, worldy);
     }
 
-    /*
     @Remote(variants = Variant.both, unreliable = true)
     public static void onEffect(Effect effect, float x, float y, float rotation, Color color){
         if(effect == null) return;
@@ -325,7 +324,7 @@ public class NetClient implements ApplicationListener{
     @Remote(variants = Variant.both)
     public static void onEffectReliable(Effect effect, float x, float y, float rotation, Color color){
         onEffect(effect, x, y, rotation, color);
-    }*/
+    }
 
     @Remote(variants = Variant.both)
     public static void infoToast(String message, float duration){
@@ -344,10 +343,11 @@ public class NetClient implements ApplicationListener{
         Groups.clear();
         netClient.removed.clear();
         logic.reset();
+        netClient.connecting = true;
 
         net.setClientLoaded(false);
 
-        ui.loadfrag.show("$connecting.data");
+        ui.loadfrag.show("@connecting.data");
 
         ui.loadfrag.setButton(() -> {
             ui.loadfrag.hide();
@@ -364,6 +364,9 @@ public class NetClient implements ApplicationListener{
 
     @Remote
     public static void playerDisconnect(int playerid){
+        if(netClient != null){
+            netClient.addRemovedEntity(playerid);
+        }
         Groups.player.removeByID(playerid);
     }
 
@@ -435,18 +438,21 @@ public class NetClient implements ApplicationListener{
     }
 
     @Remote(variants = Variant.one, priority = PacketPriority.low, unreliable = true)
-    public static void stateSnapshot(float waveTime, int wave, int enemies, boolean paused, short coreDataLen, byte[] coreData){
+    public static void stateSnapshot(float waveTime, int wave, int enemies, boolean paused, boolean gameOver, int timeData, short coreDataLen, byte[] coreData){
         try{
             if(wave > state.wave){
                 state.wave = wave;
                 Events.fire(new WaveEvent());
             }
 
+            state.gameOver = gameOver;
             state.wavetime = waveTime;
             state.wave = wave;
             state.enemies = enemies;
             state.serverPaused = paused;
 
+            universe.updateNetSeconds(timeData);
+
             netClient.byteStream.setBytes(net.decompressSnapshot(coreData, coreDataLen));
             DataInputStream input = netClient.dataStream;
 
@@ -481,7 +487,7 @@ public class NetClient implements ApplicationListener{
                 Log.err("Failed to load data!");
                 ui.loadfrag.hide();
                 quiet = true;
-                ui.showErrorMessage("$disconnect.data");
+                ui.showErrorMessage("@disconnect.data");
                 net.disconnect();
                 timeoutTime = 0f;
             }
@@ -541,6 +547,10 @@ public class NetClient implements ApplicationListener{
         quiet = true;
     }
 
+    public void clearRemovedEntity(int id){
+        removed.remove(id);
+    }
+
     public void addRemovedEntity(int id){
         removed.add(id);
     }
@@ -552,10 +562,26 @@ public class NetClient implements ApplicationListener{
     void sync(){
         if(timer.get(0, playerSyncTime)){
             BuildPlan[] requests = null;
-            if(player.isBuilder() && control.input.isBuilding){
+            if(player.isBuilder()){
                 //limit to 10 to prevent buffer overflows
                 int usedRequests = Math.min(player.builder().plans().size, 10);
 
+                int totalLength = 0;
+
+                //prevent buffer overflow by checking config length
+                for(int i = 0; i < usedRequests; i++){
+                    BuildPlan plan = player.builder().plans().get(i);
+                    if(plan.config instanceof byte[]){
+                        int length = ((byte[])plan.config).length;
+                        totalLength += length;
+                    }
+
+                    if(totalLength > 2048){
+                        usedRequests = i + 1;
+                        break;
+                    }
+                }
+
                 requests = new BuildPlan[usedRequests];
                 for(int i = 0; i < usedRequests; i++){
                     requests[i] = player.builder().plans().get(i);
@@ -563,8 +589,11 @@ public class NetClient implements ApplicationListener{
             }
 
             Unit unit = player.dead() ? Nulls.unit : player.unit();
+            int uid = player.dead() ? -1 : unit.id;
 
-            Call.clientShapshot(lastSent++,
+            Call.clientSnapshot(
+            lastSent++,
+            uid,
             player.dead(),
             unit.x, unit.y,
             player.unit().aimX(), player.unit().aimY(),
@@ -572,10 +601,11 @@ public class NetClient implements ApplicationListener{
             unit instanceof Mechc ? ((Mechc)unit).baseRotation() : 0,
             unit.vel.x, unit.vel.y,
             player.miner().mineTile(),
-            player.boosting, player.shooting, ui.chatfrag.shown(),
+            player.boosting, player.shooting, ui.chatfrag.shown(), control.input.isBuilding,
             requests,
             Core.camera.position.x, Core.camera.position.y,
-            Core.camera.width * viewScale, Core.camera.height * viewScale);
+            Core.camera.width * viewScale, Core.camera.height * viewScale
+            );
         }
 
         if(timer.get(1, 60)){
diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 42dfb92edb..9b298f9924 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -6,8 +6,8 @@ import arc.graphics.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
+import arc.util.ArcAnnotate.*;
 import arc.util.CommandHandler.*;
 import arc.util.io.*;
 import arc.util.serialization.*;
@@ -34,8 +34,9 @@ import static arc.util.Log.*;
 import static mindustry.Vars.*;
 
 public class NetServer implements ApplicationListener{
-    private static final int maxSnapshotSize = 430, timerBlockSync = 0;
-    private static final float serverSyncTime = 12, blockSyncTime = 60 * 8;
+    /** note that snapshots are compressed, so the max snapshot size here is above the typical UDP safe limit */
+    private static final int maxSnapshotSize = 800, timerBlockSync = 0;
+    private static final float serverSyncTime = 12, blockSyncTime = 60 * 6;
     private static final FloatBuffer fbuffer = FloatBuffer.allocate(20);
     private static final Vec2 vector = new Vec2();
     private static final Rect viewport = new Rect();
@@ -130,7 +131,7 @@ public class NetServer implements ApplicationListener{
                 return;
             }
 
-            if(Time.millis() < info.lastKicked){
+            if(Time.millis() < admins.getKickTime(uuid, con.address)){
                 con.kick(KickReason.recentKick);
                 return;
             }
@@ -173,7 +174,7 @@ public class NetServer implements ApplicationListener{
                 return;
             }
 
-            boolean preventDuplicates = headless && netServer.admins.getStrict();
+            boolean preventDuplicates = headless && netServer.admins.isStrict();
 
             if(preventDuplicates){
                 if(Groups.player.contains(p -> p.name.trim().equalsIgnoreCase(packet.name.trim()))){
@@ -332,6 +333,8 @@ public class NetServer implements ApplicationListener{
 
                 Call.sendMessage(Strings.format("[lightgray]A player has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
                             target.name, votes, votesRequired()));
+
+                checkPass();
             }
 
             boolean checkPass(){
@@ -368,6 +371,11 @@ public class NetServer implements ApplicationListener{
                 return;
             }
 
+            if(currentlyKicking[0] != null){
+                player.sendMessage("[scarlet]A vote is already in progress.");
+                return;
+            }
+
             if(args.length == 0){
                 StringBuilder builder = new StringBuilder();
                 builder.append("[orange]Players to kick: \n");
@@ -382,9 +390,7 @@ public class NetServer implements ApplicationListener{
                     int id = Strings.parseInt(args[0].substring(1));
                     found = Groups.player.find(p -> p.id() == id);
                 }else{
-                    found = Groups.player.find(p -> {
-                        return p.name.equalsIgnoreCase(args[0]);
-                    });
+                    found = Groups.player.find(p -> p.name.equalsIgnoreCase(args[0]));
                 }
 
                 if(found != null){
@@ -479,7 +485,7 @@ public class NetServer implements ApplicationListener{
         data.stream = new ByteArrayInputStream(stream.toByteArray());
         player.con.sendStream(data);
 
-        Log.debug("Packed @ compressed bytes of world data.", stream.size());
+        Log.debug("Packed @ bytes of world data.", stream.size());
     }
 
     public void addPacketHandler(String type, Cons2<Player, String> handler){
@@ -524,25 +530,40 @@ public class NetServer implements ApplicationListener{
     public static void serverPacketUnreliable(Player player, String type, String contents){
         serverPacketReliable(player, type, contents);
     }
+    
+    private static boolean invalid(float f){
+        return Float.isInfinite(f) || Float.isNaN(f);
+    }
 
     @Remote(targets = Loc.client, unreliable = true)
-    public static void clientShapshot(
+    public static void clientSnapshot(
         Player player,
         int snapshotID,
+        int unitID,
         boolean dead,
         float x, float y,
         float pointerX, float pointerY,
         float rotation, float baseRotation,
         float xVelocity, float yVelocity,
         Tile mining,
-        boolean boosting, boolean shooting, boolean chatting,
+        boolean boosting, boolean shooting, boolean chatting, boolean building,
         @Nullable BuildPlan[] requests,
         float viewX, float viewY, float viewWidth, float viewHeight
     ){
         NetConnection con = player.con;
         if(con == null || snapshotID < con.lastReceivedClientSnapshot) return;
 
-        boolean verifyPosition = !player.dead() && netServer.admins.getStrict() && headless;
+        //validate coordinates just in case
+        if(invalid(x)) x = 0f;
+        if(invalid(y)) y = 0f;
+        if(invalid(xVelocity)) xVelocity = 0f;
+        if(invalid(yVelocity)) yVelocity = 0f;
+        if(invalid(pointerX)) pointerX = 0f;
+        if(invalid(pointerY)) pointerY = 0f;
+        if(invalid(rotation)) rotation = 0f;
+        if(invalid(baseRotation)) baseRotation = 0f;
+
+        boolean verifyPosition = netServer.admins.isStrict() && headless;
 
         if(con.lastReceivedClientTime == 0) con.lastReceivedClientTime = Time.millis() - 16;
 
@@ -556,7 +577,10 @@ public class NetServer implements ApplicationListener{
             shooting = false;
         }
 
-        //TODO these need to be assigned elsewhere
+        if(!player.dead() && (player.unit().type().flying || !player.unit().type().canBoost)){
+            boosting = false;
+        }
+
         player.mouseX = pointerX;
         player.mouseY = pointerY;
         player.typing = chatting;
@@ -568,80 +592,80 @@ public class NetServer implements ApplicationListener{
 
         if(player.isBuilder()){
             player.builder().clearBuilding();
+            player.builder().updateBuilding(building);
+
+            if(requests != null){
+                for(BuildPlan req : requests){
+                    if(req == null) continue;
+                    Tile tile = world.tile(req.x, req.y);
+                    if(tile == null || (!req.breaking && req.block == null)) continue;
+                    //auto-skip done requests
+                    if(req.breaking && tile.block() == Blocks.air){
+                        continue;
+                    }else if(!req.breaking && tile.block() == req.block && (!req.block.rotate || (tile.build != null && tile.build.rotation == req.rotation))){
+                        continue;
+                    }else if(con.rejectedRequests.contains(r -> r.breaking == req.breaking && r.x == req.x && r.y == req.y)){ //check if request was recently rejected, and skip it if so
+                        continue;
+                    }else if(!netServer.admins.allowAction(player, req.breaking ? ActionType.breakBlock : ActionType.placeBlock, tile, action -> { //make sure request is allowed by the server
+                        action.block = req.block;
+                        action.rotation = req.rotation;
+                        action.config = req.config;
+                    })){
+                        //force the player to remove this request if that's not the case
+                        Call.removeQueueBlock(player.con, req.x, req.y, req.breaking);
+                        con.rejectedRequests.add(req);
+                        continue;
+                    }
+                    player.builder().plans().addLast(req);
+                }
+            }
         }
 
         if(player.isMiner()){
             player.miner().mineTile(mining);
         }
 
-        if(requests != null){
-            for(BuildPlan req : requests){
-                if(req == null) continue;
-                Tile tile = world.tile(req.x, req.y);
-                if(tile == null || (!req.breaking && req.block == null)) continue;
-                //auto-skip done requests
-                if(req.breaking && tile.block() == Blocks.air){
-                    continue;
-                }else if(!req.breaking && tile.block() == req.block && (!req.block.rotate || tile.rotation() == req.rotation)){
-                    continue;
-                }else if(con.rejectedRequests.contains(r -> r.breaking == req.breaking && r.x == req.x && r.y == req.y)){ //check if request was recently rejected, and skip it if so
-                    continue;
-                }else if(!netServer.admins.allowAction(player, req.breaking ? ActionType.breakBlock : ActionType.placeBlock, tile, action -> { //make sure request is allowed by the server
-                    action.block = req.block;
-                    action.rotation = req.rotation;
-                    action.config = req.config;
-                })){
-                    //force the player to remove this request if that's not the case
-                    Call.removeQueueBlock(player.con, req.x, req.y, req.breaking);
-                    con.rejectedRequests.add(req);
-                    continue;
-                }
-                player.builder().plans().addLast(req);
-            }
-        }
-
         con.rejectedRequests.clear();
 
         if(!player.dead()){
             Unit unit = player.unit();
 
-            unit.vel.set(xVelocity, yVelocity).limit(unit.type().speed);
             long elapsed = Time.timeSinceMillis(con.lastReceivedClientTime);
-            float maxSpeed = player.unit().type().speed;
+            float maxSpeed = ((player.unit().type().canBoost && player.unit().isFlying()) ? player.unit().type().boostMultiplier : 1f) * player.unit().type().speed;
+            if(unit.isGrounded()){
+                maxSpeed *= unit.floorSpeedMultiplier();
+            }
+
             float maxMove = elapsed / 1000f * 60f * maxSpeed * 1.1f;
 
-            if(con.lastUnit != unit){
-                con.lastUnit = unit;
-                con.lastPosition.set(unit);
-            }
-
-            //if the player think they're dead their position should be ignored
-            if(dead){
-                x = unit.x;
-                y = unit.y;
-            }
-
-            vector.set(x, y).sub(con.lastPosition);
-            vector.limit(maxMove);
-
-            float prevx = unit.x, prevy = unit.y;
-            unit.set(con.lastPosition);
-            if(!unit.isFlying()){
-                unit.move(vector.x, vector.y);
-            }else{
-                unit.trns(vector.x, vector.y);
-            }
-
-            //set last position after movement
-            con.lastPosition.set(unit);
+            //ignore the position if the player thinks they're dead, or the unit is wrong
+            boolean ignorePosition = dead || unit.id != unitID;
             float newx = unit.x, newy = unit.y;
 
-            if(!verifyPosition){
-                unit.set(prevx, prevy);
-                newx = x;
-                newy = y;
-            }else if(!Mathf.within(x, y, newx, newy, correctDist) && !dead){
-                Call.setPosition(player.con, newx, newy); //teleport and correct position when necessary
+            if(!ignorePosition){
+                unit.vel.set(xVelocity, yVelocity).limit(maxSpeed);
+
+                vector.set(x, y).sub(unit);
+                vector.limit(maxMove);
+
+                float prevx = unit.x, prevy = unit.y;
+                //unit.set(con.lastPosition);
+                if(!unit.isFlying()){
+                    unit.move(vector.x, vector.y);
+                }else{
+                    unit.trns(vector.x, vector.y);
+                }
+
+                newx = unit.x;
+                newy = unit.y;
+
+                if(!verifyPosition){
+                    unit.set(prevx, prevy);
+                    newx = x;
+                    newy = y;
+                }else if(!Mathf.within(x, y, newx, newy, correctDist)){
+                    Call.setPosition(player.con, newx, newy); //teleport and correct position when necessary
+                }
             }
 
             //write sync data to the buffer
@@ -671,8 +695,8 @@ public class NetServer implements ApplicationListener{
     public static void adminRequest(Player player, Player other, AdminAction action){
 
         if(!player.admin){
-            Log.warn("ACCESS DENIED: Player @ / @ attempted to perform admin action without proper security access.",
-            player.name, player.con.address);
+            Log.warn("ACCESS DENIED: Player @ / @ attempted to perform admin action '@' on '@' without proper security access.",
+            player.name, player.con.address, action.name(), other == null ? null : other.name);
             return;
         }
 
@@ -687,6 +711,7 @@ public class NetServer implements ApplicationListener{
             logic.skipWave();
         }else if(action == AdminAction.ban){
             netServer.admins.banPlayerIP(other.con.address);
+            netServer.admins.banPlayerID(other.con.uuid);
             other.kick(KickReason.banned);
             Log.info("&lc@ has banned @.", player.name, other.name);
         }else if(action == AdminAction.kick){
@@ -705,13 +730,15 @@ public class NetServer implements ApplicationListener{
 
     @Remote(targets = Loc.client)
     public static void connectConfirm(Player player){
+        player.add();
+
         if(player.con == null || player.con.hasConnected) return;
 
-        player.add();
         player.con.hasConnected = true;
+
         if(Config.showConnectMessages.bool()){
             Call.sendMessage("[accent]" + player.name + "[accent] has connected.");
-            Log.info("&lm[@] &y@ has connected. ", player.uuid(), player.name);
+            Log.info("&lm[@] &y@ has connected.", player.uuid(), player.name);
         }
 
         if(!Config.motd.string().equalsIgnoreCase("off")){
@@ -722,7 +749,7 @@ public class NetServer implements ApplicationListener{
     }
 
     public boolean isWaitingForPlayers(){
-        if(state.rules.pvp){
+        if(state.rules.pvp && !state.gameOver){
             int used = 0;
             for(TeamData t : state.teams.getActive()){
                 if(Groups.player.count(p -> p.team() == t.team) > 0){
@@ -739,7 +766,7 @@ public class NetServer implements ApplicationListener{
 
         if(!headless && !closing && net.server() && state.isMenu()){
             closing = true;
-            ui.loadfrag.show("$server.closing");
+            ui.loadfrag.show("@server.closing");
             Time.runTask(5f, () -> {
                 net.closeServer();
                 ui.loadfrag.hide();
@@ -748,6 +775,10 @@ public class NetServer implements ApplicationListener{
         }
 
         if(state.isGame() && net.server()){
+            if(state.rules.pvp){
+                state.serverPaused = isWaitingForPlayers();
+            }
+
             sync();
         }
     }
@@ -777,11 +808,11 @@ public class NetServer implements ApplicationListener{
         syncStream.reset();
 
         short sent = 0;
-        for(Building entity : Groups.tile){
-            if(!entity.block().sync) continue;
+        for(Building entity : Groups.build){
+            if(!entity.block.sync) continue;
             sent ++;
 
-            dataStream.writeInt(entity.tile().pos());
+            dataStream.writeInt(entity.pos());
             entity.writeAll(Writes.get(dataStream));
 
             if(syncStream.size() > maxSnapshotSize){
@@ -802,12 +833,12 @@ public class NetServer implements ApplicationListener{
 
     public void writeEntitySnapshot(Player player) throws IOException{
         syncStream.reset();
-        Seq<CoreEntity> cores = state.teams.cores(player.team());
+        Seq<CoreBuild> cores = state.teams.cores(player.team());
 
         dataStream.writeByte(cores.size);
 
-        for(CoreEntity entity : cores){
-            dataStream.writeInt(entity.tile().pos());
+        for(CoreBuild entity : cores){
+            dataStream.writeInt(entity.tile.pos());
             entity.items.write(Writes.get(dataStream));
         }
 
@@ -815,7 +846,7 @@ public class NetServer implements ApplicationListener{
         byte[] stateBytes = syncStream.toByteArray();
 
         //write basic state data.
-        Call.stateSnapshot(player.con, state.wavetime, state.wave, state.enemies, state.serverPaused, (short)stateBytes.length, net.compressSnapshot(stateBytes));
+        Call.stateSnapshot(player.con, state.wavetime, state.wave, state.enemies, state.serverPaused, state.gameOver, universe.seconds(), (short)stateBytes.length, net.compressSnapshot(stateBytes));
 
         viewport.setSize(player.con.viewWidth, player.con.viewHeight).setCenter(player.con.viewX, player.con.viewY);
 
diff --git a/core/src/mindustry/core/Platform.java b/core/src/mindustry/core/Platform.java
index 83c0c46c5a..7eae8136c0 100644
--- a/core/src/mindustry/core/Platform.java
+++ b/core/src/mindustry/core/Platform.java
@@ -14,10 +14,18 @@ import mindustry.type.*;
 import mindustry.ui.dialogs.*;
 import rhino.*;
 
+import java.net.*;
+
 import static mindustry.Vars.*;
 
 public interface Platform{
 
+    /** Dynamically loads a jar file. */
+    default Class<?> loadJar(Fi jar, String mainClass) throws Exception{
+        URLClassLoader classLoader = new URLClassLoader(new URL[]{jar.file().toURI().toURL()}, ClassLoader.getSystemClassLoader());
+        return classLoader.loadClass(mainClass);
+    }
+
     /** Steam: Update lobby visibility.*/
     default void updateLobby(){}
 
@@ -111,7 +119,7 @@ public interface Platform{
      * @param extension File extension to filter
      */
     default void showFileChooser(boolean open, String extension, Cons<Fi> cons){
-        new FileChooser(open ? "$open" : "$save", file -> file.extEquals(extension), open, file -> {
+        new FileChooser(open ? "@open" : "@save", file -> file.extEquals(extension), open, file -> {
             if(!open){
                 cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
             }else{
@@ -121,7 +129,7 @@ public interface Platform{
     }
 
     /**
-     * Show a file chooser for multiple file types. Only supported on desktop.
+     * Show a file chooser for multiple file types.
      * @param cons Selection listener
      * @param extensions File extensions to filter
      */
@@ -129,7 +137,7 @@ public interface Platform{
         if(mobile){
             showFileChooser(true, extensions[0], cons);
         }else{
-            new FileChooser("$open", file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+            new FileChooser("@open", file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
         }
     }
 
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 5b0b0a00ef..ad7806267c 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -28,6 +28,8 @@ public class Renderer implements ApplicationListener{
     public PlanetRenderer planets;
 
     public FrameBuffer effectBuffer = new FrameBuffer();
+    public float laserOpacity = 1f;
+
     private Bloom bloom;
     private FxProcessor fx = new FxProcessor();
     private Color clearColor = new Color(0f, 0f, 0f, 1f);
@@ -59,8 +61,10 @@ public class Renderer implements ApplicationListener{
     @Override
     public void update(){
         Color.white.set(1f, 1f, 1f, 1f);
+        Gl.clear(Gl.stencilBufferBit);
 
         camerascale = Mathf.lerpDelta(camerascale, targetscale, 0.1f);
+        laserOpacity = Core.settings.getInt("lasersopacity") / 100f;
 
         if(landTime > 0){
             landTime -= Time.delta;
@@ -87,6 +91,10 @@ public class Renderer implements ApplicationListener{
         }
     }
 
+    public boolean isLanding(){
+        return landTime > 0;
+    }
+
     public float weatherAlpha(){
         return weatherAlpha;
     }
@@ -134,7 +142,7 @@ public class Renderer implements ApplicationListener{
         }catch(Throwable e){
             e.printStackTrace();
             settings.put("bloom", false);
-            ui.showErrorMessage("$error.bloom");
+            ui.showErrorMessage("@error.bloom");
         }
     }
 
@@ -181,6 +189,8 @@ public class Renderer implements ApplicationListener{
     }
 
     public void draw(){
+        Events.fire(Trigger.preDraw);
+
         camera.update();
 
         if(Float.isNaN(camera.position.x) || Float.isNaN(camera.position.y)){
@@ -201,6 +211,8 @@ public class Renderer implements ApplicationListener{
 
         Draw.sort(true);
 
+        Events.fire(Trigger.draw);
+
         if(pixelator.enabled()){
             pixelator.register();
         }
@@ -250,6 +262,8 @@ public class Renderer implements ApplicationListener{
         Draw.reset();
         Draw.flush();
         Draw.sort(false);
+
+        Events.fire(Trigger.postDraw);
     }
 
     private void drawBackground(){
@@ -261,9 +275,9 @@ public class Renderer implements ApplicationListener{
             float fract = landTime / Fx.coreLand.lifetime;
             Building entity = player.closestCore();
 
-            TextureRegion reg = entity.block().icon(Cicon.full);
+            TextureRegion reg = entity.block.icon(Cicon.full);
             float scl = Scl.scl(4f) / camerascale;
-            float s = reg.getWidth() * Draw.scl * scl * 4f * fract;
+            float s = reg.width * Draw.scl * scl * 4f * fract;
 
             Draw.color(Pal.lightTrail);
             Draw.rect("circle-shadow", entity.getX(), entity.getY(), s, s);
@@ -275,7 +289,7 @@ public class Renderer implements ApplicationListener{
 
             Draw.color();
             Draw.mixcol(Color.white, fract);
-            Draw.rect(reg, entity.getX(), entity.getY(), reg.getWidth() * Draw.scl * scl, reg.getHeight() * Draw.scl * scl, fract * 135f);
+            Draw.rect(reg, entity.getX(), entity.getY(), reg.width * Draw.scl * scl, reg.height * Draw.scl * scl, fract * 135f);
 
             Draw.reset();
         }
@@ -314,7 +328,7 @@ public class Renderer implements ApplicationListener{
         int memory = w * h * 4 / 1024 / 1024;
 
         if(memory >= 65){
-            ui.showInfo("$screenshot.invalid");
+            ui.showInfo("@screenshot.invalid");
             return;
         }
 
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index 8dfcefdad9..536e89a9b2 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -24,6 +24,7 @@ import mindustry.editor.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.LogicDialog;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 import mindustry.ui.fragments.*;
@@ -67,6 +68,7 @@ public class UI implements ApplicationListener, Loadable{
     public SchematicsDialog schematics;
     public ModsDialog mods;
     public ColorPicker picker;
+    public LogicDialog logic;
 
     public Cursor drillCursor, unloadCursor;
 
@@ -85,7 +87,7 @@ public class UI implements ApplicationListener, Loadable{
         Fonts.def.getData().markupEnabled = true;
         Fonts.def.setOwnsTexture(false);
 
-        Core.assets.getAll(BitmapFont.class, new Seq<>()).each(font -> font.setUseIntegerPositions(true));
+        Core.assets.getAll(Font.class, new Seq<>()).each(font -> font.setUseIntegerPositions(true));
         Core.scene = new Scene();
         Core.input.addProcessor(Core.scene);
 
@@ -99,6 +101,7 @@ public class UI implements ApplicationListener, Loadable{
         Dialog.setHideAction(() -> sequence(fadeOut(0.1f)));
 
         Tooltips.getInstance().animations = false;
+        Tooltips.getInstance().textProvider = text -> new Tooltip(t -> t.background(Styles.black5).margin(4f).add(text));
 
         Core.settings.setErrorHandler(e -> {
             e.printStackTrace();
@@ -118,13 +121,15 @@ public class UI implements ApplicationListener, Loadable{
 
     @Override
     public Seq<AssetDescriptor> getDependencies(){
-        return Seq.with(new AssetDescriptor<>(Control.class), new AssetDescriptor<>("outline", BitmapFont.class), new AssetDescriptor<>("default", BitmapFont.class), new AssetDescriptor<>("chat", BitmapFont.class));
+        return Seq.with(new AssetDescriptor<>(Control.class), new AssetDescriptor<>("outline", Font.class), new AssetDescriptor<>("default", Font.class), new AssetDescriptor<>("chat", Font.class));
     }
 
     @Override
     public void update(){
         if(disableUI || Core.scene == null) return;
 
+        Events.fire(Trigger.uiDrawBegin);
+
         Core.scene.act();
         Core.scene.draw();
 
@@ -140,6 +145,8 @@ public class UI implements ApplicationListener, Loadable{
             control.tutorial.draw();
             Draw.flush();
         }
+
+        Events.fire(Trigger.uiDrawEnd);
     }
 
     @Override
@@ -178,14 +185,15 @@ public class UI implements ApplicationListener, Loadable{
         research = new ResearchDialog();
         mods = new ModsDialog();
         schematics = new SchematicsDialog();
+        logic = new LogicDialog();
 
         Group group = Core.scene.root;
 
         menuGroup.setFillParent(true);
-        menuGroup.touchable(Touchable.childrenOnly);
+        menuGroup.touchable = Touchable.childrenOnly;
         menuGroup.visible(() -> state.isMenu());
         hudGroup.setFillParent(true);
-        hudGroup.touchable(Touchable.childrenOnly);
+        hudGroup.touchable = Touchable.childrenOnly;
         hudGroup.visible(() -> state.isGame());
 
         Core.scene.add(menuGroup);
@@ -217,14 +225,17 @@ public class UI implements ApplicationListener, Loadable{
     }
 
     public TextureRegionDrawable getIcon(String name){
-        if(Icon.icons.containsKey(name)){
-            return Icon.icons.get(name);
-        }
+        if(Icon.icons.containsKey(name)) return Icon.icons.get(name);
         return Core.atlas.getDrawable("error");
     }
 
+    public TextureRegionDrawable getIcon(String name, String def){
+        if(Icon.icons.containsKey(name)) return Icon.icons.get(name);
+        return getIcon(def);
+    }
+
     public void loadAnd(Runnable call){
-        loadAnd("$loading", call);
+        loadAnd("@loading", call);
     }
 
     public void loadAnd(String text, Runnable call){
@@ -238,7 +249,7 @@ public class UI implements ApplicationListener, Loadable{
     public void showTextInput(String titleText, String dtext, int textLength, String def, boolean inumeric, Cons<String> confirmed){
         if(mobile){
             Core.input.getTextInput(new TextInput(){{
-                this.title = (titleText.startsWith("$") ? Core.bundle.get(titleText.substring(1)) : titleText);
+                this.title = (titleText.startsWith("@") ? Core.bundle.get(titleText.substring(1)) : titleText);
                 this.text = def;
                 this.numeric = inumeric;
                 this.maxLength = textLength;
@@ -251,11 +262,11 @@ public class UI implements ApplicationListener, Loadable{
                 TextField field = cont.field(def, t -> {}).size(330f, 50f).get();
                 field.setFilter((f, c) -> field.getText().length() < textLength && filter.acceptChar(f, c));
                 buttons.defaults().size(120, 54).pad(4);
-                buttons.button("$ok", () -> {
+                buttons.button("@ok", () -> {
                     confirmed.get(field.getText());
                     hide();
                 }).disabled(b -> field.getText().isEmpty());
-                buttons.button("$cancel", this::hide);
+                buttons.button("@cancel", this::hide);
                 keyDown(KeyCode.enter, () -> {
                     String text = field.getText();
                     if(!text.isEmpty()){
@@ -282,6 +293,7 @@ public class UI implements ApplicationListener, Loadable{
 
     public void showInfoFade(String info){
         Table table = new Table();
+        table.touchable = Touchable.disabled;
         table.setFillParent(true);
         table.actions(Actions.fadeOut(7f, Interp.fade), Actions.remove());
         table.top().add(info).style(Styles.outlineLabel).padTop(10);
@@ -292,7 +304,7 @@ public class UI implements ApplicationListener, Loadable{
     public void showInfoToast(String info, float duration){
         Table table = new Table();
         table.setFillParent(true);
-        table.touchable(Touchable.disabled);
+        table.touchable = Touchable.disabled;
         table.update(() -> {
             if(state.isMenu()) table.remove();
         });
@@ -305,7 +317,7 @@ public class UI implements ApplicationListener, Loadable{
     public void showInfoPopup(String info, float duration, int align, int top, int left, int bottom, int right){
         Table table = new Table();
         table.setFillParent(true);
-        table.touchable(Touchable.disabled);
+        table.touchable = Touchable.disabled;
         table.update(() -> {
             if(state.isMenu()) table.remove();
         });
@@ -318,7 +330,7 @@ public class UI implements ApplicationListener, Loadable{
     public void showLabel(String info, float duration, float worldx, float worldy){
         Table table = new Table();
         table.setFillParent(true);
-        table.touchable(Touchable.disabled);
+        table.touchable = Touchable.disabled;
         table.update(() -> {
             if(state.isMenu()) table.remove();
         });
@@ -340,24 +352,32 @@ public class UI implements ApplicationListener, Loadable{
         new Dialog(""){{
             getCell(cont).growX();
             cont.margin(15).add(info).width(400f).wrap().get().setAlignment(Align.center, Align.center);
-            buttons.button("$ok", () -> {
+            buttons.button("@ok", () -> {
                 hide();
                 listener.run();
             }).size(110, 50).pad(4);
         }}.show();
     }
 
+    public void showStartupInfo(String info){
+        new Dialog(""){{
+            getCell(cont).growX();
+            cont.margin(15).add(info).width(400f).wrap().get().setAlignment(Align.left);
+            buttons.button("@ok", this::hide).size(110, 50).pad(4);
+        }}.show();
+    }
+
     public void showErrorMessage(String text){
         new Dialog(""){{
             setFillParent(true);
             cont.margin(15f);
-            cont.add("$error.title");
+            cont.add("@error.title");
             cont.row();
             cont.image().width(300f).pad(2).height(4f).color(Color.scarlet);
             cont.row();
             cont.add(text).pad(2f).growX().wrap().get().setAlignment(Align.center);
             cont.row();
-            cont.button("$ok", this::hide).size(120, 50).pad(4);
+            cont.button("@ok", this::hide).size(120, 50).pad(4);
         }}.show();
     }
 
@@ -372,17 +392,17 @@ public class UI implements ApplicationListener, Loadable{
 
             setFillParent(true);
             cont.margin(15);
-            cont.add("$error.title").colspan(2);
+            cont.add("@error.title").colspan(2);
             cont.row();
             cont.image().width(300f).pad(2).colspan(2).height(4f).color(Color.scarlet);
             cont.row();
-            cont.add((text.startsWith("$") ? Core.bundle.get(text.substring(1)) : text) + (message == null ? "" : "\n[lightgray](" + message + ")")).colspan(2).wrap().growX().center().get().setAlignment(Align.center);
+            cont.add((text.startsWith("@") ? Core.bundle.get(text.substring(1)) : text) + (message == null ? "" : "\n[lightgray](" + message + ")")).colspan(2).wrap().growX().center().get().setAlignment(Align.center);
             cont.row();
 
             Collapser col = new Collapser(base -> base.pane(t -> t.margin(14f).add(Strings.neatError(exc)).color(Color.lightGray).left()), true);
 
-            cont.button("$details", Styles.togglet, col::toggle).size(180f, 50f).checked(b -> !col.isCollapsed()).fillX().right();
-            cont.button("$ok", this::hide).size(110, 50).fillX().left();
+            cont.button("@details", Styles.togglet, col::toggle).size(180f, 50f).checked(b -> !col.isCollapsed()).fillX().right();
+            cont.button("@ok", this::hide).size(110, 50).fillX().left();
             cont.row();
             cont.add(col).colspan(2).pad(2);
         }}.show();
@@ -399,14 +419,14 @@ public class UI implements ApplicationListener, Loadable{
             cont.row();
             cont.add(text).width(400f).wrap().get().setAlignment(align, align);
             cont.row();
-            buttons.button("$ok", this::hide).size(110, 50).pad(4);
+            buttons.button("@ok", this::hide).size(110, 50).pad(4);
         }}.show();
     }
 
     public void showInfoText(String titleText, String text){
         new Dialog(titleText){{
             cont.margin(15).add(text).width(400f).wrap().left().get().setAlignment(Align.left, Align.left);
-            buttons.button("$ok", this::hide).size(110, 50).pad(4);
+            buttons.button("@ok", this::hide).size(110, 50).pad(4);
         }}.show();
     }
 
@@ -415,7 +435,7 @@ public class UI implements ApplicationListener, Loadable{
             cont.margin(10).add(text);
             titleTable.row();
             titleTable.image().color(Pal.accent).height(3f).growX().pad(2f);
-            buttons.button("$ok", this::hide).size(110, 50).pad(4);
+            buttons.button("@ok", this::hide).size(110, 50).pad(4);
         }}.show();
     }
 
@@ -428,8 +448,8 @@ public class UI implements ApplicationListener, Loadable{
         dialog.cont.add(text).width(mobile ? 400f : 500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center);
         dialog.buttons.defaults().size(200f, 54f).pad(2f);
         dialog.setFillParent(false);
-        dialog.buttons.button("$cancel", dialog::hide);
-        dialog.buttons.button("$ok", () -> {
+        dialog.buttons.button("@cancel", dialog::hide);
+        dialog.buttons.button("@ok", () -> {
             dialog.hide();
             confirmed.run();
         });
@@ -469,10 +489,11 @@ public class UI implements ApplicationListener, Loadable{
 
     public void announce(String text){
         Table t = new Table();
+        t.touchable = Touchable.disabled;
         t.background(Styles.black3).margin(8f)
-        .add(text).style(Styles.outlineLabel);
+        .add(text).style(Styles.outlineLabel).labelAlign(Align.center);
         t.update(() -> t.setPosition(Core.graphics.getWidth()/2f, Core.graphics.getHeight()/2f, Align.center));
-        t.actions(Actions.fadeOut(3, Interp.pow4In));
+        t.actions(Actions.fadeOut(3, Interp.pow4In), Actions.remove());
         Core.scene.add(t);
     }
 
@@ -481,17 +502,21 @@ public class UI implements ApplicationListener, Loadable{
         dialog.cont.add(text).width(500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center);
         dialog.buttons.defaults().size(200f, 54f).pad(2f);
         dialog.setFillParent(false);
-        dialog.buttons.button("$ok", () -> {
+        dialog.buttons.button("@ok", () -> {
             dialog.hide();
             confirmed.run();
         });
         dialog.show();
     }
 
-    public String formatAmount(int number){
-        if(number >= 1000000){
-            return Strings.fixed(number / 1000000f, 1) + "[gray]" + Core.bundle.get("unit.millions") + "[]";
-        }else if(number >= 10000){
+    //TODO move?
+
+    public static String formatAmount(long number){
+        if(number >= 1_000_000_000){
+            return Strings.fixed(number / 1_000_000_000f, 1) + "[gray]" + Core.bundle.get("unit.billions") + "[]";
+        }else if(number >= 1_000_000){
+            return Strings.fixed(number / 1_000_000f, 1) + "[gray]" + Core.bundle.get("unit.millions") + "[]";
+        }else if(number >= 10_000){
             return number / 1000 + "[gray]" + Core.bundle.get("unit.thousands") + "[]";
         }else if(number >= 1000){
             return Strings.fixed(number / 1000f, 1) + "[gray]" + Core.bundle.get("unit.thousands") + "[]";
@@ -499,4 +524,22 @@ public class UI implements ApplicationListener, Loadable{
             return number + "";
         }
     }
+
+    public static int roundAmount(int number){
+        if(number >= 1_000_000_000){
+            return Mathf.round(number, 100_000_000);
+        }else if(number >= 1_000_000){
+            return Mathf.round(number, 100_000);
+        }else if(number >= 10_000){
+            return Mathf.round(number, 1000);
+        }else if(number >= 1000){
+            return Mathf.round(number, 100);
+        }else if(number >= 100){
+            return Mathf.round(number, 100);
+        }else if(number >= 10){
+            return Mathf.round(number, 10);
+        }else{
+            return number;
+        }
+    }
 }
diff --git a/core/src/mindustry/core/Version.java b/core/src/mindustry/core/Version.java
index 08a105d8fb..bef40c5e87 100644
--- a/core/src/mindustry/core/Version.java
+++ b/core/src/mindustry/core/Version.java
@@ -45,4 +45,12 @@ public class Version{
             build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1;
         }
     }
+
+    /** get menu version without colors */
+    public static String combined(){
+        if(build == -1){
+            return "custom build";
+        }
+        return (type.equals("official") ? modifier : type) + " build " + build + (revision == 0 ? "" : "." + revision);
+    }
 }
diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java
index 09d70ed31a..23d366b09a 100644
--- a/core/src/mindustry/core/World.java
+++ b/core/src/mindustry/core/World.java
@@ -5,11 +5,13 @@ import arc.func.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
+import arc.struct.ObjectIntMap.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.noise.*;
 import mindustry.content.*;
 import mindustry.core.GameState.*;
+import mindustry.ctype.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.game.Teams.*;
@@ -19,7 +21,6 @@ import mindustry.maps.*;
 import mindustry.maps.filters.*;
 import mindustry.maps.filters.GenerateFilter.*;
 import mindustry.type.*;
-import mindustry.type.Sector.*;
 import mindustry.type.Weather.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
@@ -30,14 +31,20 @@ import static mindustry.Vars.*;
 public class World{
     public final Context context = new Context();
 
-    public @NonNull Tiles tiles = new Tiles(0, 0);
+    public Tiles tiles = new Tiles(0, 0);
 
     private boolean generating, invalidMap;
+    private ObjectMap<Map, Runnable> customMapLoaders = new ObjectMap<>();
 
     public World(){
 
     }
 
+    /** Adds a custom handler function for loading a custom map - usually a generated one. */
+    public void addMapLoader(Map map, Runnable loader){
+        customMapLoaders.put(map, loader);
+    }
+
     public boolean isInvalidMap(){
         return invalidMap;
     }
@@ -79,13 +86,11 @@ public class World{
         return height()*tilesize;
     }
 
-    @NonNull
     public Floor floor(int x, int y){
         Tile tile = tile(x, y);
         return tile == null ? Blocks.air.asFloor() : tile.floor();
     }
 
-    @NonNull
     public Floor floorWorld(float x, float y){
         Tile tile = tileWorld(x, y);
         return tile == null ? Blocks.air.asFloor() : tile.floor();
@@ -102,10 +107,12 @@ public class World{
     }
 
     @Nullable
-    public Tile Building(int x, int y){
+    public Tile tileBuilding(int x, int y){
         Tile tile = tiles.get(x, y);
         if(tile == null) return null;
-        if(tile.build != null) return tile.build.tile();
+        if(tile.build != null){
+            return tile.build.tile();
+        }
         return tile;
     }
 
@@ -123,7 +130,6 @@ public class World{
         return tile.build;
     }
 
-    @NonNull
     public Tile rawTile(int x, int y){
         return tiles.getn(x, y);
     }
@@ -185,16 +191,12 @@ public class World{
                 continue;
             }
 
-            tile.updateOcclusion();
-
             if(tile.build != null){
                 tile.build.updateProximity();
             }
         }
 
-        if(!headless){
-            addDarkness(tiles);
-        }
+        addDarkness(tiles);
 
         Groups.resize(-finalWorldBounds, -finalWorldBounds, tiles.width * tilesize + finalWorldBounds * 2, tiles.height * tilesize + finalWorldBounds * 2);
 
@@ -257,9 +259,71 @@ public class World{
 
         state.rules.weather.clear();
 
-        if(sector.is(SectorAttribute.rainy)) state.rules.weather.add(new WeatherEntry(Weathers.rain));
-        if(sector.is(SectorAttribute.snowy)) state.rules.weather.add(new WeatherEntry(Weathers.snow));
-        if(sector.is(SectorAttribute.desert)) state.rules.weather.add(new WeatherEntry(Weathers.sandstorm));
+        //apply weather based on terrain
+        ObjectIntMap<Block> floorc = new ObjectIntMap<>();
+        ObjectSet<UnlockableContent> content = new ObjectSet<>();
+
+        float waterFloors = 0, totalFloors = 0;
+
+        for(Tile tile : world.tiles){
+            if(world.getDarkness(tile.x, tile.y) >= 3){
+                continue;
+            }
+
+            Liquid liquid = tile.floor().liquidDrop;
+            if(tile.floor().itemDrop != null) content.add(tile.floor().itemDrop);
+            if(tile.overlay().itemDrop != null) content.add(tile.overlay().itemDrop);
+            if(liquid != null) content.add(liquid);
+
+            if(!tile.block().isStatic()){
+                totalFloors ++;
+                if(liquid == Liquids.water){
+                    waterFloors += tile.floor().isDeep() ? 1f : 0.7f;
+                }
+                floorc.increment(tile.floor());
+                if(tile.overlay() != Blocks.air){
+                    floorc.increment(tile.overlay());
+                }
+            }
+        }
+
+        //sort counts in descending order
+        Seq<Entry<Block>> entries = floorc.entries().toArray();
+        entries.sort(e -> -e.value);
+        //remove all blocks occuring < 30 times - unimportant
+        entries.removeAll(e -> e.value < 30);
+
+        Block[] floors = new Block[entries.size];
+        int[] floorCounts = new int[entries.size];
+        for(int i = 0; i < entries.size; i++){
+            floorCounts[i] = entries.get(i).value;
+            floors[i] = entries.get(i).key;
+        }
+
+        //TODO bad code
+        boolean hasSnow = floors[0].name.contains("ice") || floors[0].name.contains("snow");
+        boolean hasRain = !hasSnow && floors[0].name.contains("water");
+        boolean hasDesert = !hasSnow && !hasRain && floors[0].name.contains("sand");
+        boolean hasSpores = floors[0].name.contains("spore") || floors[0].name.contains("moss") || floors[0].name.contains("tainted");
+
+        if(hasSnow){
+            state.rules.weather.add(new WeatherEntry(Weathers.snow));
+        }
+
+        if(hasRain){
+            state.rules.weather.add(new WeatherEntry(Weathers.rain));
+        }
+
+        if(hasDesert){
+            state.rules.weather.add(new WeatherEntry(Weathers.sandstorm));
+        }
+
+        if(hasSpores){
+            state.rules.weather.add(new WeatherEntry(Weathers.sporestorm));
+        }
+
+        state.secinfo.resources = content.asArray();
+        state.secinfo.resources.sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id)));
 
     }
 
@@ -272,12 +336,18 @@ public class World{
     }
 
     public void loadMap(Map map, Rules checkRules){
+        //load using custom loader if possible
+        if(customMapLoaders.containsKey(map)){
+            customMapLoaders.get(map).run();
+            return;
+        }
+
         try{
             SaveIO.load(map.file, new FilterContext(map));
         }catch(Throwable e){
             Log.err(e);
             if(!headless){
-                ui.showErrorMessage("$map.invalid");
+                ui.showErrorMessage("@map.invalid");
                 Core.app.post(() -> state.set(State.menu));
                 invalidMap = true;
             }
@@ -291,17 +361,17 @@ public class World{
 
         if(!headless){
             if(state.teams.playerCores().size == 0 && !checkRules.pvp){
-                ui.showErrorMessage("$map.nospawn");
+                ui.showErrorMessage("@map.nospawn");
                 invalidMap = true;
             }else if(checkRules.pvp){ //pvp maps need two cores to be valid
                 if(state.teams.getActive().count(TeamData::hasCore) < 2){
                     invalidMap = true;
-                    ui.showErrorMessage("$map.nospawn.pvp");
+                    ui.showErrorMessage("@map.nospawn.pvp");
                 }
             }else if(checkRules.attackMode){ //attack maps need two cores to be valid
                 invalidMap = state.teams.get(state.rules.waveTeam).noCores();
                 if(invalidMap){
-                    ui.showErrorMessage("$map.nospawn.attack");
+                    ui.showErrorMessage("@map.nospawn.attack");
                 }
             }
         }else{
@@ -317,7 +387,7 @@ public class World{
 
     public void notifyChanged(Tile tile){
         if(!generating){
-            Core.app.post(() -> Events.fire(new BuildinghangeEvent(tile)));
+            Core.app.post(() -> Events.fire(new TileChangeEvent(tile)));
         }
     }
 
@@ -418,7 +488,7 @@ public class World{
             int idx = tile.y * tiles.width + tile.x;
 
             if(tile.isDarkened()){
-                tile.rotation(dark[idx]);
+                tile.data = dark[idx];
             }
 
             if(dark[idx] == 4){
@@ -432,7 +502,7 @@ public class World{
                     }
                 }
 
-                if(full) tile.rotation(5);
+                if(full) tile.data = 5;
             }
         }
     }
@@ -446,7 +516,7 @@ public class World{
             dark = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), dark);
         }
 
-        if(state.hasSector()){
+        if(state.hasSector() && state.getSector().preset == null){
             int circleBlend = 14;
             //quantized angle
             float offset = state.getSector().rect.rotation + 90;
@@ -472,7 +542,7 @@ public class World{
 
         Tile tile = world.tile(x, y);
         if(tile != null && tile.block().solid && tile.block().fillsTile && !tile.block().synthetic()){
-            dark = Math.max(dark, tile.rotation());
+            dark = Math.max(dark, tile.data);
         }
 
         return dark;
@@ -484,6 +554,9 @@ public class World{
 
     private class Context implements WorldContext{
 
+        Context(){
+        }
+
         @Override
         public Tile tile(int index){
             return tiles.geti(index);
diff --git a/core/src/mindustry/ctype/Content.java b/core/src/mindustry/ctype/Content.java
index 7565dc88b0..ad6c3401ee 100644
--- a/core/src/mindustry/ctype/Content.java
+++ b/core/src/mindustry/ctype/Content.java
@@ -10,8 +10,7 @@ import mindustry.mod.Mods.*;
 public abstract class Content implements Comparable<Content>, Disposable{
     public final short id;
     /** Info on which mod this content was loaded from. */
-    public @NonNull ModContentInfo minfo = new ModContentInfo();
-
+    public ModContentInfo minfo = new ModContentInfo();
 
     public Content(){
         this.id = (short)Vars.content.getBy(getContentType()).size;
diff --git a/core/src/mindustry/ctype/ContentType.java b/core/src/mindustry/ctype/ContentType.java
index bc147d8c81..e62377628c 100644
--- a/core/src/mindustry/ctype/ContentType.java
+++ b/core/src/mindustry/ctype/ContentType.java
@@ -15,7 +15,8 @@ public enum ContentType{
     loadout_UNUSED,
     typeid_UNUSED,
     error,
-    planet;
+    planet,
+    ammo;
 
     public static final ContentType[] all = values();
 }
diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java
index a74241a518..9c4b147214 100644
--- a/core/src/mindustry/ctype/UnlockableContent.java
+++ b/core/src/mindustry/ctype/UnlockableContent.java
@@ -1,12 +1,14 @@
 package mindustry.ctype;
 
 import arc.*;
+import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.scene.ui.layout.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.game.EventType.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
 import mindustry.ui.*;
 
 import static mindustry.Vars.*;
@@ -29,7 +31,7 @@ public abstract class UnlockableContent extends MappableContent{
 
         this.localizedName = Core.bundle.get(getContentType() + "." + this.name + ".name", this.name);
         this.description = Core.bundle.getOrNull(getContentType() + "." + this.name + ".description");
-        this.unlocked = Core.settings != null && Core.settings.getBool(name + "-unlocked", false);
+        this.unlocked = Core.settings != null && Core.settings.getBool(this.name + "-unlocked", false);
     }
 
     public String displayDescription(){
@@ -42,6 +44,15 @@ public abstract class UnlockableContent extends MappableContent{
 
     }
 
+    /** @return items needed to research this content */
+    public ItemStack[] researchRequirements(){
+        return ItemStack.empty;
+    }
+
+    public String emoji(){
+        return Fonts.getUnicodeStr(name);
+    }
+
     /** Returns a specific content icon, or the region {contentType}-{name} if not found.*/
     public TextureRegion icon(Cicon icon){
         if(cicons[icon.ordinal()] == null){
@@ -55,6 +66,12 @@ public abstract class UnlockableContent extends MappableContent{
         return cicons[icon.ordinal()];
     }
 
+    /** Iterates through any implicit dependencies of this content.
+     * For blocks, this would be the items required to build it. */
+    public void getDependencies(Cons<UnlockableContent> cons){
+
+    }
+
     /** This should show all necessary info about this content in the specified table. */
     public abstract void displayInfo(Table table);
 
diff --git a/core/src/mindustry/editor/DrawOperation.java b/core/src/mindustry/editor/DrawOperation.java
index c28219f629..e63c2f3a6b 100755
--- a/core/src/mindustry/editor/DrawOperation.java
+++ b/core/src/mindustry/editor/DrawOperation.java
@@ -50,7 +50,7 @@ public class DrawOperation{
         }else if(type == OpType.block.ordinal()){
             return tile.blockID();
         }else if(type == OpType.rotation.ordinal()){
-            return tile.rotation();
+            return tile.build == null ? 0 : (byte)tile.build.rotation;
         }else if(type == OpType.team.ordinal()){
             return (byte)tile.getTeamID();
         }else if(type == OpType.overlay.ordinal()){
@@ -64,17 +64,21 @@ public class DrawOperation{
             if(type == OpType.floor.ordinal()){
                 tile.setFloor((Floor)content.block(to));
             }else if(type == OpType.block.ordinal()){
+                tile.getLinkedTiles(t -> editor.renderer.updatePoint(t.x, t.y));
+
                 Block block = content.block(to);
-                tile.setBlock(block, tile.team(), tile.rotation());
+                tile.setBlock(block, tile.team(), tile.build == null ? 0 : tile.build.rotation);
+
+                tile.getLinkedTiles(t -> editor.renderer.updatePoint(t.x, t.y));
             }else if(type == OpType.rotation.ordinal()){
-                tile.rotation(to);
+                if(tile.build != null) tile.build.rotation = to;
             }else if(type == OpType.team.ordinal()){
                 tile.setTeam(Team.get(to));
             }else if(type == OpType.overlay.ordinal()){
                 tile.setOverlayID(to);
             }
         });
-        editor.renderer().updatePoint(tile.x, tile.y);
+        editor.renderer.updatePoint(tile.x, tile.y);
     }
 
     @Struct
diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java
index 45965b4dab..bc09f3c110 100644
--- a/core/src/mindustry/editor/EditorTile.java
+++ b/core/src/mindustry/editor/EditorTile.java
@@ -19,8 +19,8 @@ public class EditorTile extends Tile{
     }
 
     @Override
-    public void setFloor(@NonNull Floor type){
-        if(state.isGame()){
+    public void setFloor(Floor type){
+        if(skip()){
             super.setFloor(type);
             return;
         }
@@ -39,29 +39,27 @@ public class EditorTile extends Tile{
         super.setFloor(type);
     }
 
-    @Override
-    public void updateOcclusion(){
-        super.updateOcclusion();
-
-        ui.editor.editor.renderer().updatePoint(x, y);
-    }
-
     @Override
     public void setBlock(Block type, Team team, int rotation){
-        if(state.isGame()){
+        if(skip()){
             super.setBlock(type, team, rotation);
             return;
         }
 
+        if(this.block == type && (build == null || build.rotation == rotation)){
+            update();
+            return;
+        }
+
         op(OpType.block, block.id);
         if(rotation != 0) op(OpType.rotation, (byte)rotation);
-        if(team() != Team.derelict) op(OpType.team, (byte)team().id);
+        if(team != Team.derelict) op(OpType.team, (byte)team.id);
         super.setBlock(type, team, rotation);
     }
 
     @Override
     public void setTeam(Team team){
-        if(state.isGame()){
+        if(skip()){
             super.setTeam(team);
             return;
         }
@@ -71,21 +69,9 @@ public class EditorTile extends Tile{
         super.setTeam(team);
     }
 
-    @Override
-    public void rotation(int rotation){
-        if(state.isGame()){
-            super.rotation(rotation);
-            return;
-        }
-
-        if(rotation == rotation()) return;
-        op(OpType.rotation, rotation());
-        super.rotation(rotation);
-    }
-
     @Override
     public void setOverlay(Block overlay){
-        if(state.isGame()){
+        if(skip()){
             super.setOverlay(overlay);
             return;
         }
@@ -97,21 +83,25 @@ public class EditorTile extends Tile{
     }
 
     @Override
-    protected void preChanged(){
-        super.preChanged();
+    protected void fireChanged(){
+        if(skip()){
+            super.fireChanged();
+        }else{
+            update();
+        }
     }
 
     @Override
     public void recache(){
-        if(state.isGame()){
+        if(skip()){
             super.recache();
         }
     }
     
     @Override
-    protected void changeEntity(Team team, Prov<Building> entityprov){
-        if(state.isGame()){
-            super.changeEntity(team, entityprov);
+    protected void changeEntity(Team team, Prov<Building> entityprov, int rotation){
+        if(skip()){
+            super.changeEntity(team, entityprov, rotation);
             return;
         }
 
@@ -122,15 +112,23 @@ public class EditorTile extends Tile{
         
         Block block = block();
 
-        if(block.hasEntity()){
-            build = entityprov.get().init(this, team, false);
-            build.cons(new ConsumeModule(build));
+        if(block.hasBuilding()){
+            build = entityprov.get().init(this, team, false, rotation);
+            build.cons = new ConsumeModule(build);
             if(block.hasItems) build.items = new ItemModule();
             if(block.hasLiquids) build.liquids(new LiquidModule());
             if(block.hasPower) build.power(new PowerModule());
         }
     }
 
+    private void update(){
+        ui.editor.editor.renderer.updatePoint(x, y);
+    }
+
+    private boolean skip(){
+        return state.isGame() || ui.editor.editor.isLoading();
+    }
+
     private void op(OpType type, short value){
         ui.editor.editor.addTileOp(TileOp.get(x, y, (byte)type.ordinal(), value));
     }
diff --git a/core/src/mindustry/editor/EditorTool.java b/core/src/mindustry/editor/EditorTool.java
index 47053049e2..2dff5e9f46 100644
--- a/core/src/mindustry/editor/EditorTool.java
+++ b/core/src/mindustry/editor/EditorTool.java
@@ -1,6 +1,7 @@
 package mindustry.editor;
 
 import arc.func.*;
+import arc.input.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
@@ -10,16 +11,16 @@ import mindustry.game.*;
 import mindustry.world.*;
 
 public enum EditorTool{
-    zoom,
-    pick{
+    zoom(KeyCode.v),
+    pick(KeyCode.i){
         public void touched(MapEditor editor, int x, int y){
             if(!Structs.inBounds(x, y, editor.width(), editor.height())) return;
 
             Tile tile = editor.tile(x, y);
-            editor.drawBlock = tile.block() == Blocks.air ? tile.overlay() == Blocks.air ? tile.floor() : tile.overlay() : tile.block();
+            editor.drawBlock = tile.block() == Blocks.air || !tile.block().inEditor ? tile.overlay() == Blocks.air ? tile.floor() : tile.overlay() : tile.block();
         }
     },
-    line("replace", "orthogonal"){
+    line(KeyCode.l, "replace", "orthogonal"){
 
         @Override
         public void touchedLine(MapEditor editor, int x1, int y1, int x2, int y2){
@@ -43,7 +44,7 @@ public enum EditorTool{
             });
         }
     },
-    pencil("replace", "square", "drawteams"){
+    pencil(KeyCode.b, "replace", "square", "drawteams"){
         {
             edit = true;
             draggable = true;
@@ -67,7 +68,7 @@ public enum EditorTool{
 
         }
     },
-    eraser("eraseores"){
+    eraser(KeyCode.e, "eraseores"){
         {
             edit = true;
             draggable = true;
@@ -86,7 +87,7 @@ public enum EditorTool{
             });
         }
     },
-    fill("replaceall", "fillteams"){
+    fill(KeyCode.g, "replaceall", "fillteams"){
         {
             edit = true;
         }
@@ -205,7 +206,7 @@ public enum EditorTool{
             }
         }
     },
-    spray("replace"){
+    spray(KeyCode.r, "replace"){
         final double chance = 0.012;
 
         {
@@ -231,8 +232,12 @@ public enum EditorTool{
         }
     };
 
+    public static final EditorTool[] all = values();
+
     /** All the internal alternate placement modes of this tool. */
     public final String[] altModes;
+    /** Key to activate this tool. */
+    public KeyCode key = KeyCode.unset;
     /** The current alternate placement mode. -1 is the standard mode, no changes.*/
     public int mode = -1;
     /** Whether this tool causes canvas changes when touched.*/
@@ -244,10 +249,20 @@ public enum EditorTool{
         this(new String[]{});
     }
 
+    EditorTool(KeyCode code){
+        this(new String[]{});
+        this.key = code;
+    }
+
     EditorTool(String... altModes){
         this.altModes = altModes;
     }
 
+    EditorTool(KeyCode code, String... altModes){
+        this.altModes = altModes;
+        this.key = code;
+    }
+
     public void touched(MapEditor editor, int x, int y){}
 
     public void touchedLine(MapEditor editor, int x1, int y1, int x2, int y2){}
diff --git a/core/src/mindustry/editor/MapEditor.java b/core/src/mindustry/editor/MapEditor.java
index b408cde898..49d174779b 100644
--- a/core/src/mindustry/editor/MapEditor.java
+++ b/core/src/mindustry/editor/MapEditor.java
@@ -6,6 +6,7 @@ import arc.graphics.*;
 import arc.math.*;
 import arc.struct.*;
 import mindustry.content.*;
+import mindustry.editor.DrawOperation.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.io.*;
@@ -17,10 +18,10 @@ import static mindustry.Vars.*;
 public class MapEditor{
     public static final int[] brushSizes = {1, 2, 3, 4, 5, 9, 15, 20};
 
-    private final Context context = new Context();
-    private StringMap tags = new StringMap();
-    private MapRenderer renderer = new MapRenderer(this);
+    public StringMap tags = new StringMap();
+    public MapRenderer renderer = new MapRenderer(this);
 
+    private final Context context = new Context();
     private OperationStack stack = new OperationStack();
     private DrawOperation currentOp;
     private boolean loading;
@@ -30,8 +31,8 @@ public class MapEditor{
     public Block drawBlock = Blocks.stone;
     public Team drawTeam = Team.sharded;
 
-    public StringMap getTags(){
-        return tags;
+    public boolean isLoading(){
+        return loading;
     }
 
     public void beginEdit(int width, int height){
@@ -51,7 +52,7 @@ public class MapEditor{
         if(map.file.parent().parent().name().equals("1127400") && steam){
             tags.put("steamid",  map.file.parent().name());
         }
-        MapIO.loadMap(map, context);
+        load(() -> MapIO.loadMap(map, context));
         renderer.resize(width(), height());
         loading = false;
     }
@@ -125,7 +126,7 @@ public class MapEditor{
             x = Mathf.clamp(x, (drawBlock.size - 1) / 2, width() - drawBlock.size / 2 - 1);
             y = Mathf.clamp(y, (drawBlock.size - 1) / 2, height() - drawBlock.size / 2 - 1);
             if(!hasOverlap(x, y)){
-                tile(x, y).setBlock(drawBlock, drawTeam, 0);
+                tile(x, y).setBlock(drawBlock, drawTeam, rotation);
             }
         }else{
             boolean isFloor = drawBlock.isFloor() && drawBlock != Blocks.air;
@@ -136,13 +137,11 @@ public class MapEditor{
                 if(isFloor){
                     tile.setFloor(drawBlock.asFloor());
                 }else{
-                    tile.setBlock(drawBlock);
-                    if(drawBlock.synthetic()){
-                        tile.setTeam(drawTeam);
-                    }
-                    if(drawBlock.rotate){
-                        tile.rotation((byte)rotation);
+                    if(drawBlock.rotate && tile.build != null && tile.build.rotation != rotation){
+                        addTileOp(TileOp.get(tile.x, tile.y, (byte)OpType.rotation.ordinal(), (byte)rotation));
                     }
+
+                    tile.setBlock(drawBlock, drawTeam, rotation);
                 }
             };
 
@@ -211,10 +210,6 @@ public class MapEditor{
         }
     }
 
-    public MapRenderer renderer(){
-        return renderer;
-    }
-
     public void resize(int width, int height){
         clearOp();
 
@@ -228,8 +223,14 @@ public class MapEditor{
                 int px = offsetX + x, py = offsetY + y;
                 if(previous.in(px, py)){
                     tiles.set(x, y, previous.getn(px, py));
-                    tiles.getn(x, y).x = (short)x;
-                    tiles.getn(x, y).y = (short)y;
+                    Tile tile = tiles.getn(x, y);
+                    tile.x = (short)x;
+                    tile.y = (short)y;
+
+                    if(tile.build != null && tile.isCenter()){
+                        tile.build.x = x * tilesize + tile.block().offset;
+                        tile.build.y = y * tilesize + tile.block().offset;
+                    }
                 }else{
                     tiles.set(x, y, new EditorTile(x, y, Blocks.stone.id, (short)0, (short)0));
                 }
diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java
index a8caf77d8c..25733da92e 100644
--- a/core/src/mindustry/editor/MapEditorDialog.java
+++ b/core/src/mindustry/editor/MapEditorDialog.java
@@ -58,7 +58,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
         infoDialog = new MapInfoDialog(editor);
         generateDialog = new MapGenerateDialog(editor, true);
 
-        menu = new BaseDialog("$menu");
+        menu = new BaseDialog("@menu");
         menu.addCloseButton();
 
         float swidth = 180f;
@@ -66,41 +66,41 @@ public class MapEditorDialog extends Dialog implements Disposable{
         menu.cont.table(t -> {
             t.defaults().size(swidth, 60f).padBottom(5).padRight(5).padLeft(5);
 
-            t.button("$editor.savemap", Icon.save, this::save);
+            t.button("@editor.savemap", Icon.save, this::save);
 
-            t.button("$editor.mapinfo", Icon.pencil, () -> {
+            t.button("@editor.mapinfo", Icon.pencil, () -> {
                 infoDialog.show();
                 menu.hide();
             });
 
             t.row();
 
-            t.button("$editor.generate", Icon.terrain, () -> {
+            t.button("@editor.generate", Icon.terrain, () -> {
                 generateDialog.show(generateDialog::applyToEditor);
                 menu.hide();
             });
 
-            t.button("$editor.resize", Icon.resize, () -> {
+            t.button("@editor.resize", Icon.resize, () -> {
                 resizeDialog.show();
                 menu.hide();
             });
 
             t.row();
 
-            t.button("$editor.import", Icon.download, () -> createDialog("$editor.import",
-                "$editor.importmap", "$editor.importmap.description", Icon.download, (Runnable)loadDialog::show,
-                "$editor.importfile", "$editor.importfile.description", Icon.file, (Runnable)() ->
+            t.button("@editor.import", Icon.download, () -> createDialog("@editor.import",
+                "@editor.importmap", "@editor.importmap.description", Icon.download, (Runnable)loadDialog::show,
+                "@editor.importfile", "@editor.importfile.description", Icon.file, (Runnable)() ->
                 platform.showFileChooser(true, mapExtension, file -> ui.loadAnd(() -> {
                     maps.tryCatchMapError(() -> {
                         if(MapIO.isImage(file)){
-                            ui.showInfo("$editor.errorimage");
+                            ui.showInfo("@editor.errorimage");
                         }else{
                             editor.beginEdit(MapIO.createMap(file, true));
                         }
                     });
                 })),
 
-                "$editor.importimage", "$editor.importimage.description", Icon.fileImage, (Runnable)() ->
+                "@editor.importimage", "@editor.importimage.description", Icon.fileImage, (Runnable)() ->
                 platform.showFileChooser(true, "png", file ->
                 ui.loadAnd(() -> {
                     try{
@@ -108,17 +108,17 @@ public class MapEditorDialog extends Dialog implements Disposable{
                         editor.beginEdit(pixmap);
                         pixmap.dispose();
                     }catch(Exception e){
-                        ui.showException("$editor.errorload", e);
+                        ui.showException("@editor.errorload", e);
                         Log.err(e);
                     }
                 })))
             );
 
-            t.button("$editor.export", Icon.upload, () -> createDialog("$editor.export",
-            "$editor.exportfile", "$editor.exportfile.description", Icon.file,
-                (Runnable)() -> platform.export(editor.getTags().get("name", "unknown"), mapExtension, file -> MapIO.writeMap(file, editor.createMap(file))),
-            "$editor.exportimage", "$editor.exportimage.description", Icon.fileImage,
-                (Runnable)() -> platform.export(editor.getTags().get("name", "unknown"), "png", file -> {
+            t.button("@editor.export", Icon.upload, () -> createDialog("@editor.export",
+            "@editor.exportfile", "@editor.exportfile.description", Icon.file,
+                (Runnable)() -> platform.export(editor.tags.get("name", "unknown"), mapExtension, file -> MapIO.writeMap(file, editor.createMap(file))),
+            "@editor.exportimage", "@editor.exportimage.description", Icon.fileImage,
+                (Runnable)() -> platform.export(editor.tags.get("name", "unknown"), "png", file -> {
                     Pixmap out = MapIO.writeImage(editor.tiles());
                     file.writePNG(out);
                     out.dispose();
@@ -128,17 +128,17 @@ public class MapEditorDialog extends Dialog implements Disposable{
         menu.cont.row();
 
         if(steam){
-            menu.cont.button("$editor.publish.workshop", Icon.link, () -> {
-                Map builtin = maps.all().find(m -> m.name().equals(editor.getTags().get("name", "").trim()));
+            menu.cont.button("@editor.publish.workshop", Icon.link, () -> {
+                Map builtin = maps.all().find(m -> m.name().equals(editor.tags.get("name", "").trim()));
 
-                if(editor.getTags().containsKey("steamid") && builtin != null && !builtin.custom){
-                    platform.viewListingID(editor.getTags().get("steamid"));
+                if(editor.tags.containsKey("steamid") && builtin != null && !builtin.custom){
+                    platform.viewListingID(editor.tags.get("steamid"));
                     return;
                 }
 
                 Map map = save();
 
-                if(editor.getTags().containsKey("steamid") && map != null){
+                if(editor.tags.containsKey("steamid") && map != null){
                     platform.viewListing(map);
                     return;
                 }
@@ -146,26 +146,26 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 if(map == null) return;
 
                 if(map.tags.get("description", "").length() < 4){
-                    ui.showErrorMessage("$editor.nodescription");
+                    ui.showErrorMessage("@editor.nodescription");
                     return;
                 }
 
                 if(!Structs.contains(Gamemode.all, g -> g.valid(map))){
-                    ui.showErrorMessage("$map.nospawn");
+                    ui.showErrorMessage("@map.nospawn");
                     return;
                 }
 
                 platform.publish(map);
-            }).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.getTags().containsKey("steamid") ? editor.getTags().get("author").equals(player.name) ? "$workshop.listing" : "$view.workshop" : "$editor.publish.workshop"));
+            }).padTop(-3).size(swidth * 2f + 10, 60f).update(b -> b.setText(editor.tags.containsKey("steamid") ? editor.tags.get("author").equals(player.name) ? "@workshop.listing" : "@view.workshop" : "@editor.publish.workshop"));
 
             menu.cont.row();
         }
 
-        menu.cont.button("$editor.ingame", Icon.right, this::playtest).padTop(!steam ? -3 : 1).size(swidth * 2f + 10, 60f);
+        menu.cont.button("@editor.ingame", Icon.right, this::playtest).padTop(!steam ? -3 : 1).size(swidth * 2f + 10, 60f);
 
         menu.cont.row();
 
-        menu.cont.button("$quit", Icon.exit, () -> {
+        menu.cont.button("@quit", Icon.exit, () -> {
             tryExit();
             menu.hide();
         }).size(swidth * 2f + 10, 60f);
@@ -182,7 +182,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
             try{
                 editor.beginEdit(map);
             }catch(Exception e){
-                ui.showException("$editor.errorload", e);
+                ui.showException("@editor.errorload", e);
                 Log.err(e);
             }
         }));
@@ -235,7 +235,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
         state.rules = (lastSavedRules == null ? new Rules() : lastSavedRules);
         lastSavedRules = null;
         saved = false;
-        editor.renderer().updateAll();
+        editor.renderer.updateAll();
     }
 
     private void playtest(){
@@ -254,14 +254,10 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 "height", editor.height()
             ));
             world.endMapLoad();
-            //add entities so they update. is this really needed?
-            for(Tile tile : world.tiles){
-                if(tile.build != null){
-                    tile.build.add();
-                }
-            }
             player.set(world.width() * tilesize/2f, world.height() * tilesize/2f);
             player.clearUnit();
+            Groups.unit.clear();
+            Groups.build.clear();
             logic.play();
         });
     }
@@ -269,10 +265,10 @@ public class MapEditorDialog extends Dialog implements Disposable{
     public @Nullable Map save(){
         boolean isEditor = state.rules.editor;
         state.rules.editor = false;
-        String name = editor.getTags().get("name", "").trim();
-        editor.getTags().put("rules", JsonIO.write(state.rules));
-        editor.getTags().remove("width");
-        editor.getTags().remove("height");
+        String name = editor.tags.get("name", "").trim();
+        editor.tags.put("rules", JsonIO.write(state.rules));
+        editor.tags.remove("width");
+        editor.tags.remove("height");
 
         player.clearUnit();
 
@@ -280,14 +276,14 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
         if(name.isEmpty()){
             infoDialog.show();
-            Core.app.post(() -> ui.showErrorMessage("$editor.save.noname"));
+            Core.app.post(() -> ui.showErrorMessage("@editor.save.noname"));
         }else{
             Map map = maps.all().find(m -> m.name().equals(name));
             if(map != null && !map.custom){
                 handleSaveBuiltin(map);
             }else{
-                returned = maps.saveMap(editor.getTags());
-                ui.showInfoFade("$editor.saved");
+                returned = maps.saveMap(editor.tags);
+                ui.showInfoFade("@editor.saved");
             }
         }
 
@@ -299,7 +295,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
     /** Called when a built-in map save is attempted.*/
     protected void handleSaveBuiltin(Map map){
-        ui.showErrorMessage("$editor.save.overwrite");
+        ui.showErrorMessage("@editor.save.overwrite");
     }
 
     /**
@@ -357,7 +353,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
     @Override
     public void dispose(){
-        editor.renderer().dispose();
+        editor.renderer.dispose();
     }
 
     public void beginEditMap(Fi file){
@@ -368,7 +364,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 show();
             }catch(Exception e){
                 Log.err(e);
-                ui.showException("$editor.errorload", e);
+                ui.showException("@editor.errorload", e);
             }
         });
     }
@@ -475,7 +471,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                     mode.setColor(Pal.remove);
                     mode.update(() -> mode.setText(tool.mode == -1 ? "" : "M" + (tool.mode + 1) + " "));
                     mode.setAlignment(Align.bottomRight, Align.bottomRight);
-                    mode.touchable(Touchable.disabled);
+                    mode.touchable = Touchable.disabled;
 
                     tools.stack(button, mode);
                 };
@@ -521,7 +517,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
                 tools.row();
 
-                tools.table(Tex.underline, t -> t.add("$editor.teams"))
+                tools.table(Tex.underline, t -> t.add("@editor.teams"))
                 .colspan(3).height(40).width(size * 3f + 3f).padBottom(3);
 
                 tools.row();
@@ -557,7 +553,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
                     }
 
                     t.top();
-                    t.add("$editor.brush");
+                    t.add("@editor.brush");
                     t.row();
                     t.add(slider).width(size * 3f - 20).padTop(4f);
                 }).padTop(5).growX().top();
@@ -576,22 +572,20 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
         if(Core.input.ctrl()){
             //alt mode select
-            for(int i = 0; i < view.getTool().altModes.length + 1; i++){
-                if(Core.input.keyTap(KeyCode.valueOf("num" + (i + 1)))){
-                    view.getTool().mode = i - 1;
+            for(int i = 0; i < view.getTool().altModes.length; i++){
+                if(i + 1 < KeyCode.numbers.length && Core.input.keyTap(KeyCode.numbers[i + 1])){
+                    view.getTool().mode = i;
                 }
             }
         }else{
-            //tool select
-            for(int i = 0; i < EditorTool.values().length; i++){
-                if(Core.input.keyTap(KeyCode.valueOf("num" + (i + 1)))){
-                    view.setTool(EditorTool.values()[i]);
+            for(EditorTool tool : EditorTool.all){
+                if(Core.input.keyTap(tool.key)){
+                    view.setTool(tool);
                     break;
                 }
             }
         }
 
-
         if(Core.input.keyTap(KeyCode.escape)){
             if(!menu.isShown()){
                 menu.show();
@@ -619,14 +613,14 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 for(int x = 0; x < editor.width(); x++){
                     for(int y = 0; y < editor.height(); y++){
                         Tile tile = editor.tile(x, y);
-                        if(tile.block().breakable && tile.block() instanceof Rock){
+                        if(tile.block().breakable && tile.block() instanceof Boulder){
                             tile.setBlock(Blocks.air);
-                            editor.renderer().updatePoint(x, y);
+                            editor.renderer.updatePoint(x, y);
                         }
 
                         if(tile.overlay() != Blocks.air && tile.overlay() != Blocks.spawn){
                             tile.setOverlay(Blocks.air);
-                            editor.renderer().updatePoint(x, y);
+                            editor.renderer.updatePoint(x, y);
                         }
                     }
                 }
@@ -649,11 +643,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
     }
 
     private void tryExit(){
-        if(!saved){
-            ui.showConfirm("$confirm", "$editor.unsaved", this::hide);
-        }else{
-            hide();
-        }
+        ui.showConfirm("@confirm", "@editor.unsaved", this::hide);
     }
 
     private void addBlockSelection(Table table){
diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java
index c7d7d86ae4..a4a4c0c181 100644
--- a/core/src/mindustry/editor/MapGenerateDialog.java
+++ b/core/src/mindustry/editor/MapGenerateDialog.java
@@ -37,55 +37,55 @@ public class MapGenerateDialog extends BaseDialog{
     private Pixmap pixmap;
     private Texture texture;
     private GenerateInput input = new GenerateInput();
-    private Seq<GenerateFilter> filters = new Seq<>();
+    Seq<GenerateFilter> filters = new Seq<>();
     private int scaling = mobile ? 3 : 1;
     private Table filterTable;
 
     private AsyncExecutor executor = new AsyncExecutor(1);
     private AsyncResult<Void> result;
-    private boolean generating;
+    boolean generating;
     private GenTile returnTile = new GenTile();
 
     private GenTile[][] buffer1, buffer2;
     private Cons<Seq<GenerateFilter>> applier;
-    private CachedTile ctile = new CachedTile(){
+    CachedTile ctile = new CachedTile(){
         //nothing.
         @Override
-        protected void changeEntity(Team team, Prov<Building> entityprov){
+        protected void changeEntity(Team team, Prov<Building> entityprov, int rotation){
 
         }
     };
 
     /** @param applied whether or not to use the applied in-game mode. */
     public MapGenerateDialog(MapEditor editor, boolean applied){
-        super("$editor.generate");
+        super("@editor.generate");
         this.editor = editor;
         this.applied = applied;
 
         shown(this::setup);
         addCloseButton();
         if(applied){
-            buttons.button("$editor.apply", () -> {
+            buttons.button("@editor.apply", () -> {
                 ui.loadAnd(() -> {
                     apply();
                     hide();
                 });
             }).size(160f, 64f);
         }else{
-            buttons.button("$settings.reset", () -> {
+            buttons.button("@settings.reset", () -> {
                 filters.set(maps.readFilters(""));
                 rebuildFilters();
                 update();
             }).size(160f, 64f);
         }
-        buttons.button("$editor.randomize", () -> {
+        buttons.button("@editor.randomize", () -> {
             for(GenerateFilter filter : filters){
                 filter.randomize();
             }
             update();
         }).size(160f, 64f);
 
-        buttons.button("$add", Icon.add, this::showAdd).height(64f).width(140f);
+        buttons.button("@add", Icon.add, this::showAdd).height(64f).width(140f);
 
         if(!applied){
             hidden(this::apply);
@@ -123,7 +123,7 @@ public class MapGenerateDialog extends BaseDialog{
                     Tile tile = editor.tile(x, y);
                     input.apply(x, y, tile.floor(), tile.block(), tile.overlay());
                     filter.apply(input);
-                    writeTiles[x][y].set(input.floor, input.block, input.ore, tile.team(), tile.rotation());
+                    writeTiles[x][y].set(input.floor, input.block, input.ore, tile.team());
                 }
             }
 
@@ -134,7 +134,6 @@ public class MapGenerateDialog extends BaseDialog{
                         Tile tile = editor.tile(x, y);
                         GenTile write = writeTiles[x][y];
 
-                        tile.rotation(write.rotation);
                         tile.setFloor((Floor)content.block(write.floor));
                         tile.setBlock(content.block(write.block));
                         tile.setTeam(Team.get(write.team));
@@ -145,7 +144,7 @@ public class MapGenerateDialog extends BaseDialog{
         }
 
         //reset undo stack as generation... messes things up
-        editor.renderer().updateAll();
+        editor.renderer.updateAll();
         editor.clearOp();
     }
 
@@ -179,7 +178,7 @@ public class MapGenerateDialog extends BaseDialog{
                 add(new Image(Styles.black8));
                 add(new Image(Icon.refresh, Scaling.none));
                 visible(() -> generating && !updateEditorOnChange);
-            }}).grow().padRight(10);
+            }}).uniformX().grow().padRight(10);
             t.pane(p -> filterTable = p.marginRight(6)).update(pane -> {
                 if(Core.scene.getKeyboardFocus() instanceof Dialog && Core.scene.getKeyboardFocus() != this){
                     return;
@@ -192,7 +191,7 @@ public class MapGenerateDialog extends BaseDialog{
                 }else{
                     Core.scene.setScrollFocus(null);
                 }
-            }).grow().get().setScrollingDisabled(true, false);
+            }).grow().uniformX().get().setScrollingDisabled(true, false);
         }).grow();
 
         buffer1 = create();
@@ -214,7 +213,7 @@ public class MapGenerateDialog extends BaseDialog{
     }
 
     void rebuildFilters(){
-        int cols = Math.max((int)(Math.max(filterTable.getParent().getWidth(), Core.graphics.getWidth()/2f * 0.9f) / Scl.scl(290f)), 1);
+        int cols = Math.max((int)(Core.graphics.getWidth()/2f / Scl.scl(290f)), 1);
         filterTable.clearChildren();
         filterTable.top().left();
         int i = 0;
@@ -222,41 +221,45 @@ public class MapGenerateDialog extends BaseDialog{
         for(GenerateFilter filter : filters){
 
             //main container
-            filterTable.table(Tex.button, c -> {
+            filterTable.table(Tex.pane, c -> {
+                c.margin(0);
+
                 //icons to perform actions
-                c.table(t -> {
-                    t.top();
-                    t.add(filter.name()).padTop(5).color(Pal.accent).growX().left();
+                c.table(Tex.whiteui, t -> {
+                    t.setColor(Pal.gray);
 
-                    t.row();
+                    t.top().left();
+                    t.add(filter.name()).left().padLeft(6).width(100f).wrap();
 
-                    t.table(b -> {
-                        ImageButtonStyle style = Styles.cleari;
-                        b.defaults().size(50f);
-                        b.button(Icon.refresh, style, () -> {
-                            filter.randomize();
-                            update();
-                        });
+                    t.add().growX();
 
-                        b.button(Icon.upOpen, style, () -> {
-                            int idx = filters.indexOf(filter);
-                            filters.swap(idx, Math.max(0, idx - 1));
-                            rebuildFilters();
-                            update();
-                        });
-                        b.button(Icon.downOpen, style, () -> {
-                            int idx = filters.indexOf(filter);
-                            filters.swap(idx, Math.min(filters.size - 1, idx + 1));
-                            rebuildFilters();
-                            update();
-                        });
-                        b.button(Icon.trash, style, () -> {
-                            filters.remove(filter);
-                            rebuildFilters();
-                            update();
-                        });
+                    ImageButtonStyle style = Styles.geni;
+                    t.defaults().size(42f);
+
+                    t.button(Icon.refresh, style, () -> {
+                        filter.randomize();
+                        update();
                     });
-                }).fillX();
+
+                    t.button(Icon.upOpen, style, () -> {
+                        int idx = filters.indexOf(filter);
+                        filters.swap(idx, Math.max(0, idx - 1));
+                        rebuildFilters();
+                        update();
+                    });
+                    t.button(Icon.downOpen, style, () -> {
+                        int idx = filters.indexOf(filter);
+                        filters.swap(idx, Math.min(filters.size - 1, idx + 1));
+                        rebuildFilters();
+                        update();
+                    });
+                    t.button(Icon.cancel, style, () -> {
+                        filters.remove(filter);
+                        rebuildFilters();
+                        update();
+                    });
+                }).growX();
+
                 c.row();
                 //all the options
                 c.table(f -> {
@@ -270,20 +273,22 @@ public class MapGenerateDialog extends BaseDialog{
                         }).growX().left();
                         f.row();
                     }
-                }).grow().left().pad(2).top();
+                }).grow().left().pad(6).top();
             }).width(280f).pad(3).top().left().fillY();
+
+
             if(++i % cols == 0){
                 filterTable.row();
             }
         }
 
         if(filters.isEmpty()){
-            filterTable.add("$filters.empty").wrap().width(200f);
+            filterTable.add("@filters.empty").wrap().width(200f);
         }
     }
 
     void showAdd(){
-        BaseDialog selection = new BaseDialog("$add");
+        BaseDialog selection = new BaseDialog("@add");
         selection.setFillParent(false);
         selection.cont.defaults().size(210f, 60f);
         int i = 0;
@@ -301,7 +306,7 @@ public class MapGenerateDialog extends BaseDialog{
             if(++i % 2 == 0) selection.cont.row();
         }
 
-        selection.cont.button("$filter.defaultores", () -> {
+        selection.cont.button("@filter.defaultores", () -> {
             maps.addDefaultOres(filters);
             rebuildFilters();
             update();
@@ -345,6 +350,7 @@ public class MapGenerateDialog extends BaseDialog{
 
         result = executor.submit(() -> {
             try{
+                world.setGenerating(true);
                 generating = true;
 
                 if(!filters.isEmpty()){
@@ -365,7 +371,7 @@ public class MapGenerateDialog extends BaseDialog{
                         GenTile tile = buffer1[px][py];
                         input.apply(x, y, content.block(tile.floor), content.block(tile.block), content.block(tile.ore));
                         filter.apply(input);
-                        buffer2[px][py].set(input.floor, input.block, input.ore, Team.get(tile.team), tile.rotation);
+                        buffer2[px][py].set(input.floor, input.block, input.ore, Team.get(tile.team));
                     });
 
                     pixmap.each((px, py) -> buffer1[px][py].set(buffer2[px][py]));
@@ -397,20 +403,22 @@ public class MapGenerateDialog extends BaseDialog{
                 generating = false;
                 e.printStackTrace();
             }
-            return null;
+            world.setGenerating(false);
         });
     }
 
     private class GenTile{
-        public byte team, rotation;
+        public byte team;
         public short block, floor, ore;
 
-        public void set(Block floor, Block wall, Block ore, Team team, int rotation){
+        GenTile(){
+        }
+
+        public void set(Block floor, Block wall, Block ore, Team team){
             this.floor = floor.id;
             this.block = wall.id;
-            this.ore = ore.id;
+            this.ore = floor.asFloor().isLiquid ? 0 : ore.id;
             this.team = (byte)team.id;
-            this.rotation = (byte)rotation;
         }
 
         public void set(GenTile other){
@@ -418,11 +426,10 @@ public class MapGenerateDialog extends BaseDialog{
             this.block = other.block;
             this.ore = other.ore;
             this.team = other.team;
-            this.rotation = other.rotation;
         }
 
         public GenTile set(Tile other){
-            set(other.floor(), other.block(), other.overlay(), other.team(), other.rotation());
+            set(other.floor(), other.block(), other.overlay(), other.team());
             return this;
         }
 
@@ -430,7 +437,6 @@ public class MapGenerateDialog extends BaseDialog{
             ctile.setFloor((Floor)content.block(floor));
             ctile.setBlock(content.block(block));
             ctile.setOverlay(content.block(ore));
-            ctile.rotation(rotation);
             ctile.setTeam(Team.get(team));
             return ctile;
         }
diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java
index b5a7e435ea..c46e06f36d 100644
--- a/core/src/mindustry/editor/MapInfoDialog.java
+++ b/core/src/mindustry/editor/MapInfoDialog.java
@@ -16,7 +16,7 @@ public class MapInfoDialog extends BaseDialog{
     private final CustomRulesDialog ruleInfo = new CustomRulesDialog();
 
     public MapInfoDialog(MapEditor editor){
-        super("$editor.mapinfo");
+        super("@editor.mapinfo");
         this.editor = editor;
         this.waveInfo = new WaveInfoDialog(editor);
         this.generate = new MapGenerateDialog(editor, false);
@@ -29,52 +29,52 @@ public class MapInfoDialog extends BaseDialog{
     private void setup(){
         cont.clear();
 
-        ObjectMap<String, String> tags = editor.getTags();
+        ObjectMap<String, String> tags = editor.tags;
         
         cont.pane(t -> {
-            t.add("$editor.mapname").padRight(8).left();
+            t.add("@editor.mapname").padRight(8).left();
             t.defaults().padTop(15);
 
             TextField name = t.field(tags.get("name", ""), text -> {
                 tags.put("name", text);
             }).size(400, 55f).addInputDialog(50).get();
-            name.setMessageText("$unknown");
+            name.setMessageText("@unknown");
 
             t.row();
-            t.add("$editor.description").padRight(8).left();
+            t.add("@editor.description").padRight(8).left();
 
             TextArea description = t.area(tags.get("description", ""), Styles.areaField, text -> {
                 tags.put("description", text);
             }).size(400f, 140f).addInputDialog(1000).get();
 
             t.row();
-            t.add("$editor.author").padRight(8).left();
+            t.add("@editor.author").padRight(8).left();
 
             TextField author = t.field(tags.get("author", Core.settings.getString("mapAuthor", "")), text -> {
                 tags.put("author", text);
                 Core.settings.put("mapAuthor", text);
             }).size(400, 55f).addInputDialog(50).get();
-            author.setMessageText("$unknown");
+            author.setMessageText("@unknown");
 
             t.row();
-            t.add("$editor.rules").padRight(8).left();
-            t.button("$edit", () -> {
+            t.add("@editor.rules").padRight(8).left();
+            t.button("@edit", () -> {
                 ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules());
                 hide();
             }).left().width(200f);
 
             t.row();
-            t.add("$editor.waves").padRight(8).left();
-            t.button("$edit", () -> {
+            t.add("@editor.waves").padRight(8).left();
+            t.button("@edit", () -> {
                 waveInfo.show();
                 hide();
             }).left().width(200f);
 
             t.row();
-            t.add("$editor.generation").padRight(8).left();
-            t.button("$edit", () -> {
-                generate.show(Vars.maps.readFilters(editor.getTags().get("genfilters", "")),
-                filters -> editor.getTags().put("genfilters", JsonIO.write(filters)));
+            t.add("@editor.generation").padRight(8).left();
+            t.button("@edit", () -> {
+                generate.show(Vars.maps.readFilters(editor.tags.get("genfilters", "")),
+                filters -> editor.tags.put("genfilters", JsonIO.write(filters)));
                 hide();
             }).left().width(200f);
 
diff --git a/core/src/mindustry/editor/MapLoadDialog.java b/core/src/mindustry/editor/MapLoadDialog.java
index 540ed754a2..53673ae9d2 100644
--- a/core/src/mindustry/editor/MapLoadDialog.java
+++ b/core/src/mindustry/editor/MapLoadDialog.java
@@ -14,11 +14,11 @@ public class MapLoadDialog extends BaseDialog{
     private Map selected = null;
 
     public MapLoadDialog(Cons<Map> loader){
-        super("$editor.loadmap");
+        super("@editor.loadmap");
 
         shown(this::rebuild);
 
-        TextButton button = new TextButton("$load");
+        TextButton button = new TextButton("@load");
         button.setDisabled(() -> selected == null);
         button.clicked(() -> {
             if(selected != null){
@@ -28,7 +28,7 @@ public class MapLoadDialog extends BaseDialog{
         });
 
         buttons.defaults().size(200f, 50f);
-        buttons.button("$cancel", this::hide);
+        buttons.button("@cancel", this::hide);
         buttons.add(button);
     }
 
@@ -64,9 +64,9 @@ public class MapLoadDialog extends BaseDialog{
         }
 
         if(maps.all().size == 0){
-            table.add("$maps.none").center();
+            table.add("@maps.none").center();
         }else{
-            cont.add("$editor.loadmap");
+            cont.add("@editor.loadmap");
         }
 
         cont.row();
diff --git a/core/src/mindustry/editor/MapRenderer.java b/core/src/mindustry/editor/MapRenderer.java
index 63c27ade24..919c534128 100644
--- a/core/src/mindustry/editor/MapRenderer.java
+++ b/core/src/mindustry/editor/MapRenderer.java
@@ -24,7 +24,7 @@ public class MapRenderer implements Disposable{
 
     public MapRenderer(MapEditor editor){
         this.editor = editor;
-        this.texture = Core.atlas.find("clear-editor").getTexture();
+        this.texture = Core.atlas.find("clear-editor").texture;
     }
 
     public void resize(int width, int height){
@@ -110,18 +110,13 @@ public class MapRenderer implements Disposable{
         if(wall != Blocks.air && wall.synthetic()){
             region = !Core.atlas.isFound(wall.editorIcon()) || !center ? Core.atlas.find("clear-editor") : wall.editorIcon();
 
-            if(wall.rotate){
-                mesh.draw(idxWall, region,
-                wx * tilesize + wall.offset, wy * tilesize + wall.offset,
-                region.getWidth() * Draw.scl, region.getHeight() * Draw.scl, tile.rotdeg() - 90);
-            }else{
-                float width = region.getWidth() * Draw.scl, height = region.getHeight() * Draw.scl;
+            float width = region.width * Draw.scl, height = region.height * Draw.scl;
 
-                mesh.draw(idxWall, region,
-                wx * tilesize + wall.offset + (tilesize - width) / 2f,
-                wy * tilesize + wall.offset + (tilesize - height) / 2f,
-                width, height);
-            }
+            mesh.draw(idxWall, region,
+            wx * tilesize + wall.offset + (tilesize - width) / 2f,
+            wy * tilesize + wall.offset + (tilesize - height) / 2f,
+            width, height,
+            tile.build == null || !wall.rotate ? 0 : tile.build.rotdeg());
         }else{
             region = floor.editorVariantRegions()[Mathf.randomSeed(idxWall, 0, floor.editorVariantRegions().length - 1)];
 
@@ -135,15 +130,15 @@ public class MapRenderer implements Disposable{
             region = Core.atlas.find("block-border-editor");
         }else if(!wall.synthetic() && wall != Blocks.air && center){
             region = !Core.atlas.isFound(wall.editorIcon()) ? Core.atlas.find("clear-editor") : wall.editorIcon();
-            offsetX = tilesize / 2f - region.getWidth() / 2f * Draw.scl;
-            offsetY = tilesize / 2f - region.getHeight() / 2f * Draw.scl;
+            offsetX = tilesize / 2f - region.width / 2f * Draw.scl;
+            offsetY = tilesize / 2f - region.height / 2f * Draw.scl;
         }else if(wall == Blocks.air && !tile.overlay().isAir()){
             region = tile.overlay().editorVariantRegions()[Mathf.randomSeed(idxWall, 0, tile.overlay().editorVariantRegions().length - 1)];
         }else{
             region = Core.atlas.find("clear-editor");
         }
 
-        float width = region.getWidth() * Draw.scl, height = region.getHeight() * Draw.scl;
+        float width = region.width * Draw.scl, height = region.height * Draw.scl;
         if(!wall.synthetic() && wall != Blocks.air && !wall.isMultiblock()){
             offsetX = 0;
             offsetY = 0;
diff --git a/core/src/mindustry/editor/MapResizeDialog.java b/core/src/mindustry/editor/MapResizeDialog.java
index 29178f3976..b3e190b020 100644
--- a/core/src/mindustry/editor/MapResizeDialog.java
+++ b/core/src/mindustry/editor/MapResizeDialog.java
@@ -12,7 +12,7 @@ public class MapResizeDialog extends BaseDialog{
     int width, height;
 
     public MapResizeDialog(MapEditor editor, Intc2 cons){
-        super("$editor.resizemap");
+        super("@editor.resizemap");
         shown(() -> {
             cont.clear();
             width = editor.width();
@@ -21,7 +21,7 @@ public class MapResizeDialog extends BaseDialog{
             Table table = new Table();
 
             for(boolean w : Mathf.booleans){
-                table.add(w ? "$width" : "$height").padRight(8f);
+                table.add(w ? "@width" : "@height").padRight(8f);
                 table.defaults().height(60f).padTop(8);
 
                 table.field((w ? width : height) + "", TextFieldFilter.digitsOnly, value -> {
@@ -37,8 +37,8 @@ public class MapResizeDialog extends BaseDialog{
         });
 
         buttons.defaults().size(200f, 50f);
-        buttons.button("$cancel", this::hide);
-        buttons.button("$ok", () -> {
+        buttons.button("@cancel", this::hide);
+        buttons.button("@ok", () -> {
             cons.get(width, height);
             hide();
         });
diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java
index 728a5a2440..21e659ae1b 100644
--- a/core/src/mindustry/editor/MapView.java
+++ b/core/src/mindustry/editor/MapView.java
@@ -22,7 +22,7 @@ import static mindustry.Vars.ui;
 
 public class MapView extends Element implements GestureListener{
     private MapEditor editor;
-    private EditorTool tool = EditorTool.pencil;
+    EditorTool tool = EditorTool.pencil;
     private float offsetx, offsety;
     private float zoom = 1f;
     private boolean grid = false;
@@ -31,11 +31,11 @@ public class MapView extends Element implements GestureListener{
     private Rect rect = new Rect();
     private Vec2[][] brushPolygons = new Vec2[MapEditor.brushSizes.length][0];
 
-    private boolean drawing;
-    private int lastx, lasty;
-    private int startx, starty;
-    private float mousex, mousey;
-    private EditorTool lastTool;
+    boolean drawing;
+    int lastx, lasty;
+    int startx, starty;
+    float mousex, mousey;
+    EditorTool lastTool;
 
     public MapView(MapEditor editor){
         this.editor = editor;
@@ -46,7 +46,7 @@ public class MapView extends Element implements GestureListener{
         }
 
         Core.input.getInputProcessors().insert(0, new GestureDetector(20, 0.5f, 2, 0.15f, this));
-        touchable(Touchable.enabled);
+        this.touchable = Touchable.enabled;
 
         Point2 firstTouch = new Point2();
 
@@ -204,7 +204,7 @@ public class MapView extends Element implements GestureListener{
         zoom = Mathf.clamp(zoom, 0.2f, 20f);
     }
 
-    private Point2 project(float x, float y){
+    Point2 project(float x, float y){
         float ratio = 1f / ((float)editor.width() / editor.height());
         float size = Math.min(width, height);
         float sclwidth = size * zoom;
@@ -213,9 +213,9 @@ public class MapView extends Element implements GestureListener{
         y = (y - getHeight() / 2 + sclheight / 2 - offsety * zoom) / sclheight * editor.height();
 
         if(editor.drawBlock.size % 2 == 0 && tool != EditorTool.eraser){
-            return Tmp.g1.set((int)(x - 0.5f), (int)(y - 0.5f));
+            return Tmp.p1.set((int)(x - 0.5f), (int)(y - 0.5f));
         }else{
-            return Tmp.g1.set((int)x, (int)y);
+            return Tmp.p1.set((int)x, (int)y);
         }
     }
 
@@ -248,14 +248,20 @@ public class MapView extends Element implements GestureListener{
         Draw.color(Pal.remove);
         Lines.stroke(2f);
         Lines.rect(centerx - sclwidth / 2 - 1, centery - sclheight / 2 - 1, sclwidth + 2, sclheight + 2);
-        editor.renderer().draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
+        editor.renderer.draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
         Draw.reset();
 
         if(grid){
             Draw.color(Color.gray);
             image.setBounds(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
             image.draw();
-            Draw.color();
+
+            Lines.stroke(3f);
+            Draw.color(Pal.accent);
+            Lines.line(centerx - sclwidth/2f, centery, centerx + sclwidth/2f, centery);
+            Lines.line(centerx, centery - sclheight/2f, centerx, centery + sclheight/2f);
+
+            Draw.reset();
         }
 
         int index = 0;
diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java
new file mode 100644
index 0000000000..14b2416085
--- /dev/null
+++ b/core/src/mindustry/editor/WaveGraph.java
@@ -0,0 +1,208 @@
+package mindustry.editor;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.pooling.*;
+import mindustry.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+
+public class WaveGraph extends Table{
+    public Seq<SpawnGroup> groups = new Seq<>();
+    public int from, to = 20;
+
+    private Mode mode = Mode.counts;
+    private int[][] values;
+    private OrderedSet<UnitType> used = new OrderedSet<>();
+    private int max, maxTotal;
+    private float maxHealth;
+    private Table colors;
+    private ObjectSet<UnitType> hidden = new ObjectSet<>();
+
+    public WaveGraph(){
+        background(Tex.pane);
+
+        rect((x, y, width, height) -> {
+            Lines.stroke(Scl.scl(3f));
+
+            GlyphLayout lay = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
+            Font font = Fonts.outline;
+
+            lay.setText(font, "1");
+
+            float fh = lay.height;
+            float offsetX = Scl.scl(30f), offsetY = Scl.scl(22f) + fh + Scl.scl(5f);
+
+            float graphX = x + offsetX, graphY = y + offsetY, graphW = width - offsetX, graphH = height - offsetY;
+            float spacing = graphW / (values.length - 1);
+
+            if(mode == Mode.counts){
+                for(UnitType type : used.orderedItems()){
+                    Draw.color(color(type));
+                    Draw.alpha(parentAlpha);
+
+                    Lines.beginLine();
+
+                    for(int i = 0; i < values.length; i++){
+                        int val = values[i][type.id];
+                        float cx = graphX + i*spacing, cy = 2f + graphY + val * (graphH - 4f) / max;
+                        Lines.linePoint(cx, cy);
+                    }
+
+                    Lines.endLine();
+                }
+            }else if(mode == Mode.totals){
+                Lines.beginLine();
+
+                Draw.color(Pal.accent);
+                for(int i = 0; i < values.length; i++){
+                    int sum = 0;
+                    for(UnitType type : used.orderedItems()){
+                        sum += values[i][type.id];
+                    }
+
+                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxTotal;
+                    Lines.linePoint(cx, cy);
+                }
+
+                Lines.endLine();
+            }else if(mode == Mode.health){
+                Lines.beginLine();
+
+                Draw.color(Pal.health);
+                for(int i = 0; i < values.length; i++){
+                    float sum = 0;
+                    for(UnitType type : used.orderedItems()){
+                        sum += type.health * values[i][type.id];
+                    }
+
+                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxHealth;
+                    Lines.linePoint(cx, cy);
+                }
+
+                Lines.endLine();
+            }
+
+            //how many numbers can fit here
+            float totalMarks = (height - offsetY - getMarginBottom() *2f - 1f) / (lay.height * 2);
+
+            int markSpace = Math.max(1, Mathf.ceil(max / totalMarks));
+
+            Draw.color(Color.lightGray);
+            for(int i = 0; i < max; i += markSpace){
+                float cy = 2f + y + i * (height - 4f) / max + offsetY, cx = x + offsetX;
+                //Lines.line(cx, cy, cx + len, cy);
+
+                lay.setText(font, "" + i);
+
+                font.draw("" + i, cx, cy + lay.height/2f - Scl.scl(3f), Align.right);
+            }
+
+            float len = Scl.scl(4f);
+            font.setColor(Color.lightGray);
+
+            for(int i = 0; i < values.length; i++){
+                float cy = y + fh, cx = x + graphW / (values.length - 1) * i + offsetX;
+
+                Lines.line(cx, cy, cx, cy + len);
+                if(i == values.length/2){
+                    font.draw("" + (i + from), cx, cy - 2f, Align.center);
+                }
+            }
+            font.setColor(Color.white);
+
+            Pools.free(lay);
+
+            Draw.reset();
+        }).pad(4).padBottom(10).grow();
+
+        row();
+
+        table(t -> colors = t).growX();
+
+        row();
+
+        table(t -> {
+            t.left();
+            ButtonGroup<Button> group = new ButtonGroup<>();
+
+            for(Mode m : Mode.all){
+                t.button("@wavemode." + m.name(), Styles.fullTogglet, () -> {
+                    mode = m;
+                }).group(group).height(35f).update(b -> b.setChecked(m == mode)).width(130f);
+            }
+        }).growX();
+    }
+
+    public void rebuild(){
+        values = new int[to - from + 1][Vars.content.units().size];
+        used.clear();
+        max = maxTotal = 1;
+        maxHealth = 1f;
+
+        for(int i = from; i <= to; i++){
+            int index = i - from;
+            float healthsum = 0f;
+            int sum = 0;
+
+            for(SpawnGroup spawn : groups){
+                int spawned = spawn.getUnitsSpawned(i);
+                values[index][spawn.type.id] += spawned;
+                if(spawned > 0){
+                    used.add(spawn.type);
+                }
+                max = Math.max(max, values[index][spawn.type.id]);
+                healthsum += spawned * spawn.type.health;
+                sum += spawned;
+            }
+            maxTotal = Math.max(maxTotal, sum);
+            maxHealth = Math.max(maxHealth,healthsum);
+        }
+
+        ObjectSet<UnitType> usedCopy = new ObjectSet<>(used);
+
+        colors.clear();
+        colors.left();
+        colors.pane(t -> {
+            t.left();
+            for(UnitType type : used){
+                t.button(b -> {
+                    Color tcolor = color(type).cpy();
+                    b.image().size(32f).update(i -> i.setColor(b.isChecked() ? Tmp.c1.set(tcolor).mul(0.5f) : tcolor)).get().act(1);
+                    b.image(type.icon(Cicon.medium)).padRight(20).update(i -> i.setColor(b.isChecked() ? Color.gray : Color.white)).get().act(1);
+                    b.margin(0f);
+                }, Styles.fullTogglet, () -> {
+                    if(!hidden.add(type)){
+                        hidden.remove(type);
+                    }
+
+                    used.clear();
+                    used.addAll(usedCopy);
+                    for(UnitType o : hidden) used.remove(o);
+                }).update(b -> b.setChecked(hidden.contains(type)));
+            }
+        }).get().setScrollingDisabled(false, true);
+
+        for(UnitType type : hidden){
+            used.remove(type);
+        }
+    }
+
+    Color color(UnitType type){
+        return Tmp.c1.fromHsv(type.id / (float)Vars.content.units().size * 360f, 0.7f, 1f);
+    }
+
+    enum Mode{
+        counts, totals, health;
+
+        static Mode[] all = values();
+    }
+}
diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java
index 7f1867f92a..d5b957e143 100644
--- a/core/src/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/mindustry/editor/WaveInfoDialog.java
@@ -1,40 +1,38 @@
 package mindustry.editor;
 
 import arc.*;
-import arc.struct.*;
-import arc.graphics.*;
 import arc.input.*;
 import arc.math.*;
 import arc.scene.event.*;
 import arc.scene.ui.*;
 import arc.scene.ui.TextField.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
-import mindustry.*;
 import mindustry.content.*;
-import mindustry.ctype.ContentType;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.io.*;
 import mindustry.type.*;
-import mindustry.ui.Cicon;
+import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 
 import static mindustry.Vars.*;
-import static mindustry.game.SpawnGroup.never;
+import static mindustry.game.SpawnGroup.*;
 
 public class WaveInfoDialog extends BaseDialog{
-    private static final int displayed = 20;
-    private Seq<SpawnGroup> groups = new Seq<>();
+    private int displayed = 20;
+    Seq<SpawnGroup> groups = new Seq<>();
 
-    private Table table, preview;
+    private Table table;
     private int start = 0;
     private UnitType lastType = UnitTypes.dagger;
     private float updateTimer, updatePeriod = 1f;
+    private WaveGraph graph = new WaveGraph();
 
     public WaveInfoDialog(MapEditor editor){
-        super("$waves.title");
+        super("@waves.title");
 
         shown(this::setup);
         hidden(() -> {
@@ -47,36 +45,82 @@ public class WaveInfoDialog extends BaseDialog{
             }
         });
 
+        onResize(this::setup);
         addCloseButton();
-        buttons.button("$waves.edit", () -> {
-            BaseDialog dialog = new BaseDialog("$waves.edit");
+
+        buttons.button("@waves.edit", () -> {
+            BaseDialog dialog = new BaseDialog("@waves.edit");
             dialog.addCloseButton();
             dialog.setFillParent(false);
             dialog.cont.defaults().size(210f, 64f);
-            dialog.cont.button("$waves.copy", () -> {
-                ui.showInfoFade("$waves.copied");
+            dialog.cont.button("@waves.copy", () -> {
+                ui.showInfoFade("@waves.copied");
                 Core.app.setClipboardText(maps.writeWaves(groups));
                 dialog.hide();
             }).disabled(b -> groups == null);
             dialog.cont.row();
-            dialog.cont.button("$waves.load", () -> {
+            dialog.cont.button("@waves.load", () -> {
                 try{
                     groups = maps.readWaves(Core.app.getClipboardText());
                     buildGroups();
                 }catch(Exception e){
                     e.printStackTrace();
-                    ui.showErrorMessage("$waves.invalid");
+                    ui.showErrorMessage("@waves.invalid");
                 }
                 dialog.hide();
             }).disabled(b -> Core.app.getClipboardText() == null || Core.app.getClipboardText().isEmpty());
             dialog.cont.row();
-            dialog.cont.button("$settings.reset", () -> ui.showConfirm("$confirm", "$settings.clear.confirm", () -> {
+            dialog.cont.button("@settings.reset", () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
                 groups = JsonIO.copy(defaultWaves.get());
                 buildGroups();
                 dialog.hide();
             }));
             dialog.show();
         }).size(270f, 64f);
+
+        buttons.defaults().width(60f);
+
+        buttons.button("<", () -> {}).update(t -> {
+            if(t.getClickListener().isPressed()){
+                shift(-1);
+            }
+        });
+        buttons.button(">", () -> {}).update(t -> {
+            if(t.getClickListener().isPressed()){
+                shift(1);
+            }
+        });
+
+        buttons.button("-", () -> {}).update(t -> {
+            if(t.getClickListener().isPressed()){
+                view(-1);
+            }
+        });
+        buttons.button("+", () -> {}).update(t -> {
+            if(t.getClickListener().isPressed()){
+                view(1);
+            }
+        });
+    }
+
+    void view(int amount){
+        updateTimer += Time.delta;
+        if(updateTimer >= updatePeriod){
+            displayed += amount;
+            if(displayed < 5) displayed = 5;
+            updateTimer = 0f;
+            updateWaves();
+        }
+    }
+
+    void shift(int amount){
+        updateTimer += Time.delta;
+        if(updateTimer >= updatePeriod){
+            start += amount;
+            if(start < 0) start = 0;
+            updateTimer = 0f;
+            updateWaves();
+        }
     }
 
     void setup(){
@@ -86,47 +130,19 @@ public class WaveInfoDialog extends BaseDialog{
         cont.stack(new Table(Tex.clear, main -> {
             main.pane(t -> table = t).growX().growY().padRight(8f).get().setScrollingDisabled(true, false);
             main.row();
-            main.button("$add", () -> {
+            main.button("@add", () -> {
                 if(groups == null) groups = new Seq<>();
                 groups.add(new SpawnGroup(lastType));
                 buildGroups();
             }).growX().height(70f);
-        }), new Label("$waves.none"){{
+        }), new Label("@waves.none"){{
             visible(() -> groups.isEmpty());
-            touchable(Touchable.disabled);
+            this.touchable = Touchable.disabled;
             setWrap(true);
             setAlignment(Align.center, Align.center);
         }}).width(390f).growY();
 
-        cont.table(Tex.clear, m -> {
-            m.add("$waves.preview").color(Color.lightGray).wrap().growX().center().get().setAlignment(Align.center, Align.center);
-            m.row();
-            m.button("-", () -> {
-            }).update(t -> {
-                if(t.getClickListener().isPressed()){
-                    updateTimer += Time.delta;
-                    if(updateTimer >= updatePeriod){
-                        start = Math.max(start - 1, 0);
-                        updateTimer = 0f;
-                        updateWaves();
-                    }
-                }
-            }).growX().height(70f);
-            m.row();
-            m.pane(t -> preview = t).grow().get().setScrollingDisabled(true, true);
-            m.row();
-            m.button("+", () -> {
-            }).update(t -> {
-                if(t.getClickListener().isPressed()){
-                    updateTimer += Time.delta;
-                    if(updateTimer >= updatePeriod){
-                        start++;
-                        updateTimer = 0f;
-                        updateWaves();
-                    }
-                }
-            }).growX().height(70f);
-        }).growY().width(180f).growY();
+        cont.add(graph = new WaveGraph()).grow();
 
         buildGroups();
     }
@@ -137,6 +153,7 @@ public class WaveInfoDialog extends BaseDialog{
         table.margin(10f);
 
         if(groups != null){
+
             for(SpawnGroup group : groups){
                 table.table(Tex.button, t -> {
                     t.margin(0).defaults().pad(3).padLeft(5f).growX().left();
@@ -144,7 +161,16 @@ public class WaveInfoDialog extends BaseDialog{
                         b.left();
                         b.image(group.type.icon(mindustry.ui.Cicon.medium)).size(32f).padRight(3);
                         b.add(group.type.localizedName).color(Pal.accent);
-                    }, () -> showUpdate(group)).pad(-6f).padBottom(0f);
+
+                        b.add().growX();
+
+                        b.button(Icon.cancel, () -> {
+                            groups.remove(group);
+                            table.getCell(t).pad(0f);
+                            t.remove();
+                            updateWaves();
+                        }).pad(-6).size(46f).padRight(-12f);
+                    }, () -> showUpdate(group)).height(46f).pad(-6f).padBottom(0f);
 
                     t.row();
                     t.table(spawns -> {
@@ -154,7 +180,7 @@ public class WaveInfoDialog extends BaseDialog{
                                 updateWaves();
                             }
                         }).width(100f);
-                        spawns.add("$waves.to").padLeft(4).padRight(4);
+                        spawns.add("@waves.to").padLeft(4).padRight(4);
                         spawns.field(group.end == never ? "" : (group.end + 1) + "", TextFieldFilter.digitsOnly, text -> {
                             if(Strings.canParsePositiveInt(text)){
                                 group.end = Strings.parseInt(text) - 1;
@@ -167,14 +193,14 @@ public class WaveInfoDialog extends BaseDialog{
                     });
                     t.row();
                     t.table(p -> {
-                        p.add("$waves.every").padRight(4);
+                        p.add("@waves.every").padRight(4);
                         p.field(group.spacing + "", TextFieldFilter.digitsOnly, text -> {
                             if(Strings.canParsePositiveInt(text) && Strings.parseInt(text) > 0){
                                 group.spacing = Strings.parseInt(text);
                                 updateWaves();
                             }
                         }).width(100f);
-                        p.add("$waves.waves").padLeft(4);
+                        p.add("@waves.waves").padLeft(4);
                     });
 
                     t.row();
@@ -193,7 +219,7 @@ public class WaveInfoDialog extends BaseDialog{
                                 updateWaves();
                             }
                         }).width(80f);
-                        a.add("$waves.perspawn").padLeft(4);
+                        a.add("@waves.perspawn").padLeft(4);
                     });
                     t.row();
                     t.table(a -> {
@@ -211,24 +237,17 @@ public class WaveInfoDialog extends BaseDialog{
                                 updateWaves();
                             }
                         }).width(80f);
-                        a.add("$waves.shields").padLeft(4);
+                        a.add("@waves.shields").padLeft(4);
                     });
 
                     t.row();
-                    t.check("$waves.guardian", b -> group.effect = (b ? StatusEffects.boss : null)).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss));
+                    t.check("@waves.guardian", b -> group.effect = (b ? StatusEffects.boss : null)).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss)).padBottom(8f);
+                }).width(340f).pad(8);
 
-                    t.row();
-                    t.button("$waves.remove", () -> {
-                        groups.remove(group);
-                        table.getCell(t).pad(0f);
-                        t.remove();
-                        updateWaves();
-                    }).growX().pad(-6f).padTop(5);
-                }).width(340f).pad(16);
                 table.row();
             }
         }else{
-            table.add("$editor.default");
+            table.add("@editor.default");
         }
 
         updateWaves();
@@ -243,7 +262,7 @@ public class WaveInfoDialog extends BaseDialog{
                 if(type.isHidden()) continue;
                 p.button(t -> {
                     t.left();
-                    t.image(type.icon(mindustry.ui.Cicon.medium)).size(40f).padRight(2f);
+                    t.image(type.icon(Cicon.medium)).size(40f).padRight(2f);
                     t.add(type.localizedName);
                 }, () -> {
                     lastType = type;
@@ -258,36 +277,9 @@ public class WaveInfoDialog extends BaseDialog{
     }
 
     void updateWaves(){
-        preview.clear();
-        preview.top();
-
-        for(int i = start; i < displayed + start; i++){
-            int wave = i;
-            preview.table(Tex.underline, table -> {
-                table.add((wave + 1) + "").color(Pal.accent).center().colspan(2).get().setAlignment(Align.center, Align.center);
-                table.row();
-
-                int[] spawned = new int[Vars.content.getBy(ContentType.unit).size];
-
-                for(SpawnGroup spawn : groups){
-                    spawned[spawn.type.id] += spawn.getUnitsSpawned(wave);
-                }
-
-                for(int j = 0; j < spawned.length; j++){
-                    if(spawned[j] > 0){
-                        UnitType type = content.getByID(ContentType.unit, j);
-                        table.image(type.icon(Cicon.medium)).size(8f * 4f).padRight(4);
-                        table.add(spawned[j] + "x").color(Color.lightGray).padRight(6);
-                        table.row();
-                    }
-                }
-
-                if(table.getChildren().size == 1){
-                    table.add("$none").color(Pal.remove);
-                }
-            }).width(110f).pad(2f);
-
-            preview.row();
-        }
+        graph.groups = groups;
+        graph.from = start;
+        graph.to = start + displayed;
+        graph.rebuild();
     }
 }
diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java
index a8d743a320..e22891eba5 100644
--- a/core/src/mindustry/entities/Damage.java
+++ b/core/src/mindustry/entities/Damage.java
@@ -20,6 +20,7 @@ import static mindustry.Vars.*;
 
 /** Utility class for damaging in an area. */
 public class Damage{
+    private static Tile furthest;
     private static Rect rect = new Rect();
     private static Rect hitrect = new Rect();
     private static Vec2 tr = new Vec2();
@@ -30,24 +31,26 @@ public class Damage{
     private static Unit tmpUnit;
 
     /** Creates a dynamic explosion based on specified parameters. */
-    public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, Color color){
-        for(int i = 0; i < Mathf.clamp(power / 20, 0, 6); i++){
-            int branches = 5 + Mathf.clamp((int)(power / 30), 1, 20);
-            Time.run(i * 2f + Mathf.random(4f), () -> Lightning.create(Team.derelict, Pal.power, 3, x, y, Mathf.random(360f), branches + Mathf.range(2)));
-        }
+    public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, Color color, boolean damage){
+        if(damage){
+            for(int i = 0; i < Mathf.clamp(power / 20, 0, 6); i++){
+                int branches = 5 + Mathf.clamp((int)(power / 30), 1, 20);
+                Time.run(i * 2f + Mathf.random(4f), () -> Lightning.create(Team.derelict, Pal.power, 3, x, y, Mathf.random(360f), branches + Mathf.range(2)));
+            }
 
-        for(int i = 0; i < Mathf.clamp(flammability / 4, 0, 30); i++){
-            Time.run(i / 2f, () -> Call.createBullet(Bullets.fireball, Team.derelict, x, y, Mathf.random(360f), Bullets.fireball.damage, 1, 1));
-        }
+            for(int i = 0; i < Mathf.clamp(flammability / 4, 0, 30); i++){
+                Time.run(i / 2f, () -> Call.createBullet(Bullets.fireball, Team.derelict, x, y, Mathf.random(360f), Bullets.fireball.damage, 1, 1));
+            }
 
-        int waves = Mathf.clamp((int)(explosiveness / 4), 0, 30);
+            int waves = Mathf.clamp((int)(explosiveness / 4), 0, 30);
 
-        for(int i = 0; i < waves; i++){
-            int f = i;
-            Time.run(i * 2f, () -> {
-                Damage.damage(x, y, Mathf.clamp(radius + explosiveness, 0, 50f) * ((f + 1f) / waves), explosiveness / 2f);
-                Fx.blockExplosionSmoke.at(x + Mathf.range(radius), y + Mathf.range(radius));
-            });
+            for(int i = 0; i < waves; i++){
+                int f = i;
+                Time.run(i * 2f, () -> {
+                    Damage.damage(x, y, Mathf.clamp(radius + explosiveness, 0, 50f) * ((f + 1f) / waves), explosiveness / 2f);
+                    Fx.blockExplosionSmoke.at(x + Mathf.range(radius), y + Mathf.range(radius));
+                });
+            }
         }
 
         if(explosiveness > 15f){
@@ -59,7 +62,7 @@ public class Damage{
         }
 
         float shake = Math.min(explosiveness / 4f + 3f, 9f);
-        Effects.shake(shake, shake, x, y);
+        Effect.shake(shake, shake, x, y);
         Fx.dynamicExplosion.at(x, y, radius / 8f);
     }
 
@@ -74,6 +77,28 @@ public class Damage{
         }
     }
 
+    public static float findLaserLength(Bullet b, float length){
+        Tmp.v1.trns(b.rotation(), length);
+
+        furthest = null;
+
+        boolean found = world.raycast(b.tileX(), b.tileY(), world.toTile(b.x + Tmp.v1.x), world.toTile(b.y + Tmp.v1.y),
+        (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && furthest.block().absorbLasers);
+
+        return found && furthest != null ? Math.max(6f, b.dst(furthest.worldx(), furthest.worldy())) : length;
+    }
+
+    /** Collides a bullet with blocks in a laser, taking into account absorption blocks. Resulting length is stored in the bullet's fdata. */
+    public static float collideLaser(Bullet b, float length, boolean large){
+        float resultLength = findLaserLength(b, length);
+
+        collideLine(b, b.team, b.type.hitEffect, b.x, b.y, b.rotation(), resultLength, large);
+
+        b.fdata = resultLength;
+
+        return resultLength;
+    }
+
     public static void collideLine(Bullet hitter, Team team, Effect effect, float x, float y, float angle, float length){
         collideLine(hitter, team, effect, x, y, angle, length, false);
     }
@@ -83,11 +108,13 @@ public class Damage{
      * Only enemies of the specified team are damaged.
      */
     public static void collideLine(Bullet hitter, Team team, Effect effect, float x, float y, float angle, float length, boolean large){
+        length = findLaserLength(hitter, length);
+
         collidedBlocks.clear();
         tr.trns(angle, length);
         Intc2 collider = (cx, cy) -> {
             Building tile = world.build(cx, cy);
-            if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.team() != team && tile.collide(hitter)){
+            if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.team != team && tile.collide(hitter)){
                 tile.collision(hitter);
                 collidedBlocks.add(tile.pos());
                 hitter.type.hit(hitter, tile.x, tile.y);
@@ -130,13 +157,8 @@ public class Damage{
             if(!e.checkTarget(hitter.type.collidesAir, hitter.type.collidesGround)) return;
 
             e.hitbox(hitrect);
-            Rect other = hitrect;
-            other.y -= expand;
-            other.x -= expand;
-            other.width += expand * 2;
-            other.height += expand * 2;
 
-            Vec2 vec = Geometry.raycastRect(x, y, x2, y2, other);
+            Vec2 vec = Geometry.raycastRect(x, y, x2, y2, hitrect.grow(expand * 2));
 
             if(vec != null){
                 effect.at(vec.x, vec.y);
@@ -162,7 +184,6 @@ public class Damage{
                 Building tile = world.build(cx, cy);
                 if(tile != null && tile.team != hitter.team){
                     tmpBuilding = tile;
-                    //TODO return tile
                     return true;
                 }
                 return false;
diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java
index 37640b577b..fd82f109e9 100644
--- a/core/src/mindustry/entities/Effect.java
+++ b/core/src/mindustry/entities/Effect.java
@@ -1,15 +1,26 @@
 package mindustry.entities;
 
+import arc.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
 
 public class Effect{
+    private static final float shakeFalloff = 10000f;
     private static final EffectContainer container = new EffectContainer();
-    private static int lastid = 0;
+    private static final Seq<Effect> all = new Seq<>();
 
     public final int id;
     public final Cons<EffectContainer> renderer;
@@ -21,14 +32,15 @@ public class Effect{
     public float groundDuration;
 
     public Effect(float life, float clipsize, Cons<EffectContainer> renderer){
-        this.id = lastid++;
+        this.id = all.size;
         this.lifetime = life;
         this.renderer = renderer;
         this.size = clipsize;
+        all.add(this);
     }
 
     public Effect(float life, Cons<EffectContainer> renderer){
-        this(life, 28f, renderer);
+        this(life,50f, renderer);
     }
 
     public Effect ground(){
@@ -43,42 +55,123 @@ public class Effect{
     }
 
     public void at(Position pos){
-        Effects.create(this, pos.getX(), pos.getY(), 0, Color.white, null);
+        create(this, pos.getX(), pos.getY(), 0, Color.white, null);
     }
 
     public void at(Position pos, float rotation){
-        Effects.create(this, pos.getX(), pos.getY(), rotation, Color.white, null);
+        create(this, pos.getX(), pos.getY(), rotation, Color.white, null);
     }
 
     public void at(float x, float y){
-        Effects.create(this, x, y, 0, Color.white, null);
+        create(this, x, y, 0, Color.white, null);
     }
 
     public void at(float x, float y, float rotation){
-        Effects.create(this, x, y, rotation, Color.white, null);
+        create(this, x, y, rotation, Color.white, null);
     }
 
     public void at(float x, float y, float rotation, Color color){
-        Effects.create(this, x, y, rotation, color, null);
+        create(this, x, y, rotation, color, null);
     }
 
     public void at(float x, float y, Color color){
-        Effects.create(this, x, y, 0, color, null);
+        create(this, x, y, 0, color, null);
     }
 
     public void at(float x, float y, float rotation, Color color, Object data){
-        Effects.create(this, x, y, rotation, color, data);
+        create(this, x, y, rotation, color, data);
     }
 
     public void at(float x, float y, float rotation, Object data){
-        Effects.create(this, x, y, rotation, Color.white, data);
+        create(this, x, y, rotation, Color.white, data);
     }
 
-    public void render(int id, Color color, float life, float rotation, float x, float y, Object data){
+    public float render(int id, Color color, float life, float lifetime, float rotation, float x, float y, Object data){
         container.set(id, color, life, lifetime, rotation, x, y, data);
         Draw.z(ground ? Layer.debris : Layer.effect);
+        Draw.reset();
         renderer.get(container);
         Draw.reset();
+
+        return container.lifetime;
+    }
+
+    public static @Nullable Effect get(int id){
+        return id >= all.size || id < 0 ? null : all.get(id);
+    }
+
+    private static void shake(float intensity, float duration){
+        if(!headless){
+            Vars.renderer.shake(intensity, duration);
+        }
+    }
+
+    public static void shake(float intensity, float duration, float x, float y){
+        if(Core.camera == null) return;
+
+        float distance = Core.camera.position.dst(x, y);
+        if(distance < 1) distance = 1;
+
+        shake(Mathf.clamp(1f / (distance * distance / shakeFalloff)) * intensity, duration);
+    }
+
+    public static void shake(float intensity, float duration, Position loc){
+        shake(intensity, duration, loc.getX(), loc.getY());
+    }
+
+    public static void create(Effect effect, float x, float y, float rotation, Color color, Object data){
+        if(headless || effect == Fx.none) return;
+        if(Core.settings.getBool("effects")){
+            Rect view = Core.camera.bounds(Tmp.r1);
+            Rect pos = Tmp.r2.setSize(effect.size).setCenter(x, y);
+
+            if(view.overlaps(pos)){
+                EffectState entity = EffectState.create();
+                entity.effect = effect;
+                entity.rotation = rotation;
+                entity.data = (data);
+                entity.lifetime = (effect.lifetime);
+                entity.set(x, y);
+                entity.color.set(color);
+                if(data instanceof Posc) entity.parent = ((Posc)data);
+                entity.add();
+            }
+        }
+    }
+
+    public static void decal(TextureRegion region, float x, float y, float rotation){
+        decal(region, x, y, rotation, 3600f, Pal.rubble);
+    }
+
+    public static void decal(TextureRegion region, float x, float y, float rotation, float lifetime, Color color){
+        if(headless || region == null || !Core.atlas.isFound(region)) return;
+
+        Tile tile = world.tileWorld(x, y);
+        if(tile == null || tile.floor().isLiquid) return;
+
+        Decal decal = Decal.create();
+        decal.set(x, y);
+        decal.rotation(rotation);
+        decal.lifetime(lifetime);
+        decal.color().set(color);
+        decal.region(region);
+        decal.add();
+    }
+
+    public static void scorch(float x, float y, int size){
+        if(headless) return;
+
+        size = Mathf.clamp(size, 0, 9);
+
+        TextureRegion region = Core.atlas.find("scorch-" + size + "-" + Mathf.random(2));
+        decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble);
+    }
+
+    public static void rubble(float x, float y, int blockSize){
+        if(headless) return;
+
+        TextureRegion region = Core.atlas.find("rubble-" + blockSize + "-" + (Core.atlas.has("rubble-" + blockSize + "-1") ? Mathf.random(0, 1) : "0"));
+        decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble);
     }
 
     public static class EffectContainer implements Scaled{
diff --git a/core/src/mindustry/entities/Effects.java b/core/src/mindustry/entities/Effects.java
deleted file mode 100644
index ed4cca412f..0000000000
--- a/core/src/mindustry/entities/Effects.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package mindustry.entities;
-
-import arc.*;
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.math.geom.*;
-import arc.util.*;
-import mindustry.content.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.world.*;
-
-import static mindustry.Vars.*;
-
-public class Effects{
-    private static final float shakeFalloff = 10000f;
-
-    private static void shake(float intensity, float duration){
-        if(!headless){
-            renderer.shake(intensity, duration);
-        }
-    }
-
-    public static void shake(float intensity, float duration, float x, float y){
-        if(Core.camera == null) return;
-
-        float distance = Core.camera.position.dst(x, y);
-        if(distance < 1) distance = 1;
-
-        shake(Mathf.clamp(1f / (distance * distance / shakeFalloff)) * intensity, duration);
-    }
-
-    public static void shake(float intensity, float duration, Position loc){
-        shake(intensity, duration, loc.getX(), loc.getY());
-    }
-
-    public static void create(Effect effect, float x, float y, float rotation, Color color, Object data){
-        if(headless || effect == Fx.none) return;
-        if(Core.settings.getBool("effects")){
-            Rect view = Core.camera.bounds(Tmp.r1);
-            Rect pos = Tmp.r2.setSize(effect.size).setCenter(x, y);
-
-            if(view.overlaps(pos)){
-                EffectState entity = EffectState.create();
-                entity.effect(effect);
-                entity.rotation(rotation);
-                entity.data(data);
-                entity.lifetime(effect.lifetime);
-                entity.set(x, y);
-                entity.color().set(color);
-                if(data instanceof Posc) entity.parent((Posc)data);
-                entity.add();
-            }
-        }
-    }
-
-    public static void decal(TextureRegion region, float x, float y, float rotation){
-        decal(region, x, y, rotation, 3600f, Pal.rubble);
-    }
-
-    public static void decal(TextureRegion region, float x, float y, float rotation, float lifetime, Color color){
-        if(headless || region == null || !Core.atlas.isFound(region)) return;
-
-        Tile tile = world.tileWorld(x, y);
-        if(tile == null || tile.floor().isLiquid) return;
-
-        Decal decal = Decal.create();
-        decal.set(x, y);
-        decal.rotation(rotation);
-        decal.lifetime(lifetime);
-        decal.color().set(color);
-        decal.region(region);
-        decal.add();
-    }
-
-    public static void scorch(float x, float y, int size){
-        if(headless) return;
-
-        size = Mathf.clamp(size, 0, 9);
-
-        TextureRegion region = Core.atlas.find("scorch-" + size + "-" + Mathf.random(2));
-        decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble);
-    }
-
-    public static void rubble(float x, float y, int blockSize){
-        if(headless) return;
-
-        TextureRegion region = Core.atlas.find("rubble-" + blockSize + "-" + (Core.atlas.has("rubble-" + blockSize + "-1") ? Mathf.random(0, 1) : "0"));
-        decal(region, x, y, Mathf.random(4) * 90, 3600, Pal.rubble);
-    }
-}
diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java
index f9c6d55316..1157b83ff9 100644
--- a/core/src/mindustry/entities/EntityGroup.java
+++ b/core/src/mindustry/entities/EntityGroup.java
@@ -57,7 +57,7 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
         each(Entityc::update);
     }
 
-    public void copy(Seq arr){
+    public void copy(Seq<T> arr){
         arr.addAll(array);
     }
 
@@ -101,7 +101,7 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
         if(map == null) throw new RuntimeException("Mapping is not enabled for group " + id + "!");
         T t = map.get(id);
         if(t != null){ //remove if present in map already
-            remove(t);
+            t.remove();
         }
     }
 
diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java
index e24d34dac4..2906b4e7d7 100644
--- a/core/src/mindustry/entities/Fires.java
+++ b/core/src/mindustry/entities/Fires.java
@@ -17,7 +17,7 @@ public class Fires{
 
     /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
     public static void create(Tile tile){
-        if(net.client() || tile == null) return; //not clientside.
+        if(net.client() || tile == null || !state.rules.fire) return; //not clientside.
 
         Fire fire = map.get(tile.pos());
 
diff --git a/core/src/mindustry/entities/GroupDefs.java b/core/src/mindustry/entities/GroupDefs.java
index 3d2dcc1580..60bdbb5fd3 100644
--- a/core/src/mindustry/entities/GroupDefs.java
+++ b/core/src/mindustry/entities/GroupDefs.java
@@ -8,7 +8,7 @@ class GroupDefs<G>{
     @GroupDef(value = Playerc.class, mapping = true) G player;
     @GroupDef(value = Bulletc.class, spatial = true, collide = true) G bullet;
     @GroupDef(value = Unitc.class, spatial = true, mapping = true) G unit;
-    @GroupDef(value = Buildingc.class) G tile;
+    @GroupDef(value = Buildingc.class) G build;
     @GroupDef(value = Syncc.class, mapping = true) G sync;
     @GroupDef(value = Drawc.class) G draw;
     @GroupDef(value = WeatherStatec.class) G weather;
diff --git a/core/src/mindustry/entities/Lightning.java b/core/src/mindustry/entities/Lightning.java
index dbc7f616c9..b693239061 100644
--- a/core/src/mindustry/entities/Lightning.java
+++ b/core/src/mindustry/entities/Lightning.java
@@ -24,17 +24,17 @@ public class Lightning{
 
     /** Create a lighting branch at a location. Use Team.derelict to damage everyone. */
     public static void create(Team team, Color color, float damage, float x, float y, float targetAngle, int length){
-        createLightingInternal(null, lastSeed++, team, color, damage, x, y, targetAngle, length);
+        createLightningInternal(null, lastSeed++, team, color, damage, x, y, targetAngle, length);
     }
 
     /** Create a lighting branch at a location. Uses bullet parameters. */
     public static void create(Bullet bullet, Color color, float damage, float x, float y, float targetAngle, int length){
-        createLightingInternal(bullet, lastSeed++, bullet.team, color, damage, x, y, targetAngle, length);
+        createLightningInternal(bullet, lastSeed++, bullet.team, color, damage, x, y, targetAngle, length);
     }
 
     //TODO remote method
     //@Remote(called = Loc.server, unreliable = true)
-    private static void createLightingInternal(Bullet hitter, int seed, Team team, Color color, float damage, float x, float y, float rotation, int length){
+    private static void createLightningInternal(Bullet hitter, int seed, Team team, Color color, float damage, float x, float y, float rotation, int length){
         random.setSeed(seed);
         hit.clear();
 
diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java
index 3b9f02c75c..461e486001 100644
--- a/core/src/mindustry/entities/Puddles.java
+++ b/core/src/mindustry/entities/Puddles.java
@@ -83,7 +83,7 @@ public class Puddles{
         (liquid.flammability > 0.3f && dest.temperature > 0.7f)){ //flammable liquid + hot liquid
             Fires.create(tile);
             if(Mathf.chance(0.006 * amount)){
-                Call.createBullet(Bullets.fireball, Team.derelict, x, y, Mathf.random(360f), -1f, 1f, 1f);
+                Bullets.fireball.createNet(Team.derelict, x, y, Mathf.random(360f), -1f, 1f, 1f);
             }
         }else if(dest.temperature > 0.7f && liquid.temperature < 0.55f){ //cold liquid poured onto hot Puddle
             if(Mathf.chance(0.5f * amount)){
diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
index d32030775f..85761795e5 100644
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -1,5 +1,6 @@
 package mindustry.entities;
 
+import arc.*;
 import arc.func.*;
 import arc.math.geom.*;
 import mindustry.annotations.Annotations.*;
@@ -19,8 +20,41 @@ public class Units{
     private static boolean boolResult;
 
     @Remote(called = Loc.server)
-    public static void unitDeath(Unit unit){
-        unit.killed();
+    public static void unitCapDeath(Unit unit){
+        if(unit != null){
+            unit.dead = true;
+            Fx.unitCapKill.at(unit);
+            Core.app.post(() -> Call.unitDestroy(unit.id));
+        }
+    }
+
+    @Remote(called = Loc.server)
+    public static void unitDeath(int uid){
+        Unit unit = Groups.unit.getByID(uid);
+
+        //if there's no unit don't add it later and get it stuck as a ghost
+        if(netClient != null){
+            netClient.addRemovedEntity(uid);
+        }
+
+        if(unit != null){
+            unit.killed();
+        }
+    }
+
+    //destroys immediately
+    @Remote(called = Loc.server)
+    public static void unitDestroy(int uid){
+        Unit unit = Groups.unit.getByID(uid);
+
+        //if there's no unit don't add it later and get it stuck as a ghost
+        if(netClient != null){
+            netClient.addRemovedEntity(uid);
+        }
+
+        if(unit != null){
+            unit.destroy();
+        }
     }
 
     @Remote(called = Loc.server)
@@ -36,7 +70,7 @@ public class Units{
 
     public static int getCap(Team team){
         //wave team has no cap
-        if((team == state.rules.waveTeam && state.rules.waves) || (state.isCampaign() && team == state.rules.waveTeam)){
+        if((team == state.rules.waveTeam && !state.rules.pvp) || (state.isCampaign() && team == state.rules.waveTeam)){
             return Integer.MAX_VALUE;
         }
         return state.rules.unitCap + indexer.getExtraUnits(team);
@@ -90,7 +124,7 @@ public class Units{
 
         nearby(x, y, width, height, unit -> {
             if(boolResult) return;
-            if(unit.isGrounded() == ground){
+            if((unit.isGrounded() && !unit.type().hovering) == ground){
                 unit.hitbox(hitrect);
 
                 if(hitrect.overlaps(x, y, width, height)){
@@ -141,6 +175,18 @@ public class Units{
         }
     }
 
+    /** Returns the closest target enemy. First, units are checked, then tile entities. */
+    public static Teamc bestTarget(Team team, float x, float y, float range, Boolf<Unit> unitPred, Boolf<Building> tilePred, Sortf sort){
+        if(team == Team.derelict) return null;
+
+        Unit unit = bestEnemy(team, x, y, range, unitPred, sort);
+        if(unit != null){
+            return unit;
+        }else{
+            return findEnemyTile(team, x, y, range, tilePred);
+        }
+    }
+
     /** Returns the closest enemy of this team. Filter by predicate. */
     public static Unit closestEnemy(Team team, float x, float y, float range, Boolf<Unit> predicate){
         if(team == Team.derelict) return null;
@@ -161,6 +207,26 @@ public class Units{
         return result;
     }
 
+    /** Returns the closest enemy of this team using a custom comparison function. Filter by predicate. */
+    public static Unit bestEnemy(Team team, float x, float y, float range, Boolf<Unit> predicate, Sortf sort){
+        if(team == Team.derelict) return null;
+
+        result = null;
+        cdist = 0f;
+
+        nearbyEnemies(team, x - range, y - range, range*2f, range*2f, e -> {
+            if(e.dead() || !predicate.get(e) || !e.within(x, y, range)) return;
+
+            float cost = sort.cost(e, x, y);
+            if(result == null || cost < cdist){
+                result = e;
+                cdist = cost;
+            }
+        });
+
+        return result;
+    }
+
     /** Returns the closest ally of this team. Filter by predicate. No range. */
     public static Unit closest(Team team, float x, float y, Boolf<Unit> predicate){
         result = null;
@@ -242,9 +308,20 @@ public class Units{
 
     /** Iterates over all units that are enemies of this team. */
     public static void nearbyEnemies(Team team, float x, float y, float width, float height, Cons<Unit> cons){
-        for(Team enemy : state.teams.enemiesOf(team)){
-            nearby(enemy, x, y, width, height, cons);
+        if(team.active()){
+            for(Team enemy : state.teams.enemiesOf(team)){
+                nearby(enemy, x, y, width, height, cons);
+            }
+        }else{
+            //inactive teams have no cache, check everything
+            //TODO cache all teams with units OR blocks
+            for(Team other : Team.all){
+                if(other != team && teamIndex.count(other) > 0){
+                    nearby(other, x, y, width, height, cons);
+                }
+            }
         }
+
     }
 
     /** Iterates over all units that are enemies of this team. */
@@ -252,4 +329,7 @@ public class Units{
         nearbyEnemies(team, rect.x, rect.y, rect.width, rect.height, cons);
     }
 
+    public interface Sortf{
+        float cost(Unit unit, float x, float y);
+    }
 }
diff --git a/core/src/mindustry/entities/abilities/Ability.java b/core/src/mindustry/entities/abilities/Ability.java
index d8aed57239..466bfc1980 100644
--- a/core/src/mindustry/entities/abilities/Ability.java
+++ b/core/src/mindustry/entities/abilities/Ability.java
@@ -2,7 +2,16 @@ package mindustry.entities.abilities;
 
 import mindustry.gen.*;
 
-public interface Ability{
-    default void update(Unit unit){}
-    default void draw(Unit unit){}
+public abstract class Ability implements Cloneable{
+    public void update(Unit unit){}
+    public void draw(Unit unit){}
+
+    public Ability copy(){
+        try{
+            return (Ability)clone();
+        }catch(CloneNotSupportedException e){
+            //I am disgusted
+            throw new RuntimeException("java sucks", e);
+        }
+    }
 }
diff --git a/core/src/mindustry/entities/abilities/ForceFieldAbility.java b/core/src/mindustry/entities/abilities/ForceFieldAbility.java
index bdfa3a9cb5..fa9fa5e2c8 100644
--- a/core/src/mindustry/entities/abilities/ForceFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/ForceFieldAbility.java
@@ -1,5 +1,6 @@
 package mindustry.entities.abilities;
 
+import arc.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
@@ -10,7 +11,7 @@ import mindustry.content.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 
-public class ForceFieldAbility implements Ability{
+public class ForceFieldAbility extends Ability{
     /** Shield radius. */
     public float radius = 60f;
     /** Shield regen speed in damage/tick. */
@@ -20,21 +21,26 @@ public class ForceFieldAbility implements Ability{
     /** Cooldown after the shield is broken, in ticks. */
     public float cooldown = 60f * 5;
 
-    private float realRad;
-    private Unit paramUnit;
-    private final Cons<Shielderc> shieldConsumer = trait -> {
-        if(trait.team() != paramUnit.team && Intersector.isInsideHexagon(paramUnit.x, paramUnit.y, realRad * 2f, trait.x(), trait.y()) && paramUnit.shield > 0){
+    /** State. */
+    protected float radiusScale, alpha;
+
+    private static float realRad;
+    private static Unit paramUnit;
+    private static ForceFieldAbility paramField;
+    private static final Cons<Bullet> shieldConsumer = trait -> {
+        if(trait.team != paramUnit.team && trait.type.absorbable && Intersector.isInsideHexagon(paramUnit.x, paramUnit.y, realRad * 2f, trait.x(), trait.y()) && paramUnit.shield > 0){
             trait.absorb();
             Fx.absorb.at(trait);
 
             //break shield
             if(paramUnit.shield <= trait.damage()){
-                paramUnit.shield -= cooldown * regen;
-                Fx.shieldBreak.at(paramUnit.x, paramUnit.y, radius, paramUnit.team.color);
+                paramUnit.shield -= paramField.cooldown * paramField.regen;
+
+                Fx.shieldBreak.at(paramUnit.x, paramUnit.y, paramField.radius, paramUnit.team.color);
             }
 
             paramUnit.shield -= trait.damage();
-            paramUnit.shieldAlpha = 1f;
+            paramField.alpha = 1f;
         }
     };
 
@@ -53,14 +59,17 @@ public class ForceFieldAbility implements Ability{
             unit.shield += Time.delta * regen;
         }
 
+        alpha = Math.max(alpha - Time.delta/10f, 0f);
+
         if(unit.shield > 0){
-            unit.timer2 = Mathf.lerpDelta(unit.timer2, 1f, 0.06f);
+            radiusScale = Mathf.lerpDelta(radiusScale, 1f, 0.06f);
             paramUnit = unit;
+            paramField = this;
             checkRadius(unit);
 
             Groups.bullet.intersect(unit.x - realRad, unit.y - realRad, realRad * 2f, realRad * 2f, shieldConsumer);
         }else{
-            unit.timer2 = 0f;
+            radiusScale = 0f;
         }
     }
 
@@ -70,13 +79,23 @@ public class ForceFieldAbility implements Ability{
 
         if(unit.shield > 0){
             Draw.z(Layer.shields);
-            Draw.color(unit.team.color, Color.white, Mathf.clamp(unit.shieldAlpha));
-            Fill.poly(unit.x, unit.y, 6, realRad);
+
+            Draw.color(unit.team.color, Color.white, Mathf.clamp(alpha));
+
+            if(Core.settings.getBool("animatedshields")){
+                Fill.poly(unit.x, unit.y, 6, realRad);
+            }else{
+                Lines.stroke(1.5f);
+                Draw.alpha(0.09f);
+                Fill.poly(unit.x, unit.y, 6, radius);
+                Draw.alpha(1f);
+                Lines.poly(unit.x, unit.y, 6, radius);
+            }
         }
     }
 
     private void checkRadius(Unit unit){
         //timer2 is used to store radius scale as an effect
-        realRad = unit.timer2 * radius;
+        realRad = radiusScale * radius;
     }
 }
diff --git a/core/src/mindustry/entities/abilities/HealFieldAbility.java b/core/src/mindustry/entities/abilities/HealFieldAbility.java
index 3e12e96963..90f800ec84 100644
--- a/core/src/mindustry/entities/abilities/HealFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/HealFieldAbility.java
@@ -5,12 +5,13 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 
-public class HealFieldAbility implements Ability{
+public class HealFieldAbility extends Ability{
     public float amount = 1, reload = 100, range = 60;
     public Effect healEffect = Fx.heal;
-    public Effect activeEffect = Fx.healWave;
+    public Effect activeEffect = Fx.healWaveDynamic;
 
-    private boolean wasHealed = false;
+    protected float timer;
+    protected boolean wasHealed = false;
 
     HealFieldAbility(){}
 
@@ -22,9 +23,9 @@ public class HealFieldAbility implements Ability{
 
     @Override
     public void update(Unit unit){
-        unit.timer1 += Time.delta;
+        timer += Time.delta;
 
-        if(unit.timer1 >= reload){
+        if(timer >= reload){
             wasHealed = false;
 
             Units.nearby(unit.team, unit.x, unit.y, range, other -> {
@@ -36,10 +37,10 @@ public class HealFieldAbility implements Ability{
             });
 
             if(wasHealed){
-                activeEffect.at(unit);
+                activeEffect.at(unit, range);
             }
 
-            unit.timer1 = 0f;
+            timer = 0f;
         }
     }
 }
diff --git a/core/src/mindustry/entities/abilities/ShieldFieldAbility.java b/core/src/mindustry/entities/abilities/ShieldFieldAbility.java
index f7726e8e92..739751f6c1 100644
--- a/core/src/mindustry/entities/abilities/ShieldFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/ShieldFieldAbility.java
@@ -5,12 +5,13 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 
-public class ShieldFieldAbility implements Ability{
+public class ShieldFieldAbility extends Ability{
     public float amount = 1, max = 100f, reload = 100, range = 60;
     public Effect applyEffect = Fx.shieldApply;
     public Effect activeEffect = Fx.shieldWave;
 
-    private boolean applied = false;
+    protected float timer;
+    protected boolean applied = false;
 
     ShieldFieldAbility(){}
 
@@ -23,9 +24,9 @@ public class ShieldFieldAbility implements Ability{
 
     @Override
     public void update(Unit unit){
-        unit.timer1 += Time.delta;
+        timer += Time.delta;
 
-        if(unit.timer1 >= reload){
+        if(timer >= reload){
             applied = false;
 
             Units.nearby(unit.team, unit.x, unit.y, range, other -> {
@@ -41,7 +42,7 @@ public class ShieldFieldAbility implements Ability{
                 activeEffect.at(unit);
             }
 
-            unit.timer1 = 0f;
+            timer = 0f;
         }
     }
 }
diff --git a/core/src/mindustry/entities/abilities/StatusFieldAbility.java b/core/src/mindustry/entities/abilities/StatusFieldAbility.java
index 641e068a0f..cb72ad353d 100644
--- a/core/src/mindustry/entities/abilities/StatusFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/StatusFieldAbility.java
@@ -7,15 +7,17 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 
-public class StatusFieldAbility implements Ability{
-    public @NonNull StatusEffect effect;
+public class StatusFieldAbility extends Ability{
+    public StatusEffect effect;
     public float duration = 60, reload = 100, range = 20;
     public Effect applyEffect = Fx.heal;
     public Effect activeEffect = Fx.overdriveWave;
 
+    protected float timer;
+
     StatusFieldAbility(){}
 
-    public StatusFieldAbility(@NonNull StatusEffect effect, float duration, float reload, float range){
+    public StatusFieldAbility(StatusEffect effect, float duration, float reload, float range){
         this.duration = duration;
         this.reload = reload;
         this.range = range;
@@ -24,9 +26,9 @@ public class StatusFieldAbility implements Ability{
 
     @Override
     public void update(Unit unit){
-        unit.timer2 += Time.delta;
+        timer += Time.delta;
 
-        if(unit.timer2 >= reload){
+        if(timer >= reload){
 
             Units.nearby(unit.team, unit.x, unit.y, range, other -> {
                 other.apply(effect, duration);
@@ -34,7 +36,7 @@ public class StatusFieldAbility implements Ability{
 
             activeEffect.at(unit);
 
-            unit.timer2 = 0f;
+            timer = 0f;
         }
     }
 }
diff --git a/core/src/mindustry/entities/abilities/UnitSpawnAbility.java b/core/src/mindustry/entities/abilities/UnitSpawnAbility.java
new file mode 100644
index 0000000000..74140114d9
--- /dev/null
+++ b/core/src/mindustry/entities/abilities/UnitSpawnAbility.java
@@ -0,0 +1,59 @@
+package mindustry.entities.abilities;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+
+public class UnitSpawnAbility extends Ability{
+    public UnitType type;
+    public float spawnTime = 60f, spawnX, spawnY;
+    public Effect spawnEffect = Fx.spawn;
+
+    protected float timer;
+
+    public UnitSpawnAbility(UnitType type, float spawnTime, float spawnX, float spawnY){
+        this.type = type;
+        this.spawnTime = spawnTime;
+        this.spawnX = spawnX;
+        this.spawnY = spawnY;
+    }
+
+    public UnitSpawnAbility(){
+    }
+
+    @Override
+    public void update(Unit unit){
+        timer += Time.delta;
+
+        if(timer >= spawnTime && Units.canCreate(unit.team, type)){
+
+            float x = unit.x + Angles.trnsx(unit.rotation, spawnY, spawnX), y = unit.y + Angles.trnsy(unit.rotation, spawnY, spawnX);
+            spawnEffect.at(x, y);
+            Unit u = type.create(unit.team);
+            u.set(x, y);
+            u.rotation = unit.rotation;
+            if(!Vars.net.client()){
+                u.add();
+            }
+
+            timer = 0f;
+        }
+    }
+
+    @Override
+    public void draw(Unit unit){
+        if(Units.canCreate(unit.team, type)){
+            Draw.draw(Draw.z(), () -> {
+                float x = unit.x + Angles.trnsx(unit.rotation, spawnY, spawnX), y = unit.y + Angles.trnsy(unit.rotation, spawnY, spawnX);
+                Drawf.construct(x, y, type.icon(Cicon.full), unit.rotation - 90, timer / spawnTime, 1f, timer);
+            });
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/bullet/BasicBulletType.java b/core/src/mindustry/entities/bullet/BasicBulletType.java
index e2a829e966..ac33c28868 100644
--- a/core/src/mindustry/entities/bullet/BasicBulletType.java
+++ b/core/src/mindustry/entities/bullet/BasicBulletType.java
@@ -1,16 +1,17 @@
 package mindustry.entities.bullet;
 
-import arc.Core;
-import arc.graphics.Color;
-import arc.graphics.g2d.Draw;
-import arc.graphics.g2d.TextureRegion;
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.util.*;
 import mindustry.gen.*;
-import mindustry.graphics.Pal;
+import mindustry.graphics.*;
 
 /** An extended BulletType for most ammo-based bullets shot from turrets and units. */
 public class BasicBulletType extends BulletType{
     public Color backColor = Pal.bulletYellowBack, frontColor = Pal.bulletYellow;
+    public Color mixColorFrom = new Color(1f, 1f, 1f, 0f), mixColorTo = new Color(1f, 1f, 1f, 0f);
     public float width = 5f, height = 7f;
     public float shrinkX = 0f, shrinkY = 0.5f;
     public float spin = 0;
@@ -45,10 +46,15 @@ public class BasicBulletType extends BulletType{
         float width = this.width * ((1f - shrinkX) + shrinkX * b.fout());
         float offset = -90 + (spin != 0 ? Mathf.randomSeed(b.id, 360f) + b.time * spin : 0f);
 
+        Color mix = Tmp.c1.set(mixColorFrom).lerp(mixColorTo, b.fin());
+
+        Draw.mixcol(mix, mix.a);
+
         Draw.color(backColor);
         Draw.rect(backRegion, b.x, b.y, width, height, b.rotation() + offset);
         Draw.color(frontColor);
         Draw.rect(frontRegion, b.x, b.y, width, height, b.rotation() + offset);
-        Draw.color();
+
+        Draw.reset();
     }
 }
diff --git a/core/src/mindustry/entities/bullet/BombBulletType.java b/core/src/mindustry/entities/bullet/BombBulletType.java
index 4dd18a7750..acd18a8064 100644
--- a/core/src/mindustry/entities/bullet/BombBulletType.java
+++ b/core/src/mindustry/entities/bullet/BombBulletType.java
@@ -18,6 +18,10 @@ public class BombBulletType extends BasicBulletType{
         hitSound = Sounds.explosion;
     }
 
+    public BombBulletType(float damage, float radius){
+        this(damage, radius, "shell");
+    }
+
     public BombBulletType(){
         this(1f, 1f, "shell");
     }
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 5977a9ed22..e748310b8a 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -13,6 +13,9 @@ import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
 
 public abstract class BulletType extends Content{
     public float lifetime = 40f;
@@ -21,7 +24,7 @@ public abstract class BulletType extends Content{
     public float hitSize = 4;
     public float drawSize = 40f;
     public float drag = 0f;
-    public boolean pierce;
+    public boolean pierce, pierceBuilding;
     public Effect hitEffect, despawnEffect;
 
     /** Effect created when shooting. */
@@ -51,7 +54,7 @@ public abstract class BulletType extends Content{
     /** Status effect applied on hit. */
     public StatusEffect status = StatusEffects.none;
     /** Intensity of applied status effect in terms of duration. */
-    public float statusDuration = 60 * 10f;
+    public float statusDuration = 60 * 8f;
     /** Whether this bullet type collides with tiles. */
     public boolean collidesTiles = true;
     /** Whether this bullet type collides with tiles that are of the same team. */
@@ -66,13 +69,23 @@ public abstract class BulletType extends Content{
     public boolean scaleVelocity;
     /** Whether this bullet can be hit by point defense. */
     public boolean hittable = true;
+    /** Whether this bullet can be reflected. */
+    public boolean reflectable = true;
+    /** Whether this projectile can be absorbed by shields. */
+    public boolean absorbable = true;
+    /** Whether to move the bullet back depending on delta to fix some delta-time realted issues.
+     * Do not change unless you know what you're doing. */
+    public boolean backMove = true;
+    /** Bullet range override. */
+    public float range = -1f;
 
     //additional effects
 
     public float fragCone = 360f;
+    public float fragAngle = 0f;
     public int fragBullets = 9;
-    public float fragVelocityMin = 0.2f, fragVelocityMax = 1f;
-    public BulletType fragBullet = null;
+    public float fragVelocityMin = 0.2f, fragVelocityMax = 1f, fragLifeMin = 1f, fragLifeMax = 1f;
+    public @Nullable BulletType fragBullet = null;
     public Color hitColor = Color.white;
 
     public Color trailColor = Pal.missileYellowBack;
@@ -89,14 +102,22 @@ public abstract class BulletType extends Content{
     public float homingPower = 0f;
     public float homingRange = 50f;
 
+    public Color lightningColor = Pal.surge;
     public int lightning;
-    public int lightningLength = 5;
+    public int lightningLength = 5, lightningLengthRand = 0;
     /** Use a negative value to use default bullet damage. */
     public float lightningDamage = -1;
+    public float lightningCone = 360f;
+    public float lightningAngle = 0f;
 
     public float weaveScale = 1f;
     public float weaveMag = -1f;
-    public float hitShake = 0f;
+    public float hitShake = 0f, despawnShake = 0f;
+
+    public int puddles;
+    public float puddleRange;
+    public float puddleAmount = 5f;
+    public Liquid puddleLiquid = Liquids.water;
 
     public float lightRadius = 16f;
     public float lightOpacity = 0.3f;
@@ -115,17 +136,21 @@ public abstract class BulletType extends Content{
 
     /** Returns maximum distance the bullet this bullet type has can travel. */
     public float range(){
-        return speed * lifetime * (1f - drag);
+        return Math.max(speed * lifetime * (1f - drag), range);
     }
 
     public boolean collides(Bullet bullet, Building tile){
         return true;
     }
 
-    public void hitTile(Bullet b, Building tile){
+    public void hitTile(Bullet b, Building tile, float initialHealth){
         hit(b);
     }
 
+    public void hitEntity(Bullet b, Hitboxc other, float initialHealth){
+
+    }
+
     public void hit(Bullet b){
         hit(b, b.x, b.y);
     }
@@ -134,13 +159,20 @@ public abstract class BulletType extends Content{
         hitEffect.at(x, y, b.rotation(), hitColor);
         hitSound.at(b);
 
-        Effects.shake(hitShake, hitShake, b);
+        Effect.shake(hitShake, hitShake, b);
 
         if(fragBullet != null){
             for(int i = 0; i < fragBullets; i++){
                 float len = Mathf.random(1f, 7f);
-                float a = b.rotation() + Mathf.range(fragCone/2);
-                fragBullet.create(b, x + Angles.trnsx(a, len), y + Angles.trnsy(a, len), a, Mathf.random(fragVelocityMin, fragVelocityMax));
+                float a = b.rotation() + Mathf.range(fragCone/2) + fragAngle;
+                fragBullet.create(b, x + Angles.trnsx(a, len), y + Angles.trnsy(a, len), a, Mathf.random(fragVelocityMin, fragVelocityMax), Mathf.random(fragLifeMin, fragLifeMax));
+            }
+        }
+
+        if(puddleLiquid != null && puddles > 0){
+            for(int i = 0; i < puddles; i++){
+                Tile tile = world.tileWorld(x + Mathf.range(puddleRange), y + Mathf.range(puddleRange));
+                Puddles.deposit(tile, puddleLiquid, puddleAmount);
             }
         }
 
@@ -157,7 +189,7 @@ public abstract class BulletType extends Content{
         }
 
         for(int i = 0; i < lightning; i++){
-            Lightning.create(b, Pal.surge, lightningDamage < 0 ? damage : lightningDamage, b.x, b.y, Mathf.random(360f), lightningLength);
+            Lightning.create(b, lightningColor, lightningDamage < 0 ? damage : lightningDamage, b.x, b.y, b.rotation() + Mathf.range(lightningCone/2) + lightningAngle, lightningLength + Mathf.random(lightningLengthRand));
         }
     }
 
@@ -165,6 +197,8 @@ public abstract class BulletType extends Content{
         despawnEffect.at(b.x, b.y, b.rotation(), hitColor);
         hitSound.at(b);
 
+        Effect.shake(despawnShake, despawnShake, b);
+
         if(fragBullet != null || splashDamageRadius > 0 || lightning > 0){
             hit(b);
         }
@@ -183,7 +217,7 @@ public abstract class BulletType extends Content{
         }
 
         if(instantDisappear){
-            b.time(lifetime);
+            b.time = lifetime;
         }
     }
 
@@ -231,6 +265,10 @@ public abstract class BulletType extends Content{
         return create(parent.owner(), parent.team, x, y, angle);
     }
 
+    public Bullet create(Bullet parent, float x, float y, float angle, float velocityScl, float lifeScale){
+        return create(parent.owner(), parent.team, x, y, angle, velocityScl, lifeScale);
+    }
+
     public Bullet create(Bullet parent, float x, float y, float angle, float velocityScl){
         return create(parent.owner(), parent.team, x, y, angle, velocityScl);
     }
@@ -241,7 +279,11 @@ public abstract class BulletType extends Content{
         bullet.owner = owner;
         bullet.team = team;
         bullet.vel.trns(angle, speed * velocityScl);
-        bullet.set(x - bullet.vel.x * Time.delta, y - bullet.vel.y * Time.delta);
+        if(backMove){
+            bullet.set(x - bullet.vel.x * Time.delta, y - bullet.vel.y * Time.delta);
+        }else{
+            bullet.set(x, y);
+        }
         bullet.lifetime = lifetime * lifetimeScl;
         bullet.data = data;
         bullet.drag = drag;
@@ -249,13 +291,12 @@ public abstract class BulletType extends Content{
         bullet.damage = damage < 0 ? this.damage : damage;
         bullet.add();
 
-        if(keepVelocity && owner instanceof Hitboxc) bullet.vel.add(((Hitboxc)owner).deltaX(), ((Hitboxc)owner).deltaY());
+        if(keepVelocity && owner instanceof Velc) bullet.vel.add(((Velc)owner).vel().x, ((Velc)owner).vel().y);
         return bullet;
-
     }
 
     public void createNet(Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl){
-        Call.createBullet(this, team, x, y, damage, angle, velocityScl, lifetimeScl);
+        Call.createBullet(this, team, x, y, angle, damage, velocityScl, lifetimeScl);
     }
 
     @Remote(called = Loc.server, unreliable = true)
diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
index ef40d9b95b..e146fd7a54 100644
--- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
+++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
@@ -12,10 +12,13 @@ import mindustry.graphics.*;
 public class ContinuousLaserBulletType extends BulletType{
     public float length = 220f;
     public float shake = 1f;
+    public float fadeTime = 16f;
     public Color[] colors = {Color.valueOf("ec745855"), Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white};
     public float[] tscales = {1f, 0.7f, 0.5f, 0.2f};
     public float[] strokes = {2f, 1.5f, 1f, 0.3f};
     public float[] lenscales = {1f, 1.12f, 1.15f, 1.17f};
+    public float width = 9f, oscScl = 0.8f, oscMag = 1.5f;
+    public boolean largeHit = true;
 
     public ContinuousLaserBulletType(float damage){
         super(0.001f, damage);
@@ -25,12 +28,16 @@ public class ContinuousLaserBulletType extends BulletType{
         hitSize = 4;
         drawSize = 420f;
         lifetime = 16f;
+        keepVelocity = false;
         pierce = true;
         hittable = false;
         hitColor = colors[2];
+        collidesTiles = false;
         incendAmount = 1;
         incendSpread = 5;
         incendChance = 0.4f;
+        lightColor = Color.orange;
+        absorbable = false;
     }
 
     protected ContinuousLaserBulletType(){
@@ -42,37 +49,46 @@ public class ContinuousLaserBulletType extends BulletType{
         return length;
     }
 
+    @Override
+    public void init(){
+        super.init();
+
+        drawSize = Math.max(drawSize, length*2f);
+    }
+
     @Override
     public void update(Bullet b){
         //TODO possible laser absorption from blocks
 
         //damage every 5 ticks
         if(b.timer(1, 5f)){
-            Damage.collideLine(b, b.team, hitEffect, b.x, b.y, b.rotation(), length, true);
+            Damage.collideLine(b, b.team, hitEffect, b.x, b.y, b.rotation(), length, largeHit);
         }
 
         if(shake > 0){
-            Effects.shake(shake, shake, b);
+            Effect.shake(shake, shake, b);
         }
     }
 
     @Override
     public void draw(Bullet b){
-        float baseLen = length * b.fout();
+        float realLength = Damage.findLaserLength(b, length);
+        float fout = Mathf.clamp(b.time > b.lifetime - fadeTime ? 1f - (b.time - (lifetime - fadeTime)) / fadeTime : 1f);
+        float baseLen = realLength * fout;
 
         Lines.lineAngle(b.x, b.y, b.rotation(), baseLen);
         for(int s = 0; s < colors.length; s++){
             Draw.color(Tmp.c1.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f)));
             for(int i = 0; i < tscales.length; i++){
                 Tmp.v1.trns(b.rotation() + 180f, (lenscales[i] - 1f) * 35f);
-                Lines.stroke((9f + Mathf.absin(Time.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]);
-                Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rotation(), baseLen * lenscales[i], CapStyle.none);
+                Lines.stroke((width + Mathf.absin(Time.time(), oscScl, oscMag)) * fout * strokes[s] * tscales[i]);
+                Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rotation(), baseLen * lenscales[i], false);
             }
         }
 
         Tmp.v1.trns(b.rotation(), baseLen * 1.1f);
 
-        Drawf.light(b.team, b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, 40, Color.orange, 0.7f);
+        Drawf.light(b.team, b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, 40, lightColor, 0.7f);
         Draw.reset();
     }
 
diff --git a/core/src/mindustry/entities/bullet/HealBulletType.java b/core/src/mindustry/entities/bullet/HealBulletType.java
index af66a4c931..b811790000 100644
--- a/core/src/mindustry/entities/bullet/HealBulletType.java
+++ b/core/src/mindustry/entities/bullet/HealBulletType.java
@@ -21,6 +21,7 @@ public class HealBulletType extends BulletType{
         despawnEffect = Fx.hitLaser;
         collidesTeam = true;
         hittable = false;
+        reflectable = false;
     }
 
     public HealBulletType(){
@@ -29,7 +30,7 @@ public class HealBulletType extends BulletType{
 
     @Override
     public boolean collides(Bullet b, Building tile){
-        return tile.team() != b.team || tile.healthf() < 1f;
+        return tile.team != b.team || tile.healthf() < 1f;
     }
 
     @Override
@@ -43,11 +44,11 @@ public class HealBulletType extends BulletType{
     }
 
     @Override
-    public void hitTile(Bullet b, Building tile){
+    public void hitTile(Bullet b, Building tile, float initialHealth){
         super.hit(b);
 
-        if(tile.team() == b.team && !(tile.block() instanceof BuildBlock)){
-            Fx.healBlockFull.at(tile.x, tile.y, tile.block().size, Pal.heal);
+        if(tile.team == b.team && !(tile.block instanceof ConstructBlock)){
+            Fx.healBlockFull.at(tile.x, tile.y, tile.block.size, Pal.heal);
             tile.heal(healPercent / 100f * tile.maxHealth());
         }
     }
diff --git a/core/src/mindustry/entities/bullet/LaserBulletType.java b/core/src/mindustry/entities/bullet/LaserBulletType.java
index 571a78826d..ad5965f3b8 100644
--- a/core/src/mindustry/entities/bullet/LaserBulletType.java
+++ b/core/src/mindustry/entities/bullet/LaserBulletType.java
@@ -8,20 +8,17 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.world.*;
-
-import static mindustry.Vars.world;
 
 public class LaserBulletType extends BulletType{
-    protected static Tile furthest;
-
-    protected Color[] colors = {Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.white};
-    protected Effect laserEffect = Fx.lancerLaserShootSmoke;
-    protected float length = 160f;
-    protected float width = 15f;
-    protected float lengthFalloff = 0.5f;
-    protected float sideLength = 29f, sideWidth = 0.7f;
-    protected float sideAngle = 90f;
+    public Color[] colors = {Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.white};
+    public Effect laserEffect = Fx.lancerLaserShootSmoke;
+    public float length = 160f;
+    public float width = 15f;
+    public float lengthFalloff = 0.5f;
+    public float sideLength = 29f, sideWidth = 0.7f;
+    public float sideAngle = 90f;
+    public float lightningSpacing = -1, lightningDelay = 0.1f, lightningAngleRand;
+    public boolean largeHit = false;
 
     public LaserBulletType(float damage){
         super(0.01f, damage);
@@ -42,6 +39,13 @@ public class LaserBulletType extends BulletType{
         this(1f);
     }
 
+    @Override
+    public void init(){
+        super.init();
+
+        drawSize = Math.max(drawSize, length*2f);
+    }
+
     @Override
     public float range(){
         return length;
@@ -49,24 +53,35 @@ public class LaserBulletType extends BulletType{
 
     @Override
     public void init(Bullet b){
-        Tmp.v1.trns(b.rotation(), length);
+        float resultLength = Damage.collideLaser(b, length, largeHit), rot = b.rotation();
 
-        furthest = null;
+        laserEffect.at(b.x, b.y, rot, resultLength * 0.75f);
 
-        world.raycast(b.tileX(), b.tileY(), world.toTile(b.x + Tmp.v1.x), world.toTile(b.y + Tmp.v1.y),
-        (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && furthest.block().absorbLasers);
+        if(lightningSpacing > 0){
+            int idx = 0;
+            for(float i = 0; i <= resultLength; i += lightningSpacing){
+                float cx = b.x + Angles.trnsx(rot,  i),
+                    cy = b.y + Angles.trnsy(rot, i);
 
-        float resultLength = furthest != null ? Math.max(6f, b.dst(furthest.worldx(), furthest.worldy())) : length;
+                int f = idx++;
 
-        Damage.collideLine(b, b.team, hitEffect, b.x, b.y, b.rotation(), resultLength);
-        if(furthest != null) b.data(resultLength);
-
-        laserEffect.at(b.x, b.y, b.rotation(), resultLength * 0.75f);
+                for(int s : Mathf.signs){
+                    Time.run(f * lightningDelay, () -> {
+                        if(b.isAdded() && b.type == this){
+                            Lightning.create(b, lightningColor,
+                                lightningDamage < 0 ? damage : lightningDamage,
+                                cx, cy, rot + 90*s + Mathf.range(lightningAngleRand),
+                                lightningLength + Mathf.random(lightningLengthRand));
+                        }
+                    });
+                }
+            }
+        }
     }
 
     @Override
     public void draw(Bullet b){
-        float realLength = b.data() == null ? length : (Float)b.data();
+        float realLength = b.fdata;
 
         float f = Mathf.curve(b.fin(), 0f, 0.2f);
         float baseLen = realLength * f;
@@ -74,11 +89,10 @@ public class LaserBulletType extends BulletType{
         float compound = 1f;
 
         Lines.lineAngle(b.x, b.y, b.rotation(), baseLen);
-        Lines.precise(true);
         for(Color color : colors){
             Draw.color(color);
             Lines.stroke((cwidth *= lengthFalloff) * b.fout());
-            Lines.lineAngle(b.x, b.y, b.rotation(), baseLen, CapStyle.none);
+            Lines.lineAngle(b.x, b.y, b.rotation(), baseLen, false);
             Tmp.v1.trns(b.rotation(), baseLen);
             Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, Lines.getStroke() * 1.22f, cwidth * 2f + width / 2f, b.rotation());
 
@@ -89,7 +103,6 @@ public class LaserBulletType extends BulletType{
 
             compound *= lengthFalloff;
         }
-        Lines.precise(false);
         Draw.reset();
 
         Tmp.v1.trns(b.rotation(), baseLen * 1.1f);
diff --git a/core/src/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java
index 155ed32973..85f62216ae 100644
--- a/core/src/mindustry/entities/bullet/LiquidBulletType.java
+++ b/core/src/mindustry/entities/bullet/LiquidBulletType.java
@@ -13,7 +13,7 @@ import mindustry.world.*;
 import static mindustry.Vars.*;
 
 public class LiquidBulletType extends BulletType{
-    public @NonNull Liquid liquid;
+    public Liquid liquid;
     public float puddleSize = 6f;
 
     public LiquidBulletType(@Nullable Liquid liquid){
@@ -24,8 +24,9 @@ public class LiquidBulletType extends BulletType{
             this.status = liquid.effect;
         }
 
-        lifetime = 74f;
-        statusDuration = 90f;
+        ammoMultiplier = 1f;
+        lifetime = 34f;
+        statusDuration = 60f * 2f;
         despawnEffect = Fx.none;
         hitEffect = Fx.hitLiquid;
         smokeEffect = Fx.none;
@@ -61,7 +62,7 @@ public class LiquidBulletType extends BulletType{
     public void draw(Bullet b){
         Draw.color(liquid.color, Color.white, b.fout() / 100f);
 
-        Fill.circle(b.x, b.y, 3f);
+        Fill.circle(b.x, b.y, puddleSize / 2);
     }
 
     @Override
@@ -69,7 +70,7 @@ public class LiquidBulletType extends BulletType{
         super.despawned(b);
 
         //don't create liquids when the projectile despawns
-        hitEffect.at(b.x, b.y, liquid.color);
+        hitEffect.at(b.x, b.y, b.rotation(), liquid.color);
     }
 
     @Override
@@ -78,7 +79,7 @@ public class LiquidBulletType extends BulletType{
         Puddles.deposit(world.tileWorld(hitx, hity), liquid, puddleSize);
 
         if(liquid.temperature <= 0.5f && liquid.flammability < 0.3f){
-            float intensity = 400f;
+            float intensity = 400f * puddleSize/6f;
             Fires.extinguish(world.tileWorld(hitx, hity), intensity);
             for(Point2 p : Geometry.d4){
                 Fires.extinguish(world.tileWorld(hitx + p.x * tilesize, hity + p.y * tilesize), intensity);
diff --git a/core/src/mindustry/entities/bullet/MissileBulletType.java b/core/src/mindustry/entities/bullet/MissileBulletType.java
index a3670ac3c0..274a806f5e 100644
--- a/core/src/mindustry/entities/bullet/MissileBulletType.java
+++ b/core/src/mindustry/entities/bullet/MissileBulletType.java
@@ -15,6 +15,7 @@ public class MissileBulletType extends BasicBulletType{
         height = 8f;
         hitSound = Sounds.explosion;
         trailChance = 0.2f;
+        lifetime = 49f;
     }
 
     public MissileBulletType(float speed, float damage){
diff --git a/core/src/mindustry/entities/bullet/PointBulletType.java b/core/src/mindustry/entities/bullet/PointBulletType.java
new file mode 100644
index 0000000000..920e6e5b51
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/PointBulletType.java
@@ -0,0 +1,70 @@
+package mindustry.entities.bullet;
+
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+
+public class PointBulletType extends BulletType{
+     private static float cdist = 0f;
+     private static Unit result;
+
+     public float trailSpacing = 10f;
+
+     public PointBulletType(){
+         scaleVelocity = true;
+         lifetime = 100f;
+         collides = false;
+         keepVelocity = false;
+         backMove = false;
+     }
+
+    @Override
+    public void init(Bullet b){
+        super.init(b);
+
+        float px = b.x + b.lifetime * b.vel.x,
+            py = b.y + b.lifetime * b.vel.y,
+            rot = b.rotation();
+
+        Geometry.iterateLine(0f, b.x, b.y, px, py, trailSpacing, (x, y) -> {
+            trailEffect.at(x, y, rot);
+        });
+
+        b.time = b.lifetime;
+        b.set(px, py);
+
+        //calculate hit entity
+
+        cdist = 0f;
+        result = null;
+        float range = 1f;
+
+        Units.nearbyEnemies(b.team, px - range, py - range, range*2f, range*2f, e -> {
+            if(e.dead()) return;
+
+            e.hitbox(Tmp.r1);
+            if(!Tmp.r1.contains(px, py)) return;
+
+            float dst = e.dst(px, py) - e.hitSize;
+            if((result == null || dst < cdist)){
+                result = e;
+                cdist = dst;
+            }
+        });
+
+        if(result != null){
+            b.collision(result, px, py);
+        }else{
+            Building build = Vars.world.buildWorld(px, py);
+            if(build != null && build.team != b.team){
+                build.collision(b);
+            }
+        }
+
+        b.remove();
+
+        b.vel.setZero();
+    }
+}
diff --git a/core/src/mindustry/entities/bullet/RailBulletType.java b/core/src/mindustry/entities/bullet/RailBulletType.java
new file mode 100644
index 0000000000..8265f35e8b
--- /dev/null
+++ b/core/src/mindustry/entities/bullet/RailBulletType.java
@@ -0,0 +1,60 @@
+package mindustry.entities.bullet;
+
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.gen.*;
+
+//TODO this class is bad for multiple reasons, remove/replace it.
+//- effects unreliable
+//- not really hitscan but works like it
+//- buggy trails
+//- looks bad
+//- generally unreliable
+public class RailBulletType extends BulletType{
+    public Effect pierceEffect = Fx.hitBulletSmall, updateEffect = Fx.none;
+    /** Multiplier of damage decreased per health pierced. */
+    public float pierceDamageFactor = 1f;
+
+    public RailBulletType(){
+        pierceBuilding = true;
+        pierce = true;
+        reflectable = false;
+        hitEffect = Fx.none;
+        despawnEffect = Fx.none;
+    }
+
+    void handle(Bullet b, Posc pos, float initialHealth){
+        float sub = initialHealth*pierceDamageFactor;
+
+        if(sub >= b.damage){
+            //cause a despawn
+            b.remove();
+        }
+
+        //subtract health from each consecutive pierce
+        b.damage -= Math.min(b.damage, sub);
+
+        if(b.damage > 0){
+            pierceEffect.at(pos.getX(), pos.getY(), b.rotation());
+        }
+
+        hitEffect.at(pos.getX(), pos.getY());
+    }
+
+    @Override
+    public void update(Bullet b){
+        if(b.timer(1, 0.9f)){
+            updateEffect.at(b.x, b.y, b.rotation());
+        }
+    }
+
+    @Override
+    public void hitEntity(Bullet b, Hitboxc entity, float initialHealth){
+        handle(b, entity, initialHealth);
+    }
+
+    @Override
+    public void hitTile(Bullet b, Building tile, float initialHealth){
+        handle(b, tile, initialHealth);
+    }
+}
diff --git a/core/src/mindustry/entities/bullet/SapBulletType.java b/core/src/mindustry/entities/bullet/SapBulletType.java
index 6dab6ce13c..549485c3e2 100644
--- a/core/src/mindustry/entities/bullet/SapBulletType.java
+++ b/core/src/mindustry/entities/bullet/SapBulletType.java
@@ -39,10 +39,15 @@ public class SapBulletType extends BulletType{
 
             Draw.reset();
 
-            Drawf.light(b.team, b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, 15f * b.fout(), lightColor, 0.6f);
+            Drawf.light(b.team, b.x, b.y, Tmp.v1.x, Tmp.v1.y, 15f * b.fout(), lightColor, 0.6f);
         }
     }
 
+    @Override
+    public void drawLight(Bullet b){
+
+    }
+
     @Override
     public float range(){
         return length;
diff --git a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
index 8f26efeaae..01a7ad2d7e 100644
--- a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
+++ b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
@@ -13,9 +13,10 @@ public class ShrapnelBulletType extends BulletType{
     public float length = 100f;
     public float width = 20f;
     public Color fromColor = Color.white, toColor = Pal.lancerLaser;
+    public boolean hitLarge = false;
 
     public int serrations = 7;
-    public float serrationLenScl = 10f, serrationWidth = 4f, serrationSpacing = 8f, serrationSpaceOffset = 80f;
+    public float serrationLenScl = 10f, serrationWidth = 4f, serrationSpacing = 8f, serrationSpaceOffset = 80f, serrationFadeOffset = 0.5f;
 
     public ShrapnelBulletType(){
         speed = 0.01f;
@@ -24,23 +25,39 @@ public class ShrapnelBulletType extends BulletType{
         lifetime = 10f;
         despawnEffect = Fx.none;
         pierce = true;
+        keepVelocity = false;
+        hittable = false;
     }
 
     @Override
     public void init(Bullet b){
-        Damage.collideLine(b, b.team, hitEffect, b.x, b.y, b.rotation(), length);
+        Damage.collideLaser(b, length, hitLarge);
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        drawSize = Math.max(drawSize, length*2f);
+    }
+
+    @Override
+    public float range(){
+        return length;
     }
 
     @Override
     public void draw(Bullet b){
+        float realLength = b.fdata;
+
         Draw.color(fromColor, toColor, b.fin());
-        for(int i = 0; i < serrations; i++){
+        for(int i = 0; i < (int)(serrations * realLength / length); i++){
             Tmp.v1.trns(b.rotation(), i * serrationSpacing);
-            float sl = Mathf.clamp(b.fout() - 0.5f) * (serrationSpaceOffset - i * serrationLenScl);
+            float sl = Mathf.clamp(b.fout() - serrationFadeOffset) * (serrationSpaceOffset - i * serrationLenScl);
             Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, serrationWidth, sl, b.rotation() + 90);
             Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, serrationWidth, sl, b.rotation() - 90);
         }
-        Drawf.tri(b.x, b.y, width * b.fout(), (length + 50), b.rotation());
+        Drawf.tri(b.x, b.y, width * b.fout(), (realLength + 50), b.rotation());
         Drawf.tri(b.x, b.y, width * b.fout(), 10f, b.rotation() + 180f);
         Draw.reset();
     }
diff --git a/core/src/mindustry/entities/comp/AmmoDistributeComp.java b/core/src/mindustry/entities/comp/AmmoDistributeComp.java
new file mode 100644
index 0000000000..96e10a9ce0
--- /dev/null
+++ b/core/src/mindustry/entities/comp/AmmoDistributeComp.java
@@ -0,0 +1,28 @@
+package mindustry.entities.comp;
+
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.blocks.units.*;
+
+@Component
+abstract class AmmoDistributeComp implements Unitc{
+    @Import float x, y;
+    @Import UnitType type;
+    @Import Team team;
+    @Import float ammo;
+
+    private transient float ammoCooldown;
+
+    @Override
+    public void update(){
+        if(ammoCooldown > 0f) ammoCooldown -= Time.delta;
+
+        if(ammo > 0 && ammoCooldown <= 0f && ResupplyPoint.resupply(team, x, y, type.ammoResupplyRange, Math.min(type.ammoResupplyAmount, ammo), type.ammoType.color, u -> u != self())){
+            ammo -= Math.min(type.ammoResupplyAmount, ammo);
+            ammoCooldown = 5f;
+        }
+    }
+}
diff --git a/core/src/mindustry/entities/comp/BlockUnitComp.java b/core/src/mindustry/entities/comp/BlockUnitComp.java
index 4ae698db2a..d0ec5b9a32 100644
--- a/core/src/mindustry/entities/comp/BlockUnitComp.java
+++ b/core/src/mindustry/entities/comp/BlockUnitComp.java
@@ -18,16 +18,16 @@ abstract class BlockUnitComp implements Unitc{
         this.tile = tile;
 
         //sets up block stats
-        maxHealth(tile.block().health);
+        maxHealth(tile.block.health);
         health(tile.health());
-        hitSize(tile.block().size * tilesize * 0.7f);
+        hitSize(tile.block.size * tilesize * 0.7f);
         set(tile);
     }
 
     @Override
     public void update(){
         if(tile != null){
-            team = tile.team();
+            team = tile.team;
         }
     }
 
@@ -61,7 +61,7 @@ abstract class BlockUnitComp implements Unitc{
     public void team(Team team){
         if(tile != null && this.team != team){
             this.team = team;
-            if(tile.team() != team){
+            if(tile.team != team){
                 tile.team(team);
             }
         }
diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
index 2ea4da78fe..36f9661931 100644
--- a/core/src/mindustry/entities/comp/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -16,7 +16,7 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
-import mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.ConstructBlock.*;
 
 import java.util.*;
 
@@ -29,13 +29,7 @@ abstract class BuilderComp implements Unitc{
     @Import float x, y, rotation;
 
     @SyncLocal Queue<BuildPlan> plans = new Queue<>();
-    transient boolean updateBuilding = true;
-
-    @Override
-    public void controller(UnitController next){
-        //reset building state so AI controlled units will always start off building
-        updateBuilding = true;
-    }
+    @SyncLocal transient boolean updateBuilding = true;
 
     @Override
     public void update(){
@@ -49,7 +43,7 @@ abstract class BuilderComp implements Unitc{
         while(it.hasNext()){
             BuildPlan req = it.next();
             Tile tile = world.tile(req.x, req.y);
-            if(tile == null || (req.breaking && tile.block() == Blocks.air) || (!req.breaking && (tile.rotation() == req.rotation || !req.block.rotate) && tile.block() == req.block)){
+            if(tile == null || (req.breaking && tile.block() == Blocks.air) || (!req.breaking && ((tile.build != null && tile.build.rotation == req.rotation) || !req.block.rotate) && tile.block() == req.block)){
                 it.remove();
             }
         }
@@ -76,21 +70,21 @@ abstract class BuilderComp implements Unitc{
 
         Tile tile = world.tile(current.x, current.y);
 
-        if(!within(tile, finalPlaceDst)){
-            rotation = Mathf.slerpDelta(rotation, angleTo(tile), 0.4f);
+        if(within(tile, finalPlaceDst)){
+            lookAt(angleTo(tile));
         }
 
-        if(!(tile.block() instanceof BuildBlock)){
+        if(!(tile.block() instanceof ConstructBlock)){
             if(!current.initialized && !current.breaking && Build.validPlace(current.block, team(), current.x, current.y, current.rotation)){
                 boolean hasAll = infinite || !Structs.contains(current.block.requirements, i -> core != null && !core.items.has(i.item));
 
                 if(hasAll){
-                    Build.beginPlace(current.block, team(), current.x, current.y, current.rotation);
+                    Call.beginPlace(current.block, team(), current.x, current.y, current.rotation);
                 }else{
                     current.stuck = true;
                 }
             }else if(!current.initialized && current.breaking && Build.validBreak(team(), current.x, current.y)){
-                Build.beginBreak(team(), current.x, current.y);
+                Call.beginBreak(team(), current.x, current.y);
             }else{
                 plans.removeFirst();
                 return;
@@ -100,27 +94,23 @@ abstract class BuilderComp implements Unitc{
             return;
         }
 
-        if(tile.build instanceof BuildEntity && !current.initialized){
+        if(tile.build instanceof ConstructBuild && !current.initialized){
             Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, team(), (Builderc)this, current.breaking)));
             current.initialized = true;
         }
 
         //if there is no core to build with or no build entity, stop building!
-        if((core == null && !infinite) || !(tile.build instanceof BuildEntity)){
+        if((core == null && !infinite) || !(tile.build instanceof ConstructBuild)){
             return;
         }
 
         //otherwise, update it.
-        BuildEntity entity = tile.bc();
+        ConstructBuild entity = tile.bc();
 
         if(current.breaking){
-            entity.deconstruct(base(), core, 1f / entity.buildCost * Time.delta * type().buildSpeed * state.rules.buildSpeedMultiplier);
+            entity.deconstruct(self(), core, 1f / entity.buildCost * Time.delta * type().buildSpeed * state.rules.buildSpeedMultiplier);
         }else{
-            if(entity.construct(base(), core, 1f / entity.buildCost * Time.delta * type().buildSpeed * state.rules.buildSpeedMultiplier, current.hasConfig)){
-                if(current.hasConfig){
-                    Call.tileConfig(null, tile.build, current.config);
-                }
-            }
+            entity.construct(self(), core, 1f / entity.buildCost * Time.delta * type().buildSpeed * state.rules.buildSpeedMultiplier, current.config);
         }
 
         current.stuck = Mathf.equal(current.progress, entity.progress);
@@ -150,7 +140,6 @@ abstract class BuilderComp implements Unitc{
     boolean shouldSkip(BuildPlan request, @Nullable Building core){
         //requests that you have at least *started* are considered
         if(state.rules.infiniteResources || team().rules().infiniteResources || request.breaking || core == null) return false;
-        //TODO these are bad criteria
         return (request.stuck && !core.items.has(request.block.requirements)) || (Structs.contains(request.block.requirements, i -> !core.items.has(i.item)) && !request.initialized);
     }
 
@@ -190,8 +179,8 @@ abstract class BuilderComp implements Unitc{
             plans.remove(replace);
         }
         Tile tile = world.tile(place.x, place.y);
-        if(tile != null && tile.build instanceof BuildEntity){
-            place.progress = tile.<BuildEntity>bc().progress;
+        if(tile != null && tile.build instanceof ConstructBuild){
+            place.progress = tile.<ConstructBuild>bc().progress;
         }
         if(tail){
             plans.addLast(place);
@@ -200,6 +189,10 @@ abstract class BuilderComp implements Unitc{
         }
     }
 
+    boolean activelyBuilding(){
+        return isBuilding() && updateBuilding;
+    }
+
     /** Return the build request currently active, or the one at the top of the queue.*/
     @Nullable
     BuildPlan buildPlan(){
diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index 62e14c2b37..bf4236ce53 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -18,11 +18,13 @@ import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.audio.*;
 import mindustry.content.*;
+import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
@@ -37,9 +39,9 @@ import static mindustry.Vars.*;
 
 @EntityDef(value = {Buildingc.class}, isFinal = false, genio = false, serialize = false)
 @Component(base = true)
-abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, QuadTreeObject, Displayable{
+abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, QuadTreeObject, Displayable, Senseable, Controllable{
     //region vars and initialization
-    static final float timeToSleep = 60f * 1;
+    static final float timeToSleep = 60f * 1, timeToUncontrol = 60f * 6;
     static final ObjectSet<Building> tmpTiles = new ObjectSet<>();
     static final Seq<Building> tempTileEnts = new Seq<>();
     static final Seq<Tile> tempTiles = new Seq<>();
@@ -53,6 +55,9 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     transient Seq<Building> proximity = new Seq<>(8);
     transient boolean updateFlow;
     transient byte dump;
+    transient int rotation;
+    transient boolean enabled = true;
+    transient float enabledControlTime;
 
     PowerModule power;
     ItemModule items;
@@ -68,10 +73,17 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     private transient boolean initialized;
 
     /** Sets this tile entity data to this and adds it if necessary. */
-    public Building init(Tile tile, Team team, boolean shouldAdd){
+    public Building init(Tile tile, Team team, boolean shouldAdd, int rotation){
         if(!initialized){
             create(tile.block(), team);
+        }else{
+            if(block.hasPower){
+                //reinit power graph
+                power.graph = new PowerGraph();
+                power.graph.add(self());
+            }
         }
+        this.rotation = rotation;
         this.tile = tile;
 
         set(tile.drawx(), tile.drawy());
@@ -82,7 +94,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
         created();
 
-        return base();
+        return self();
     }
 
     /** Sets up all the necessary variables, but does not add this entity anywhere. */
@@ -95,21 +107,21 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             sound = new SoundLoop(block.activeSound, block.activeSoundVolume);
         }
 
-        health(block.health);
+        health = block.health;
         maxHealth(block.health);
         timer(new Interval(block.timers));
 
-        cons = new ConsumeModule(base());
+        cons = new ConsumeModule(self());
         if(block.hasItems) items = new ItemModule();
         if(block.hasLiquids) liquids = new LiquidModule();
         if(block.hasPower){
             power = new PowerModule();
-            power.graph.add(base());
+            power.graph.add(self());
         }
 
         initialized = true;
 
-        return base();
+        return self();
     }
 
     @Override
@@ -129,8 +141,9 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     public final void writeBase(Writes write){
         write.f(health);
-        write.b(rotation());
+        write.b(rotation | 0b10000000);
         write.b(team.id);
+        write.b(0); //extra padding for later use
         if(items != null) items.write(write);
         if(power != null) power.write(write);
         if(liquids != null) liquids.write(write);
@@ -139,12 +152,20 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     public final void readBase(Reads read){
         health = read.f();
-        rotation(read.b());
+        byte rot = read.b();
         team = Team.get(read.b());
-        if(items != null) items.read(read);
-        if(power != null) power.read(read);
-        if(liquids != null) liquids.read(read);
-        if(cons != null) cons.read(read);
+
+        rotation = rot & 0b01111111;
+        boolean legacy = true;
+        if((rot & 0b10000000) != 0){
+            read.b(); //padding
+            legacy = false;
+        }
+
+        if(items != null) items.read(read, legacy);
+        if(power != null) power.read(read, legacy);
+        if(liquids != null) liquids.read(read, legacy);
+        if(cons != null) cons.read(read, legacy);
     }
 
     public void writeAll(Writes write){
@@ -174,17 +195,17 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void configure(Object value){
         //save last used config
         block.lastConfig = value;
-        Call.tileConfig(player, base(), value);
+        Call.tileConfig(player, self(), value);
     }
 
     /** Configure from a server. */
     public void configureAny(Object value){
-        Call.tileConfig(null, base(), value);
+        Call.tileConfig(null, self(), value);
     }
 
     /** Deselect this tile from configuration. */
     public void deselect(){
-        if(!headless && control.input.frag.config.getSelectedTile() == base()){
+        if(!headless && control.input.frag.config.getSelectedTile() == self()){
             control.input.frag.config.hideConfig();
         }
     }
@@ -231,25 +252,25 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     /** Multiblock front. */
     public @Nullable Building front(){
         int trns = block.size/2 + 1;
-        return nearby(Geometry.d4(rotation()).x * trns, Geometry.d4(rotation()).y * trns);
+        return nearby(Geometry.d4(rotation).x * trns, Geometry.d4(rotation).y * trns);
     }
 
     /** Multiblock back. */
     public @Nullable Building back(){
         int trns = block.size/2 + 1;
-        return nearby(Geometry.d4(rotation() + 2).x * trns, Geometry.d4(rotation() + 2).y * trns);
+        return nearby(Geometry.d4(rotation + 2).x * trns, Geometry.d4(rotation + 2).y * trns);
     }
 
     /** Multiblock left. */
     public @Nullable Building left(){
         int trns = block.size/2 + 1;
-        return nearby(Geometry.d4(rotation() + 1).x * trns, Geometry.d4(rotation() + 1).y * trns);
+        return nearby(Geometry.d4(rotation + 1).x * trns, Geometry.d4(rotation + 1).y * trns);
     }
 
     /** Multiblock right. */
     public @Nullable Building right(){
         int trns = block.size/2 + 1;
-        return nearby(Geometry.d4(rotation() + 3).x * trns, Geometry.d4(rotation() + 3).y * trns);
+        return nearby(Geometry.d4(rotation + 3).x * trns, Geometry.d4(rotation + 3).y * trns);
     }
 
     public int pos(){
@@ -257,15 +278,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public float rotdeg(){
-        return tile.rotdeg();
-    }
-
-    public int rotation(){
-        return tile.rotation();
-    }
-
-    public void rotation(int rotation){
-        tile.rotation(rotation);
+        return rotation * 90;
     }
 
     public Floor floor(){
@@ -300,6 +313,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     /** Base efficiency. If this entity has non-buffered power, returns the power %, otherwise returns 1. */
     public float efficiency(){
+        //disabled -> 0 efficiency
+        if(!enabled) return 0;
         return power != null && (block.consumes.has(ConsumeType.power) && !block.consumes.getPower().buffered) ? power.status : 1f;
     }
 
@@ -331,10 +346,20 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     //endregion
     //region handler methods
 
+    /** Called when this block is dropped as a payload. */
+    public void dropped(){
+
+    }
+
+    /** This is for logic blocks. */
+    public void handleString(Object value){
+
+    }
+
     public void created(){}
-    
+
     public boolean shouldConsume(){
-        return true;
+        return enabled;
     }
 
     public boolean productionValid(){
@@ -347,7 +372,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     /** Returns the amount of items this block can accept. */
     public int acceptStack(Item item, int amount, Teamc source){
-        if(acceptItem(base(), item) && block.hasItems && (source == null || source.team() == team)){
+        if(acceptItem(self(), item) && block.hasItems && (source == null || source.team() == team)){
             return Math.min(getMaximumAccepted(item) - items.get(item), amount);
         }else{
             return 0;
@@ -396,12 +421,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
      * @param todump payload to dump.
      * @return whether the payload was moved successfully
      */
-    public boolean movePayload(@NonNull Payload todump){
+    public boolean movePayload(Payload todump){
         int trns = block.size/2 + 1;
-        Tile next = tile.getNearby(Geometry.d4(rotation()).x * trns, Geometry.d4(rotation()).y * trns);
+        Tile next = tile.getNearby(Geometry.d4(rotation).x * trns, Geometry.d4(rotation).y * trns);
 
-        if(next != null && next.build != null && next.build.team() == team && next.build.acceptPayload(base(), todump)){
-            next.build.handlePayload(base(), todump);
+        if(next != null && next.build != null && next.build.team == team && next.build.acceptPayload(self(), todump)){
+            next.build.handlePayload(self(), todump);
             return true;
         }
 
@@ -413,7 +438,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
      * @param todump payload to dump.
      * @return whether the payload was moved successfully
      */
-    public boolean dumpPayload(@NonNull Payload todump){
+    public boolean dumpPayload(Payload todump){
         if(proximity.size == 0) return false;
 
         int dump = this.dump;
@@ -421,8 +446,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         for(int i = 0; i < proximity.size; i++){
             Building other = proximity.get((i + dump) % proximity.size);
 
-            if(other.team() == team && other.acceptPayload(base(), todump)){
-                other.handlePayload(base(), todump);
+            if(other.team == team && other.acceptPayload(self(), todump)){
+                other.handlePayload(self(), todump);
                 incrementDump(proximity.size);
                 return true;
             }
@@ -455,7 +480,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         for(int i = 0; i < proximity.size; i++){
             incrementDump(proximity.size);
             Building other = proximity.get((i + dump) % proximity.size);
-            other = other.getLiquidDestination(base(), liquid);
+            other = other.getLiquidDestination(self(), liquid);
 
             if(other != null && other.team == team && other.block.hasLiquids && canDumpLiquid(other, liquid) && other.liquids != null){
                 float ofract = other.liquids.get(liquid) / other.block.liquidCapacity;
@@ -474,14 +499,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void transferLiquid(Building next, float amount, Liquid liquid){
         float flow = Math.min(next.block.liquidCapacity - next.liquids.get(liquid) - 0.001f, amount);
 
-        if(next.acceptLiquid(base(), liquid, flow)){
-            next.handleLiquid(base(), liquid, flow);
+        if(next.acceptLiquid(self(), liquid, flow)){
+            next.handleLiquid(self(), liquid, flow);
             liquids.remove(liquid, flow);
         }
     }
 
     public float moveLiquidForward(float leakResistance, Liquid liquid){
-        Tile next = tile.getNearby(rotation());
+        Tile next = tile.getNearby(rotation);
 
         if(next == null) return 0;
 
@@ -498,36 +523,33 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public float moveLiquid(Building next, Liquid liquid){
         if(next == null) return 0;
 
-        next = next.getLiquidDestination(base(), liquid);
+        next = next.getLiquidDestination(self(), liquid);
 
-        if(next.team() == team && next.block.hasLiquids && liquids.get(liquid) > 0f){
+        if(next.team == team && next.block.hasLiquids && liquids.get(liquid) > 0f){
+            float ofract = next.liquids.get(liquid) / next.block.liquidCapacity;
+            float fract = liquids.get(liquid) / block.liquidCapacity * block.liquidPressure;
+            float flow = Math.min(Mathf.clamp((fract - ofract) * (1f)) * (block.liquidCapacity), liquids.get(liquid));
+            flow = Math.min(flow, next.block.liquidCapacity - next.liquids.get(liquid) - 0.001f);
 
-            if(next.acceptLiquid(base(), liquid, 0f)){
-                float ofract = next.liquids().get(liquid) / next.block.liquidCapacity;
-                float fract = liquids.get(liquid) / block.liquidCapacity * block.liquidPressure;
-                float flow = Math.min(Mathf.clamp((fract - ofract) * (1f)) * (block.liquidCapacity), liquids.get(liquid));
-                flow = Math.min(flow, next.block.liquidCapacity - next.liquids().get(liquid) - 0.001f);
+            if(flow > 0f && ofract <= fract && next.acceptLiquid(self(), liquid, flow)){
+                next.handleLiquid(self(), liquid, flow);
+                liquids.remove(liquid, flow);
+                return flow;
+            }else if(next.liquids.currentAmount() / next.block.liquidCapacity > 0.1f && fract > 0.1f){
+                //TODO these are incorrect effect positions
+                float fx = (x + next.x) / 2f, fy = (y + next.y) / 2f;
 
-                if(flow > 0f && ofract <= fract && next.acceptLiquid(base(), liquid, flow)){
-                    next.handleLiquid(base(), liquid, flow);
-                    liquids.remove(liquid, flow);
-                    return flow;
-                }else if(ofract > 0.1f && fract > 0.1f){
-                    //TODO these are incorrect effect positions
-                    float fx = (x + next.x) / 2f, fy = (y + next.y) / 2f;
-
-                    Liquid other = next.liquids().current();
-                    if((other.flammability > 0.3f && liquid.temperature > 0.7f) || (liquid.flammability > 0.3f && other.temperature > 0.7f)){
-                        damage(1 * Time.delta);
-                        next.damage(1 * Time.delta);
-                        if(Mathf.chance(0.1 * Time.delta)){
-                            Fx.fire.at(fx, fy);
-                        }
-                    }else if((liquid.temperature > 0.7f && other.temperature < 0.55f) || (other.temperature > 0.7f && liquid.temperature < 0.55f)){
-                        liquids.remove(liquid, Math.min(liquids.get(liquid), 0.7f * Time.delta));
-                        if(Mathf.chance(0.2f * Time.delta)){
-                            Fx.steam.at(fx, fy);
-                        }
+                Liquid other = next.liquids.current();
+                if((other.flammability > 0.3f && liquid.temperature > 0.7f) || (liquid.flammability > 0.3f && other.temperature > 0.7f)){
+                    damage(1 * Time.delta);
+                    next.damage(1 * Time.delta);
+                    if(Mathf.chance(0.1 * Time.delta)){
+                        Fx.fire.at(fx, fy);
+                    }
+                }else if((liquid.temperature > 0.7f && other.temperature < 0.55f) || (other.temperature > 0.7f && liquid.temperature < 0.55f)){
+                    liquids.remove(liquid, Math.min(liquids.get(liquid), 0.7f * Time.delta));
+                    if(Mathf.chance(0.2f * Time.delta)){
+                        Fx.steam.at(fx, fy);
                     }
                 }
             }
@@ -536,7 +558,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public Building getLiquidDestination(Building from, Liquid liquid){
-        return base();
+        return self();
     }
 
     public @Nullable Payload getPayload(){
@@ -558,13 +580,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         for(int i = 0; i < proximity.size; i++){
             incrementDump(proximity.size);
             Building other = proximity.get((i + dump) % proximity.size);
-            if(other.team() == team && other.acceptItem(base(), item) && canDump(other, item)){
-                other.handleItem(base(), item);
+            if(other.team == team && other.acceptItem(self(), item) && canDump(other, item)){
+                other.handleItem(self(), item);
                 return;
             }
         }
 
-        handleItem(base(), item);
+        handleItem(self(), item);
     }
 
     /**
@@ -576,8 +598,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         for(int i = 0; i < proximity.size; i++){
             incrementDump(proximity.size);
             Building other = proximity.get((i + dump) % proximity.size);
-            if(other.team() == team && other.acceptItem(base(), item) && canDump(other, item)){
-                other.handleItem(base(), item);
+            if(other.team == team && other.acceptItem(self(), item) && canDump(other, item)){
+                other.handleItem(self(), item);
                 return true;
             }
         }
@@ -609,16 +631,16 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
                 for(int ii = 0; ii < content.items().size; ii++){
                     Item item = content.item(ii);
 
-                    if(other.team() == team && items.has(item) && other.acceptItem(base(), item) && canDump(other, item)){
-                        other.handleItem(base(), item);
+                    if(other.team == team && items.has(item) && other.acceptItem(self(), item) && canDump(other, item)){
+                        other.handleItem(self(), item);
                         items.remove(item, 1);
                         incrementDump(proximity.size);
                         return true;
                     }
                 }
             }else{
-                if(other.team() == team && other.acceptItem(base(), todump) && canDump(other, todump)){
-                    other.handleItem(base(), todump);
+                if(other.team == team && other.acceptItem(self(), todump) && canDump(other, todump)){
+                    other.handleItem(self(), todump);
                     items.remove(todump, 1);
                     incrementDump(proximity.size);
                     return true;
@@ -643,8 +665,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     /** Try offloading an item to a nearby container in its facing direction. Returns true if success. */
     public boolean moveForward(Item item){
         Building other = front();
-        if(other != null && other.team() == team && other.acceptItem(base(), item)){
-            other.handleItem(base(), item);
+        if(other != null && other.team == team && other.acceptItem(self(), item)){
+            other.handleItem(self(), item);
             return true;
         }
         return false;
@@ -663,8 +685,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void updatePowerGraph(){
 
         for(Building other : getPowerConnections(tempTileEnts)){
-            if(other.power() != null){
-                other.power().graph.addGraph(power.graph);
+            if(other.power != null){
+                other.power.graph.addGraph(power.graph);
             }
         }
     }
@@ -674,13 +696,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             return;
         }
 
-        power.graph.remove(base());
+        power.graph.remove(self());
         for(int i = 0; i < power.links.size; i++){
             Tile other = world.tile(power.links.get(i));
             if(other != null && other.build != null && other.build.power != null){
                 other.build.power.links.removeValue(pos());
             }
         }
+        power.links.clear();
     }
 
     public Seq<Building> getPowerConnections(Seq<Building> out){
@@ -688,7 +711,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         if(power == null) return out;
 
         for(Building other : proximity){
-            if(other != null && other.power() != null
+            if(other != null && other.power != null
             && !(block.consumesPower && other.block.consumesPower && !block.outputsPower && !other.block.outputsPower)
             && !power.links.contains(other.pos())){
                 out.add(other);
@@ -703,7 +726,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public float getProgressIncrease(float baseTime){
-        return 1f / baseTime * delta() * efficiency();
+        return 1f / baseTime * edelta();
+    }
+
+    public float getDisplayEfficiency(){
+        return getProgressIncrease(1f) / edelta();
     }
 
     /** @return whether this block should play its active sound.*/
@@ -717,11 +744,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public void drawStatus(){
-        if(block.consumes.any()){
+        if(block.enableDrawStatus && block.consumes.any()){
             float brcx = tile.drawx() + (block.size * tilesize / 2f) - (tilesize / 2f);
             float brcy = tile.drawy() - (block.size * tilesize / 2f) + (tilesize / 2f);
 
-            Draw.z(Layer.blockOver);
+            Draw.z(Layer.power + 1);
             Draw.color(Pal.gray);
             Fill.square(brcx, brcy, 2.5f, 45);
             Draw.color(cons.status().color);
@@ -743,6 +770,16 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void drawSelect(){
     }
 
+    public void drawDisabled(){
+        Draw.color(Color.scarlet);
+        Draw.alpha(0.8f);
+
+        float size = 6f;
+        Draw.rect(Icon.cancel.getRegion(), x, y, size, size);
+
+        Draw.reset();
+    }
+
     public void draw(){
         Draw.rect(block.region, x, y, block.rotate ? rotdeg() : 0);
 
@@ -782,10 +819,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     /** Called after the block is placed by this client. */
     @CallSuper
-    public void playerPlaced(){
-        if(block.saveConfig && block.lastConfig != null){
-            configure(block.lastConfig);
-        }
+    public void playerPlaced(Object config){
+
     }
 
     /** Called after the block is placed by anyone. */
@@ -798,10 +833,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             tempTiles.clear();
             Geometry.circle(tileX(), tileY(), range, (x, y) -> {
                 Building other = world.build(x, y);
-                if(other != null && other.block instanceof PowerNode && ((PowerNode)other.block).linkValid(other, base()) && !PowerNode.insulated(other, base())
-                    && !other.proximity().contains(this.<Building>base()) &&
-                !(block.outputsPower && proximity.contains(p -> p.power() != null && p.power().graph == other.power().graph))){
-                    tempTiles.add(other.tile());
+                if(other != null && other.block instanceof PowerNode && ((PowerNode)other.block).linkValid(other, self()) && !PowerNode.insulated(other, self())
+                    && !other.proximity().contains(this.<Building>self()) &&
+                !(block.outputsPower && proximity.contains(p -> p.power != null && p.power.graph == other.power.graph))){
+                    tempTiles.add(other.tile);
                 }
             });
             tempTiles.sort(Structs.comparingFloat(t -> t.dst2(tile)));
@@ -814,6 +849,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         }
     }
 
+    /**
+     * Called when a block is placed over some other blocks. This seq will always have at least one item.
+     * Should load some previous state, if necessary. */
+    public void overwrote(Seq<Building> previous){
+
+    }
+
     public void onRemoved(){
     }
 
@@ -826,7 +868,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     /** Called when arbitrary configuration is applied to a tile. */
-    public void configured(@Nullable Player player, @Nullable Object value){
+    public void configured(@Nullable Unit builder, @Nullable Object value){
         //null is of type void.class; anonymous classes use their superclass.
         Class<?> type = value == null ? void.class : value.getClass().isAnonymousClass() ? value.getClass().getSuperclass() : value.getClass();
 
@@ -835,8 +877,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         }
     }
 
-    /** Called when the block is tapped.*/
-    public void tapped(Player player){
+    /** Called when the block is tapped by the local player. */
+    public void tapped(){
 
     }
 
@@ -863,7 +905,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             power += this.power.status * block.consumes.getPower().capacity;
         }
 
-        if(block.hasLiquids){
+        if(block.hasLiquids && state.rules.damageExplosions){
 
             liquids.each((liquid, amount) -> {
                 float splash = Mathf.clamp(amount / 4f, 0f, 10f);
@@ -879,9 +921,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             });
         }
 
-        Damage.dynamicExplosion(x, y, flammability, explosiveness * 3.5f, power, tilesize * block.size / 2f, Pal.darkFlame);
+        Damage.dynamicExplosion(x, y, flammability, explosiveness * 3.5f, power, tilesize * block.size / 2f, Pal.darkFlame, state.rules.damageExplosions);
+
         if(!floor().solid && !floor().isLiquid){
-            Effects.rubble(x, y, block.size);
+            Effect.rubble(x, y, block.size);
         }
     }
 
@@ -936,7 +979,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             table.row();
             table.table(this::displayConsumption).growX();
 
-            boolean displayFlow = (block.category == Category.distribution || block.category == Category.liquid) && Core.settings.getBool("flow");
+            boolean displayFlow = (block.category == Category.distribution || block.category == Category.liquid) && Core.settings.getBool("flow") && block.displayFlow;
 
             if(displayFlow){
                 String ps = " " + StatUnit.perSecond.localized();
@@ -974,9 +1017,21 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
                 if(liquids != null){
                     table.row();
                     table.table(l -> {
-                        l.left();
-                        l.image(() -> liquids.current().icon(Cicon.small)).padRight(3f);
-                        l.label(() -> liquids.getFlowRate() < 0 ? "..." : Strings.fixed(liquids.getFlowRate(), 2) + ps).color(Color.lightGray);
+                        boolean[] had = {false};
+
+                        Runnable rebuild = () -> {
+                            l.clearChildren();
+                            l.left();
+                            l.image(() -> liquids.current().icon(Cicon.small)).padRight(3f);
+                            l.label(() -> liquids.getFlowRate() < 0 ? "..." : Strings.fixed(liquids.getFlowRate(), 2) + ps).color(Color.lightGray);
+                        };
+
+                        l.update(() -> {
+                           if(!had[0] && liquids.hadFlow()){
+                               had[0] = true;
+                               rebuild.run();
+                           }
+                        });
                     }).left();
                 }
             }
@@ -989,13 +1044,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         table.left();
         for(Consume cons : block.consumes.all()){
             if(cons.isOptional() && cons.isBoost()) continue;
-            cons.build(base(), table);
+            cons.build(self(), table);
         }
     }
 
     public void displayBars(Table table){
         for(Func<Building, Bar> bar : block.bars.list()){
-            table.add(bar.get(base())).growX();
+            table.add(bar.get(self())).growX();
             table.row();
         }
     }
@@ -1021,7 +1076,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
      * @return whether or not this block should be deselected.
      */
     public boolean onConfigureTileTapped(Building other){
-        return base() != other;
+        return self() != other;
     }
 
     /** Returns whether this config menu should show when the specified player taps it. */
@@ -1062,6 +1117,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return true;
     }
 
+    public boolean canPickup(){
+        return true;
+    }
+
     public void removeFromProximity(){
         onProximityRemoved();
         tmpTiles.clear();
@@ -1076,7 +1135,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         }
 
         for(Building other : tmpTiles){
-            other.proximity.remove(base(), true);
+            other.proximity.remove(self(), true);
             other.onProximityUpdate();
         }
     }
@@ -1092,8 +1151,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             if(other == null || !(other.tile.interactable(team))) continue;
 
             //add this tile to proximity of nearby tiles
-            if(!other.proximity.contains(base(), true)){
-                other.proximity.add(base());
+            if(!other.proximity.contains(self(), true)){
+                other.proximity.add(self());
             }
 
             tmpTiles.add(other);
@@ -1132,13 +1191,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     @Replace
     @Override
     public boolean isValid(){
-        return tile.build == base() && !dead();
+        return tile.build == self() && !dead();
     }
 
     @Replace
     @Override
     public void kill(){
-        Call.tileDestroyed(base());
+        Call.tileDestroyed(self());
     }
 
     @Replace
@@ -1152,10 +1211,58 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             damage /= state.rules.blockHealthMultiplier;
         }
 
-        Call.tileDamage(base(), health - handleDamage(damage));
+        Call.tileDamage(self(), health - handleDamage(damage));
 
         if(health <= 0){
-            Call.tileDestroyed(base());
+            Call.tileDestroyed(self());
+        }
+    }
+
+    @Override
+    public double sense(LAccess sensor){
+        return switch(sensor){
+            case x -> x;
+            case y -> y;
+            case team -> team.id;
+            case health -> health;
+            case maxHealth -> maxHealth();
+            case efficiency -> efficiency();
+            case rotation -> rotation;
+            case totalItems -> items == null ? 0 : items.total();
+            case totalLiquids -> liquids == null ? 0 : liquids.total();
+            case totalPower -> power == null || !block.consumes.hasPower() ? 0 : power.status * (block.consumes.getPower().buffered ? block.consumes.getPower().capacity : 1f);
+            case itemCapacity -> block.itemCapacity;
+            case liquidCapacity -> block.liquidCapacity;
+            case powerCapacity -> block.consumes.hasPower() ? block.consumes.getPower().capacity : 0f;
+            case powerNetIn -> power == null ? 0 : power.graph.getLastScaledPowerIn() * 60;
+            case powerNetOut -> power == null ? 0 : power.graph.getLastScaledPowerOut() * 60;
+            case powerNetStored -> power == null ? 0 : power.graph.getLastPowerStored();
+            case powerNetCapacity -> power == null ? 0 : power.graph.getLastCapacity();
+            default -> 0;
+        };
+    }
+
+    @Override
+    public Object senseObject(LAccess sensor){
+        return switch(sensor){
+            case type -> block;
+            default -> noSensed;
+        };
+
+    }
+
+    @Override
+    public double sense(Content content){
+        if(content instanceof Item && items != null) return items.get((Item)content);
+        if(content instanceof Liquid && liquids != null) return liquids.get((Liquid)content);
+        return 0;
+    }
+
+    @Override
+    public void control(LAccess type, double p1, double p2, double p3, double p4){
+        if(type == LAccess.enabled){
+            enabled = !Mathf.zero((float)p1);
+            enabledControlTime = timeToUncontrol;
         }
     }
 
@@ -1183,15 +1290,25 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             timeScale = 1f;
         }
 
+        if(block.autoResetEnabled){
+            enabledControlTime -= Time.delta;
+
+            if(enabledControlTime <= 0){
+                enabled = true;
+            }
+        }
+
         if(sound != null){
             sound.update(x, y, shouldActiveSound());
         }
 
         if(block.idleSound != Sounds.none && shouldIdleSound()){
-            loops.play(block.idleSound, base(), block.idleSoundVolume);
+            loops.play(block.idleSound, self(), block.idleSoundVolume);
         }
 
-        updateTile();
+        if(enabled || !block.noUpdateDisabled){
+            updateTile();
+        }
 
         if(items != null){
             items.update(updateFlow);
diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java
index c94216c923..5ef68ac2e1 100644
--- a/core/src/mindustry/entities/comp/BulletComp.java
+++ b/core/src/mindustry/entities/comp/BulletComp.java
@@ -25,27 +25,36 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
     Object data;
     BulletType type;
     float damage;
+    float fdata;
 
     @Override
     public void getCollisions(Cons<QuadTree> consumer){
-        for(Team team : team.enemies()){
-            consumer.get(teamIndex.tree(team));
+        if(team.active()){
+            for(Team team : team.enemies()){
+                consumer.get(teamIndex.tree(team));
+            }
+        }else{
+            for(Team other : Team.all){
+                if(other != team && teamIndex.count(other) > 0){
+                    consumer.get(teamIndex.tree(other));
+                }
+            }
         }
     }
 
     @Override
     public void drawBullets(){
-        type.draw(base());
+        type.draw(self());
     }
 
     @Override
     public void add(){
-        type.init(base());
+        type.init(self());
     }
 
     @Override
     public void remove(){
-        type.despawned(base());
+        type.despawned(self());
         collided.clear();
     }
 
@@ -83,10 +92,12 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
     @MethodPriority(100)
     @Override
     public void collision(Hitboxc other, float x, float y){
-        type.hit(base(), x, y);
+        type.hit(self(), x, y);
+        float health = 0f;
 
         if(other instanceof Healthc){
             Healthc h = (Healthc)other;
+            health = h.health();
             h.damage(damage);
         }
 
@@ -102,30 +113,40 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
         }else{
             collided.add(other.id());
         }
+
+        type.hitEntity(self(), other, health);
     }
 
     @Override
     public void update(){
-        type.update(base());
+        type.update(self());
 
         if(type.collidesTiles && type.collides && type.collidesGround){
             world.raycastEach(world.toTile(lastX()), world.toTile(lastY()), tileX(), tileY(), (x, y) -> {
 
                 Building tile = world.build(x, y);
-                if(tile == null) return false;
+                if(tile == null || !isAdded()) return false;
 
-                if(tile.collide(base()) && type.collides(base(), tile) && !tile.dead() && (type.collidesTeam || tile.team != team)){
+                if(tile.collide(self()) && type.collides(self(), tile) && !tile.dead() && (type.collidesTeam || tile.team != team) && !(type.pierceBuilding && collided.contains(tile.id))){
                     boolean remove = false;
 
+                    float health = tile.health;
+
                     if(tile.team != team){
-                        remove = tile.collision(base());
+                        remove = tile.collision(self());
                     }
 
                     if(remove || type.collidesTeam){
-                        type.hitTile(base(), tile);
-                        remove();
+                        if(!type.pierceBuilding){
+                            remove();
+                        }else{
+                            collided.add(tile.id);
+                        }
                     }
-                    return true;
+
+                    type.hitTile(self(), tile, health);
+
+                    return !type.pierceBuilding;
                 }
 
                 return false;
@@ -137,8 +158,8 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
     public void draw(){
         Draw.z(Layer.bullet);
 
-        type.draw(base());
-        type.drawLight(base());
+        type.draw(self());
+        type.drawLight(self());
     }
 
     /** Sets the bullet's rotation in degrees. */
diff --git a/core/src/mindustry/entities/comp/CommanderComp.java b/core/src/mindustry/entities/comp/CommanderComp.java
index 5462014a16..99bca89cf9 100644
--- a/core/src/mindustry/entities/comp/CommanderComp.java
+++ b/core/src/mindustry/entities/comp/CommanderComp.java
@@ -1,10 +1,13 @@
 package mindustry.entities.comp;
 
+import arc.func.*;
+import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.ai.formations.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 
@@ -12,16 +15,19 @@ import mindustry.gen.*;
 @Component
 abstract class CommanderComp implements Unitc{
     private static final Seq<FormationMember> members = new Seq<>();
+    private static final Seq<Unit> units = new Seq<>();
 
     @Import float x, y, rotation;
 
     transient @Nullable Formation formation;
     transient Seq<Unit> controlling = new Seq<>();
+    /** minimum speed of any unit in the formation. */
+    transient float minFormationSpeed;
 
     @Override
     public void update(){
         if(formation != null){
-            formation.anchor.set(x, y, rotation);
+            formation.anchor.set(x, y, /*rotation*/ 0); //TODO rotation set to 0 because rotating is pointless
             formation.updateSlots();
         }
     }
@@ -42,21 +48,51 @@ abstract class CommanderComp implements Unitc{
         clearCommand();
     }
 
+    void commandNearby(FormationPattern pattern){
+        commandNearby(pattern, u -> true);
+    }
+
+    void commandNearby(FormationPattern pattern, Boolf<Unit> include){
+        Formation formation = new Formation(new Vec3(x, y, rotation), pattern);
+        formation.slotAssignmentStrategy = new DistanceAssignmentStrategy(pattern);
+
+        units.clear();
+
+        Units.nearby(team(), x, y, 200f, u -> {
+            if(u.isAI() && include.get(u) && u != self()){
+                units.add(u);
+            }
+        });
+
+        units.sort(u -> u.dst2(this));
+        units.truncate(type().commandLimit);
+
+        command(formation, units);
+    }
+
     void command(Formation formation, Seq<Unit> units){
         clearCommand();
 
+        float spacing = hitSize() * 0.65f;
+        minFormationSpeed = type().speed;
+
         controlling.addAll(units);
         for(Unit unit : units){
-            unit.controller(new FormationAI(base(), formation));
+            FormationAI ai;
+            unit.controller(ai = new FormationAI(self(), formation));
+            spacing = Math.max(spacing, ai.formationSize());
+            minFormationSpeed = Math.min(minFormationSpeed, unit.type().speed);
         }
         this.formation = formation;
 
+        //update formation spacing based on max size
+        formation.pattern.spacing = spacing;
+
         members.clear();
         for(Unitc u : units){
             members.add((FormationAI)u.controller());
         }
 
-
         //TODO doesn't handle units that don't fit a formation
         formation.addMembers(members);
     }
@@ -68,7 +104,7 @@ abstract class CommanderComp implements Unitc{
     void clearCommand(){
         //reset controlled units
         for(Unit unit : controlling){
-            if(unit.controller().isBeingControlled(base())){
+            if(unit.controller().isBeingControlled(self())){
                 unit.controller(unit.type().createController());
             }
         }
diff --git a/core/src/mindustry/entities/comp/DecalComp.java b/core/src/mindustry/entities/comp/DecalComp.java
index 6db6b58f53..33ce6d406c 100644
--- a/core/src/mindustry/entities/comp/DecalComp.java
+++ b/core/src/mindustry/entities/comp/DecalComp.java
@@ -27,7 +27,7 @@ abstract class DecalComp implements Drawc, Timedc, Rotc, Posc{
 
     @Replace
     public float clipSize(){
-        return region.getWidth()*2;
+        return region.width *2;
     }
 
 }
diff --git a/core/src/mindustry/entities/comp/EffectStateComp.java b/core/src/mindustry/entities/comp/EffectStateComp.java
index 3ad57d5d19..776a696049 100644
--- a/core/src/mindustry/entities/comp/EffectStateComp.java
+++ b/core/src/mindustry/entities/comp/EffectStateComp.java
@@ -8,13 +8,16 @@ import mindustry.gen.*;
 @EntityDef(value = {EffectStatec.class, Childc.class}, pooled = true, serialize = false)
 @Component(base = true)
 abstract class EffectStateComp implements Posc, Drawc, Timedc, Rotc, Childc{
+    @Import float time, lifetime, rotation, x, y;
+    @Import int id;
+
     Color color = new Color(Color.white);
     Effect effect;
     Object data;
 
     @Override
     public void draw(){
-        effect.render(id(), color, time(), rotation(), x(), y(), data);
+        lifetime = effect.render(id, color, time, lifetime, rotation, x, y, data);
     }
 
     @Replace
diff --git a/core/src/mindustry/entities/comp/ElevationMoveComp.java b/core/src/mindustry/entities/comp/ElevationMoveComp.java
index af4b58571d..f87bc1de0f 100644
--- a/core/src/mindustry/entities/comp/ElevationMoveComp.java
+++ b/core/src/mindustry/entities/comp/ElevationMoveComp.java
@@ -1,23 +1,18 @@
 package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
+import mindustry.entities.EntityCollisions.*;
 import mindustry.gen.*;
 
-import static mindustry.Vars.collisions;
-
 @Component
 abstract class ElevationMoveComp implements Velc, Posc, Flyingc, Hitboxc{
     @Import float x, y;
 
     @Replace
     @Override
-    public void move(float cx, float cy){
-        if(isFlying()){
-            x += cx;
-            y += cy;
-        }else{
-            collisions.move(this, cx, cy);
-        }
+    public SolidPred solidity(){
+        return isFlying() ? null : EntityCollisions::solid;
     }
 
 }
diff --git a/core/src/mindustry/entities/comp/EntityComp.java b/core/src/mindustry/entities/comp/EntityComp.java
index 3e49ea01ce..2b20e908b2 100644
--- a/core/src/mindustry/entities/comp/EntityComp.java
+++ b/core/src/mindustry/entities/comp/EntityComp.java
@@ -40,7 +40,7 @@ abstract class EntityComp{
         return false;
     }
 
-    <T extends Entityc> T base(){
+    <T extends Entityc> T self(){
         return (T)this;
     }
 
diff --git a/core/src/mindustry/entities/comp/FireComp.java b/core/src/mindustry/entities/comp/FireComp.java
index 075a96416b..ea67ca9e19 100644
--- a/core/src/mindustry/entities/comp/FireComp.java
+++ b/core/src/mindustry/entities/comp/FireComp.java
@@ -15,14 +15,14 @@ import static mindustry.Vars.*;
 
 @EntityDef(value = {Firec.class}, pooled = true)
 @Component(base = true)
-abstract class FireComp implements Timedc, Posc, Firec{
+abstract class FireComp implements Timedc, Posc, Firec, Syncc{
     private static final float spreadChance = 0.05f, fireballChance = 0.07f;
 
     @Import float time, lifetime, x, y;
 
     Tile tile;
-    private Block block;
-    private float baseFlammability = -1, puddleFlammability;
+    private transient Block block;
+    private transient float baseFlammability = -1, puddleFlammability;
 
     @Override
     public void update(){
@@ -97,6 +97,11 @@ abstract class FireComp implements Timedc, Posc, Firec{
 
     @Override
     public void afterRead(){
-        Fires.register(base());
+        Fires.register(self());
+    }
+
+    @Override
+    public void afterSync(){
+        Fires.register(self());
     }
 }
diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java
index ef53b1fece..83c16d3525 100644
--- a/core/src/mindustry/entities/comp/FlyingComp.java
+++ b/core/src/mindustry/entities/comp/FlyingComp.java
@@ -1,10 +1,12 @@
 package mindustry.entities.comp;
 
+import arc.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.world.blocks.environment.*;
 
@@ -14,7 +16,7 @@ import static mindustry.Vars.net;
 abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
     private static final Vec2 tmp1 = new Vec2(), tmp2 = new Vec2();
 
-    @Import float x, y;
+    @Import float x, y, speedMultiplier;
     @Import Vec2 vel;
 
     @SyncLocal float elevation;
@@ -50,13 +52,13 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
 
     void moveAt(Vec2 vector, float acceleration){
         Vec2 t = tmp1.set(vector).scl(floorSpeedMultiplier()); //target vector
-        tmp2.set(t).sub(vel).limit(acceleration * vector.len()); //delta vector
+        tmp2.set(t).sub(vel).limit(acceleration * vector.len() * Time.delta); //delta vector
         vel.add(tmp2);
     }
 
     float floorSpeedMultiplier(){
         Floor on = isFlying() || hovering ? Blocks.air.asFloor() : floorOn();
-        return on.speedMultiplier;
+        return on.speedMultiplier * speedMultiplier;
     }
 
     @Override
@@ -74,7 +76,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
         }
 
         if(!hovering && isGrounded() && floor.isLiquid){
-            if((splashTimer += Mathf.dst(deltaX(), deltaY())) >= 7f){
+            if((splashTimer += Mathf.dst(deltaX(), deltaY())) >= (7f + hitSize()/8f)){
                 floor.walkEffect.at(x, y, hitSize() / 8f, floor.mapColor);
                 splashTimer = 0f;
             }
@@ -90,7 +92,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
             //TODO is the netClient check necessary?
             if(drownTime >= 0.999f && !net.client()){
                 kill();
-                //TODO drown event!
+                Events.fire(new UnitDrownEvent(self()));
             }
         }else{
             drownTime = Mathf.lerpDelta(drownTime, 0f, 0.03f);
diff --git a/core/src/mindustry/entities/comp/HealthComp.java b/core/src/mindustry/entities/comp/HealthComp.java
index 609f3da46f..ca65ea8115 100644
--- a/core/src/mindustry/entities/comp/HealthComp.java
+++ b/core/src/mindustry/entities/comp/HealthComp.java
@@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 
 @Component
-abstract class HealthComp implements Entityc{
+abstract class HealthComp implements Entityc, Posc{
     static final float hitDuration = 9f;
 
     float health;
diff --git a/core/src/mindustry/entities/comp/HitboxComp.java b/core/src/mindustry/entities/comp/HitboxComp.java
index 29b458c429..9473dfbca3 100644
--- a/core/src/mindustry/entities/comp/HitboxComp.java
+++ b/core/src/mindustry/entities/comp/HitboxComp.java
@@ -11,7 +11,7 @@ import mindustry.gen.*;
 abstract class HitboxComp implements Posc, QuadTreeObject{
     @Import float x, y;
 
-    transient float lastX, lastY, hitSize;
+    transient float lastX, lastY, deltaX, deltaY, hitSize;
 
     @Override
     public void update(){
@@ -33,6 +33,8 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
     }
 
     void updateLastPosition(){
+        deltaX = x - lastX;
+        deltaY = y - lastY;
         lastX = x;
         lastY = y;
     }
@@ -41,20 +43,12 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
 
     }
 
-    float deltaX(){
-        return x - lastX;
-    }
-
-    float deltaY(){
-        return y - lastY;
-    }
-
     float deltaLen(){
-        return Mathf.len(deltaX(), deltaY());
+        return Mathf.len(deltaX, deltaY);
     }
 
     float deltaAngle(){
-        return Mathf.angle(deltaX(), deltaY());
+        return Mathf.angle(deltaX, deltaY);
     }
 
     boolean collides(Hitboxc other){
@@ -67,7 +61,8 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
     }
 
     public void hitboxTile(Rect rect){
-        float scale = 0.66f;
-        rect.setCentered(x, y, hitSize * scale, hitSize * scale);
+        //tile hitboxes are never bigger than a tile, otherwise units get stuck
+        float size = Math.min(hitSize * 0.66f, 7.9f);
+        rect.setCentered(x, y, size, size);
     }
 }
diff --git a/core/src/mindustry/entities/comp/LaunchCoreComp.java b/core/src/mindustry/entities/comp/LaunchCoreComp.java
index 186cff2b2e..7283a9e220 100644
--- a/core/src/mindustry/entities/comp/LaunchCoreComp.java
+++ b/core/src/mindustry/entities/comp/LaunchCoreComp.java
@@ -44,7 +44,7 @@ abstract class LaunchCoreComp implements Drawc, Timedc{
         Draw.z(Layer.weather - 1);
 
         TextureRegion region = block.icon(Cicon.full);
-        float rw = region.getWidth() * Draw.scl * scale, rh = region.getHeight() * Draw.scl * scale;
+        float rw = region.width * Draw.scl * scale, rh = region.height * Draw.scl * scale;
 
         Draw.alpha(alpha);
         Draw.rect(region, cx, cy, rw, rh, rotation - 45);
diff --git a/core/src/mindustry/entities/comp/LegsComp.java b/core/src/mindustry/entities/comp/LegsComp.java
index e516c6befe..e6022ed91e 100644
--- a/core/src/mindustry/entities/comp/LegsComp.java
+++ b/core/src/mindustry/entities/comp/LegsComp.java
@@ -4,16 +4,16 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.ai.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.entities.EntityCollisions.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.blocks.environment.*;
 
-import static mindustry.Vars.*;
-
 @Component
 abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
     @Import float x, y;
@@ -26,34 +26,52 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
 
     @Replace
     @Override
-    public void move(float cx, float cy){
-        collisions.moveCheck(this, cx, cy, !type.allowLegStep ? EntityCollisions::solid : EntityCollisions::legsSolid);
+    public SolidPred solidity(){
+        return !type.allowLegStep ? EntityCollisions::solid : EntityCollisions::legsSolid;
+    }
+
+    @Override
+    @Replace
+    public int pathType(){
+        return Pathfinder.costLegs;
+    }
+
+    @Override
+    public void add(){
+        resetLegs();
+    }
+
+    public void resetLegs(){
+        float rot = baseRotation;
+        int count = type.legCount;
+        float legLength = type.legLength;
+
+        this.legs = new Leg[count];
+
+        float spacing = 360f / count;
+
+        for(int i = 0; i < legs.length; i++){
+            Leg l = new Leg();
+
+            l.joint.trns(i * spacing + rot, legLength/2f + type.legBaseOffset).add(x, y);
+            l.base.trns(i * spacing + rot, legLength + type.legBaseOffset).add(x, y);
+
+            legs[i] = l;
+        }
     }
 
     @Override
     public void update(){
         if(Mathf.dst(deltaX(), deltaY()) > 0.001f){
-            baseRotation = Mathf.slerpDelta(baseRotation, Mathf.angle(deltaX(), deltaY()), 0.1f);
+            baseRotation = Angles.moveToward(baseRotation, Mathf.angle(deltaX(), deltaY()), type.rotateSpeed);
         }
 
         float rot = baseRotation;
-        int count = type.legCount;
         float legLength = type.legLength;
 
         //set up initial leg positions
         if(legs.length != type.legCount){
-            this.legs = new Leg[count];
-
-            float spacing = 360f / count;
-
-            for(int i = 0; i < legs.length; i++){
-                Leg l = new Leg();
-
-                l.joint.trns(i * spacing + rot, legLength/2f + type.legBaseOffset).add(x, y);
-                l.base.trns(i * spacing + rot, legLength + type.legBaseOffset).add(x, y);
-
-                legs[i] = l;
-            }
+            resetLegs();
         }
 
         float moveSpeed = type.legSpeed;
@@ -100,7 +118,7 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
 
                     //shake when legs contact ground
                     if(type.landShake > 0){
-                        Effects.shake(type.landShake, type.landShake, l.base);
+                        Effect.shake(type.landShake, type.landShake, l.base);
                     }
 
                     if(type.legSplashDamage > 0){
diff --git a/core/src/mindustry/entities/comp/MechComp.java b/core/src/mindustry/entities/comp/MechComp.java
index 60e9a7dbde..94bb380c96 100644
--- a/core/src/mindustry/entities/comp/MechComp.java
+++ b/core/src/mindustry/entities/comp/MechComp.java
@@ -1,19 +1,86 @@
 package mindustry.entities.comp;
 
+import arc.graphics.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
 
 @Component
 abstract class MechComp implements Posc, Flyingc, Hitboxc, Unitc, Mechc, ElevationMovec{
+    @Import float x, y, hitSize;
+    @Import UnitType type;
+
     @SyncField(false) @SyncLocal float baseRotation;
-    transient float walkTime;
+    transient float walkTime, walkExtension;
+    transient private boolean walked;
 
     @Override
     public void update(){
-        float len = deltaLen();
-        baseRotation = Angles.moveToward(baseRotation, deltaAngle(), type().baseRotateSpeed * Mathf.clamp(len / type().speed));
-        walkTime += Time.delta *len;
+        //trigger animation only when walking manually
+        if(walked || net.client()){
+            float len = deltaLen();
+            baseRotation = Angles.moveToward(baseRotation, deltaAngle(), type().baseRotateSpeed * Mathf.clamp(len / type().speed / Time.delta) * Time.delta);
+            walkTime += len;
+            walked = false;
+        }
+
+        //update mech effects
+        float extend = walkExtend(false);
+        float base = walkExtend(true);
+        float extendScl = base % 1f;
+
+        float lastExtend = walkExtension;
+
+        if(extendScl < lastExtend && base % 2f > 1f){
+            int side = -Mathf.sign(extend);
+            float width = hitSize / 2f * side, length = type.mechStride * 1.35f;
+
+            float cx = x + Angles.trnsx(baseRotation, length, width),
+            cy = y + Angles.trnsy(baseRotation, length, width);
+
+            if(type.mechStepShake > 0){
+                Effect.shake(type.mechStepShake, type.mechStepShake, cx, cy);
+            }
+
+            if(type.mechStepParticles){
+                Tile tile = world.tileWorld(cx, cy);
+                if(tile != null){
+                    Color color = tile.floor().mapColor;
+                    Fx.unitLand.at(cx, cy, hitSize/8f, color);
+                }
+            }
+        }
+
+        walkExtension = extendScl;
+    }
+
+    public float walkExtend(boolean scaled){
+
+        //now ranges from -maxExtension to maxExtension*3
+        float raw = walkTime % (type.mechStride * 4);
+
+        if(scaled) return raw / type.mechStride;
+
+        if(raw > type.mechStride*3) raw = raw - type.mechStride * 4;
+        else if(raw > type.mechStride*2) raw = type.mechStride * 2 - raw;
+        else if(raw > type.mechStride) raw = type.mechStride * 2 - raw;
+
+        return raw;
+    }
+
+    @Override
+    public void moveAt(Vec2 vector, float acceleration){
+        if(!vector.isZero()){
+            //mark walking state when moving in a controlled manner
+            walked = true;
+        }
     }
 }
diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java
index 23b566c534..7049617b73 100644
--- a/core/src/mindustry/entities/comp/MinerComp.java
+++ b/core/src/mindustry/entities/comp/MinerComp.java
@@ -33,52 +33,56 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
     }
 
     boolean mining(){
-        return mineTile != null;
+        return mineTile != null && !(((Object)this) instanceof Builderc && ((Builderc)(Object)this).activelyBuilding());
     }
 
     @Override
     public void update(){
         Building core = closestCore();
 
-        if(core != null && mineTile != null && mineTile.drop() != null && !acceptsItem(mineTile.drop()) && within(core, mineTransferRange)){
+        if(core != null && mineTile != null && mineTile.drop() != null && !acceptsItem(mineTile.drop()) && within(core, mineTransferRange) && !offloadImmediately()){
             int accepted = core.acceptStack(item(), stack().amount, this);
             if(accepted > 0){
                 Call.transferItemTo(item(), accepted,
                 mineTile.worldx() + Mathf.range(tilesize / 2f),
-                mineTile.worldy() + Mathf.range(tilesize / 2f), core.tile());
+                mineTile.worldy() + Mathf.range(tilesize / 2f), core);
                 clearItem();
             }
         }
 
         if(mineTile == null || core == null || mineTile.block() != Blocks.air || dst(mineTile.worldx(), mineTile.worldy()) > miningRange
-        || (((Object)this) instanceof Builderc && ((Builderc)(Object)this).isBuilding())
-        || mineTile.drop() == null || !acceptsItem(mineTile.drop()) || !canMine(mineTile.drop())){
+        || mineTile.drop() == null || !canMine(mineTile.drop())){
             mineTile = null;
             mineTimer = 0f;
-        }else{
+        }else if(mining()){
             Item item = mineTile.drop();
-            rotation(Mathf.slerpDelta(rotation(), angleTo(mineTile.worldx(), mineTile.worldy()), 0.4f));
+            lookAt(angleTo(mineTile.worldx(), mineTile.worldy()));
             mineTimer += Time.delta *type.mineSpeed;
 
+            if(Mathf.chance(0.06 * Time.delta)){
+                Fx.pulverizeSmall.at(mineTile.worldx() + Mathf.range(tilesize / 2f), mineTile.worldy() + Mathf.range(tilesize / 2f), 0f, item.color);
+            }
+
             if(mineTimer >= 50f + item.hardness*10f){
                 mineTimer = 0;
 
                 if(within(core, mineTransferRange) && core.acceptStack(item, 1, this) == 1 && offloadImmediately()){
                     Call.transferItemTo(item, 1,
                     mineTile.worldx() + Mathf.range(tilesize / 2f),
-                    mineTile.worldy() + Mathf.range(tilesize / 2f), core.tile());
+                    mineTile.worldy() + Mathf.range(tilesize / 2f), core);
                 }else if(acceptsItem(item)){
                     //this is clientside, since items are synced anyway
                     InputHandler.transferItemToUnit(item,
                     mineTile.worldx() + Mathf.range(tilesize / 2f),
                     mineTile.worldy() + Mathf.range(tilesize / 2f),
                     this);
+                }else{
+                    mineTile = null;
+                    mineTimer = 0f;
                 }
             }
 
-            if(Mathf.chance(0.06 * Time.delta)){
-                Fx.pulverizeSmall.at(mineTile.worldx() + Mathf.range(tilesize / 2f), mineTile.worldy() + Mathf.range(tilesize / 2f), 0f, item.color);
-            }
+
         }
     }
 
diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
index 87d9e7509a..75bc07c21e 100644
--- a/core/src/mindustry/entities/comp/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -6,17 +6,36 @@ import arc.util.*;
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
 
 /** An entity that holds a payload. */
 @Component
-abstract class PayloadComp implements Posc, Rotc, Hitboxc{
+abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     @Import float x, y, rotation;
+    @Import UnitType type;
 
     Seq<Payload> payloads = new Seq<>();
 
+    float payloadUsed(){
+        return payloads.sumf(p -> p.size() * p.size());
+    }
+
+    boolean canPickup(Unit unit){
+        return payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity + 0.001f;
+    }
+
+    boolean canPickup(Building build){
+        return payloadUsed() + build.block.size * build.block.size * Vars.tilesize * Vars.tilesize <= type.payloadCapacity + 0.001f;
+    }
+
+    boolean canPickupPayload(Payload pay){
+        return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity + 0.001f;
+    }
+
     boolean hasPayload(){
         return payloads.size > 0;
     }
@@ -29,10 +48,13 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc{
         unit.remove();
         payloads.add(new UnitPayload(unit));
         Fx.unitPickup.at(unit);
+        if(Vars.net.client()){
+            Vars.netClient.clearRemovedEntity(unit.id);
+        }
     }
 
     void pickup(Building tile){
-        tile.tile().remove();
+        tile.tile.remove();
         payloads.add(new BlockPayload(tile));
         Fx.unitPickup.at(tile);
     }
@@ -52,6 +74,11 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc{
     boolean tryDropPayload(Payload payload){
         Tile on = tileOn();
 
+        //clear removed state of unit so it can be synced
+        if(Vars.net.client() && payload instanceof UnitPayload){
+            Vars.netClient.clearRemovedEntity(((UnitPayload)payload).unit.id);
+        }
+
         //drop off payload on an acceptor if possible
         if(on != null && on.build != null && on.build.acceptPayload(on.build, payload)){
             Fx.unitDrop.at(on.build);
@@ -71,15 +98,21 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc{
         Unit u = payload.unit;
 
         //can't drop ground units
-        if((tileOn() == null || tileOn().solid()) && u.elevation < 0.1f){
+        if(!u.canPass(tileX(), tileY())){
             return false;
         }
 
+        Fx.unitDrop.at(this);
+
+        //clients do not drop payloads
+        if(Vars.net.client()) return true;
+
         u.set(this);
         u.trns(Tmp.v1.rnd(Mathf.random(2f)));
         u.rotation(rotation);
+        //reset the ID to a new value to make sure it's synced
+        u.id = EntityGroup.nextId();
         u.add();
-        Fx.unitDrop.at(u);
 
         return true;
     }
@@ -87,9 +120,9 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc{
     /** @return whether the tile has been successfully placed. */
     boolean dropBlock(BlockPayload payload){
         Building tile = payload.entity;
-        int tx = Vars.world.toTile(x - tile.block().offset), ty = Vars.world.toTile(y - tile.block().offset);
+        int tx = Vars.world.toTile(x - tile.block.offset), ty = Vars.world.toTile(y - tile.block.offset);
         Tile on = Vars.world.tile(tx, ty);
-        if(on != null && Build.validPlace(tile.block(), tile.team(), tx, ty, tile.rotation())){
+        if(on != null && Build.validPlace(tile.block, tile.team, tx, ty, tile.rotation, false)){
             int rot = (int)((rotation + 45f) / 90f) % 4;
             payload.place(on, rot);
 
diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java
index 4f4800daa7..dc99d75fb9 100644
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -33,11 +33,13 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
 
     @Import float x, y;
 
-    @NonNull @ReadOnly Unit unit = Nulls.unit;
+    @ReadOnly Unit unit = Nulls.unit;
+    transient private Unit lastReadUnit = Nulls.unit;
     transient @Nullable NetConnection con;
 
     @ReadOnly Team team = Team.sharded;
-    @SyncLocal boolean admin, typing, shooting, boosting;
+    @SyncLocal boolean typing, shooting, boosting;
+    boolean admin;
     @SyncLocal float mouseX, mouseY;
     String name = "noname";
     Color color = new Color();
@@ -54,11 +56,11 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return unit instanceof Minerc;
     }
 
-    public @Nullable CoreEntity closestCore(){
+    public @Nullable CoreBuild closestCore(){
         return state.teams.closestCore(x, y, team);
     }
 
-    public @Nullable CoreEntity core(){
+    public @Nullable CoreBuild core(){
         return team.core();
     }
 
@@ -69,6 +71,10 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return unit.icon();
     }
 
+    public boolean displayAmmo(){
+        return unit instanceof BlockUnitc || state.rules.unitAmmo;
+    }
+
     public void reset(){
         team = state.rules.defaultTeam;
         admin = typing = false;
@@ -86,11 +92,17 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
 
     @Replace
     public float clipSize(){
-        return unit.isNull() ? 20 : unit.type().hitsize * 2f;
+        return unit.isNull() ? 20 : unit.type().hitSize * 2f;
     }
 
     @Override
     public void afterSync(){
+        //simulate a unit change after sync
+        Unit set = unit;
+        unit = lastReadUnit;
+        unit(set);
+        lastReadUnit = unit;
+
         unit.aim(mouseX, mouseY);
         //this is only necessary when the thing being controlled isn't synced
         unit.controlWeapons(shooting, shooting);
@@ -104,7 +116,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
             clearUnit();
         }
 
-        CoreEntity core = closestCore();
+        CoreBuild core = closestCore();
 
         if(!dead()){
             set(unit);
@@ -114,7 +126,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
             //update some basic state to sync things
             if(unit.type().canBoost){
                 Tile tile = unit.tileOn();
-                unit.elevation(Mathf.approachDelta(unit.elevation, (tile != null && tile.solid()) || boosting ? 1f : 0f, 0.08f));
+                unit.elevation = Mathf.approachDelta(unit.elevation, (tile != null && tile.solid()) || boosting ? 1f : 0f, 0.08f);
             }
         }else if(core != null){
             //have a small delay before death to prevent the camera from jumping around too quickly
@@ -122,7 +134,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
             deathTimer += Time.delta;
             if(deathTimer >= deathDelay){
                 //request spawn - this happens serverside only
-                core.requestSpawn(base());
+                core.requestSpawn(self());
                 deathTimer = 0;
             }
         }
@@ -163,6 +175,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
     public void unit(Unit unit){
         if(unit == null) throw new IllegalArgumentException("Unit cannot be null. Use clearUnit() instead.");
         if(this.unit == unit) return;
+
         if(this.unit != Nulls.unit){
             //un-control the old unit
             this.unit.controller(this.unit.type().createController());
@@ -171,9 +184,14 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         if(unit != Nulls.unit){
             unit.team(team);
             unit.controller(this);
+
+            //this player just became remote, snap the interpolation so it doesn't go wild
+            if(unit.isRemote()){
+                unit.snapInterpolation();
+            }
         }
 
-        Events.fire(new UnitChangeEvent(base(), unit));
+        Events.fire(new UnitChangeEvent(self(), unit));
     }
 
     boolean dead(){
@@ -205,7 +223,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         Draw.z(Layer.playerName);
         float z = Drawf.text();
 
-        BitmapFont font = Fonts.def;
+        Font font = Fonts.def;
         GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
         final float nameHeight = 11;
         final float textHeight = 15;
diff --git a/core/src/mindustry/entities/comp/PosComp.java b/core/src/mindustry/entities/comp/PosComp.java
index e004b6db89..d43d097bac 100644
--- a/core/src/mindustry/entities/comp/PosComp.java
+++ b/core/src/mindustry/entities/comp/PosComp.java
@@ -45,11 +45,16 @@ abstract class PosComp implements Position{
         return tile == null || tile.block() != Blocks.air ? (Floor)Blocks.air : tile.floor();
     }
 
-     Block blockOn(){
+    Block blockOn(){
         Tile tile = tileOn();
         return tile == null ? Blocks.air : tile.block();
     }
 
+    boolean onSolid(){
+        Tile tile = tileOn();
+        return tile != null && tile.solid();
+    }
+
     @Nullable Tile tileOn(){
         return world.tileWorld(x, y);
     }
diff --git a/core/src/mindustry/entities/comp/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java
index 35ab03416c..669ee7e1f2 100644
--- a/core/src/mindustry/entities/comp/PuddleComp.java
+++ b/core/src/mindustry/entities/comp/PuddleComp.java
@@ -128,6 +128,6 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
 
     @Override
     public void afterRead(){
-        Puddles.register(base());
+        Puddles.register(self());
     }
 }
diff --git a/core/src/mindustry/entities/comp/ShieldComp.java b/core/src/mindustry/entities/comp/ShieldComp.java
index 5125faa96e..c0fb68d78a 100644
--- a/core/src/mindustry/entities/comp/ShieldComp.java
+++ b/core/src/mindustry/entities/comp/ShieldComp.java
@@ -23,7 +23,6 @@ abstract class ShieldComp implements Healthc, Posc{
     @Override
     public void damage(float amount){
         //apply armor
-        //TODO balancing of armor stats & minArmorDamage
         amount = Math.max(amount - armor, minArmorDamage * amount);
 
         hitTime = 1f;
diff --git a/core/src/mindustry/entities/comp/StatusComp.java b/core/src/mindustry/entities/comp/StatusComp.java
index bf61535026..3a31b13b95 100644
--- a/core/src/mindustry/entities/comp/StatusComp.java
+++ b/core/src/mindustry/entities/comp/StatusComp.java
@@ -1,7 +1,6 @@
 package mindustry.entities.comp;
 
 import arc.graphics.*;
-import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.pooling.*;
@@ -22,10 +21,7 @@ abstract class StatusComp implements Posc, Flyingc{
 
     @ReadOnly transient float speedMultiplier = 1, damageMultiplier = 1, armorMultiplier = 1, reloadMultiplier = 1;
 
-    /** @return damage taken based on status armor multipliers */
-    float getShieldDamage(float amount){
-        return amount * Mathf.clamp(1f - armorMultiplier / 100f);
-    }
+    @Import UnitType type;
 
     /** Apply a status effect for 1 tick (for permanent effects) **/
     void apply(StatusEffect effect){
@@ -46,7 +42,7 @@ abstract class StatusComp implements Posc, Flyingc{
                     return;
                 }else if(entry.effect.reactsWith(effect)){ //find opposite
                     StatusEntry.tmp.effect = entry.effect;
-                    entry.effect.getTransition(base(), effect, entry.time, duration, StatusEntry.tmp);
+                    entry.effect.getTransition(self(), effect, entry.time, duration, StatusEntry.tmp);
                     entry.time = StatusEntry.tmp.time;
 
                     if(StatusEntry.tmp.effect != entry.effect){
@@ -102,7 +98,7 @@ abstract class StatusComp implements Posc, Flyingc{
     @Override
     public void update(){
         Floor floor = floorOn();
-        if(isGrounded()){
+        if(isGrounded() && !type.hovering){
             //apply effect
             apply(floor.status, floor.statusDuration);
         }
@@ -129,14 +125,14 @@ abstract class StatusComp implements Posc, Flyingc{
                 armorMultiplier *= entry.effect.armorMultiplier;
                 damageMultiplier *= entry.effect.damageMultiplier;
                 reloadMultiplier *= entry.effect.reloadMultiplier;
-                entry.effect.update(base(), entry.time);
+                entry.effect.update(self(), entry.time);
             }
         }
     }
 
     public void draw(){
         for(StatusEntry e : statuses){
-            e.effect.draw(base());
+            e.effect.draw(self());
         }
     }
 
diff --git a/core/src/mindustry/entities/comp/SyncComp.java b/core/src/mindustry/entities/comp/SyncComp.java
index 0fd3d06cae..8875df0967 100644
--- a/core/src/mindustry/entities/comp/SyncComp.java
+++ b/core/src/mindustry/entities/comp/SyncComp.java
@@ -13,6 +13,7 @@ abstract class SyncComp implements Entityc{
 
     //all these method bodies are internally generated
     void snapSync(){}
+    void snapInterpolation(){}
     void readSync(Reads read){}
     void writeSync(Writes write){}
     void readSyncManual(FloatBuffer buffer){}
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index e4aac95a3a..cb88d312ca 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -5,16 +5,21 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
+import mindustry.ai.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.ctype.*;
 import mindustry.entities.*;
+import mindustry.entities.abilities.*;
 import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
@@ -23,18 +28,19 @@ import mindustry.world.blocks.environment.*;
 import static mindustry.Vars.*;
 
 @Component(base = true)
-abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Displayable{
+abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Displayable, Senseable{
 
-    @Import boolean hovering;
-    @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health;
-    @Import boolean dead;
+    @Import boolean hovering, dead;
+    @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, ammo;
     @Import Team team;
+    @Import int id;
 
     private UnitController controller;
     private UnitType type;
-    boolean spawnedByCore, deactivated;
+    boolean spawnedByCore;
 
-    transient float timer1, timer2;
+    transient Seq<Ability> abilities = new Seq<>(0);
+    private transient float resupplyTime = Mathf.random(10f);
 
     public void moveAt(Vec2 vector){
         moveAt(vector, type.accel);
@@ -50,13 +56,66 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         lookAt(x, y);
     }
 
+    public boolean inRange(Position other){
+        return within(other, type.range);
+    }
+
     public boolean hasWeapons(){
         return type.hasWeapons();
     }
 
+    public float range(){
+        return type.range;
+    }
+
     @Replace
     public float clipSize(){
-        return type.region.getWidth() * 2f;
+        return Math.max(type.region.width * 2f, type.clipSize);
+    }
+
+    @Override
+    public double sense(LAccess sensor){
+        return switch(sensor){
+            case totalItems -> stack().amount;
+            case rotation -> rotation;
+            case health -> health;
+            case maxHealth -> maxHealth;
+            case x -> x;
+            case y -> y;
+            case team -> team.id;
+            case shooting -> isShooting() ? 1 : 0;
+            case shootX -> aimX();
+            case shootY -> aimY();
+            default -> 0;
+        };
+    }
+
+    @Override
+    public Object senseObject(LAccess sensor){
+        return switch(sensor){
+            case type -> type;
+            default -> noSensed;
+        };
+
+    }
+
+    @Override
+    public double sense(Content content){
+        if(content == stack().item) return stack().amount;
+        return 0;
+    }
+
+    @Override
+    @Replace
+    public boolean canDrown(){
+        return isGrounded() && !hovering && type.canDrown;
+    }
+
+    @Override
+    @Replace
+    public boolean canShoot(){
+        //cannot shoot while boosting
+        return !(type.canBoost && isFlying());
     }
 
     @Override
@@ -72,7 +131,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     @Override
     public void controller(UnitController next){
         this.controller = next;
-        if(controller.unit() != base()) controller.unit(base());
+        if(controller.unit() != self()) controller.unit(self());
     }
 
     @Override
@@ -102,8 +161,13 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         return type;
     }
 
+    /** @return pathfinder path type for calculating costs */
+    public int pathType(){
+        return Pathfinder.costGround;
+    }
+
     public void lookAt(float angle){
-        rotation = Angles.moveToward(rotation, angle, type.rotateSpeed * Time.delta);
+        rotation = Angles.moveToward(rotation, angle, type.rotateSpeed * Time.delta * speedMultiplier());
     }
 
     public void lookAt(Position pos){
@@ -126,24 +190,26 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         return Units.getCap(team);
     }
 
-    private void setStats(UnitType type){
+    public void setStats(UnitType type){
         this.type = type;
         this.maxHealth = type.health;
         this.drag = type.drag;
-        this.elevation = type.flying ? 1f : 0;
         this.armor = type.armor;
-        this.hitSize = type.hitsize;
+        this.hitSize = type.hitSize;
         this.hovering = type.hovering;
 
         if(controller == null) controller(type.createController());
         if(mounts().length != type.weapons.size) setupWeapons(type);
+        if(abilities.size != type.abilities.size){
+            abilities = type.abilities.map(Ability::copy);
+        }
     }
 
     @Override
     public void afterSync(){
         //set up type info after reading
         setStats(this.type);
-        controller.unit(base());
+        controller.unit(self());
     }
 
     @Override
@@ -155,46 +221,55 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     @Override
     public void add(){
-        teamIndex.updateCount(team, type, 1);
 
         //check if over unit cap
-        if(count() > cap() && !spawnedByCore){
-            deactivated = true;
-        }else{
-            teamIndex.updateActiveCount(team, type, 1);
+        if(count() > cap() && !spawnedByCore && !dead){
+            Call.unitCapDeath(self());
+            teamIndex.updateCount(team, type, -1);
         }
     }
 
     @Override
     public void remove(){
         teamIndex.updateCount(team, type, -1);
-        controller.removed(base());
+        controller.removed(self());
     }
 
     @Override
     public void landed(){
         if(type.landShake > 0f){
-            Effects.shake(type.landShake, type.landShake, this);
+            Effect.shake(type.landShake, type.landShake, this);
         }
 
-        type.landed(base());
+        type.landed(self());
     }
 
     @Override
     public void update(){
-        //activate the unit when possible
-        if(!net.client() && deactivated && teamIndex.countActive(team, type) < Units.getCap(team)){
-            teamIndex.updateActiveCount(team, type, 1);
-            deactivated = false;
+
+        type.update(self());
+
+        if(state.rules.unitAmmo && ammo < type.ammoCapacity - 0.0001f){
+            resupplyTime += Time.delta;
+
+            //resupply only at a fixed interval to prevent lag
+            if(resupplyTime > 10f){
+                type.ammoType.resupply(self());
+                resupplyTime = 0f;
+            }
         }
 
-        if(!deactivated) type.update(base());
+        if(abilities.size > 0){
+            for(Ability a : abilities){
+                a.update(self());
+            }
+        }
 
         drag = type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f);
 
         //apply knockback based on spawns
         if(team != state.rules.waveTeam){
-            float relativeSize = state.rules.dropZoneRadius + bounds()/2f + 1f;
+            float relativeSize = state.rules.dropZoneRadius + hitSize/2f + 1f;
             for(Tile spawn : spawner.getSpawns()){
                 if(within(spawn.worldx(), spawn.worldy(), relativeSize)){
                     vel().add(Tmp.v1.set(this).sub(spawn.worldx(), spawn.worldy()).setLength(0.1f + 1f - dst(spawn) / relativeSize).scl(0.45f * Time.delta));
@@ -203,7 +278,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         }
 
         //simulate falling down
-        if(dead){
+        if(dead || health <= 0){
             //less drag when dead
             drag = 0.01f;
 
@@ -238,7 +313,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         if(tile != null && isGrounded() && !type.hovering){
             //unit block update
             if(tile.build != null){
-                tile.build.unitOn(base());
+                tile.build.unitOn(self());
             }
 
             //apply damage
@@ -247,19 +322,29 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             }
         }
 
+        //kill entities on tiles that are solid to them
+        if(tile != null && !canPassOn()){
+            //boost if possible
+            if(type.canBoost){
+                elevation = 1f;
+            }else if(!net.client()){
+                kill();
+            }
+        }
+
         //AI only updates on the server
-        if(!net.client() && !dead && !deactivated){
+        if(!net.client() && !dead){
             controller.updateUnit();
         }
 
-        //do not control anything when deactivated
-        if(deactivated){
-            controlWeapons(false, false);
+        //clear controller when it becomes invalid
+        if(!controller.isValidController()){
+            resetController();
         }
 
         //remove units spawned by the core
         if(spawnedByCore && !isPlayer()){
-            Call.unitDespawn(base());
+            Call.unitDespawn(self());
         }
     }
 
@@ -270,18 +355,18 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     /** Actually destroys the unit, removing it and creating explosions. **/
     public void destroy(){
-        float explosiveness = 2f + item().explosiveness * stack().amount;
-        float flammability = item().flammability * stack().amount;
-        Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, Pal.darkFlame);
+        float explosiveness = 2f + item().explosiveness * stack().amount / 2f;
+        float flammability = item().flammability * stack().amount / 2f;
+        Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, Pal.darkFlame, state.rules.damageExplosions);
 
         float shake = hitSize / 3f;
 
-        Effects.scorch(x, y, (int)(hitSize / 5));
+        Effect.scorch(x, y, (int)(hitSize / 5));
         Fx.explosion.at(this);
-        Effects.shake(shake, shake, this);
+        Effect.shake(shake, shake, this);
         type.deathSound.at(this);
 
-        Events.fire(new UnitDestroyEvent(base()));
+        Events.fire(new UnitDestroyEvent(self()));
 
         if(explosiveness > 7f && isLocal()){
             Events.fire(Trigger.suicideBomb);
@@ -289,15 +374,15 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
         //if this unit crash landed (was flying), damage stuff in a radius
         if(type.flying){
-            Damage.damage(team,x, y, hitSize * 1.1f, hitSize * type.crashDamageMultiplier, true, false, true);
+            Damage.damage(team,x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f, true, false, true);
         }
 
         if(!headless){
             for(int i = 0; i < type.wreckRegions.length; i++){
                 if(type.wreckRegions[i].found()){
-                    float range = type.hitsize/4f;
+                    float range = type.hitSize /4f;
                     Tmp.v1.rnd(range);
-                    Effects.decal(type.wreckRegions[i], x + Tmp.v1.x, y + Tmp.v1.y, rotation - 90);
+                    Effect.decal(type.wreckRegions[i], x + Tmp.v1.x, y + Tmp.v1.y, rotation - 90);
                 }
             }
         }
@@ -307,7 +392,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     @Override
     public void display(Table table){
-        type.display(base(), table);
+        type.display(self(), table);
     }
 
     @Override
@@ -317,7 +402,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     @Override
     public void draw(){
-        type.draw(base());
+        type.draw(self());
     }
 
     @Override
@@ -336,7 +421,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         dead = true;
 
         //don't waste time when the unit is already on the ground, just destroy it
-        if(isGrounded()){
+        if(!type.flying){
             destroy();
         }
     }
@@ -347,6 +432,6 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         if(dead || net.client()) return;
 
         //deaths are synced; this calls killed()
-        Call.unitDeath(base());
+        Call.unitDeath(id);
     }
 }
diff --git a/core/src/mindustry/entities/comp/VelComp.java b/core/src/mindustry/entities/comp/VelComp.java
index b01e6322ce..deec6756d1 100644
--- a/core/src/mindustry/entities/comp/VelComp.java
+++ b/core/src/mindustry/entities/comp/VelComp.java
@@ -1,10 +1,15 @@
 package mindustry.entities.comp;
 
+import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
+import arc.util.ArcAnnotate.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.entities.EntityCollisions.*;
 import mindustry.gen.*;
 
+import static mindustry.Vars.*;
+
 @Component
 abstract class VelComp implements Posc{
     @Import float x, y;
@@ -18,7 +23,24 @@ abstract class VelComp implements Posc{
     @Override
     public void update(){
         move(vel.x * Time.delta, vel.y * Time.delta);
-        vel.scl(1f - drag * Time.delta);
+        vel.scl(Mathf.clamp(1f - drag * Time.delta));
+    }
+
+    /** @return function to use for check solid state. if null, no checking is done. */
+    @Nullable
+    SolidPred solidity(){
+        return null;
+    }
+
+    /** @return whether this entity can move through a location*/
+    boolean canPass(int tileX, int tileY){
+        SolidPred s = solidity();
+        return s == null || !s.solid(tileX, tileY);
+    }
+
+    /** @return whether this entity can exist on its current location*/
+    boolean canPassOn(){
+        return canPass(tileX(), tileY());
     }
 
     boolean moving(){
@@ -26,7 +48,13 @@ abstract class VelComp implements Posc{
     }
 
     void move(float cx, float cy){
-        x += cx;
-        y += cy;
+        SolidPred check = solidity();
+
+        if(check != null){
+            collisions.move(self(), cx, cy, check);
+        }else{
+            x += cx;
+            y += cy;
+        }
     }
 }
diff --git a/core/src/mindustry/entities/comp/WaterMoveComp.java b/core/src/mindustry/entities/comp/WaterMoveComp.java
index 3cc371eade..f87679efdb 100644
--- a/core/src/mindustry/entities/comp/WaterMoveComp.java
+++ b/core/src/mindustry/entities/comp/WaterMoveComp.java
@@ -4,16 +4,17 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
+import mindustry.ai.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.entities.EntityCollisions.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 
-import static mindustry.Vars.*;
-
 //just a proof of concept
 @Component
 abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
@@ -35,13 +36,26 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
         }
     }
 
+    @Override
+    @Replace
+    public int pathType(){
+        return Pathfinder.costWater;
+    }
+
+    @Override
+    public void add(){
+        tleft.clear();
+        tright.clear();
+    }
+
+    @Override
     public void draw(){
         float z = Draw.z();
 
         Draw.z(Layer.debris);
 
-        Floor floor = floorOn();
-        Color color = Tmp.c1.set(floor.mapColor).mul(1.5f);
+        Floor floor = tileOn() == null ? Blocks.air.asFloor() : tileOn().floor();
+        Color color = Tmp.c1.set(floor.mapColor.equals(Color.black) ? Blocks.water.mapColor : floor.mapColor).mul(1.5f);
         trailColor.lerp(color, Mathf.clamp(Time.delta * 0.04f));
 
         tleft.draw(trailColor, type.trailScl);
@@ -52,19 +66,8 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
 
     @Replace
     @Override
-    public void move(float cx, float cy){
-        if(isGrounded()){
-            collisions.moveCheck(this, cx, cy, EntityCollisions::waterSolid);
-        }else{
-            x += cx;
-            y += cy;
-        }
-    }
-
-    @Replace
-    @Override
-    public boolean canDrown(){
-        return false;
+    public SolidPred solidity(){
+        return isFlying() ? null : EntityCollisions::waterSolid;
     }
 
     @Replace
@@ -72,5 +75,10 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
         Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();
         return on.isDeep() ? 1.3f : 1f;
     }
+
+    public boolean onLiquid(){
+        Tile tile = tileOn();
+        return tile != null && tile.floor().isLiquid;
+    }
 }
 
diff --git a/core/src/mindustry/entities/comp/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java
index b05800d702..d826ba555f 100644
--- a/core/src/mindustry/entities/comp/WeaponsComp.java
+++ b/core/src/mindustry/entities/comp/WeaponsComp.java
@@ -13,37 +13,35 @@ import mindustry.type.*;
 import static mindustry.Vars.*;
 
 @Component
-abstract class WeaponsComp implements Teamc, Posc, Rotc{
+abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
     @Import float x, y, rotation, reloadMultiplier;
+    @Import Vec2 vel;
+    @Import UnitType type;
 
-    /** minimum cursor distance from unit, fixes 'cross-eyed' shooting */
-    static final float minAimDst = 18f;
     /** temporary weapon sequence number */
     static int sequenceNum = 0;
 
     /** weapon mount array, never null */
     @SyncLocal WeaponMount[] mounts = {};
-    @ReadOnly transient float range, aimX, aimY;
+    @ReadOnly transient float aimX, aimY;
     @ReadOnly transient boolean isRotate;
     boolean isShooting;
     float ammo;
 
+    float ammof(){
+        return ammo / type.ammoCapacity;
+    }
+
     void setWeaponRotation(float rotation){
         for(WeaponMount mount : mounts){
             mount.rotation = rotation;
         }
     }
 
-    boolean inRange(Position other){
-        return within(other, range);
-    }
-
     void setupWeapons(UnitType def){
         mounts = new WeaponMount[def.weapons.size];
-        range = def.range;
         for(int i = 0; i < mounts.length; i++){
             mounts[i] = new WeaponMount(def.weapons.get(i));
-            range = Math.max(range, def.weapons.get(i).bullet.range());
         }
     }
 
@@ -67,7 +65,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
     /** Aim at something. This will make all mounts point at it. */
     void aim(float x, float y){
         Tmp.v1.set(x, y).sub(this.x, this.y);
-        if(Tmp.v1.len() < minAimDst) Tmp.v1.setLength(minAimDst);
+        if(Tmp.v1.len() < type.aimDst) Tmp.v1.setLength(type.aimDst);
 
         x = Tmp.v1.x + this.x;
         y = Tmp.v1.y + this.y;
@@ -81,13 +79,50 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
         aimY = y;
     }
 
+    boolean canShoot(){
+        return true;
+    }
+
+    @Override
+    public void remove(){
+        for(WeaponMount mount : mounts){
+            if(mount.bullet != null){
+                mount.bullet.time = mount.bullet.lifetime - 10f;
+                mount.bullet = null;
+            }
+        }
+    }
+
     /** Update shooting and rotation for this unit. */
     @Override
     public void update(){
+        boolean can = canShoot();
+
         for(WeaponMount mount : mounts){
             Weapon weapon = mount.weapon;
             mount.reload = Math.max(mount.reload - Time.delta * reloadMultiplier, 0);
 
+            float weaponRotation = this.rotation - 90 + (weapon.rotate ? mount.rotation : 0);
+            float mountX = this.x + Angles.trnsx(this.rotation - 90, weapon.x, weapon.y),
+                mountY = this.y + Angles.trnsy(this.rotation - 90, weapon.x, weapon.y);
+            float shootX = mountX + Angles.trnsx(weaponRotation, weapon.shootX, weapon.shootY),
+                shootY = mountY + Angles.trnsy(weaponRotation, weapon.shootX, weapon.shootY);
+            float shootAngle = weapon.rotate ? weaponRotation + 90 : Angles.angle(shootX, shootY, mount.aimX, mount.aimY) + (this.rotation - angleTo(mount.aimX, mount.aimY));
+
+            //update continuous state
+            if(weapon.continuous && mount.bullet != null){
+                if(!mount.bullet.isAdded() || mount.bullet.time >= mount.bullet.lifetime){
+                    mount.bullet = null;
+                }else{
+                    mount.bullet.rotation(weaponRotation + 90);
+                    mount.bullet.set(shootX, shootY);
+                    vel.add(Tmp.v1.trns(rotation + 180f, mount.bullet.type.recoil));
+                }
+            }else{
+                //heat decreases when not firing
+                mount.heat = Math.max(mount.heat - Time.delta * reloadMultiplier / mount.weapon.cooldownTime, 0);
+            }
+
             //flip weapon shoot side for alternating weapons at half reload
             if(weapon.otherSide != -1 && weapon.alternate && mount.side == weapon.flipSprite &&
                 mount.reload + Time.delta > weapon.reload/2f && mount.reload <= weapon.reload/2f){
@@ -96,37 +131,28 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
             }
 
             //rotate if applicable
-            if(weapon.rotate && (mount.rotate || mount.shoot)){
-                float axisX = this.x + Angles.trnsx(rotation - 90,  weapon.x, weapon.y),
-                    axisY = this.y + Angles.trnsy(rotation - 90,  weapon.x, weapon.y);
+            if(weapon.rotate && (mount.rotate || mount.shoot) && can){
+                float axisX = this.x + Angles.trnsx(this.rotation - 90,  weapon.x, weapon.y),
+                    axisY = this.y + Angles.trnsy(this.rotation - 90,  weapon.x, weapon.y);
 
-                mount.targetRotation = Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - rotation;
+                mount.targetRotation = Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - this.rotation;
                 mount.rotation = Angles.moveToward(mount.rotation, mount.targetRotation, weapon.rotateSpeed * Time.delta);
-            }else{
+            }else if(!weapon.rotate){
                 mount.rotation = 0;
                 mount.targetRotation = angleTo(mount.aimX, mount.aimY);
             }
 
             //shoot if applicable
             if(mount.shoot && //must be shooting
+                can && //must be able to shoot
                 (ammo > 0 || !state.rules.unitAmmo || team().rules().infiniteAmmo) && //check ammo
                 (!weapon.alternate || mount.side == weapon.flipSprite) &&
+                //TODO checking for velocity this way isn't entirely correct
+                (vel.len() >= mount.weapon.minShootVelocity || (net.active() && !isLocal())) && //check velocity requirements
                 mount.reload <= 0.0001f && //reload has to be 0
                 Angles.within(weapon.rotate ? mount.rotation : this.rotation, mount.targetRotation, mount.weapon.shootCone) //has to be within the cone
             ){
-
-                float rotation = this.rotation - 90;
-                float weaponRotation = rotation + (weapon.rotate ? mount.rotation : 0);
-
-                //m a t h
-
-                float mountX = this.x + Angles.trnsx(rotation, weapon.x, weapon.y),
-                    mountY = this.y + Angles.trnsy(rotation, weapon.x, weapon.y);
-                float shootX = mountX + Angles.trnsx(weaponRotation, weapon.shootX, weapon.shootY),
-                    shootY = mountY + Angles.trnsy(weaponRotation, weapon.shootX, weapon.shootY);
-                float shootAngle = weapon.rotate ? weaponRotation + 90 : Angles.angle(shootX, shootY, mount.aimX, mount.aimY) + (this.rotation - angleTo(mount.aimX, mount.aimY));
-
-                shoot(weapon, shootX, shootY, mount.aimX, mount.aimY, shootAngle, Mathf.sign(weapon.x));
+                shoot(mount, shootX, shootY, mount.aimX, mount.aimY, shootAngle, Mathf.sign(weapon.x));
 
                 mount.reload = weapon.reload;
 
@@ -136,7 +162,8 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
         }
     }
 
-    private void shoot(Weapon weapon, float x, float y, float aimX, float aimY, float rotation, int side){
+    private void shoot(WeaponMount mount, float x, float y, float aimX, float aimY, float rotation, int side){
+        Weapon weapon = mount.weapon;
 
         float baseX = this.x, baseY = this.y;
 
@@ -146,27 +173,46 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
         float lifeScl = ammo.scaleVelocity ? Mathf.clamp(Mathf.dst(x, y, aimX, aimY) / ammo.range()) : 1f;
 
         sequenceNum = 0;
-        if(weapon.shotDelay > 0.01f){
+        if(weapon.shotDelay + weapon.firstShotDelay > 0.01f){
             Angles.shotgun(weapon.shots, weapon.spacing, rotation, f -> {
-                Time.run(sequenceNum * weapon.shotDelay, () -> bullet(weapon, x + this.x - baseX, y + this.y - baseY, f + Mathf.range(weapon.inaccuracy), lifeScl));
+                Time.run(sequenceNum * weapon.shotDelay + weapon.firstShotDelay, () -> {
+                    if(!isAdded()) return;
+                    mount.bullet = bullet(weapon, x + this.x - baseX, y + this.y - baseY, f + Mathf.range(weapon.inaccuracy), lifeScl);
+                });
                 sequenceNum++;
             });
         }else{
-            Angles.shotgun(weapon.shots, weapon.spacing, rotation, f -> bullet(weapon, x, y, f + Mathf.range(weapon.inaccuracy), lifeScl));
+            Angles.shotgun(weapon.shots, weapon.spacing, rotation, f -> mount.bullet = bullet(weapon, x, y, f + Mathf.range(weapon.inaccuracy), lifeScl));
         }
 
-        if(this instanceof Velc){
-            ((Velc)this).vel().add(Tmp.v1.trns(rotation + 180f, ammo.recoil));
-        }
         boolean parentize = ammo.keepVelocity;
 
-        Effects.shake(weapon.shake, weapon.shake, x, y);
+        if(weapon.firstShotDelay > 0){
+            Time.run(weapon.firstShotDelay, () -> {
+                if(!isAdded()) return;
+
+                vel.add(Tmp.v1.trns(rotation + 180f, ammo.recoil));
+                Effect.shake(weapon.shake, weapon.shake, x, y);
+                mount.heat = 1f;
+            });
+        }else{
+            vel.add(Tmp.v1.trns(rotation + 180f, ammo.recoil));
+            Effect.shake(weapon.shake, weapon.shake, x, y);
+            mount.heat = 1f;
+        }
+
         weapon.ejectEffect.at(x, y, rotation * side);
         ammo.shootEffect.at(x, y, rotation, parentize ? this : null);
         ammo.smokeEffect.at(x, y, rotation, parentize ? this : null);
+        apply(weapon.shootStatus, weapon.shootStatusDuration);
     }
 
-    private void bullet(Weapon weapon, float x, float y, float angle, float lifescl){
-        weapon.bullet.create(this, team(), x, y, angle, (1f - weapon.velocityRnd) + Mathf.random(weapon.velocityRnd), lifescl);
+    private Bullet bullet(Weapon weapon, float x, float y, float angle, float lifescl){
+        float xr = Mathf.range(weapon.xRand);
+
+        return weapon.bullet.create(this, team(),
+        x + Angles.trnsx(angle, 0, xr),
+        y + Angles.trnsy(angle, 0, xr),
+        angle, (1f - weapon.velocityRnd) + Mathf.random(weapon.velocityRnd), lifescl);
     }
 }
diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java
index 3a9d43e2b2..03d9daf8b4 100644
--- a/core/src/mindustry/entities/units/AIController.java
+++ b/core/src/mindustry/entities/units/AIController.java
@@ -2,51 +2,178 @@ package mindustry.entities.units;
 
 import arc.math.*;
 import arc.math.geom.*;
+import arc.util.ArcAnnotate.*;
 import arc.util.*;
+import mindustry.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.indexer;
+import static mindustry.Vars.*;
 
 public class AIController implements UnitController{
     protected static final Vec2 vec = new Vec2();
     protected static final int timerTarget = 0;
+    protected static final int timerTarget2 = 1;
+    protected static final int timerTarget3 = 2;
 
     protected Unit unit;
-    protected Teamc target;
     protected Interval timer = new Interval(4);
 
+    /** main target that is being faced */
+    protected Teamc target;
+    /** targets for each weapon */
+    protected Teamc[] targets = {};
+
     {
         timer.reset(0, Mathf.random(40f));
+        timer.reset(1, Mathf.random(60f));
     }
 
-    protected void targetClosestAllyFlag(BlockFlag flag){
-        Tile target = Geometry.findClosest(unit.x, unit.y, indexer.getAllied(unit.team, flag));
-        if(target != null) this.target = target.build;
+    @Override
+    public void updateUnit(){
+        updateVisuals();
+        updateTargeting();
+        updateMovement();
     }
 
-    protected void targetClosestEnemyFlag(BlockFlag flag){
-        Tile target = Geometry.findClosest(unit.x, unit.y, indexer.getEnemy(unit.team, flag));
-        if(target != null) this.target = target.build;
+    protected UnitCommand command(){
+        return unit.team.data().command;
+    }
+
+    protected void updateVisuals(){
+
+        if(unit.isFlying()){
+            unit.wobble();
+
+            if(unit.moving()){
+                unit.lookAt(unit.vel.angle());
+            }
+        }
+    }
+
+    protected void updateMovement(){
+
+    }
+
+    protected void updateTargeting(){
+        if(unit.hasWeapons()){
+            updateWeapons();
+        }
+    }
+
+    protected void updateWeapons(){
+        if(targets.length != unit.mounts.length) targets = new Teamc[unit.mounts.length];
+
+        float rotation = unit.rotation - 90;
+        boolean ret = retarget();
+
+        if(ret){
+            target = findTarget(unit.x, unit.y, unit.range(), unit.type().targetAir, unit.type().targetGround);
+        }
+
+        if(Units.invalidateTarget(target, unit.team, unit.x, unit.y)){
+            target = null;
+        }
+
+        for(int i = 0; i < targets.length; i++){
+            WeaponMount mount = unit.mounts[i];
+            Weapon weapon = mount.weapon;
+
+            float mountX = unit.x + Angles.trnsx(rotation, weapon.x, weapon.y),
+                mountY = unit.y + Angles.trnsy(rotation, weapon.x, weapon.y);
+
+            if(unit.type().singleTarget){
+                targets[i] = target;
+            }else{
+                if(ret){
+                    targets[i] = findTarget(mountX, mountY, weapon.bullet.range(), weapon.bullet.collidesAir, weapon.bullet.collidesGround);
+                }
+
+                if(Units.invalidateTarget(targets[i], unit.team, mountX, mountY, weapon.bullet.range())){
+                    targets[i] = null;
+                }
+            }
+
+            boolean shoot = false;
+
+            if(targets[i] != null){
+                shoot = targets[i].within(mountX, mountY, weapon.bullet.range());
+
+                if(shoot){
+                    Vec2 to = Predict.intercept(unit, targets[i], weapon.bullet.speed);
+                    mount.aimX = to.x;
+                    mount.aimY = to.y;
+                }
+            }
+
+            mount.shoot = shoot;
+            mount.rotate = shoot;
+        }
+    }
+
+    protected Teamc targetFlag(float x, float y, BlockFlag flag, boolean enemy){
+        Tile target = Geometry.findClosest(x, y, enemy ? indexer.getEnemy(unit.team, flag) : indexer.getAllied(unit.team, flag));
+        return target == null ? null : target.build;
+    }
+
+    protected Teamc target(float x, float y, float range, boolean air, boolean ground){
+        return Units.closestTarget(unit.team, x, y, range, u -> u.checkTarget(air, ground), t -> ground);
     }
 
     protected boolean retarget(){
         return timer.get(timerTarget, 30);
     }
 
-    protected void targetClosest(){
-        Teamc newTarget = Units.closestTarget(unit.team, unit.x, unit.y, Math.max(unit.range(), unit.type().range), u -> (unit.type().targetAir && u.isFlying()) || (unit.type().targetGround && !u.isFlying()));
-        if(newTarget != null){
-            target = newTarget;
-        }
+    protected Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
+        return target(x, y, range, air, ground);
     }
 
     protected void init(){
 
     }
 
+    protected @Nullable Tile getClosestSpawner(){
+        return Geometry.findClosest(unit.x, unit.y, Vars.spawner.getSpawns());
+    }
+
+    protected void circle(Position target, float circleLength){
+        circle(target, circleLength, unit.type().speed);
+    }
+
+    protected void circle(Position target, float circleLength, float speed){
+        if(target == null) return;
+
+        vec.set(target).sub(unit);
+
+        if(vec.len() < circleLength){
+            vec.rotate((circleLength - vec.len()) / circleLength * 180f);
+        }
+
+        vec.setLength(speed);
+
+        unit.moveAt(vec);
+    }
+
+    protected void moveTo(Position target, float circleLength){
+        if(target == null) return;
+
+        vec.set(target).sub(unit);
+
+        float length = circleLength <= 0.001f ? 1f : Mathf.clamp((unit.dst(target) - circleLength) / 100f, -1f, 1f);
+
+        vec.setLength(unit.type().speed * length);
+        if(length < -0.5f){
+            vec.rotate(180f);
+        }else if(length < 0){
+            vec.setZero();
+        }
+
+        unit.moveAt(vec);
+    }
+
     @Override
     public void unit(Unit unit){
         if(this.unit == unit) return;
diff --git a/core/src/mindustry/entities/units/BuildPlan.java b/core/src/mindustry/entities/units/BuildPlan.java
index 3e265cba92..fb4a7a2816 100644
--- a/core/src/mindustry/entities/units/BuildPlan.java
+++ b/core/src/mindustry/entities/units/BuildPlan.java
@@ -3,6 +3,7 @@ package mindustry.entities.units;
 import arc.func.*;
 import arc.math.geom.*;
 import arc.util.ArcAnnotate.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
@@ -15,8 +16,6 @@ public class BuildPlan{
     public @Nullable Block block;
     /** Whether this is a break request.*/
     public boolean breaking;
-    /** Whether this request comes with a config int. If yes, any blocks placed with this request will not call playerPlaced.*/
-    public boolean hasConfig;
     /** Config int. Not used unless hasConfig is true.*/
     public Object config;
     /** Original position, only used in schematics.*/
@@ -39,6 +38,16 @@ public class BuildPlan{
         this.breaking = false;
     }
 
+    /** This creates a build request with a config. */
+    public BuildPlan(int x, int y, int rotation, Block block, Object config){
+        this.x = x;
+        this.y = y;
+        this.rotation = rotation;
+        this.block = block;
+        this.breaking = false;
+        this.config = config;
+    }
+
     /** This creates a remove request. */
     public BuildPlan(int x, int y){
         this.x = x;
@@ -52,7 +61,8 @@ public class BuildPlan{
 
     }
 
-    public static Object pointConfig(Object config, Cons<Point2> cons){
+    /** Transforms the internal position of this config using the specified function, and return the result. */
+    public static Object pointConfig(Block block, Object config, Cons<Point2> cons){
         if(config instanceof Point2){
             config = ((Point2)config).cpy();
             cons.get((Point2)config);
@@ -64,14 +74,15 @@ public class BuildPlan{
                 cons.get(result[i++]);
             }
             config = result;
+        }else if(block != null){
+            config = block.pointConfig(config, cons);
         }
         return config;
     }
 
-    /** If this requests's config is a Point2 or an array of Point2s, this returns a copy of them for transformation.
-     * Otherwise does nothing. */
+    /** Transforms the internal position of this config using the specified function. */
     public void pointConfig(Cons<Point2> cons){
-        this.config = pointConfig(this.config, cons);
+        this.config = pointConfig(block, this.config, cons);
     }
 
     public BuildPlan copy(){
@@ -81,7 +92,6 @@ public class BuildPlan{
         copy.rotation = rotation;
         copy.block = block;
         copy.breaking = breaking;
-        copy.hasConfig = hasConfig;
         copy.config = config;
         copy.originalX = originalX;
         copy.originalY = originalY;
@@ -124,16 +134,14 @@ public class BuildPlan{
         return y*tilesize + block.offset;
     }
 
-    public BuildPlan configure(Object config){
-        this.config = config;
-        this.hasConfig = true;
-        return this;
-    }
-
     public @Nullable Tile tile(){
         return world.tile(x, y);
     }
 
+    public @Nullable Building build(){
+        return world.build(x, y);
+    }
+
     @Override
     public String toString(){
         return "BuildRequest{" +
diff --git a/core/src/mindustry/entities/units/StateMachine.java b/core/src/mindustry/entities/units/StateMachine.java
deleted file mode 100644
index 9181df106e..0000000000
--- a/core/src/mindustry/entities/units/StateMachine.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package mindustry.entities.units;
-
-public class StateMachine{
-    private UnitState state;
-
-    public void update(){
-        if(state != null) state.update();
-    }
-
-    public void set(UnitState next){
-        if(next == state) return;
-        if(state != null) state.exited();
-        this.state = next;
-        if(next != null) next.entered();
-    }
-
-    public UnitState current(){
-        return state;
-    }
-
-    public boolean is(UnitState state){
-        return this.state == state;
-    }
-
-    public interface UnitState{
-        default void entered(){
-        }
-
-        default void exited(){
-        }
-
-        default void update(){
-        }
-    }
-}
diff --git a/core/src/mindustry/entities/units/UnitCommand.java b/core/src/mindustry/entities/units/UnitCommand.java
index dada524b84..977150a92d 100644
--- a/core/src/mindustry/entities/units/UnitCommand.java
+++ b/core/src/mindustry/entities/units/UnitCommand.java
@@ -3,7 +3,7 @@ package mindustry.entities.units;
 import arc.*;
 
 public enum UnitCommand{
-    attack, retreat, rally;
+    attack, rally, idle;
 
     private final String localized;
     public static final UnitCommand[] all = values();
diff --git a/core/src/mindustry/entities/units/WeaponMount.java b/core/src/mindustry/entities/units/WeaponMount.java
index 89becb6dcf..f5aa45c4ea 100644
--- a/core/src/mindustry/entities/units/WeaponMount.java
+++ b/core/src/mindustry/entities/units/WeaponMount.java
@@ -1,5 +1,7 @@
 package mindustry.entities.units;
 
+import arc.util.ArcAnnotate.*;
+import mindustry.gen.*;
 import mindustry.type.*;
 
 public class WeaponMount{
@@ -11,6 +13,8 @@ public class WeaponMount{
     public float rotation;
     /** destination rotation; do not modify! */
     public float targetRotation;
+    /** current heat, 0 to 1*/
+    public float heat;
     /** aiming position in world coordinates */
     public float aimX, aimY;
     /** whether to shoot right now */
@@ -19,6 +23,8 @@ public class WeaponMount{
     public boolean rotate = false;
     /** extra state for alternating weapons */
     public boolean side;
+    /** current bullet for continuous weapons */
+    public @Nullable Bullet bullet;
 
     public WeaponMount(Weapon weapon){
         this.weapon = weapon;
diff --git a/core/src/mindustry/game/DefaultWaves.java b/core/src/mindustry/game/DefaultWaves.java
index b7388040f5..a889f9d4ba 100644
--- a/core/src/mindustry/game/DefaultWaves.java
+++ b/core/src/mindustry/game/DefaultWaves.java
@@ -1,41 +1,51 @@
 package mindustry.game;
 
-import arc.struct.Seq;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
 import mindustry.content.*;
-import mindustry.type.ItemStack;
+import mindustry.type.*;
+
+import static mindustry.content.UnitTypes.*;
 
 public class DefaultWaves{
     private Seq<SpawnGroup> spawns;
 
     public Seq<SpawnGroup> get(){
-        if(spawns == null && UnitTypes.dagger != null){
+        if(spawns == null && dagger != null){
             spawns = Seq.with(
-            new SpawnGroup(UnitTypes.dagger){{
+            new SpawnGroup(dagger){{
                 end = 10;
                 unitScaling = 2f;
             }},
 
-            new SpawnGroup(UnitTypes.crawler){{
+            new SpawnGroup(crawler){{
                 begin = 4;
                 end = 13;
                 unitAmount = 2;
                 unitScaling = 1.5f;
             }},
 
-            new SpawnGroup(UnitTypes.flare){{
+            new SpawnGroup(flare){{
                 begin = 12;
                 end = 16;
                 unitScaling = 1f;
             }},
 
-            new SpawnGroup(UnitTypes.dagger){{
+            new SpawnGroup(dagger){{
                 begin = 11;
                 unitScaling = 1.7f;
                 spacing = 2;
                 max = 4;
             }},
 
-            new SpawnGroup(UnitTypes.mace){{
+            new SpawnGroup(pulsar){{
+                begin = 13;
+                spacing = 3;
+                unitScaling = 0.5f;
+            }},
+
+            new SpawnGroup(mace){{
                 begin = 7;
                 spacing = 3;
                 unitScaling = 2;
@@ -43,28 +53,28 @@ public class DefaultWaves{
                 end = 30;
             }},
 
-            new SpawnGroup(UnitTypes.dagger){{
+            new SpawnGroup(dagger){{
                 begin = 8;
                 unitScaling = 1;
                 unitAmount = 4;
                 spacing = 2;
             }},
 
-            new SpawnGroup(UnitTypes.mace){{
+            new SpawnGroup(mace){{
                 begin = 28;
                 spacing = 3;
                 unitScaling = 1;
                 end = 40;
             }},
 
-            new SpawnGroup(UnitTypes.mace){{
+            new SpawnGroup(mace){{
                 begin = 45;
                 spacing = 3;
                 unitScaling = 2;
                 effect = StatusEffects.overdrive;
             }},
 
-            new SpawnGroup(UnitTypes.mace){{
+            new SpawnGroup(mace){{
                 begin = 120;
                 spacing = 2;
                 unitScaling = 3;
@@ -72,13 +82,13 @@ public class DefaultWaves{
                 effect = StatusEffects.overdrive;
             }},
 
-            new SpawnGroup(UnitTypes.flare){{
+            new SpawnGroup(flare){{
                 begin = 16;
                 unitScaling = 1;
                 spacing = 2;
             }},
 
-            new SpawnGroup(UnitTypes.dagger){{
+            new SpawnGroup(dagger){{
                 begin = 82;
                 spacing = 3;
                 unitAmount = 4;
@@ -86,7 +96,7 @@ public class DefaultWaves{
                 effect = StatusEffects.overdrive;
             }},
 
-            new SpawnGroup(UnitTypes.dagger){{
+            new SpawnGroup(dagger){{
                 begin = 41;
                 spacing = 5;
                 unitAmount = 1;
@@ -94,7 +104,7 @@ public class DefaultWaves{
                 effect = StatusEffects.shielded;
             }},
 
-            new SpawnGroup(UnitTypes.fortress){{
+            new SpawnGroup(fortress){{
                 begin = 40;
                 spacing = 5;
                 unitAmount = 2;
@@ -102,7 +112,7 @@ public class DefaultWaves{
                 max = 20;
             }},
 
-            new SpawnGroup(UnitTypes.dagger){{
+            new SpawnGroup(dagger){{
                 begin = 35;
                 spacing = 3;
                 unitAmount = 4;
@@ -111,7 +121,7 @@ public class DefaultWaves{
                 end = 60;
             }},
 
-            new SpawnGroup(UnitTypes.dagger){{
+            new SpawnGroup(dagger){{
                 begin = 42;
                 spacing = 3;
                 unitAmount = 4;
@@ -120,14 +130,14 @@ public class DefaultWaves{
                 end = 130;
             }},
 
-            new SpawnGroup(UnitTypes.horizon){{
+            new SpawnGroup(horizon){{
                 begin = 40;
                 unitAmount = 2;
                 spacing = 2;
                 unitScaling = 2;
             }},
 
-            new SpawnGroup(UnitTypes.flare){{
+            new SpawnGroup(flare){{
                 begin = 50;
                 unitAmount = 4;
                 unitScaling = 3;
@@ -135,7 +145,7 @@ public class DefaultWaves{
                 effect = StatusEffects.overdrive;
             }},
 
-            new SpawnGroup(UnitTypes.zenith){{
+            new SpawnGroup(zenith){{
                 begin = 50;
                 unitAmount = 2;
                 unitScaling = 3;
@@ -143,42 +153,42 @@ public class DefaultWaves{
                 max = 16;
             }},
 
-            new SpawnGroup(UnitTypes.horizon){{
+            new SpawnGroup(horizon){{
                 begin = 53;
                 unitAmount = 2;
                 unitScaling = 3;
                 spacing = 4;
             }},
 
-            new SpawnGroup(UnitTypes.atrax){{
+            new SpawnGroup(atrax){{
                 begin = 31;
                 unitAmount = 4;
                 unitScaling = 1;
                 spacing = 3;
             }},
 
-            new SpawnGroup(UnitTypes.vestige){{
+            new SpawnGroup(scepter){{
                 begin = 41;
                 unitAmount = 1;
                 unitScaling = 1;
                 spacing = 30;
             }},
 
-            new SpawnGroup(UnitTypes.cataclyst){{
+            new SpawnGroup(reign){{
                 begin = 81;
                 unitAmount = 1;
                 unitScaling = 1;
                 spacing = 40;
             }},
 
-            new SpawnGroup(UnitTypes.antumbra){{
+            new SpawnGroup(antumbra){{
                 begin = 131;
                 unitAmount = 1;
                 unitScaling = 1;
                 spacing = 40;
             }},
 
-            new SpawnGroup(UnitTypes.horizon){{
+            new SpawnGroup(horizon){{
                 begin = 90;
                 unitAmount = 2;
                 unitScaling = 3;
@@ -188,4 +198,76 @@ public class DefaultWaves{
         }
         return spawns == null ? new Seq<>() : spawns;
     }
+
+    //TODO move elsewhere
+    public static Seq<SpawnGroup> generate(){
+        UnitType[][] species = {
+        {dagger, mace, fortress, scepter, reign},
+        {nova, pulsar, quasar, vela, corvus},
+        {crawler, atrax, spiroct, arkyid, toxopid},
+        //{risso, minke, bryde, sei, omura}, //questionable choices
+        //{mono, poly, mega, quad, oct}, //do not attack
+        {flare, horizon, zenith, antumbra, eclipse}
+        };
+
+        //required progression:
+        //- extra periodic patterns
+
+        Seq<SpawnGroup> out = new Seq<>();
+
+        //max reasonable wave, after which everything gets boring
+        int cap = 400;
+
+        //main sequence
+        float shieldStart = 30, shieldsPerWave = 12;
+        UnitType[] curSpecies = Structs.random(species);
+        int curTier = 0;
+
+        for(int i = 0; i < cap;){
+            int f = i;
+            int next = Mathf.random(15, 25);
+
+            float shieldAmount = Math.max((i - shieldStart) * shieldsPerWave, 0);
+
+            //main progression
+            out.add(new SpawnGroup(curSpecies[Math.min(curTier, curSpecies.length - 1)]){{
+                unitAmount = f == 0 ? 1 : 10;
+                begin = f;
+                end = f + next >= cap ? never : f + next;
+                max = 16;
+                unitScaling = Mathf.random(1f, 2f);
+                shields = shieldAmount;
+                shieldScaling = shieldsPerWave;
+            }});
+
+            //extra progression that tails out, blends in
+            out.add(new SpawnGroup(curSpecies[Math.min(curTier, curSpecies.length - 1)]){{
+                unitAmount = 6;
+                begin = f + next;
+                end = f + next + Mathf.random(8, 12);
+                max = 10;
+                unitScaling = Mathf.random(2f);
+                spacing = Mathf.random(2, 3);
+                shields = shieldAmount;
+                shieldScaling = shieldsPerWave;
+            }});
+
+            i += next;
+            if(curTier < 3 || Mathf.chance(0.2)){
+                curTier ++;
+            }
+
+            //do not spawn bosses
+            curTier = Math.min(curTier, 3);
+
+            //small chance to switch species
+            if(Mathf.chance(0.2)){
+                curSpecies = Structs.random(species);
+            }
+        }
+
+
+
+        return out;
+    }
 }
diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java
index e3915e4b45..fbfa0ab032 100644
--- a/core/src/mindustry/game/EventType.java
+++ b/core/src/mindustry/game/EventType.java
@@ -5,6 +5,7 @@ import mindustry.core.GameState.*;
 import mindustry.ctype.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
+import mindustry.net.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
@@ -29,12 +30,16 @@ public class EventType{
         openWiki,
         teamCoreDamage,
         socketConfigChanged,
-        update
+        update,
+        draw,
+        preDraw,
+        postDraw,
+        uiDrawBegin,
+        uiDrawEnd
     }
 
     public static class WinEvent{}
     public static class LoseEvent{}
-    public static class LaunchEvent{}
     public static class ResizeEvent{}
     public static class MapMakeEvent{}
     public static class MapPublishEvent{}
@@ -76,7 +81,6 @@ public class EventType{
         }
     }
 
-
     public static class CommandIssueEvent{
         public final Building tile;
         public final UnitCommand command;
@@ -87,6 +91,14 @@ public class EventType{
         }
     }
 
+    public static class ClientPreConnectEvent{
+        public final Host host;
+
+        public ClientPreConnectEvent(Host host){
+            this.host = host;
+        }
+    }
+
     public static class PlayerChatEvent{
         public final Player player;
         public final String message;
@@ -97,27 +109,6 @@ public class EventType{
         }
     }
 
-    /** Called when a zone's requirements are met. */
-    public static class ZoneRequireCompleteEvent{
-        public final SectorPreset zoneMet, zoneForMet;
-        public final Objectives.Objective objective;
-
-        public ZoneRequireCompleteEvent(SectorPreset zoneMet, SectorPreset zoneForMet, Objectives.Objective objective){
-            this.zoneMet = zoneMet;
-            this.zoneForMet = zoneForMet;
-            this.objective = objective;
-        }
-    }
-
-    /** Called when a zone's requirements are met. */
-    public static class ZoneConfigureCompleteEvent{
-        public final SectorPreset zone;
-
-        public ZoneConfigureCompleteEvent(SectorPreset zone){
-            this.zone = zone;
-        }
-    }
-
     /** Called when a sector is conquered, e.g. a boss or base is defeated. */
     public static class SectorCaptureEvent{
         public final Sector sector;
@@ -157,30 +148,30 @@ public class EventType{
         }
     }
 
-    /** Called when the player taps a block. */
-    public static class TapEvent{
-        public final Building tile;
-        public final Player player;
-
-        public TapEvent(Building tile, Player player){
-            this.tile = tile;
-            this.player = player;
-        }
-    }
-
-    /** Called when the player sets a specific block. */
-    public static class TapConfigEvent{
+    /** Called when the player configures a specific building. */
+    public static class ConfigEvent{
         public final Building tile;
         public final Player player;
         public final Object value;
 
-        public TapConfigEvent(Building tile, Player player, Object value){
+        public ConfigEvent(Building tile, Player player, Object value){
             this.tile = tile;
             this.player = player;
             this.value = value;
         }
     }
 
+    /** Called when a player taps any tile. */
+    public static class TapEvent{
+        public final Player player;
+        public final Tile tile;
+
+        public TapEvent(Player player, Tile tile){
+            this.tile = tile;
+            this.player = player;
+        }
+    }
+
     public static class GameOverEvent{
         public final Team winner;
 
@@ -189,11 +180,10 @@ public class EventType{
         }
     }
 
-    /** Called from the logic thread. Do not access graphics here! */
-    public static class BuildinghangeEvent{
+    public static class TileChangeEvent{
         public final Tile tile;
 
-        public BuildinghangeEvent(Tile tile){
+        public TileChangeEvent(Tile tile){
             this.tile = tile;
         }
     }
@@ -244,12 +234,14 @@ public class EventType{
         public final Team team;
         public final @Nullable Unit unit;
         public final boolean breaking;
+        public final @Nullable Object config;
 
-        public BlockBuildEndEvent(Tile tile, @Nullable Unit unit, Team team, boolean breaking){
+        public BlockBuildEndEvent(Tile tile, @Nullable Unit unit, Team team, boolean breaking, @Nullable Object config){
             this.tile = tile;
             this.team = team;
             this.unit = unit;
             this.breaking = breaking;
+            this.config = config;
         }
     }
 
@@ -289,6 +281,14 @@ public class EventType{
         }
     }
 
+    public static class UnitDrownEvent{
+        public final Unit unit;
+
+        public UnitDrownEvent(Unit unit){
+            this.unit = unit;
+        }
+    }
+
     public static class UnitCreateEvent{
         public final Unit unit;
 
diff --git a/core/src/mindustry/game/Objectives.java b/core/src/mindustry/game/Objectives.java
index 6f8913b9e2..535f1d3e13 100644
--- a/core/src/mindustry/game/Objectives.java
+++ b/core/src/mindustry/game/Objectives.java
@@ -2,75 +2,54 @@ package mindustry.game;
 
 import arc.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
+import mindustry.ctype.*;
 import mindustry.type.*;
-import mindustry.world.*;
 
 /** Holds objective classes. */
 public class Objectives{
 
-    public static class Unlock implements Objective{
-        public @NonNull Block block;
+    public static class Research implements Objective{
+        public UnlockableContent content;
 
-        public Unlock(Block block){
-            this.block = block;
+        public Research(UnlockableContent content){
+            this.content = content;
         }
 
-        protected Unlock(){}
+        protected Research(){}
 
         @Override
         public boolean complete(){
-            return block.unlocked();
+            return content.unlocked();
         }
 
         @Override
         public String display(){
-            return Core.bundle.format("requirement.unlock", block.localizedName);
+            return Core.bundle.format("requirement.research", content.emoji() + " " + content.localizedName);
         }
     }
 
-    public static class SectorWave extends SectorObjective{
-        public int wave;
+    public static class SectorComplete extends SectorObjective{
 
-        public SectorWave(SectorPreset zone, int wave){
-            this.preset = zone;
-            this.wave = wave;
-        }
-
-        protected SectorWave(){}
-
-        @Override
-        public boolean complete(){
-            return preset.bestWave() >= wave;
-        }
-
-        @Override
-        public String display(){
-            return Core.bundle.format("requirement.wave", wave, preset.localizedName);
-        }
-    }
-
-    public static class Launched extends SectorObjective{
-
-        public Launched(SectorPreset zone){
+        public SectorComplete(SectorPreset zone){
             this.preset = zone;
         }
 
-        protected Launched(){}
+        protected SectorComplete(){}
 
         @Override
         public boolean complete(){
-            return preset.hasLaunched();
+            return preset.sector.isCaptured();
         }
 
         @Override
         public String display(){
-            return Core.bundle.format("requirement.core", preset.localizedName);
+            return Core.bundle.format("requirement.capture", preset.localizedName);
         }
     }
 
+    //TODO merge
     public abstract static class SectorObjective implements Objective{
-        public @NonNull SectorPreset preset;
+        public SectorPreset preset;
     }
 
     /** Defines a specific objective for a game. */
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index 83b0c67e6a..ac302a9754 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -38,6 +38,12 @@ public class Rules{
     public boolean canGameOver = true;
     /** Whether reactors can explode and damage other blocks. */
     public boolean reactorExplosions = true;
+    /** Whether schematics are allowed */
+    public boolean schematicsAllowed = true;
+    /** Whether friendly explosions can occur and set fire/damage other blocks. */
+    public boolean damageExplosions = true;
+    /** Whether fire is enabled. */
+    public boolean fire = true;
     /** Whether units use and require ammo. */
     public boolean unitAmmo = false;
     /** How fast unit pads build units. */
@@ -62,8 +68,6 @@ public class Rules{
     public float dropZoneRadius = 300f;
     /** Time between waves in ticks. */
     public float waveSpacing = 60 * 60 * 2;
-    /** How many times longer a launch wave takes. */
-    public float launchWaveMultiplier = 2f;
     /** Wave after which the player 'wins'. Used in sectors. Use a value <= 0 to disable. */
     public int winWave = 0;
     /** Base unit cap. Can still be increased by blocks. */
@@ -85,13 +89,12 @@ public class Rules{
     public boolean enemyLights = true;
     /** Ambient light color, used when lighting is enabled. */
     public Color ambientLight = new Color(0.01f, 0.01f, 0.04f, 0.99f);
-    /** Multiplier for solar panel power output.
-    negative = use ambient light if lighting is enabled. */
-    public float solarPowerMultiplier = -1f;
     /** team of the player by default */
     public Team defaultTeam = Team.sharded;
     /** team of the enemy in waves/sectors */
     public Team waveTeam = Team.crux;
+    /** name of the custom mode that this ruleset describes, or null. */
+    public @Nullable String modeName;
     /** special tags for additional info */
     public StringMap tags = new StringMap();
 
diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java
index 681887e685..0f7908aa63 100644
--- a/core/src/mindustry/game/Saves.java
+++ b/core/src/mindustry/game/Saves.java
@@ -23,14 +23,14 @@ import java.util.*;
 import static mindustry.Vars.*;
 
 public class Saves{
-    private Seq<SaveSlot> saves = new Seq<>();
-    private @Nullable SaveSlot current;
+    Seq<SaveSlot> saves = new Seq<>();
+    @Nullable SaveSlot current;
     private @Nullable SaveSlot lastSectorSave;
-    private AsyncExecutor previewExecutor = new AsyncExecutor(1);
+    AsyncExecutor previewExecutor = new AsyncExecutor(1);
     private boolean saving;
     private float time;
 
-    private long totalPlaytime;
+    long totalPlaytime;
     private long lastTimestamp;
 
     public Saves(){
@@ -61,6 +61,9 @@ public class Saves{
         //automatically assign sector save slots
         for(SaveSlot slot : saves){
             if(slot.getSector() != null){
+                if(slot.getSector().save != null){
+                    Log.warn("Sector @ has two corresponding saves: @ and @", slot.getSector(), slot.getSector().save.file, slot.file);
+                }
                 slot.getSector().save = slot;
             }
         }
@@ -75,7 +78,6 @@ public class Saves{
     }
 
     public void update(){
-        SaveSlot current = this.current;
 
         if(current != null && state.isGame()
         && !(state.isPaused() && Core.scene.hasDialog())){
@@ -90,14 +92,13 @@ public class Saves{
             if(time > Core.settings.getInt("saveinterval") * 60){
                 saving = true;
 
-                Time.runTask(2f, () -> {
-                    try{
-                        current.save();
-                    }catch(Throwable e){
-                        e.printStackTrace();
-                    }
-                    saving = false;
-                });
+                try{
+                    current.save();
+                }catch(Throwable e){
+                    e.printStackTrace();
+                }
+
+                Time.runTask(3f, () -> saving = false);
 
                 time = 0;
             }
@@ -128,6 +129,7 @@ public class Saves{
             sector.save.setName(sector.save.file.nameWithoutExtension());
             saves.add(sector.save);
         }
+        sector.save.setAutosave(true);
         sector.save.save();
         lastSectorSave = sector.save;
         Core.settings.put("last-sector-save", sector.save.getName());
@@ -164,6 +166,14 @@ public class Saves{
         return saves;
     }
 
+    public void deleteAll(){
+        for(SaveSlot slot : saves.copy()){
+            if(!slot.isSector()){
+                slot.delete();
+            }
+        }
+    }
+
     public class SaveSlot{
         public final Fi file;
         boolean requestedPreview;
@@ -180,7 +190,7 @@ public class Saves{
                 current = this;
                 totalPlaytime = meta.timePlayed;
                 savePreview();
-            }catch(Exception e){
+            }catch(Throwable e){
                 throw new SaveException(e);
             }
         }
@@ -263,7 +273,7 @@ public class Saves{
             mods.removeAll(Vars.mods.getModStrings());
 
             if(!mods.isEmpty()){
-                ui.showConfirm("$warning", Core.bundle.format("mod.missing", mods.toString("\n")), run);
+                ui.showConfirm("@warning", Core.bundle.format("mod.missing", mods.toString("\n")), run);
             }else{
                 run.run();
             }
diff --git a/core/src/mindustry/game/Schematic.java b/core/src/mindustry/game/Schematic.java
index 01088826bb..5024ecb132 100644
--- a/core/src/mindustry/game/Schematic.java
+++ b/core/src/mindustry/game/Schematic.java
@@ -2,9 +2,7 @@ package mindustry.game;
 
 import arc.files.*;
 import arc.struct.*;
-import arc.struct.IntIntMap.*;
 import arc.util.ArcAnnotate.*;
-import mindustry.*;
 import mindustry.content.*;
 import mindustry.mod.Mods.*;
 import mindustry.type.*;
@@ -12,7 +10,6 @@ import mindustry.world.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.storage.*;
 import mindustry.world.consumers.*;
-import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -24,7 +21,7 @@ public class Schematic implements Publishable, Comparable<Schematic>{
     /** Associated mod. If null, no mod is associated with this schematic. */
     public @Nullable LoadedMod mod;
 
-    public Schematic(Seq<Stile> tiles, @NonNull StringMap tags, int width, int height){
+    public Schematic(Seq<Stile> tiles, StringMap tags, int width, int height){
         this.tiles = tiles;
         this.tags = tags;
         this.width = width;
@@ -39,29 +36,23 @@ public class Schematic implements Publishable, Comparable<Schematic>{
         return tiles.sumf(s -> s.block.consumes.has(ConsumeType.power) ? s.block.consumes.getPower().usage : 0f);
     }
 
-    public Seq<ItemStack> requirements(){
-        IntIntMap amounts = new IntIntMap();
+    public ItemSeq requirements(){
+        ItemSeq requirements = new ItemSeq();
 
         tiles.each(t -> {
-            if(t.block.buildVisibility == BuildVisibility.hidden) return;
-
             for(ItemStack stack : t.block.requirements){
-                amounts.increment(stack.item.id, stack.amount);
+                requirements.add(stack.item, stack.amount);
             }
         });
-        Seq<ItemStack> stacks = new Seq<>();
-        for(Entry ent : amounts.entries()){
-            stacks.add(new ItemStack(Vars.content.item(ent.key), ent.value));
-        }
-        stacks.sort();
-        return stacks;
+
+        return requirements;
     }
 
     public boolean hasCore(){
         return tiles.contains(s -> s.block instanceof CoreBlock);
     }
 
-    public @NonNull CoreBlock findCore(){
+    public CoreBlock findCore(){
         Stile tile = tiles.find(s -> s.block instanceof CoreBlock);
         if(tile == null) throw new IllegalArgumentException("Schematic is missing a core!");
         return (CoreBlock)tile.block;
@@ -127,7 +118,7 @@ public class Schematic implements Publishable, Comparable<Schematic>{
     }
 
     public static class Stile{
-        public @NonNull Block block;
+        public Block block;
         public short x, y;
         public Object config;
         public byte rotation;
diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java
index 29b44a6efd..672f0a23b5 100644
--- a/core/src/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -28,6 +28,7 @@ import mindustry.io.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.distribution.*;
+import mindustry.world.blocks.legacy.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.production.*;
 import mindustry.world.blocks.sandbox.*;
@@ -42,7 +43,6 @@ import static mindustry.Vars.*;
 public class Schematics implements Loadable{
     private static final Schematic tmpSchem = new Schematic(new Seq<>(), new StringMap(), 0, 0);
     private static final Schematic tmpSchem2 = new Schematic(new Seq<>(), new StringMap(), 0, 0);
-    public static final String base64Header = "bXNjaAB";
 
     private static final byte[] header = {'m', 's', 'c', 'h'};
     private static final byte version = 1;
@@ -248,7 +248,7 @@ public class Schematics implements Loadable{
             Draw.rect(Tmp.tr1, buffer.getWidth()/2f, buffer.getHeight()/2f, buffer.getWidth(), -buffer.getHeight());
             Draw.color();
 
-            Seq<BuildPlan> requests = schematic.tiles.map(t -> new BuildPlan(t.x, t.y, t.rotation, t.block).configure(t.config));
+            Seq<BuildPlan> requests = schematic.tiles.map(t -> new BuildPlan(t.x, t.y, t.rotation, t.block, t.config));
 
             Draw.flush();
             //scale each request to fit schematic
@@ -279,7 +279,7 @@ public class Schematics implements Loadable{
 
     /** Creates an array of build requests from a schematic's data, centered on the provided x+y coordinates. */
     public Seq<BuildPlan> toRequests(Schematic schem, int x, int y){
-        return schem.tiles.map(t -> new BuildPlan(t.x + x - schem.width/2, t.y + y - schem.height/2, t.rotation, t.block).original(t.x, t.y, schem.width, schem.height).configure(t.config))
+        return schem.tiles.map(t -> new BuildPlan(t.x + x - schem.width/2, t.y + y - schem.height/2, t.rotation, t.block, t.config).original(t.x, t.y, schem.width, schem.height))
             .removeAll(s -> !s.block.isVisible() || !s.block.unlockedNow());
     }
 
@@ -347,9 +347,9 @@ public class Schematics implements Loadable{
             for(int cy = y; cy <= y2; cy++){
                 Building linked = world.build(cx, cy);
 
-                if(linked != null &&linked.block().isVisible() && !(linked.block() instanceof BuildBlock)){
-                    int top = linked.block().size/2;
-                    int bot = linked.block().size % 2 == 1 ? -linked.block().size/2 : -(linked.block().size - 1)/2;
+                if(linked != null && linked.block.isVisible() && !(linked.block instanceof ConstructBlock)){
+                    int top = linked.block.size/2;
+                    int bot = linked.block.size % 2 == 1 ? -linked.block.size/2 : -(linked.block.size - 1)/2;
                     minx = Math.min(linked.tileX() + bot, minx);
                     miny = Math.min(linked.tileY() + bot, miny);
                     maxx = Math.max(linked.tileX() + top, maxx);
@@ -375,11 +375,11 @@ public class Schematics implements Loadable{
             for(int cy = oy; cy <= oy2; cy++){
                 Building tile = world.build(cx, cy);
 
-                if(tile != null && !counted.contains(tile.pos()) && !(tile.block() instanceof BuildBlock)
-                    && (tile.block().isVisible() || (tile.block() instanceof CoreBlock))){
+                if(tile != null && !counted.contains(tile.pos()) && !(tile.block instanceof ConstructBlock)
+                    && (tile.block.isVisible() || (tile.block instanceof CoreBlock))){
                     Object config = tile.config();
 
-                    tiles.add(new Stile(tile.block(), tile.tileX() + offsetX, tile.tileY() + offsetY, config, (byte)tile.rotation()));
+                    tiles.add(new Stile(tile.block, tile.tileX() + offsetX, tile.tileY() + offsetY, config, (byte)tile.rotation));
                     counted.add(tile.pos());
                 }
             }
@@ -418,8 +418,7 @@ public class Schematics implements Loadable{
             Tile tile = world.tile(st.x + ox, st.y + oy);
             if(tile == null) return;
 
-            tile.setBlock(st.block, team, 0);
-            tile.rotation(st.rotation);
+            tile.setBlock(st.block, team, st.rotation);
 
             Object config = st.config;
             if(tile.build != null){
@@ -438,8 +437,7 @@ public class Schematics implements Loadable{
             Tile tile = world.tile(st.x + ox, st.y + oy);
             if(tile == null) return;
 
-            tile.setBlock(st.block, team, 0);
-            tile.rotation(st.rotation);
+            tile.setBlock(st.block, team, st.rotation);
 
             Object config = st.config;
             if(tile.build != null){
@@ -489,8 +487,9 @@ public class Schematics implements Loadable{
             IntMap<Block> blocks = new IntMap<>();
             byte length = stream.readByte();
             for(int i = 0; i < length; i++){
-                Block block = Vars.content.getByName(ContentType.block, stream.readUTF());
-                blocks.put(i, block == null ? Blocks.air : block);
+                String name = stream.readUTF();
+                Block block = Vars.content.getByName(ContentType.block, SaveFileReader.fallback.get(name, name));
+                blocks.put(i, block == null || block instanceof LegacyBlock ? Blocks.air : block);
             }
 
             int total = stream.readInt();
@@ -586,7 +585,7 @@ public class Schematics implements Loadable{
         int ox = schem.width/2, oy = schem.height/2;
 
         schem.tiles.each(req -> {
-            req.config = BuildPlan.pointConfig(req.config, p -> {
+            req.config = BuildPlan.pointConfig(req.block, req.config, p -> {
                 int cx = p.x, cy = p.y;
                 int lx = cx;
 
diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java
index 4192831910..cb6197d879 100644
--- a/core/src/mindustry/game/SectorInfo.java
+++ b/core/src/mindustry/game/SectorInfo.java
@@ -2,9 +2,10 @@ package mindustry.game;
 
 import arc.math.*;
 import arc.struct.*;
-import arc.util.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.content.*;
+import mindustry.ctype.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
@@ -23,7 +24,7 @@ public class SectorInfo{
     /** Export statistics. */
     public ObjectMap<Item, ExportStat> export = new ObjectMap<>();
     /** Items stored in all cores. */
-    public ObjectIntMap<Item> coreItems = new ObjectIntMap<>();
+    public ItemSeq coreItems = new ItemSeq();
     /** The best available core type. */
     public Block bestCoreType = Blocks.air;
     /** Max storage capacity. */
@@ -32,6 +33,10 @@ public class SectorInfo{
     public boolean hasCore = true;
     /** Sector that was launched from. */
     public @Nullable Sector origin;
+    /** Launch destination. */
+    public @Nullable Sector destination;
+    /** Resources known to occur at this sector. */
+    public Seq<UnlockableContent> resources = new Seq<>();
     /** Time spent at this sector. Do not use unless you know what you're doing. */
     public transient float internalTimeSpent;
 
@@ -40,6 +45,12 @@ public class SectorInfo{
     /** Core item storage to prevent spoofing. */
     private transient int[] lastCoreItems;
 
+    /** @return the real location items go when launched on this sector */
+    public Sector getRealDestination(){
+        //on multiplayer the destination is, by default, the first captured sector (basically random)
+        return !net.client() || destination != null ? destination : state.rules.sector.planet.sectors.find(Sector::hasBase);
+    }
+
     /** Updates export statistics. */
     public void handleItemExport(ItemStack stack){
         handleItemExport(stack.item, stack.amount);
@@ -64,12 +75,12 @@ public class SectorInfo{
         //update core items
         coreItems.clear();
 
-        CoreEntity entity = state.rules.defaultTeam.core();
+        CoreBuild entity = state.rules.defaultTeam.core();
 
         if(entity != null){
             ItemModule items = entity.items;
             for(int i = 0; i < items.length(); i++){
-                coreItems.put(content.item(i), items.get(i));
+                coreItems.set(content.item(i), items.get(i));
             }
         }
 
@@ -77,18 +88,22 @@ public class SectorInfo{
         bestCoreType = !hasCore ? Blocks.air : state.rules.defaultTeam.cores().max(e -> e.block.size).block;
         storageCapacity = entity != null ? entity.storageCapacity : 0;
 
-        //update sector's internal time spent counter1
+        //update sector's internal time spent counter
         state.rules.sector.setTimeSpent(internalTimeSpent);
     }
 
-    /** Update averages of various stats.
+    /** Update averages of various stats, updates some special sector logic.
      * Called every frame. */
     public void update(){
+        //updating in multiplayer as a client doesn't make sense
+        if(net.client()) return;
+
         internalTimeSpent += Time.delta;
 
-        //time spent exceeds turn duration!
-        if(internalTimeSpent >= turnDuration && internalTimeSpent - Time.delta < turnDuration){
-            universe.displayTimeEnd();
+        //autorun turns
+        if(internalTimeSpent >= turnDuration){
+            internalTimeSpent = 0;
+            universe.runTurn();
         }
 
         //create last stored core items
@@ -97,7 +112,7 @@ public class SectorInfo{
             updateCoreDeltas();
         }
 
-        CoreEntity ent = state.rules.defaultTeam.core();
+        CoreBuild ent = state.rules.defaultTeam.core();
 
         //refresh throughput
         if(time.get(refreshPeriod)){
@@ -140,19 +155,8 @@ public class SectorInfo{
         }
     }
 
-    /** @return the items in this sector now, taking into account production and items received. */
-    public ObjectIntMap<Item> getCurrentItems(Sector sector){
-        ObjectIntMap<Item> map = new ObjectIntMap<>();
-        map.putAll(coreItems);
-        long seconds = sector.getSecondsPassed();
-        production.each((item, stat) -> map.increment(item, (int)(stat.mean * seconds)));
-        //increment based on received items
-        sector.getReceivedItems().each(stack -> map.increment(stack.item, stack.amount));
-        return map;
-    }
-
     private void updateCoreDeltas(){
-        CoreEntity ent = state.rules.defaultTeam.core();
+        CoreBuild ent = state.rules.defaultTeam.core();
         for(int i = 0; i < lastCoreItems.length; i++){
             lastCoreItems[i] = ent == null ? 0 : ent.items.get(i);
         }
@@ -171,5 +175,9 @@ public class SectorInfo{
 
         /** mean in terms of items produced per refresh rate (currently, per second) */
         public float mean;
+
+        public String toString(){
+            return mean + "";
+        }
     }
 }
diff --git a/core/src/mindustry/game/Stats.java b/core/src/mindustry/game/Stats.java
index 4a03f6199e..1d175607ba 100644
--- a/core/src/mindustry/game/Stats.java
+++ b/core/src/mindustry/game/Stats.java
@@ -22,6 +22,7 @@ public class Stats{
     /** Friendly buildings destroyed. */
     public int buildingsDestroyed;
 
+    //TODO fix
     public RankResult calculateRank(Sector zone, boolean launched){
         float score = 0;
 
@@ -39,7 +40,7 @@ public class Stats{
 
         //weigh used fractions
         float frac = 0f;
-        Seq<Item> obtainable = Seq.select(zone.data.resources, i -> i instanceof Item).as();
+        Seq<Item> obtainable = zone.save == null ? new Seq<>() : zone.save.meta.secinfo.resources.select(i -> i instanceof Item).as();
         for(Item item : obtainable){
             frac += Mathf.clamp((float)itemsDelivered.get(item, 0) / capacity) / (float)obtainable.size;
         }
diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index b82e8e1f12..5a416009ff 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -36,12 +36,12 @@ public class Team implements Comparable<Team>{
         blue = new Team(5, "blue", Color.royal.cpy());
 
     static{
-        Mathf.random.setSeed(8);
+        Mathf.rand.setSeed(8);
         //create the whole 256 placeholder teams
         for(int i = 6; i < all.length; i++){
             new Team(i, "team#" + i, Color.HSVtoRGB(360f * Mathf.random(), 100f * Mathf.random(0.6f, 1f), 100f * Mathf.random(0.8f, 1f), 1f));
         }
-        Mathf.random.setSeed(new Rand().nextLong());
+        Mathf.rand.setSeed(new Rand().nextLong());
     }
 
     public static Team get(int id){
@@ -74,7 +74,7 @@ public class Team implements Comparable<Team>{
 
     /** @return the core items for this team, or an empty item module.
      * Never add to the resulting item module, as it is mutable. */
-    public @NonNull ItemModule items(){
+    public ItemModule items(){
         return core() == null ? ItemModule.empty : core().items;
     }
 
@@ -91,7 +91,7 @@ public class Team implements Comparable<Team>{
         return state.teams.get(this);
     }
 
-    public @Nullable CoreEntity core(){
+    public @Nullable CoreBuild core(){
         return data().core();
     }
 
@@ -103,7 +103,7 @@ public class Team implements Comparable<Team>{
         return state.teams.areEnemies(this, other);
     }
 
-    public Seq<CoreEntity> cores(){
+    public Seq<CoreBuild> cores(){
         return state.teams.cores(this);
     }
 
diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
index 592aa9d444..e513c31fc6 100644
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -5,7 +5,10 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.ai.*;
+import mindustry.content.*;
+import mindustry.entities.units.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
 import static mindustry.Vars.*;
@@ -21,15 +24,15 @@ public class Teams{
         active.add(get(Team.crux));
     }
 
-    public @Nullable CoreEntity closestEnemyCore(float x, float y, Team team){
+    public @Nullable CoreBuild closestEnemyCore(float x, float y, Team team){
         for(Team enemy : team.enemies()){
-            CoreEntity tile = Geometry.findClosest(x, y, enemy.cores());
+            CoreBuild tile = Geometry.findClosest(x, y, enemy.cores());
             if(tile != null) return tile;
         }
         return null;
     }
 
-    public @Nullable CoreEntity closestCore(float x, float y, Team team){
+    public @Nullable CoreBuild closestCore(float x, float y, Team team){
         return Geometry.findClosest(x, y, get(team).cores);
     }
 
@@ -37,10 +40,10 @@ public class Teams{
         return get(team).enemies;
     }
 
-    public boolean eachEnemyCore(Team team, Boolf<CoreEntity> ret){
+    public boolean eachEnemyCore(Team team, Boolf<CoreBuild> ret){
         for(TeamData data : active){
             if(areEnemies(team, data.team)){
-                for(CoreEntity tile : data.cores){
+                for(CoreBuild tile : data.cores){
                     if(ret.get(tile)){
                         return true;
                     }
@@ -68,12 +71,12 @@ public class Teams{
         return map[team.id];
     }
 
-    public Seq<CoreEntity> playerCores(){
+    public Seq<CoreBuild> playerCores(){
         return get(state.rules.defaultTeam).cores;
     }
 
     /** Do not modify! */
-    public Seq<CoreEntity> cores(Team team){
+    public Seq<CoreBuild> cores(Team team){
         return get(team).cores;
     }
 
@@ -98,8 +101,8 @@ public class Teams{
         return active;
     }
 
-    public void registerCore(CoreEntity core){
-        TeamData data = get(core.team());
+    public void registerCore(CoreBuild core){
+        TeamData data = get(core.team);
         //add core if not present
         if(!data.cores.contains(core)){
             data.cores.add(core);
@@ -113,8 +116,8 @@ public class Teams{
         }
     }
 
-    public void unregisterCore(CoreEntity entity){
-        TeamData data = get(entity.team());
+    public void unregisterCore(CoreBuild entity){
+        TeamData data = get(entity.team);
         //remove core
         data.cores.remove(entity);
         //unregister in active list
@@ -143,11 +146,17 @@ public class Teams{
     }
 
     public class TeamData{
-        public final Seq<CoreEntity> cores = new Seq<>();
+        public final Seq<CoreBuild> cores = new Seq<>();
         public final Team team;
         public final BaseAI ai;
+
         public Team[] enemies = {};
+        /** Planned blocks for drones. This is usually only blocks that have been broken. */
         public Queue<BlockPlan> blocks = new Queue<>();
+        /** The current command for units to follow. */
+        public UnitCommand command = UnitCommand.attack;
+        /** Target items to mine. */
+        public Seq<Item> mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium);
 
         public TeamData(Team team){
             this.team = team;
@@ -166,13 +175,13 @@ public class Teams{
             return cores.isEmpty();
         }
 
-        public @Nullable CoreEntity core(){
+        public @Nullable CoreBuild core(){
             return cores.isEmpty() ? null : cores.first();
         }
 
         /** @return whether this team is controlled by the AI and builds bases. */
         public boolean hasAI(){
-            return state.rules.attackMode && team.rules().ai;
+            return team.rules().ai;
         }
 
         @Override
diff --git a/core/src/mindustry/game/Tutorial.java b/core/src/mindustry/game/Tutorial.java
index cfaa85a84c..e0f73248ed 100644
--- a/core/src/mindustry/game/Tutorial.java
+++ b/core/src/mindustry/game/Tutorial.java
@@ -23,9 +23,9 @@ public class Tutorial{
     private static final int mineCopper = 18;
     private static final int blocksToBreak = 3, blockOffset = -6;
 
-    private ObjectSet<String> events = new ObjectSet<>();
-    private ObjectIntMap<Block> blocksPlaced = new ObjectIntMap<>();
-    private int sentence;
+    ObjectSet<String> events = new ObjectSet<>();
+    ObjectIntMap<Block> blocksPlaced = new ObjectIntMap<>();
+    int sentence;
     public TutorialStage stage = TutorialStage.values()[0];
 
     public Tutorial(){
@@ -250,7 +250,7 @@ public class Tutorial{
             Building core = state.teams.playerCores().first();
 
             for(int i = 0; i < blocksToBreak; i++){
-                if(world.tile(core.tile().x + blockOffset, core.tile().y + i).block() == Blocks.scrapWall){
+                if(world.tile(core.tile.x + blockOffset, core.tile.y + i).block() == Blocks.scrapWall){
                     return false;
                 }
             }
diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java
index 33f14eb1e7..b2c9c7d039 100644
--- a/core/src/mindustry/game/Universe.java
+++ b/core/src/mindustry/game/Universe.java
@@ -5,7 +5,6 @@ import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
-import mindustry.core.GameState.*;
 import mindustry.game.EventType.*;
 import mindustry.type.*;
 import mindustry.world.blocks.storage.*;
@@ -14,12 +13,13 @@ import static mindustry.Vars.*;
 
 /** Updates and handles state of the campaign universe. Has no relevance to other gamemodes. */
 public class Universe{
-    private long seconds;
+    private int seconds;
+    private int netSeconds;
     private float secondCounter;
     private int turn;
 
     private Schematic lastLoadout;
-    private Seq<ItemStack> lastLaunchResources = new Seq<>();
+    private ItemSeq lastLaunchResources = new ItemSeq();
 
     public Universe(){
         load();
@@ -53,25 +53,26 @@ public class Universe{
         }
     }
 
-    public void displayTimeEnd(){
-        if(!headless){
-            state.set(State.paused);
-
-            ui.announce("Next turn incoming.");
-        }
+    /** @return sectors attacked on the current planet, minus the ones that are being played on right now. */
+    public Seq<Sector> getAttacked(Planet planet){
+        return planet.sectors.select(s -> s.hasWaves() && s.hasBase() && !s.isBeingPlayed() && s.getSecondsPassed() > 1);
     }
 
     /** Update planet rotations, global time and relevant state. */
     public void update(){
-        secondCounter += Time.delta / 60f;
 
-        if(secondCounter >= 1){
-            seconds += (int)secondCounter;
-            secondCounter %= 1f;
+        //only update time when not in multiplayer
+        if(!net.client()){
+            secondCounter += Time.delta / 60f;
 
-            //save every few seconds
-            if(seconds % 10 == 1){
-                save();
+            if(secondCounter >= 1){
+                seconds += (int)secondCounter;
+                secondCounter %= 1f;
+
+                //save every few seconds
+                if(seconds % 10 == 1){
+                    save();
+                }
             }
         }
 
@@ -86,14 +87,14 @@ public class Universe{
         }
     }
 
-    public Seq<ItemStack> getLaunchResources(){
-        lastLaunchResources = Core.settings.getJson("launch-resources", Seq.class, ItemStack.class, Seq::new);
+    public ItemSeq getLaunchResources(){
+        lastLaunchResources = Core.settings.getJson("launch-resources-seq", ItemSeq.class, ItemSeq::new);
         return lastLaunchResources;
     }
 
-    public void updateLaunchResources(Seq<ItemStack> stacks){
+    public void updateLaunchResources(ItemSeq stacks){
         this.lastLaunchResources = stacks;
-        Core.settings.putJson("launch-resources", ItemStack.class, lastLaunchResources);
+        Core.settings.putJson("launch-resources-seq", lastLaunchResources);
     }
 
     /** Updates selected loadout for future deployment. */
@@ -140,48 +141,80 @@ public class Universe{
                         sector.setSecondsPassed(sector.getSecondsPassed() + actuallyPassed);
 
                         //check if the sector has been attacked too many times...
-                        if(sector.hasBase() && sector.getSecondsPassed() * 60f > turnDuration * sectorDestructionTurns){
+                        if(sector.hasBase() && sector.hasWaves() && sector.getSecondsPassed() * 60f > turnDuration * sectorDestructionTurns){
                             //fire event for losing the sector
                             Events.fire(new SectorLoseEvent(sector));
 
                             //if so, just delete the save for now. it's lost.
                             //TODO don't delete it later maybe
                             sector.save.delete();
+                            //clear recieved
+                            sector.setExtraItems(new ItemSeq());
                             sector.save = null;
                         }
                     }
 
+                    //export to another sector
+                    if(sector.save != null && sector.save.meta != null && sector.save.meta.secinfo != null && sector.save.meta.secinfo.destination != null){
+                        Sector to = sector.save.meta.secinfo.destination;
+                        if(to.save != null){
+                            ItemSeq items = to.getExtraItems();
+                            //calculated exported items to this sector
+                            sector.save.meta.secinfo.export.each((item, stat) -> items.add(item, (int)(stat.mean * newSecondsPassed)));
+                            to.setExtraItems(items);
+                        }
+                    }
+
                     //reset time spent to 0
                     sector.setTimeSpent(0f);
                 }
             }
         }
-        //TODO events
 
         Events.fire(new TurnEvent());
 
         save();
     }
 
-    public float secondsMod(float mod, float scale){
-        return (seconds / scale) % mod;
+    /** This method is expensive to call; only do so sparingly. */
+    public ItemSeq getGlobalResources(){
+        ItemSeq count = new ItemSeq();
+
+        for(Planet planet : content.planets()){
+            for(Sector sector : planet.sectors){
+                if(sector.hasSave()){
+                    count.add(sector.calculateItems());
+                }
+            }
+        }
+
+        return count;
     }
 
-    public long seconds(){
-        return seconds;
+    public void updateNetSeconds(int value){
+        netSeconds = value;
+    }
+
+    public float secondsMod(float mod, float scale){
+        return (seconds() / scale) % mod;
+    }
+
+    public int seconds(){
+        //use networked seconds when playing as client
+        return net.client() ? netSeconds : seconds;
     }
 
     public float secondsf(){
-        return seconds + secondCounter;
+        return seconds() + secondCounter;
     }
 
     private void save(){
-        Core.settings.put("utime", seconds);
+        Core.settings.put("utimei", seconds);
         Core.settings.put("turn", turn);
     }
 
     private void load(){
-        seconds = Core.settings.getLong("utime");
+        seconds = Core.settings.getInt("utimei");
         turn = Core.settings.getInt("turn");
     }
 
diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java
index 97382dd6d7..c65b3cae7c 100644
--- a/core/src/mindustry/graphics/BlockRenderer.java
+++ b/core/src/mindustry/graphics/BlockRenderer.java
@@ -35,7 +35,7 @@ public class BlockRenderer implements Disposable{
     private FrameBuffer dark = new FrameBuffer();
     private Seq<Building> outArray2 = new Seq<>();
     private Seq<Tile> shadowEvents = new Seq<>();
-    private IntSet processedEntities = new IntSet();
+    private IntSet processedEntities = new IntSet(), processedLinks = new IntSet();
     private boolean displayStatus = false;
 
     public BlockRenderer(){
@@ -82,7 +82,7 @@ public class BlockRenderer implements Disposable{
             dark.end();
         });
 
-        Events.on(BuildinghangeEvent.class, event -> {
+        Events.on(TileChangeEvent.class, event -> {
             shadowEvents.add(event.tile);
 
             int avgx = (int)(camera.position.x / tilesize);
@@ -180,6 +180,7 @@ public class BlockRenderer implements Disposable{
         tileview.clear();
         lightview.clear();
         processedEntities.clear();
+        processedLinks.clear();
 
         int minx = Math.max(avgx - rangex - expandr, 0);
         int miny = Math.max(avgy - rangey - expandr, 0);
@@ -192,12 +193,19 @@ public class BlockRenderer implements Disposable{
                 Tile tile = world.rawTile(x, y);
                 Block block = tile.block();
                 //link to center
-                if(tile.build != null) tile = tile.build.tile();
+                if(tile.build != null){
+                    tile = tile.build.tile;
+                }
 
-                if(block != Blocks.air && block.cacheLayer == CacheLayer.normal && (tile.build == null || !processedEntities.contains(tile.build.id()))){
+                if(block != Blocks.air && block.cacheLayer == CacheLayer.normal && (tile.build == null || !processedEntities.contains(tile.build.id))){
                     if(block.expanded || !expanded){
-                        tileview.add(tile);
-                        if(tile.build != null) processedEntities.add(tile.build.id());
+                        if(tile.build == null || processedLinks.add(tile.build.id)){
+                            tileview.add(tile);
+                            if(tile.build != null){
+                                processedEntities.add(tile.build.id);
+                                processedLinks.add(tile.build.id);
+                            }
+                        }
                     }
 
                     //lights are drawn even in the expanded range
@@ -207,8 +215,8 @@ public class BlockRenderer implements Disposable{
 
                     if(tile.build != null && tile.build.power != null && tile.build.power.links.size > 0){
                         for(Building other : tile.build.getPowerConnections(outArray2)){
-                            if(other.block() instanceof PowerNode){ //TODO need a generic way to render connections!
-                                tileview.add(other.tile());
+                            if(other.block instanceof PowerNode && processedLinks.add(other.id)){ //TODO need a generic way to render connections!
+                                tileview.add(other.tile);
                             }
                         }
                     }
@@ -249,7 +257,7 @@ public class BlockRenderer implements Disposable{
                         Draw.z(Layer.block);
                     }
 
-                    if(entity.team() != player.team()){
+                    if(entity.team != player.team()){
                         entity.drawTeam();
                         Draw.z(Layer.block);
                     }
diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java
index 00bd578dc4..c3eed64feb 100644
--- a/core/src/mindustry/graphics/CacheLayer.java
+++ b/core/src/mindustry/graphics/CacheLayer.java
@@ -18,6 +18,17 @@ public enum CacheLayer{
             endShader(Shaders.water);
         }
     },
+    mud{
+        @Override
+        public void begin(){
+            beginShader();
+        }
+
+        @Override
+        public void end(){
+            endShader(Shaders.mud);
+        }
+    },
     tar{
         @Override
         public void begin(){
@@ -41,7 +52,7 @@ public enum CacheLayer{
         }
     },
     normal(5),
-    walls;
+    walls(3);
 
     public static final CacheLayer[] all = values();
     /** Capacity multiplier. */
diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java
index 0a5bbb39c0..f1d45bebc3 100644
--- a/core/src/mindustry/graphics/Drawf.java
+++ b/core/src/mindustry/graphics/Drawf.java
@@ -84,6 +84,30 @@ public class Drawf{
         Draw.color();
     }
 
+    public static void shadow(TextureRegion region, float x, float y, float rotation){
+        Draw.color(Pal.shadow);
+        Draw.rect(region, x, y, rotation);
+        Draw.color();
+    }
+
+    public static void shadow(TextureRegion region, float x, float y){
+        Draw.color(Pal.shadow);
+        Draw.rect(region, x, y);
+        Draw.color();
+    }
+
+    public static void liquid(TextureRegion region, float x, float y, float alpha, Color color, float rotation){
+        Draw.color(color, alpha);
+        Draw.rect(region, x, y, rotation);
+        Draw.color();
+    }
+
+    public static void liquid(TextureRegion region, float x, float y, float alpha, Color color){
+        Draw.color(color, alpha);
+        Draw.rect(region, x, y);
+        Draw.color();
+    }
+
     public static void dashCircle(float x, float y, float rad, Color color){
         Lines.stroke(3f, Pal.gray);
         Lines.dashCircle(x, y, rad);
@@ -150,15 +174,14 @@ public class Drawf{
     }
 
     public static void laser(Team team, TextureRegion line, TextureRegion edge, float x, float y, float x2, float y2, float rotation, float scale){
-        Tmp.v1.trns(rotation, 8f * scale * Draw.scl);
+        float scl = 8f * scale * Draw.scl;
+        float vx = Mathf.cosDeg(rotation) * scl, vy = Mathf.sinDeg(rotation) * scl;
 
-        Draw.rect(edge, x, y, edge.getWidth() * scale * Draw.scl, edge.getHeight() * scale * Draw.scl, rotation + 180);
-        Draw.rect(edge, x2, y2, edge.getWidth() * scale * Draw.scl, edge.getHeight() * scale * Draw.scl, rotation);
+        Draw.rect(edge, x, y, edge.width * scale * Draw.scl, edge.height * scale * Draw.scl, rotation + 180);
+        Draw.rect(edge, x2, y2, edge.width * scale * Draw.scl, edge.height * scale * Draw.scl, rotation);
 
         Lines.stroke(12f * scale);
-        Lines.precise(true);
-        Lines.line(line, x + Tmp.v1.x, y + Tmp.v1.y, x2 - Tmp.v1.x, y2 - Tmp.v1.y, CapStyle.none, 0f);
-        Lines.precise(false);
+        Lines.line(line, x + vx, y + vy, x2 - vx, y2 - vy, false);
         Lines.stroke(1f);
 
         light(team, x, y, x2, y2);
@@ -173,6 +196,20 @@ public class Drawf{
         construct(t, content.icon(Cicon.full), rotation, progress, speed, time);
     }
 
+    public static void construct(float x, float y, TextureRegion region, float rotation, float progress, float speed, float time){
+        Shaders.build.region = region;
+        Shaders.build.progress = progress;
+        Shaders.build.color.set(Pal.accent);
+        Shaders.build.color.a = speed;
+        Shaders.build.time = -time / 20f;
+
+        Draw.shader(Shaders.build);
+        Draw.rect(region, x, y, rotation);
+        Draw.shader();
+
+        Draw.reset();
+    }
+
     public static void construct(Building t, TextureRegion region, float rotation, float progress, float speed, float time){
         Shaders.build.region = region;
         Shaders.build.progress = progress;
@@ -187,7 +224,7 @@ public class Drawf{
         Draw.color(Pal.accent);
         Draw.alpha(speed);
 
-        Lines.lineAngleCenter(t.x + Mathf.sin(time, 20f, Vars.tilesize / 2f * t.block().size - 2f), t.y, 90, t.block().size * Vars.tilesize - 4f);
+        Lines.lineAngleCenter(t.x + Mathf.sin(time, 20f, Vars.tilesize / 2f * t.block.size - 2f), t.y, 90, t.block.size * Vars.tilesize - 4f);
 
         Draw.reset();
     }
diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java
index 7a7f502473..4030125ebb 100644
--- a/core/src/mindustry/graphics/FloorRenderer.java
+++ b/core/src/mindustry/graphics/FloorRenderer.java
@@ -20,7 +20,7 @@ public class FloorRenderer implements Disposable{
     //TODO find out number with best performance
     private static final int chunksize = mobile ? 16 : 32;
 
-    private Chunk[][] cache;
+    private int[][][] cache;
     private MultiCacheBatch cbatch;
     private IntSet drawnLayerSet = new IntSet();
     private IntSet recacheSet = new IntSet();
@@ -63,11 +63,11 @@ public class FloorRenderer implements Disposable{
                 if(!Structs.inBounds(worldx, worldy, cache))
                     continue;
 
-                Chunk chunk = cache[worldx][worldy];
+                int[] chunk = cache[worldx][worldy];
 
                 //loop through all layers, and add layer index if it exists
                 for(int i = 0; i < layers; i++){
-                    if(chunk.caches[i] != -1 && i != CacheLayer.walls.ordinal()){
+                    if(chunk[i] != -1 && i != CacheLayer.walls.ordinal()){
                         drawnLayerSet.add(i);
                     }
                 }
@@ -154,9 +154,9 @@ public class FloorRenderer implements Disposable{
                     continue;
                 }
 
-                Chunk chunk = cache[worldx][worldy];
-                if(chunk.caches[layer.ordinal()] == -1) continue;
-                cbatch.drawCache(chunk.caches[layer.ordinal()]);
+                int[] chunk = cache[worldx][worldy];
+                if(chunk[layer.ordinal()] == -1) continue;
+                cbatch.drawCache(chunk[layer.ordinal()]);
             }
         }
 
@@ -165,7 +165,7 @@ public class FloorRenderer implements Disposable{
 
     private void cacheChunk(int cx, int cy){
         used.clear();
-        Chunk chunk = cache[cx][cy];
+        int[] chunk = cache[cx][cy];
 
         for(int tilex = cx * chunksize; tilex < (cx + 1) * chunksize && tilex < world.width(); tilex++){
             for(int tiley = cy * chunksize; tiley < (cy + 1) * chunksize && tiley < world.height(); tiley++){
@@ -184,15 +184,15 @@ public class FloorRenderer implements Disposable{
         }
     }
 
-    private void cacheChunkLayer(int cx, int cy, Chunk chunk, CacheLayer layer){
+    private void cacheChunkLayer(int cx, int cy, int[] chunk, CacheLayer layer){
         Batch current = Core.batch;
         Core.batch = cbatch;
 
         //begin a new cache
-        if(chunk.caches[layer.ordinal()] == -1){
+        if(chunk[layer.ordinal()] == -1){
             cbatch.beginCache();
         }else{
-            cbatch.beginCache(chunk.caches[layer.ordinal()]);
+            cbatch.beginCache(chunk[layer.ordinal()]);
         }
 
         for(int tilex = cx * chunksize; tilex < (cx + 1) * chunksize; tilex++){
@@ -206,19 +206,19 @@ public class FloorRenderer implements Disposable{
                     floor = tile.floor();
                 }
 
-                if(tile.block().cacheLayer == layer && layer == CacheLayer.walls && !(tile.isDarkened() && tile.rotation() >= 5)){
+                if(tile.block().cacheLayer == layer && layer == CacheLayer.walls && !(tile.isDarkened() && tile.data >= 5)){
                     tile.block().drawBase(tile);
                 }else if(floor.cacheLayer == layer && (world.isAccessible(tile.x, tile.y) || tile.block().cacheLayer != CacheLayer.walls || !tile.block().fillsTile)){
                     floor.drawBase(tile);
-                }else if(floor.cacheLayer.ordinal() < layer.ordinal() && layer != CacheLayer.walls){
-                    floor.drawNonLayer(tile);
+                }else if(floor.cacheLayer != layer && layer != CacheLayer.walls){
+                    floor.drawNonLayer(tile, layer);
                 }
             }
         }
 
         Core.batch = current;
         cbatch.reserve(layer.capacity * chunksize * chunksize);
-        chunk.caches[layer.ordinal()] = cbatch.endCache();
+        chunk[layer.ordinal()] = cbatch.endCache();
     }
 
     public void clearTiles(){
@@ -227,15 +227,14 @@ public class FloorRenderer implements Disposable{
         recacheSet.clear();
         int chunksx = Mathf.ceil((float)(world.width()) / chunksize),
         chunksy = Mathf.ceil((float)(world.height()) / chunksize);
-        cache = new Chunk[chunksx][chunksy];
-        cbatch = new MultiCacheBatch(chunksize * chunksize * 5);
+        cache = new int[chunksx][chunksy][CacheLayer.all.length];
+        cbatch = new MultiCacheBatch(chunksize * chunksize * 9);
 
         Time.mark();
 
         for(int x = 0; x < chunksx; x++){
             for(int y = 0; y < chunksy; y++){
-                cache[x][y] = new Chunk();
-                Arrays.fill(cache[x][y].caches, -1);
+                Arrays.fill(cache[x][y], -1);
 
                 cacheChunk(x, y);
             }
@@ -251,10 +250,4 @@ public class FloorRenderer implements Disposable{
             cbatch = null;
         }
     }
-
-    private static class Chunk{
-        /** Maps cache layer ID to cache ID in the batch.
-         * -1 means that this cache is unoccupied. */
-        int[] caches = new int[CacheLayer.all.length];
-    }
 }
diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java
index 83067c1f96..46b9093a14 100644
--- a/core/src/mindustry/graphics/IndexedRenderer.java
+++ b/core/src/mindustry/graphics/IndexedRenderer.java
@@ -7,11 +7,10 @@ import arc.graphics.gl.*;
 import arc.math.*;
 import arc.util.*;
 
-//TODO this class is a trainwreck, remove it
 public class IndexedRenderer implements Disposable{
     private static final int vsize = 5;
 
-    private Shader program = new Shader(
+    private final Shader program = new Shader(
     "attribute vec4 a_position;\n" +
     "attribute vec4 a_color;\n" +
     "attribute vec2 a_texCoord0;\n" +
@@ -68,10 +67,10 @@ public class IndexedRenderer implements Disposable{
     public void draw(int index, TextureRegion region, float x, float y, float w, float h){
         float fx2 = x + w;
         float fy2 = y + h;
-        float u = region.getU();
-        float v = region.getV2();
-        float u2 = region.getU2();
-        float v2 = region.getV();
+        float u = region.u;
+        float v = region.v2;
+        float u2 = region.u2;
+        float v2 = region.v;
 
         float[] vertices = tmpVerts;
         float color = this.color;
@@ -96,32 +95,32 @@ public class IndexedRenderer implements Disposable{
         vertices[idx++] = v2;
 
         //tri2
-        vertices[idx++] = x;
-        vertices[idx++] = y;
-        vertices[idx++] = color;
-        vertices[idx++] = u;
-        vertices[idx++] = v;
-
-        vertices[idx++] = fx2;
-        vertices[idx++] = y;
-        vertices[idx++] = color;
-        vertices[idx++] = u2;
-        vertices[idx++] = v;
-
         vertices[idx++] = fx2;
         vertices[idx++] = fy2;
         vertices[idx++] = color;
         vertices[idx++] = u2;
         vertices[idx++] = v2;
 
+        vertices[idx++] = fx2;
+        vertices[idx++] = y;
+        vertices[idx++] = color;
+        vertices[idx++] = u2;
+        vertices[idx++] = v;
+
+        vertices[idx++] = x;
+        vertices[idx++] = y;
+        vertices[idx++] = color;
+        vertices[idx++] = u;
+        vertices[idx++] = v;
+
         mesh.updateVertices(index * vsize * 6, vertices);
     }
 
     public void draw(int index, TextureRegion region, float x, float y, float w, float h, float rotation){
-        float u = region.getU();
-        float v = region.getV2();
-        float u2 = region.getU2();
-        float v2 = region.getV();
+        float u = region.u;
+        float v = region.v2;
+        float u2 = region.u2;
+        float v2 = region.v;
 
         float originX = w / 2, originY = h / 2;
 
@@ -155,6 +154,19 @@ public class IndexedRenderer implements Disposable{
         vertices[idx++] = u;
         vertices[idx++] = v;
 
+        vertices[idx++] = x2;
+        vertices[idx++] = y2;
+        vertices[idx++] = color;
+        vertices[idx++] = u;
+        vertices[idx++] = v2;
+
+        vertices[idx++] = x3;
+        vertices[idx++] = y3;
+        vertices[idx++] = color;
+        vertices[idx++] = u2;
+        vertices[idx++] = v2;
+
+        //tri2
         vertices[idx++] = x3;
         vertices[idx++] = y3;
         vertices[idx++] = color;
@@ -164,28 +176,15 @@ public class IndexedRenderer implements Disposable{
         vertices[idx++] = x4;
         vertices[idx++] = y4;
         vertices[idx++] = color;
-        vertices[idx++] = u;
-        vertices[idx++] = v2;
+        vertices[idx++] = u2;
+        vertices[idx++] = v;
 
-        //tri2
         vertices[idx++] = x1;
         vertices[idx++] = y1;
         vertices[idx++] = color;
         vertices[idx++] = u;
         vertices[idx++] = v;
 
-        vertices[idx++] = x2;
-        vertices[idx++] = y2;
-        vertices[idx++] = color;
-        vertices[idx++] = u2;
-        vertices[idx++] = v;
-
-        vertices[idx++] = x3;
-        vertices[idx++] = y3;
-        vertices[idx++] = color;
-        vertices[idx++] = u2;
-        vertices[idx++] = v2;
-
         mesh.updateVertices(index * vsize * 6, vertices);
     }
 
diff --git a/core/src/mindustry/graphics/Layer.java b/core/src/mindustry/graphics/Layer.java
index 87892852f2..519850a2f9 100644
--- a/core/src/mindustry/graphics/Layer.java
+++ b/core/src/mindustry/graphics/Layer.java
@@ -5,6 +5,9 @@ public class Layer{
 
     public static final float
 
+    //min layer
+    min = -11,
+
     //background, which may be planets or an image or nothing at all
     background = -10,
 
@@ -81,7 +84,10 @@ public class Layer{
     end = 200,
 
     //things after pixelation - used for text
-    endPixeled = 210
+    endPixeled = 210,
+
+    //max layer
+    max = 220
 
     ;
 }
diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java
index 63cd3f2783..fbe154a6b9 100644
--- a/core/src/mindustry/graphics/LightRenderer.java
+++ b/core/src/mindustry/graphics/LightRenderer.java
@@ -58,10 +58,10 @@ public class LightRenderer{
             TextureRegion ledge = Core.atlas.find("circle-end"), lmid = Core.atlas.find("circle-mid");
 
             float color = Draw.getColor().toFloatBits();
-            float u = lmid.getU();
-            float v = lmid.getV2();
-            float u2 = lmid.getU2();
-            float v2 = lmid.getV();
+            float u = lmid.u;
+            float v = lmid.v2;
+            float u2 = lmid.u2;
+            float v2 = lmid.v;
 
 
             Vec2 v1 = Tmp.v1.trnsExact(rot + 90f, stroke);
@@ -98,15 +98,15 @@ public class LightRenderer{
             vertices[22] = v;
             vertices[23] = 0;
 
-            Draw.vert(ledge.getTexture(), vertices, 0, vertices.length);
+            Draw.vert(ledge.texture, vertices, 0, vertices.length);
 
 
             Vec2 v3 = Tmp.v2.trnsExact(rot, stroke);
 
-            u = ledge.getU();
-            v = ledge.getV2();
-            u2 = ledge.getU2();
-            v2 = ledge.getV();
+            u = ledge.u;
+            v = ledge.v2;
+            u2 = ledge.u2;
+            v2 = ledge.v;
 
             vertices[0] = lx4;
             vertices[1] = ly4;
@@ -136,7 +136,7 @@ public class LightRenderer{
             vertices[22] = v;
             vertices[23] = 0;
 
-            Draw.vert(ledge.getTexture(), vertices, 0, vertices.length);
+            Draw.vert(ledge.texture, vertices, 0, vertices.length);
 
             vertices[0] = lx2;
             vertices[1] = ly2;
@@ -166,7 +166,7 @@ public class LightRenderer{
             vertices[22] = v;
             vertices[23] = 0;
 
-            Draw.vert(ledge.getTexture(), vertices, 0, vertices.length);
+            Draw.vert(ledge.texture, vertices, 0, vertices.length);
         });
     }
 
diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java
index 12ffe9af40..35674837d6 100644
--- a/core/src/mindustry/graphics/LoadRenderer.java
+++ b/core/src/mindustry/graphics/LoadRenderer.java
@@ -98,7 +98,6 @@ public class LoadRenderer implements Disposable{
 
         float w = Core.graphics.getWidth(), h = Core.graphics.getHeight(), s = Scl.scl();
         //s = 2f;
-        Lines.precise(true);
 
         Draw.proj().setOrtho(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());
 
@@ -172,7 +171,7 @@ public class LoadRenderer implements Disposable{
         Lines.poly(w/2, h/2, 4, rad2);
 
         if(assets.isLoaded("tech")){
-            BitmapFont font = assets.get("tech");
+            Font font = assets.get("tech");
             font.getData().markupEnabled = true;
 
             int panei = 0;
@@ -461,13 +460,12 @@ public class LoadRenderer implements Disposable{
             String key = name.contains("script") ? "scripts" : name.contains("content") ? "content" : name.contains("mod") ? "mods" : name.contains("msav") ||
             name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system";
 
-            BitmapFont font = assets.get("tech");
+            Font font = assets.get("tech");
             font.setColor(Pal.accent);
             Draw.color(Color.black);
-            font.draw(red + "[[[[ " +key + " ]]\n\n"+orange+"<" + Version.modifier + " " + (Version.build == 0 ? " [init]" : Version.build == -1 ? " custom" : " " + Version.build) + ">", w/2f, h/2f + 110*s, Align.center);
+            font.draw(red + "[[[[ " + key + " ]]\n"+orange+"<" + Version.modifier + " " + (Version.build == 0 ? " [init]" : Version.build == -1 ? " custom" : " " + Version.build) + ">", w/2f, h/2f + 110*s, Align.center);
         }
 
-        Lines.precise(false);
         Draw.flush();
 
         fx.end();
diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java
index bc72220c77..5d036ce4e5 100644
--- a/core/src/mindustry/graphics/MenuRenderer.java
+++ b/core/src/mindustry/graphics/MenuRenderer.java
@@ -50,21 +50,21 @@ public class MenuRenderer implements Disposable{
         Simplex s3 = new Simplex(offset + 2);
         RidgedPerlin rid = new RidgedPerlin(1 + offset, 1);
         Block[] selected = Structs.select(
-            new Block[]{Blocks.sand, Blocks.sandRocks},
-            new Block[]{Blocks.shale, Blocks.shaleRocks},
-            new Block[]{Blocks.ice, Blocks.icerocks},
-            new Block[]{Blocks.sand, Blocks.sandRocks},
-            new Block[]{Blocks.shale, Blocks.shaleRocks},
-            new Block[]{Blocks.ice, Blocks.icerocks},
+            new Block[]{Blocks.sand, Blocks.sandWall},
+            new Block[]{Blocks.shale, Blocks.shaleWall},
+            new Block[]{Blocks.ice, Blocks.iceWall},
+            new Block[]{Blocks.sand, Blocks.sandWall},
+            new Block[]{Blocks.shale, Blocks.shaleWall},
+            new Block[]{Blocks.ice, Blocks.iceWall},
             new Block[]{Blocks.moss, Blocks.sporePine}
         );
         Block[] selected2 = Structs.select(
-            new Block[]{Blocks.ignarock, Blocks.duneRocks},
-            new Block[]{Blocks.ignarock, Blocks.duneRocks},
-            new Block[]{Blocks.stone, Blocks.rocks},
-            new Block[]{Blocks.stone, Blocks.rocks},
-            new Block[]{Blocks.moss, Blocks.sporerocks},
-            new Block[]{Blocks.salt, Blocks.saltRocks}
+            new Block[]{Blocks.basalt, Blocks.duneWall},
+            new Block[]{Blocks.basalt, Blocks.duneWall},
+            new Block[]{Blocks.stone, Blocks.stoneWall},
+            new Block[]{Blocks.stone, Blocks.stoneWall},
+            new Block[]{Blocks.moss, Blocks.sporeWall},
+            new Block[]{Blocks.salt, Blocks.saltWall}
         );
 
         Block ore1 = ores.random();
@@ -113,7 +113,7 @@ public class MenuRenderer implements Disposable{
                     if(heat > base){
                         ore = Blocks.air;
                         wall = Blocks.air;
-                        floor = Blocks.ignarock;
+                        floor = Blocks.basalt;
 
                         if(heat > base + 0.1){
                             floor = Blocks.hotrock;
@@ -146,7 +146,7 @@ public class MenuRenderer implements Disposable{
                         floor = Mathf.chance(0.2) ? Blocks.sporeMoss : Blocks.moss;
 
                         if(wall != Blocks.air){
-                            wall = Blocks.sporerocks;
+                            wall = Blocks.sporeWall;
                         }
                     }
                 }
@@ -243,7 +243,7 @@ public class MenuRenderer implements Disposable{
 
         TextureRegion icon = flyerType.icon(Cicon.full);
 
-        float size = Math.max(icon.getWidth(), icon.getHeight()) * Draw.scl * 1.6f;
+        float size = Math.max(icon.width, icon.height) * Draw.scl * 1.6f;
 
         flyers((x, y) -> {
             Draw.rect(flyerType.region, x - 12f, y - 13f, flyerRot - 90);
diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index ab95e0f260..f9803b9db8 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -36,7 +36,11 @@ public class MinimapRenderer implements Disposable{
         });
 
         //make sure to call on the graphics thread
-        Events.on(BuildinghangeEvent.class, event -> Core.app.post(() -> update(event.tile)));
+        Events.on(TileChangeEvent.class, event -> {
+            if(!ui.editor.isShown()){
+                update(event.tile);
+            }
+        });
     }
 
     public Pixmap getPixmap(){
@@ -118,8 +122,8 @@ public class MinimapRenderer implements Disposable{
         float dy = (Core.camera.position.y / tilesize);
         dx = Mathf.clamp(dx, sz, world.width() - sz);
         dy = Mathf.clamp(dy, sz, world.height() - sz);
-        float invTexWidth = 1f / texture.getWidth();
-        float invTexHeight = 1f / texture.getHeight();
+        float invTexWidth = 1f / texture.width;
+        float invTexHeight = 1f / texture.height;
         float x = dx - sz, y = world.height() - dy - sz, width = sz * 2, height = sz * 2;
         region.set(x * invTexWidth, y * invTexHeight, (x + width) * invTexWidth, (y + height) * invTexHeight);
         return region;
@@ -172,7 +176,7 @@ public class MinimapRenderer implements Disposable{
     }
 
     public void drawLabel(float x, float y, String text, Color color){
-        BitmapFont font = Fonts.outline;
+        Font font = Fonts.outline;
         GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
         boolean ints = font.usesIntegerPositions();
         font.getData().setScale(1 / 1.5f / Scl.scl(1f));
diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java
index 8b7f940197..ea988e5e78 100644
--- a/core/src/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/mindustry/graphics/OverlayRenderer.java
@@ -35,32 +35,35 @@ public class OverlayRenderer{
 
     public void drawTop(){
 
-        if(Core.settings.getBool("playerindicators")){
-            for(Player player : Groups.player){
-                if(Vars.player != player && Vars.player.team() == player.team()){
-                    if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f)
-                    .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){
+        if(!player.dead()){
+            if(Core.settings.getBool("playerindicators")){
+                for(Player player : Groups.player){
+                    if(Vars.player != player && Vars.player.team() == player.team()){
+                        if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f)
+                        .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){
 
-                        Tmp.v1.set(player.x, player.y).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength);
+                            Tmp.v1.set(player).sub(Vars.player).setLength(indicatorLength);
 
-                        Lines.stroke(2f, player.team().color);
-                        Lines.lineAngle(Core.camera.position.x + Tmp.v1.x, Core.camera.position.y + Tmp.v1.y, Tmp.v1.angle(), 4f);
-                        Draw.reset();
+                            Lines.stroke(2f, Vars.player.team().color);
+                            Lines.lineAngle(Vars.player.x + Tmp.v1.x, Vars.player.y + Tmp.v1.y, Tmp.v1.angle(), 4f);
+                            Draw.reset();
+                        }
                     }
                 }
             }
-        }
 
-        if(Core.settings.getBool("indicators")){
-            Groups.unit.each(unit -> {
-                if(!unit.isLocal() && unit.team() != player.team() && !rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f).setCenter(Core.camera.position.x, Core.camera.position.y).contains(unit.x(), unit.y())){
-                    Tmp.v1.set(unit.x(), unit.y()).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength);
+            if(Core.settings.getBool("indicators")){
+                Groups.unit.each(unit -> {
+                    if(!unit.isLocal() && unit.team != player.team() && !rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f)
+                    .setCenter(Core.camera.position.x, Core.camera.position.y).contains(unit.x, unit.y)){
+                        Tmp.v1.set(unit.x, unit.y).sub(player).setLength(indicatorLength);
 
-                    Lines.stroke(1f, unit.team().color);
-                    Lines.lineAngle(Core.camera.position.x + Tmp.v1.x, Core.camera.position.y + Tmp.v1.y, Tmp.v1.angle(), 3f);
-                    Draw.reset();
-                }
-            });
+                        Lines.stroke(1f, unit.team().color);
+                        Lines.lineAngle(player.x + Tmp.v1.x, player.y + Tmp.v1.y, Tmp.v1.angle(), 3f);
+                        Draw.reset();
+                    }
+                });
+            }
         }
 
         if(player.dead()) return; //dead players don't draw
@@ -79,7 +82,7 @@ public class OverlayRenderer{
 
             if(select instanceof BlockUnitc){
                 //special selection for block "units"
-                Fill.square(select.x, select.y, ((BlockUnitc)select).tile().block().size * tilesize/2f);
+                Fill.square(select.x, select.y, ((BlockUnitc)select).tile().block.size * tilesize/2f);
             }else{
                 Draw.rect(select.type().icon(Cicon.full), select.x(), select.y(), select.rotation() - 90);
             }
@@ -108,7 +111,7 @@ public class OverlayRenderer{
                 if(dst < state.rules.enemyCoreBuildRadius * 2.2f){
                     Draw.color(Color.darkGray);
                     Lines.circle(core.x, core.y - 2, state.rules.enemyCoreBuildRadius);
-                    Draw.color(Pal.accent, core.team().color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f));
+                    Draw.color(Pal.accent, core.team.color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f));
                     Lines.circle(core.x, core.y, state.rules.enemyCoreBuildRadius);
                 }
             });
@@ -129,20 +132,25 @@ public class OverlayRenderer{
         //draw selected block
         if(input.block == null && !Core.scene.hasMouse()){
             Vec2 vec = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
-            Building tile = world.buildWorld(vec.x, vec.y);
+            Building build = world.buildWorld(vec.x, vec.y);
 
-            if(tile != null && tile.team() == player.team()){
-                tile.drawSelect();
+            if(build != null && build.team == player.team()){
+                build.drawSelect();
+                if(!build.enabled && build.block.drawDisabled){
+                   build.drawDisabled();
+                }
 
-                if(Core.input.keyDown(Binding.rotateplaced) && tile.block().rotate && tile.interactable(player.team())){
-                    control.input.drawArrow(tile.block(), tile.tileX(), tile.tileY(), tile.rotation(), true);
+                if(Core.input.keyDown(Binding.rotateplaced) && build.block.rotate && build.block.quickRotate && build.interactable(player.team())){
+                    control.input.drawArrow(build.block, build.tileX(), build.tileY(), build.rotation, true);
                     Draw.color(Pal.accent, 0.3f + Mathf.absin(4f, 0.2f));
-                    Fill.square(tile.x, tile.y, tile.block().size * tilesize/2f);
+                    Fill.square(build.x, build.y, build.block.size * tilesize/2f);
                     Draw.color();
                 }
             }
         }
 
+        input.drawOverSelect();
+
         //draw selection overlay when dropping item
         if(input.isDroppingItem()){
             Vec2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
@@ -153,11 +161,11 @@ public class OverlayRenderer{
             Draw.reset();
 
             Building tile = world.buildWorld(v.x, v.y);
-            if(tile != null && tile.interactable(player.team()) && tile.acceptStack(player.unit().item(), player.unit().stack.amount, player.unit()) > 0){
+            if(tile != null && tile.interactable(player.team()) && tile.acceptStack(player.unit().item(), player.unit().stack.amount, player.unit()) > 0 && player.within(tile, itemTransferRange)){
                 Lines.stroke(3f, Pal.gray);
-                Lines.square(tile.x, tile.y, tile.block().size * tilesize / 2f + 3 + Mathf.absin(Time.time(), 5f, 1f));
+                Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 3 + Mathf.absin(Time.time(), 5f, 1f));
                 Lines.stroke(1f, Pal.place);
-                Lines.square(tile.x, tile.y, tile.block().size * tilesize / 2f + 2 + Mathf.absin(Time.time(), 5f, 1f));
+                Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 2 + Mathf.absin(Time.time(), 5f, 1f));
                 Draw.reset();
 
             }
diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java
index 84121a9893..a61b363557 100644
--- a/core/src/mindustry/graphics/Pal.java
+++ b/core/src/mindustry/graphics/Pal.java
@@ -3,12 +3,16 @@ package mindustry.graphics;
 import arc.graphics.Color;
 
 public class Pal{
-    public static final Color
+    public static Color
 
     items = Color.valueOf("2ea756"),
     command = Color.valueOf("eab678"),
 
     sap = Color.valueOf("665c9f"),
+    sapBullet = Color.valueOf("bf92f9"),
+    sapBulletBack = Color.valueOf("6d56bf"),
+
+    spore = Color.valueOf("7457ce"),
 
     shield = Color.valueOf("ffd37f").a(0.7f),
     shieldIn = Color.black.cpy().a(0f),
@@ -42,6 +46,8 @@ public class Pal{
     lightishGray = Color.valueOf("a2a2a2"),
     darkishGray = new Color(0.3f, 0.3f, 0.3f, 1f),
     darkerGray = new Color(0.2f, 0.2f, 0.2f, 1f),
+    darkestGray = new Color(0.1f, 0.1f, 0.1f, 1f),
+    shadow = new Color(0, 0, 0, 0.22f),
     ammo = Color.valueOf("ff8947"),
     rubble = Color.valueOf("1c1817"),
 
diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java
index fd418c9673..5fed02b762 100644
--- a/core/src/mindustry/graphics/Shaders.java
+++ b/core/src/mindustry/graphics/Shaders.java
@@ -20,15 +20,16 @@ public class Shaders{
     public static UnitBuild build;
     public static DarknessShader darkness;
     public static LightShader light;
-    public static SurfaceShader water, tar, slag;
+    public static SurfaceShader water, mud, tar, slag;
     public static PlanetShader planet;
     public static PlanetGridShader planetGrid;
     public static AtmosphereShader atmosphere;
-    public static MeshShader mesh = new MeshShader();
+    public static MeshShader mesh;
     public static Shader unlit;
     public static Shader screenspace;
 
     public static void init(){
+        mesh = new MeshShader();
         blockbuild = new BlockBuild();
         try{
             shield = new ShieldShader();
@@ -41,6 +42,7 @@ public class Shaders{
         darkness = new DarknessShader();
         light = new LightShader();
         water = new SurfaceShader("water");
+        mud = new SurfaceShader("mud");
         tar = new SurfaceShader("tar");
         slag = new SurfaceShader("slag");
         planet = new PlanetShader();
@@ -151,9 +153,9 @@ public class Shaders{
             setUniformf("u_time", time);
             setUniformf("u_color", color);
             setUniformf("u_progress", progress);
-            setUniformf("u_uv", region.getU(), region.getV());
-            setUniformf("u_uv2", region.getU2(), region.getV2());
-            setUniformf("u_texsize", region.getTexture().getWidth(), region.getTexture().getHeight());
+            setUniformf("u_uv", region.u, region.v);
+            setUniformf("u_uv2", region.u2, region.v2);
+            setUniformf("u_texsize", region.texture.width, region.texture.height);
         }
     }
 
@@ -170,10 +172,10 @@ public class Shaders{
         public void apply(){
             setUniformf("u_progress", progress);
             setUniformf("u_color", color);
-            setUniformf("u_uv", region.getU(), region.getV());
-            setUniformf("u_uv2", region.getU2(), region.getV2());
+            setUniformf("u_uv", region.u, region.v);
+            setUniformf("u_uv2", region.u2, region.v2);
             setUniformf("u_time", Time.time());
-            setUniformf("u_texsize", region.getTexture().getWidth(), region.getTexture().getHeight());
+            setUniformf("u_texsize", region.texture.width, region.texture.height);
         }
     }
 
diff --git a/core/src/mindustry/graphics/Trail.java b/core/src/mindustry/graphics/Trail.java
index e48cdda550..9838e40b63 100644
--- a/core/src/mindustry/graphics/Trail.java
+++ b/core/src/mindustry/graphics/Trail.java
@@ -18,6 +18,10 @@ public class Trail{
         points = new Seq<>(length);
     }
 
+    public void clear(){
+        points.clear();
+    }
+
     public void draw(Color color, float width){
         Draw.color(color);
 
diff --git a/core/src/mindustry/graphics/g3d/MeshBuilder.java b/core/src/mindustry/graphics/g3d/MeshBuilder.java
index 2342c469c6..dc26cec9f5 100644
--- a/core/src/mindustry/graphics/g3d/MeshBuilder.java
+++ b/core/src/mindustry/graphics/g3d/MeshBuilder.java
@@ -4,11 +4,10 @@ import arc.graphics.*;
 import arc.graphics.VertexAttributes.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
-import arc.util.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
 
 public class MeshBuilder{
-    private static final Vec3 v1 = new Vec3(), v2 = new Vec3(), v3 = new Vec3();
+    private static final Vec3 v1 = new Vec3(), v2 = new Vec3(), v3 = new Vec3(), v4 = new Vec3();
     private static final float[] floats = new float[3 + 3 + 1];
     private static Mesh mesh;
 
@@ -111,7 +110,7 @@ public class MeshBuilder{
     }
 
     private static Vec3 normal(Vec3 v1, Vec3 v2, Vec3 v3){
-        return Tmp.v32.set(v2).sub(v1).crs(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z).nor();
+        return v4.set(v2).sub(v1).crs(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z).nor();
     }
 
     private static void verts(Vec3 a, Vec3 b, Vec3 c, Vec3 normal, Color color){
diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java
index 214b8be191..e0e76c0cee 100644
--- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java
+++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java
@@ -33,11 +33,11 @@ public class PlanetRenderer implements Disposable{
     /** The sun/main planet of the solar system from which everything is rendered. */
     public final Planet solarSystem = Planets.sun;
     /** Planet being looked at. */
-    public Planet planet = Planets.starter;
+    public Planet planet = Planets.serpulo;
     /** Camera used for rendering. */
     public Camera3D cam = new Camera3D();
     /** Raw vertex batch. */
-    public final VertexBatch3D batch = new VertexBatch3D(10000, false, true, 0);
+    public final VertexBatch3D batch = new VertexBatch3D(20000, false, true, 0);
 
     public float zoom = 1f;
 
diff --git a/core/src/mindustry/input/Binding.java b/core/src/mindustry/input/Binding.java
index 517e50ca69..75655412cb 100644
--- a/core/src/mindustry/input/Binding.java
+++ b/core/src/mindustry/input/Binding.java
@@ -8,7 +8,8 @@ import arc.input.*;
 public enum Binding implements KeyBind{
     move_x(new Axis(KeyCode.a, KeyCode.d), "general"),
     move_y(new Axis(KeyCode.s, KeyCode.w)),
-    mouse_move(KeyCode.mouseForward),
+    mouse_move(KeyCode.mouseBack),
+    pan(KeyCode.mouseForward),
 
     boost(KeyCode.shiftLeft),
     control(KeyCode.controlLeft),
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index bb3970a71e..a71ed25564 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -13,7 +13,6 @@ import arc.scene.ui.layout.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.*;
-import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -28,32 +27,44 @@ import static mindustry.Vars.*;
 import static mindustry.input.PlaceMode.*;
 
 public class DesktopInput extends InputHandler{
-    private Vec2 movement = new Vec2();
+    public Vec2 movement = new Vec2();
     /** Current cursor type. */
-    private Cursor cursorType = SystemCursor.arrow;
+    public Cursor cursorType = SystemCursor.arrow;
     /** Position where the player started dragging a line. */
-    private int selectX, selectY, schemX, schemY;
+    public int selectX = -1, selectY = -1, schemX = -1, schemY = -1;
     /** Last known line positions.*/
-    private int lastLineX, lastLineY, schematicX, schematicY;
+    public int lastLineX, lastLineY, schematicX, schematicY;
     /** Whether selecting mode is active. */
-    private PlaceMode mode;
+    public PlaceMode mode;
     /** Animation scale for line. */
-    private float selectScale;
+    public float selectScale;
     /** Selected build request for movement. */
-    private @Nullable BuildPlan sreq;
+    public @Nullable BuildPlan sreq;
     /** Whether player is currently deleting removal requests. */
-    private boolean deleting = false, shouldShoot = false;
+    public boolean deleting = false, shouldShoot = false, panning = false;
+    /** Mouse pan speed. */
+    public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 9f;
 
     @Override
     public void buildUI(Group group){
+
+        group.fill(t -> {
+            t.visible(() -> Core.settings.getBool("hints") && ui.hudfrag.shown() && !player.dead() && !player.unit().spawnedByCore() && !(Core.settings.getBool("hints") && lastSchematic != null && !selectRequests.isEmpty()));
+            t.bottom();
+            t.table(Styles.black6, b -> {
+                b.defaults().left();
+                b.label(() -> Core.bundle.format("respawn", Core.keybinds.get(Binding.respawn).key.toString())).style(Styles.outlineLabel);
+            }).margin(6f);
+        });
+
         group.fill(t -> {
             t.bottom();
             t.visible(() -> {
-                t.getColor().a = Mathf.lerpDelta(t.getColor().a, player.builder().isBuilding() ? 1f : 0f, 0.15f);
+                t.color.a = Mathf.lerpDelta(t.color.a, player.builder().isBuilding() ? 1f : 0f, 0.15f);
 
-                return Core.settings.getBool("hints") && selectRequests.isEmpty() && t.getColor().a > 0.01f;
+                return Core.settings.getBool("hints") && selectRequests.isEmpty() && t.color.a > 0.01f;
             });
-            t.touchable(() -> t.getColor().a < 0.1f ? Touchable.disabled : Touchable.childrenOnly);
+            t.touchable(() -> t.color.a < 0.1f ? Touchable.disabled : Touchable.childrenOnly);
             t.table(Styles.black6, b -> {
                 b.defaults().left();
                 b.label(() -> Core.bundle.format(!isBuilding ?  "resumebuilding" : "pausebuilding", Core.keybinds.get(Binding.pause_building).key.toString())).style(Styles.outlineLabel);
@@ -65,28 +76,19 @@ public class DesktopInput extends InputHandler{
         });
 
         group.fill(t -> {
-            t.visible(() -> Core.settings.getBool("hints") && lastSchematic != null && !selectRequests.isEmpty());
+            t.visible(() -> lastSchematic != null && !selectRequests.isEmpty());
             t.bottom();
             t.table(Styles.black6, b -> {
                 b.defaults().left();
-                b.label( () -> Core.bundle.format("schematic.flip",
-                Core.keybinds.get(Binding.schematic_flip_x).key.toString(),
-                Core.keybinds.get(Binding.schematic_flip_y).key.toString())).style(Styles.outlineLabel);
+                b.label(() -> Core.bundle.format("schematic.flip",
+                    Core.keybinds.get(Binding.schematic_flip_x).key.toString(),
+                    Core.keybinds.get(Binding.schematic_flip_y).key.toString())).style(Styles.outlineLabel).visible(() -> Core.settings.getBool("hints"));
                 b.row();
                 b.table(a -> {
-                    a.button("$schematic.add", Icon.save, this::showSchematicSave).colspan(2).size(250f, 50f).disabled(f -> lastSchematic == null || lastSchematic.file != null);
+                    a.button("@schematic.add", Icon.save, this::showSchematicSave).colspan(2).size(250f, 50f).disabled(f -> lastSchematic == null || lastSchematic.file != null);
                 });
             }).margin(6f);
         });
-
-        group.fill(t -> {
-            t.visible(() -> Core.settings.getBool("hints") && !player.dead() && !player.unit().spawnedByCore());
-            t.bottom();
-            t.table(Styles.black6, b -> {
-                b.defaults().left();
-                b.label(() -> Core.bundle.format("respawn", Core.keybinds.get(Binding.respawn).key.toString())).style(Styles.outlineLabel);
-            }).margin(6f);
-        });
     }
 
     @Override
@@ -97,10 +99,10 @@ public class DesktopInput extends InputHandler{
 
         //draw break selection
         if(mode == breaking){
-            drawBreakSelection(selectX, selectY, cursorX, cursorY);
+            drawBreakSelection(selectX, selectY, cursorX, cursorY, !Core.input.keyDown(Binding.schematic_select) ? maxLength : Vars.maxSchematicSize);
         }
 
-        if(Core.input.keyDown(Binding.schematic_select) && !Core.scene.hasKeyboard()){
+        if(Core.input.keyDown(Binding.schematic_select) && !Core.scene.hasKeyboard() && mode != breaking){
             drawSelection(schemX, schemY, cursorX, cursorY, Vars.maxSchematicSize);
         }
 
@@ -133,14 +135,12 @@ public class DesktopInput extends InputHandler{
         }
 
         //draw schematic requests
-        for(BuildPlan request : selectRequests){
-            request.animScale = 1f;
-            drawRequest(request);
-        }
+        selectRequests.each(req -> {
+            req.animScale = 1f;
+            drawRequest(req);
+        });
 
-        for(BuildPlan request : selectRequests){
-            drawOverRequest(request);
-        }
+        selectRequests.each(this::drawOverRequest);
 
         if(player.isBuilder()){
             //draw things that may be placed soon
@@ -177,27 +177,40 @@ public class DesktopInput extends InputHandler{
     public void update(){
         super.update();
 
-        if(net.active() && Core.input.keyTap(Binding.player_list)){
+        if(net.active() && Core.input.keyTap(Binding.player_list) && (scene.getKeyboardFocus() == null || scene.getKeyboardFocus().isDescendantOf(ui.listfrag.content))){
             ui.listfrag.toggle();
         }
 
-        //TODO awful UI state checking code
-        if((player.dead() || state.isPaused()) && !ui.chatfrag.shown()){
-            if(!(scene.getKeyboardFocus() instanceof TextField) && !scene.hasDialog()){
-                //move camera around
-                float camSpeed = !Core.input.keyDown(Binding.boost) ? 3f : 8f;
-                Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta * camSpeed));
+        boolean panCam = false;
+        float camSpeed = (!Core.input.keyDown(Binding.boost) ? panSpeed : panBoostSpeed) * Time.delta;
 
-                if(Core.input.keyDown(Binding.mouse_move)){
-                    Core.camera.position.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2f) * 0.005f, -1, 1) * camSpeed;
-                    Core.camera.position.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2f) * 0.005f, -1, 1) * camSpeed;
-                }
+        if(input.keyDown(Binding.pan)){
+            panCam = true;
+            panning = true;
+        }
+
+        if((Math.abs(Core.input.axis(Binding.move_x)) > 0 || Math.abs(Core.input.axis(Binding.move_y)) > 0 || input.keyDown(Binding.mouse_move)) && (!scene.hasField())){
+            panning = false;
+        }
+
+        //TODO awful UI state checking code
+        if(((player.dead() || state.isPaused()) && !ui.chatfrag.shown()) && (!scene.hasField() && !scene.hasDialog())){
+            if(input.keyDown(Binding.mouse_move)){
+                panCam = true;
             }
-        }else if(!player.dead()){
+            panning = false;
+
+            Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(camSpeed));
+        }else if(!player.dead() && !panning){
             Core.camera.position.lerpDelta(player, Core.settings.getBool("smoothcamera") ? 0.08f : 1f);
         }
 
-        shouldShoot = true;
+        if(panCam){
+            Core.camera.position.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2f) * panScale, -1, 1) * camSpeed;
+            Core.camera.position.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2f) * panScale, -1, 1) * camSpeed;
+        }
+
+        shouldShoot = !scene.hasMouse();
 
         if(!scene.hasMouse()){
             if(Core.input.keyDown(Binding.control) && Core.input.keyTap(Binding.select)){
@@ -212,7 +225,7 @@ public class DesktopInput extends InputHandler{
         if(!player.dead() && !state.isPaused() && !(Core.scene.getKeyboardFocus() instanceof TextField)){
             updateMovement(player.unit());
 
-            if(Core.input.keyDown(Binding.respawn) && !player.unit().spawnedByCore()){
+            if(Core.input.keyDown(Binding.respawn) && !player.unit().spawnedByCore() && !scene.hasField()){
                 Call.unitClear(player);
                 controlledType = null;
             }
@@ -294,7 +307,7 @@ public class DesktopInput extends InputHandler{
                 cursorType = ui.unloadCursor;
             }
 
-            if(cursor.build != null && cursor.interactable(player.team()) && !isPlacing() && Math.abs(Core.input.axisTap(Binding.rotate)) > 0 && Core.input.keyDown(Binding.rotateplaced) && cursor.block().rotate){
+            if(cursor.build != null && cursor.interactable(player.team()) && !isPlacing() && Math.abs(Core.input.axisTap(Binding.rotate)) > 0 && Core.input.keyDown(Binding.rotateplaced) && cursor.block().rotate && cursor.block().quickRotate){
                 Call.rotateBlock(player, cursor.build, Core.input.axisTap(Binding.rotate) > 0);
             }
         }
@@ -330,20 +343,19 @@ public class DesktopInput extends InputHandler{
 
         table.button(Icon.paste, Styles.clearPartiali, () -> {
             ui.schematics.show();
-        });
+        }).tooltip("@schematics");
 
         table.button(Icon.tree, Styles.clearPartiali, () -> {
             ui.research.show();
-        }).visible(() -> state.isCampaign());
+        }).visible(() -> state.isCampaign()).tooltip("@research");
 
         table.button(Icon.map, Styles.clearPartiali, () -> {
             ui.planet.show();
-        }).visible(() -> state.isCampaign());
+        }).visible(() -> state.isCampaign()).tooltip("@planetmap");
 
         table.button(Icon.up, Styles.clearPartiali, () -> {
-            ui.planet.show(state.getSector(), player.team().core());
-        }).visible(() -> state.isCampaign())
-        .disabled(b -> player.team().core() == null || !player.team().core().items.has(player.team().core().block.requirements));
+            ui.planet.showLaunch(state.getSector(), player.team().core());
+        }).visible(() -> state.isCampaign()).tooltip("@launchcore").disabled(b -> player.team().core() == null);
     }
 
     void pollInput(){
@@ -380,7 +392,7 @@ public class DesktopInput extends InputHandler{
             player.builder().clearBuilding();
         }
 
-        if(Core.input.keyTap(Binding.schematic_select) && !Core.scene.hasKeyboard()){
+        if(Core.input.keyTap(Binding.schematic_select) && !Core.scene.hasKeyboard() && mode != breaking){
             schemX = rawCursorX;
             schemY = rawCursorY;
         }
@@ -399,12 +411,14 @@ public class DesktopInput extends InputHandler{
             selectRequests.clear();
         }
 
-        if(Core.input.keyRelease(Binding.schematic_select) && !Core.scene.hasKeyboard()){
+        if(Core.input.keyRelease(Binding.schematic_select) && !Core.scene.hasKeyboard() && selectX == -1 && selectY == -1 && schemX != -1 && schemY != -1){
             lastSchematic = schematics.create(schemX, schemY, rawCursorX, rawCursorY);
             useSchematic(lastSchematic);
             if(selectRequests.isEmpty()){
                 lastSchematic = null;
             }
+            schemX = -1;
+            schemY = -1;
         }
 
         if(!selectRequests.isEmpty()){
@@ -445,6 +459,10 @@ public class DesktopInput extends InputHandler{
         }
 
         if(Core.input.keyTap(Binding.select) && !Core.scene.hasMouse()){
+            if(selected != null){
+                Call.tileTap(player, selected);
+            }
+
             BuildPlan req = getRequest(cursorX, cursorY);
 
             if(Core.input.keyDown(Binding.break_block)){
@@ -483,6 +501,8 @@ public class DesktopInput extends InputHandler{
             mode = breaking;
             selectX = tileX(Core.input.mouseX());
             selectY = tileY(Core.input.mouseY());
+            schemX = rawCursorX;
+            schemY = rawCursorY;
         }
 
         if(Core.input.keyDown(Binding.select) && mode == none && !isPlacing() && deleting){
@@ -503,6 +523,12 @@ public class DesktopInput extends InputHandler{
             overrideLineRotation = false;
         }
 
+        if(Core.input.keyRelease(Binding.break_block) && Core.input.keyDown(Binding.schematic_select) && mode == breaking){
+            lastSchematic = schematics.create(schemX, schemY, rawCursorX, rawCursorY);
+            schemX = -1;
+            schemY = -1;
+        }
+
         if(Core.input.keyRelease(Binding.break_block) || Core.input.keyRelease(Binding.select)){
 
             if(mode == placing && block != null){ //touch up while placing, place everything in selection
@@ -510,8 +536,14 @@ public class DesktopInput extends InputHandler{
                 lineRequests.clear();
                 Events.fire(new LineConfirmEvent());
             }else if(mode == breaking){ //touch up while breaking, break everything in selection
-                removeSelection(selectX, selectY, cursorX, cursorY);
+                removeSelection(selectX, selectY, cursorX, cursorY, !Core.input.keyDown(Binding.schematic_select) ? maxLength : Vars.maxSchematicSize);
+                if(lastSchematic != null){
+                    useSchematic(lastSchematic);
+                    lastSchematic = null;
+                }
             }
+            selectX = -1;
+            selectY = -1;
 
             tryDropItems(selected == null ? null : selected.build, Core.input.mouseWorld().x, Core.input.mouseWorld().y);
 
@@ -556,6 +588,8 @@ public class DesktopInput extends InputHandler{
 
     @Override
     public void updateState(){
+        super.updateState();
+
         if(state.isMenu()){
             droppingItem = false;
             mode = none;
@@ -566,11 +600,19 @@ public class DesktopInput extends InputHandler{
     }
 
     protected void updateMovement(Unit unit){
-        boolean omni = !(unit instanceof WaterMovec);
-        boolean legs = unit.isGrounded();
+        boolean omni = unit.type().omniMovement;
+        boolean ground = unit.isGrounded();
 
-        float strafePenalty = legs ? 1f : Mathf.lerp(1f, unit.type().strafePenalty, Angles.angleDist(unit.vel().angle(), unit.rotation()) / 180f);
-        float speed = unit.type().speed * Mathf.lerp(1f, unit.type().canBoost ? unit.type().boostMultiplier : 1f, unit.elevation()) * strafePenalty;
+        float strafePenalty = ground ? 1f : Mathf.lerp(1f, unit.type().strafePenalty, Angles.angleDist(unit.vel().angle(), unit.rotation()) / 180f);
+        float baseSpeed = unit.type().speed;
+
+        //limit speed to minimum formation speed to preserve formation
+        if(unit instanceof Commanderc && ((Commanderc)unit).isCommanding()){
+            //add a tiny multiplier to let units catch up just in case
+            baseSpeed = ((Commanderc)unit).minFormationSpeed() * 0.95f;
+        }
+
+        float speed = baseSpeed * Mathf.lerp(1f, unit.type().canBoost ? unit.type().boostMultiplier : 1f, unit.elevation) * strafePenalty;
         float xa = Core.input.axis(Binding.move_x);
         float ya = Core.input.axis(Binding.move_y);
         boolean boosted = (unit instanceof Mechc && unit.isFlying());
@@ -586,8 +628,8 @@ public class DesktopInput extends InputHandler{
         if(aimCursor){
             unit.lookAt(mouseAngle);
         }else{
-            if(unit.moving()){
-                unit.lookAt(unit.vel().angle());
+            if(!movement.isZero()){
+                unit.lookAt(unit.vel.isZero() ? movement.angle() : unit.vel.angle());
             }
         }
 
@@ -595,8 +637,8 @@ public class DesktopInput extends InputHandler{
             unit.moveAt(movement);
         }else{
             unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len()));
-            if(!movement.isZero() && legs){
-                unit.vel.rotateTo(movement.angle(), unit.type().rotateSpeed * Time.delta);
+            if(!movement.isZero() && ground){
+                unit.vel.rotateTo(movement.angle(), unit.type().rotateSpeed);
             }
         }
 
@@ -609,24 +651,13 @@ public class DesktopInput extends InputHandler{
 
         //update payload input
         if(unit instanceof Payloadc){
-            Payloadc pay = (Payloadc)unit;
 
-            if(Core.input.keyTap(Binding.pickupCargo) && pay.payloads().size < unit.type().payloadCapacity){
-                Unit target = Units.closest(player.team(), pay.x(), pay.y(), unit.type().hitsize * 2.5f, u -> u.isAI() && u.isGrounded() && u.mass() < unit.mass() && u.within(unit, u.hitSize + unit.hitSize * 1.2f));
-                if(target != null){
-                    Call.pickupUnitPayload(player, target);
-                }else if(!pay.hasPayload()){
-                    Building tile = world.buildWorld(pay.x(), pay.y());
-
-                    if(tile != null && tile.team() == unit.team){
-                        Call.pickupBlockPayload(player, tile);
-                    }
-                }
+            if(Core.input.keyTap(Binding.pickupCargo)){
+                tryPickupPayload();
             }
 
             if(Core.input.keyTap(Binding.dropCargo)){
-                Call.dropPayload(player, player.x, player.y);
-                pay.dropLastPayload();
+                tryDropPayload();
             }
         }
 
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index e92b3d1961..9034bcdd07 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -14,7 +14,6 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
-import mindustry.ai.formations.*;
 import mindustry.ai.formations.patterns.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
@@ -32,7 +31,7 @@ import mindustry.type.*;
 import mindustry.ui.fragments.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
-import mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.ConstructBlock.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
@@ -60,16 +59,16 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     public int rotation;
     public boolean droppingItem;
     public Group uiGroup;
-    public boolean isBuilding = true, buildWasAutoPaused = false;
+    public boolean isBuilding = true, buildWasAutoPaused = false, wasShooting = false;
     public @Nullable UnitType controlledType;
 
-    protected @Nullable Schematic lastSchematic;
-    protected GestureDetector detector;
-    protected PlaceLine line = new PlaceLine();
-    protected BuildPlan resultreq;
-    protected BuildPlan brequest = new BuildPlan();
-    protected Seq<BuildPlan> lineRequests = new Seq<>();
-    protected Seq<BuildPlan> selectRequests = new Seq<>();
+    public @Nullable Schematic lastSchematic;
+    public GestureDetector detector;
+    public PlaceLine line = new PlaceLine();
+    public BuildPlan resultreq;
+    public BuildPlan brequest = new BuildPlan();
+    public Seq<BuildPlan> lineRequests = new Seq<>();
+    public Seq<BuildPlan> selectRequests = new Seq<>();
 
     //methods to override
 
@@ -86,12 +85,12 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     @Remote(called = Loc.server, unreliable = true)
-    public static void transferItemTo(Item item, int amount, float x, float y, Tile tile){
-        if(tile == null || tile.build == null || tile.build.items == null) return;
+    public static void transferItemTo(Item item, int amount, float x, float y, Building build){
+        if(build == null || build.items == null) return;
         for(int i = 0; i < Mathf.clamp(amount / 3, 1, 8); i++){
-            Time.run(i * 3, () -> createItemTransfer(item, amount, x, y, tile, () -> {}));
+            Time.run(i * 3, () -> createItemTransfer(item, amount, x, y, build, () -> {}));
         }
-        tile.build.items.add(item, amount);
+        build.items.add(item, amount);
     }
 
     public static void createItemTransfer(Item item, int amount, float x, float y, Position to, Runnable done){
@@ -106,56 +105,113 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         player.builder().removeBuild(x, y, breaking);
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
-    public static void pickupUnitPayload(Player player, Unit target){
+    @Remote(targets = Loc.both, called = Loc.server)
+    public static void requestUnitPayload(Player player, Unit target){
+        if(player == null) return;
+
         Unit unit = player.unit();
         Payloadc pay = (Payloadc)unit;
 
-        if(target.isAI() && target.isGrounded() && pay.payloads().size < unit.type().payloadCapacity
-            && target.mass() < unit.mass()
-            && target.within(unit, unit.type().hitsize * 1.5f + target.type().hitsize)){
-            pay.pickup(target);
+        if(target.isAI() && target.isGrounded() && pay.canPickup(target)
+        && target.within(unit, unit.type().hitSize * 2f + target.type().hitSize * 2f)){
+            Call.pickedUnitPayload(player, target);
         }
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
-    public static void pickupBlockPayload(Player player, Building tile){
+    @Remote(targets = Loc.both, called = Loc.server)
+    public static void requestBlockPayload(Player player, Building tile){
+        if(player == null) return;
+
         Unit unit = player.unit();
         Payloadc pay = (Payloadc)unit;
 
-        if(tile != null && tile.team() == unit.team && pay.payloads().size < unit.type().payloadCapacity
-            && unit.within(tile, tilesize * tile.block.size * 1.2f)){
+        if(tile != null && tile.team == unit.team
+        && unit.within(tile, tilesize * tile.block.size * 1.2f + tilesize * 5f)){
             //pick up block directly
-            if(tile.block().buildVisibility != BuildVisibility.hidden && tile.block().size <= 2){
-                pay.pickup(tile);
+            if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
+                Call.pickedBlockPayload(player, tile, true);
             }else{ //pick up block payload
                 Payload current = tile.getPayload();
-                if(current != null && current.canBeTaken(pay)){
-                    Payload taken = tile.takePayload();
-                    if(taken != null){
-                        pay.addPayload(taken);
-                        Fx.unitPickup.at(tile);
-                    }
+                if(current != null && pay.canPickupPayload(current)){
+                    Call.pickedBlockPayload(player, tile, false);
                 }
             }
         }
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
-    public static void dropPayload(Player player, float x, float y){
+    @Remote(targets = Loc.server, called = Loc.server)
+    public static void pickedUnitPayload(Player player, Unit target){
+        if(player == null || target == null || !(player.unit() instanceof Payloadc)){
+            if(target != null){
+                target.remove();
+            }
+            return;
+        }
+
+        ((Payloadc)player.unit()).pickup(target);
+    }
+
+    @Remote(targets = Loc.server, called = Loc.server)
+    public static void pickedBlockPayload(Player player, Building tile, boolean onGround){
+        if(player == null || tile == null || !(player.unit() instanceof Payloadc)){
+            if(tile != null && onGround){
+                Fx.unitPickup.at(tile);
+                tile.tile.remove();
+            }
+            return;
+        }
+
+        Unit unit = player.unit();
+        Payloadc pay = (Payloadc)unit;
+
+        if(onGround){
+            if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
+                pay.pickup(tile);
+            }else{
+                Fx.unitPickup.at(tile);
+                tile.tile.remove();
+            }
+        }else{
+            Payload current = tile.getPayload();
+            if(current != null && pay.canPickupPayload(current)){
+                Payload taken = tile.takePayload();
+                if(taken != null){
+                    pay.addPayload(taken);
+                    Fx.unitPickup.at(tile);
+                }
+            }
+        }
+    }
+
+    @Remote(targets = Loc.both, called = Loc.server)
+    public static void requestDropPayload(Player player, float x, float y){
+        if(player == null || net.client()) return;
+
         Payloadc pay = (Payloadc)player.unit();
 
-        //allow a slight margin of error
-        if(pay.within(x, y, tilesize * 2f)){
-            float prevx = pay.x(), prevy = pay.y();
-            pay.set(x, y);
-            pay.dropLastPayload();
-            pay.set(prevx, prevy);
-        }
+        //apply margin of error
+        Tmp.v1.set(x, y).sub(pay).limit(tilesize * 4f).add(pay);
+        float cx = Tmp.v1.x, cy = Tmp.v1.y;
+
+        Call.payloadDropped(player, cx, cy);
+    }
+
+    @Remote(called = Loc.server, targets = Loc.server)
+    public static void payloadDropped(Player player, float x, float y){
+        if(player == null) return;
+
+        Payloadc pay = (Payloadc)player.unit();
+
+        float prevx = pay.x(), prevy = pay.y();
+        pay.set(x, y);
+        pay.dropLastPayload();
+        pay.set(prevx, prevy);
     }
 
     @Remote(targets = Loc.client, called = Loc.server)
     public static void dropItem(Player player, float angle){
+        if(player == null) return;
+
         if(net.server() && player.unit().stack.amount <= 0){
             throw new ValidateException(player, "Player cannot drop an item.");
         }
@@ -166,21 +222,24 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     @Remote(targets = Loc.both, called = Loc.server, forward = true, unreliable = true)
     public static void rotateBlock(Player player, Building tile, boolean direction){
+        if(tile == null) return;
+
         if(net.server() && (!Units.canInteract(player, tile) ||
-            !netServer.admins.allowAction(player, ActionType.rotate, tile.tile(), action -> action.rotation = Mathf.mod(tile.rotation() + Mathf.sign(direction), 4)))){
+            !netServer.admins.allowAction(player, ActionType.rotate, tile.tile(), action -> action.rotation = Mathf.mod(tile.rotation + Mathf.sign(direction), 4)))){
             throw new ValidateException(player, "Player cannot rotate a block.");
         }
 
-        tile.rotation(Mathf.mod(tile.rotation() + Mathf.sign(direction), 4));
+        tile.rotation = Mathf.mod(tile.rotation + Mathf.sign(direction), 4);
         tile.updateProximity();
         tile.noSleep();
     }
 
     @Remote(targets = Loc.both, forward = true, called = Loc.server)
     public static void transferInventory(Player player, Building tile){
-        if(player == null || tile == null) return;
+        if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null) return;
+
         if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, tile) ||
-            !netServer.admins.allowAction(player, ActionType.depositItem, tile.tile(), action -> {
+            !netServer.admins.allowAction(player, ActionType.depositItem, tile.tile, action -> {
                 action.itemAmount = player.unit().stack.amount;
                 action.item = player.unit().item();
             }))){
@@ -195,46 +254,58 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         Core.app.post(() -> Events.fire(new DepositEvent(tile, player, item, accepted)));
 
         tile.getStackOffset(item, stackTrns);
+        tile.handleStack(item, accepted, player.unit());
 
         createItemTransfer(
             item,
             amount,
             player.x + Angles.trnsx(player.unit().rotation + 180f, backTrns), player.y + Angles.trnsy(player.unit().rotation + 180f, backTrns),
             new Vec2(tile.x + stackTrns.x, tile.y + stackTrns.y),
-            () -> tile.handleStack(item, accepted, player.unit())
+            () -> {}
         );
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
-    public static void tileTapped(Player player, Building tile){
-        if(tile == null || player == null) return;
+    @Remote(targets = Loc.both, called = Loc.both, forward = true)
+    public static void tileConfig(@Nullable Player player, Building tile, @Nullable Object value){
+        if(tile == null) return;
         if(net.server() && (!Units.canInteract(player, tile) ||
-        !netServer.admins.allowAction(player, ActionType.tapTile, tile.tile(), action -> {}))) throw new ValidateException(player, "Player cannot tap a tile.");
-        tile.tapped(player);
-        Core.app.post(() -> Events.fire(new TapEvent(tile, player)));
+            !netServer.admins.allowAction(player, ActionType.configure, tile.tile, action -> action.config = value))) throw new ValidateException(player, "Player cannot configure a tile.");
+        tile.configured(player == null || player.dead() ? null : player.unit(), value);
+        Core.app.post(() -> Events.fire(new ConfigEvent(tile, player, value)));
+    }
+
+    //only useful for servers or local mods, and is not replicated across clients
+    //uses unreliable packets due to high frequency
+    @Remote(targets = Loc.both, called = Loc.both, unreliable = true)
+    public static void tileTap(@Nullable Player player, Tile tile){
+        if(tile == null) return;
+
+        Events.fire(new TapEvent(player, tile));
     }
 
     @Remote(targets = Loc.both, called = Loc.both, forward = true)
-    public static void tileConfig(Player player, Building tile, @Nullable Object value){
-        if(tile == null) return;
-        if(net.server() && (!Units.canInteract(player, tile) ||
-            !netServer.admins.allowAction(player, ActionType.configure, tile.tile(), action -> action.config = value))) throw new ValidateException(player, "Player cannot configure a tile.");
-        tile.configured(player, value);
-        Core.app.post(() -> Events.fire(new TapConfigEvent(tile, player, value)));
-    }
-
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
     public static void unitControl(Player player, @Nullable Unit unit){
+        if(player == null) return;
+
         //clear player unit when they possess a core
-        if((unit instanceof BlockUnitc && ((BlockUnitc)unit).tile() instanceof CoreEntity)){
+        if((unit instanceof BlockUnitc && ((BlockUnitc)unit).tile() instanceof CoreBuild)){
             Fx.spawn.at(player);
+            if(net.client()){
+                control.input.controlledType = null;
+            }
+
             player.clearUnit();
-            player.deathTimer(60f); //for instant respawn
+            player.deathTimer = 61f;
+            ((CoreBuild)((BlockUnitc)unit).tile()).requestSpawn(player);
+
         }else if(unit == null){ //just clear the unit (is this used?)
             player.clearUnit();
             //make sure it's AI controlled, so players can't overwrite each other
-        }else if(unit.isAI() && unit.team == player.team() && !unit.deactivated){
-            player.unit(unit);
+        }else if(unit.isAI() && unit.team == player.team() && !unit.dead){
+            if(!net.client()){
+                player.unit(unit);
+            }
+
             Time.run(Fx.unitSpirit.lifetime, () -> Fx.unitControl.at(unit.x, unit.y, 0f, unit));
             if(!player.dead()){
                 Fx.unitSpirit.at(player.x, player.y, 0f, unit);
@@ -242,42 +313,29 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
+    @Remote(targets = Loc.both, called = Loc.both, forward = true)
     public static void unitClear(Player player){
         //no free core teleports?
-        if(!player.dead() && player.unit().spawnedByCore) return;
+        if(player == null || !player.dead() && player.unit().spawnedByCore) return;
 
         Fx.spawn.at(player);
         player.clearUnit();
-        player.deathTimer(60f); //for instant respawn
+        player.deathTimer = 61f; //for instant respawn
     }
 
     @Remote(targets = Loc.both, called = Loc.server, forward = true)
     public static void unitCommand(Player player){
-        if(player.dead() || !(player.unit() instanceof Commanderc)) return;
+        if(player == null || player.dead() || !(player.unit() instanceof Commanderc)) return;
 
         Commanderc commander = (Commanderc)player.unit();
 
         if(commander.isCommanding()){
             commander.clearCommand();
         }else{
-            FormationPattern pattern = new SquareFormation();
-            Formation formation = new Formation(new Vec3(player.x, player.y, player.unit().rotation), pattern);
-            formation.slotAssignmentStrategy = new DistanceAssignmentStrategy(pattern);
-
-            units.clear();
 
+            //TODO try out some other formations
+            commander.commandNearby(new CircleFormation());
             Fx.commandSend.at(player);
-            Units.nearby(player.team(), player.x, player.y, 200f, u -> {
-                if(u.isAI()){
-                    units.add(u);
-                }
-            });
-
-            units.sort(u -> u.dst2(player.unit()));
-            units.truncate(player.unit().type().commandLimit);
-
-            commander.command(formation, units);
         }
 
     }
@@ -305,12 +363,18 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             player.builder().updateBuilding(isBuilding);
         }
 
+        if(player.shooting && !wasShooting && player.unit().hasWeapons() && state.rules.unitAmmo && player.unit().ammo <= 0){
+            player.unit().type().weapons.first().noAmmoSound.at(player.unit());
+        }
+
+        wasShooting = player.shooting;
+
         if(!player.dead()){
             controlledType = player.unit().type();
         }
 
         if(controlledType != null && player.dead()){
-            Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType && !u.deactivated);
+            Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType && !u.dead);
 
             if(unit != null){
                 Call.unitControl(player, unit);
@@ -320,7 +384,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     public void checkUnit(){
         if(controlledType != null){
-            Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType && !u.deactivated);
+            Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType && !u.dead);
             if(unit == null && controlledType == UnitTypes.block){
                 unit = world.buildWorld(player.x, player.y) instanceof ControlBlock ? ((ControlBlock)world.buildWorld(player.x, player.y)).unit() : null;
             }
@@ -335,6 +399,30 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }
     }
 
+    public void tryPickupPayload(){
+        Unit unit = player.unit();
+        if(!(unit instanceof Payloadc)) return;
+        Payloadc pay = (Payloadc)unit;
+
+        Unit target = Units.closest(player.team(), pay.x(), pay.y(), unit.type().hitSize * 2.5f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(unit, u.hitSize + unit.hitSize * 1.2f));
+        if(target != null){
+            Call.requestUnitPayload(player, target);
+        }else{
+            Building tile = world.buildWorld(pay.x(), pay.y());
+
+            if(tile != null && tile.team == unit.team){
+                Call.requestBlockPayload(player, tile);
+            }
+        }
+    }
+
+    public void tryDropPayload(){
+        Unit unit = player.unit();
+        if(!(unit instanceof Payloadc)) return;
+
+        Call.requestDropPayload(player, player.x, player.y);
+    }
+
     public float getMouseX(){
         return Core.input.mouseX();
     }
@@ -352,7 +440,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     public void updateState(){
-
+        if(state.isMenu()){
+            controlledType = null;
+        }
     }
 
     public void drawBottom(){
@@ -363,6 +453,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     }
 
+    public void drawOverSelect(){
+
+    }
+
     public void drawSelected(int x, int y, Block block, Color color){
         Drawf.selected(x, y, block, color);
     }
@@ -377,7 +471,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     public boolean requestMatches(BuildPlan request){
         Tile tile = world.tile(request.x, request.y);
-        return tile != null && tile.block() instanceof BuildBlock && tile.<BuildEntity>bc().cblock == request.block;
+        return tile != null && tile.block() instanceof ConstructBlock && tile.<ConstructBuild>bc().cblock == request.block;
     }
 
     public void drawBreaking(int x, int y){
@@ -395,18 +489,18 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     protected void showSchematicSave(){
         if(lastSchematic == null) return;
 
-        ui.showTextInput("$schematic.add", "$name", "", text -> {
+        ui.showTextInput("@schematic.add", "@name", "", text -> {
             Schematic replacement = schematics.all().find(s -> s.name().equals(text));
             if(replacement != null){
-                ui.showConfirm("$confirm", "$schematic.replace", () -> {
+                ui.showConfirm("@confirm", "@schematic.replace", () -> {
                     schematics.overwrite(replacement, lastSchematic);
-                    ui.showInfoFade("$schematic.saved");
+                    ui.showInfoFade("@schematic.saved");
                     ui.schematics.showInfo(replacement);
                 });
             }else{
                 lastSchematic.tags.put("name", text);
                 schematics.add(lastSchematic);
-                ui.showInfoFade("$schematic.saved");
+                ui.showInfoFade("@schematic.saved");
                 ui.schematics.showInfo(lastSchematic);
             }
         });
@@ -518,20 +612,16 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             if(test.get(req)) return req;
         }
 
-        for(BuildPlan req : selectRequests){
-            if(test.get(req)) return req;
-        }
-
-        return null;
+        return selectRequests.find(test);
     }
 
-    protected void drawBreakSelection(int x1, int y1, int x2, int y2){
+    protected void drawBreakSelection(int x1, int y1, int x2, int y2, int maxLength){
         NormalizeDrawResult result = Placement.normalizeDrawArea(Blocks.air, x1, y1, x2, y2, false, maxLength, 1f);
         NormalizeResult dresult = Placement.normalizeArea(x1, y1, x2, y2, rotation, false, maxLength);
 
         for(int x = dresult.x; x <= dresult.x2; x++){
             for(int y = dresult.y; y <= dresult.y2; y++){
-                Tile tile = world.Building(x, y);
+                Tile tile = world.tileBuilding(x, y);
                 if(tile == null || !validBreak(tile.x, tile.y)) continue;
 
                 drawBreaking(tile.x, tile.y);
@@ -572,6 +662,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
     }
 
+    protected void drawBreakSelection(int x1, int y1, int x2, int y2){
+        drawBreakSelection(x1, y1, x2, y2, maxLength);
+    }
+
     protected void drawSelection(int x1, int y1, int x2, int y2, int maxLength){
         NormalizeDrawResult result = Placement.normalizeDrawArea(Blocks.air, x1, y1, x2, y2, false, maxLength, 1f);
 
@@ -618,13 +712,6 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     protected void drawRequest(BuildPlan request){
         request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation));
-
-        if(request.block.saveConfig && request.block.lastConfig != null && !request.hasConfig){
-            Object conf = request.config;
-            request.config = request.block.lastConfig;
-            request.block.drawRequestConfig(request, allRequests());
-            request.config = conf;
-        }
     }
 
     /** Draws a placement icon for a specific block. */
@@ -639,15 +726,25 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         removeSelection(x1, y1, x2, y2, false);
     }
 
+    /** Remove everything from the queue in a selection. */
+    protected void removeSelection(int x1, int y1, int x2, int y2, int maxLength){
+        removeSelection(x1, y1, x2, y2, false, maxLength);
+    }
+
     /** Remove everything from the queue in a selection. */
     protected void removeSelection(int x1, int y1, int x2, int y2, boolean flush){
+        removeSelection(x1, y1, x2, y2, false, maxLength);
+    }
+
+    /** Remove everything from the queue in a selection. */
+    protected void removeSelection(int x1, int y1, int x2, int y2, boolean flush, int maxLength){
         NormalizeResult result = Placement.normalizeArea(x1, y1, x2, y2, rotation, false, maxLength);
         for(int x = 0; x <= Math.abs(result.x2 - result.x); x++){
             for(int y = 0; y <= Math.abs(result.y2 - result.y); y++){
                 int wx = x1 + x * Mathf.sign(x2 - x1);
                 int wy = y1 + y * Mathf.sign(y2 - y1);
 
-                Tile tile = world.Building(wx, wy);
+                Tile tile = world.tileBuilding(wx, wy);
 
                 if(tile == null) continue;
 
@@ -693,7 +790,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         lineRequests.clear();
         iterateLine(x1, y1, x2, y2, l -> {
             rotation = l.rotation;
-            BuildPlan req = new BuildPlan(l.x, l.y, l.rotation, block);
+            BuildPlan req = new BuildPlan(l.x, l.y, l.rotation, block, block.nextConfig());
             req.animScale = 1f;
             lineRequests.add(req);
         });
@@ -722,7 +819,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         boolean consumed = false, showedInventory = false;
 
         //check if tapped block is configurable
-        if(tile.block().configurable && tile.interactable(player.team())){
+        if(tile.block.configurable && tile.interactable(player.team())){
             consumed = true;
             if(((!frag.config.isShown() && tile.shouldShowConfigure(player)) //if the config fragment is hidden, show
             //alternatively, the current selected block can 'agree' to switch config tiles
@@ -745,14 +842,14 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
         //call tapped event
         if(!consumed && tile.interactable(player.team())){
-            Call.tileTapped(player, tile);
+            tile.tapped();
         }
 
         //consume tap event if necessary
-        if(tile.interactable(player.team()) && tile.block().consumesTap){
+        if(tile.interactable(player.team()) && tile.block.consumesTap){
             consumed = true;
-        }else if(tile.interactable(player.team()) && tile.block().synthetic() && !consumed){
-            if(tile.block().hasItems && tile.items.total() > 0){
+        }else if(tile.interactable(player.team()) && tile.block.synthetic() && !consumed){
+            if(tile.block.hasItems && tile.items.total() > 0){
                 frag.inv.showFor(tile);
                 consumed = true;
                 showedInventory = true;
@@ -843,7 +940,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     public @Nullable Unit selectedUnit(){
-        Unit unit = Units.closest(player.team(), Core.input.mouseWorld().x, Core.input.mouseWorld().y, 40f, u -> u.isAI() && !u.deactivated);
+        Unit unit = Units.closest(player.team(), Core.input.mouseWorld().x, Core.input.mouseWorld().y, 40f, u -> u.isAI());
         if(unit != null){
             unit.hitbox(Tmp.r1);
             Tmp.r1.grow(6f);
@@ -853,7 +950,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }
 
         Building tile = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
-        if(tile instanceof ControlBlock && tile.team() == player.team()){
+        if(tile instanceof ControlBlock && tile.team == player.team()){
             return ((ControlBlock)tile).unit();
         }
 
@@ -890,9 +987,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             }
 
             uiGroup = new WidgetGroup();
-            uiGroup.touchable(Touchable.childrenOnly);
+            uiGroup.touchable = Touchable.childrenOnly;
             uiGroup.setFillParent(true);
             ui.hudGroup.addChild(uiGroup);
+            uiGroup.toBack();
             buildUI(uiGroup);
 
             frag.add();
@@ -900,7 +998,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     public boolean canShoot(){
-        return block == null && !Core.scene.hasMouse() && !onConfigurable() && !isDroppingItem() && !(player.builder().updateBuilding() && player.builder().isBuilding());
+        return block == null && !onConfigurable() && !isDroppingItem() && !(player.builder().updateBuilding() && player.builder().isBuilding()) &&
+            !(player.unit() instanceof Mechc && player.unit().isFlying());
     }
 
     public boolean onConfigurable(){
@@ -921,7 +1020,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
         ItemStack stack = player.unit().stack;
 
-        if(tile != null && tile.acceptStack(stack.item, stack.amount, player.unit()) > 0 && tile.interactable(player.team()) && tile.block().hasItems && player.unit().stack().amount > 0 && tile.interactable(player.team())){
+        if(tile != null && tile.acceptStack(stack.item, stack.amount, player.unit()) > 0 && tile.interactable(player.team()) && tile.block.hasItems && player.unit().stack().amount > 0 && tile.interactable(player.team())){
             Call.transferInventory(player, tile);
         }else{
             Call.dropItem(player.angleTo(x, y));
@@ -965,13 +1064,12 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         if(req != null){
             player.builder().plans().remove(req);
         }
-        player.builder().addBuild(new BuildPlan(x, y, rotation, block));
+        player.builder().addBuild(new BuildPlan(x, y, rotation, block, block.nextConfig()));
     }
 
     public void breakBlock(int x, int y){
         Tile tile = world.tile(x, y);
-        //TODO hacky
-        if(tile != null && tile.build != null) tile = tile.build.tile();
+        if(tile != null && tile.build != null) tile = tile.build.tile;
         player.builder().addBuild(new BuildPlan(tile.x, tile.y));
     }
 
@@ -987,15 +1085,15 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         Draw.rect(Core.atlas.find("place-arrow"),
         x * tilesize + block.offset + dx*trns,
         y * tilesize + block.offset - 1 + dy*trns,
-        Core.atlas.find("place-arrow").getWidth() * Draw.scl,
-        Core.atlas.find("place-arrow").getHeight() * Draw.scl, rotation * 90 - 90);
+        Core.atlas.find("place-arrow").width * Draw.scl,
+        Core.atlas.find("place-arrow").height * Draw.scl, rotation * 90 - 90);
 
         Draw.color(!valid ? Pal.remove : Pal.accent);
         Draw.rect(Core.atlas.find("place-arrow"),
         x * tilesize + block.offset + dx*trns,
         y * tilesize + block.offset + dy*trns,
-        Core.atlas.find("place-arrow").getWidth() * Draw.scl,
-        Core.atlas.find("place-arrow").getHeight() * Draw.scl, rotation * 90 - 90);
+        Core.atlas.find("place-arrow").width * Draw.scl,
+        Core.atlas.find("place-arrow").height * Draw.scl, rotation * 90 - 90);
     }
 
     void iterateLine(int startX, int startY, int endX, int endY, Cons<PlaceLine> cons){
@@ -1073,192 +1171,4 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         public int x, y, rotation;
         public boolean last;
     }
-
-    //TODO implement all of this!
-    /*
-        protected void updateKeyboard(){
-        Tile tile = world.tileWorld(x, y);
-        boolean canMove = !Core.scene.hasKeyboard() || ui.minimapfrag.shown();
-
-        isBoosting = Core.input.keyDown(Binding.dash) && !mech.flying;
-
-        //if player is in solid block
-        if(tile != null && tile.solid()){
-            isBoosting = true;
-        }
-
-        float speed = isBoosting && !mech.flying ? mech.boostSpeed : mech.speed;
-
-        if(mech.flying){
-            //prevent strafing backwards, have a penalty for doing so
-            float penalty = 0.2f; //when going 180 degrees backwards, reduce speed to 0.2x
-            speed *= Mathf.lerp(1f, penalty, Angles.angleDist(rotation, velocity.angle()) / 180f);
-        }
-
-        movement.setZero();
-
-        float xa = Core.input.axis(Binding.move_x);
-        float ya = Core.input.axis(Binding.move_y);
-        if(!(Core.scene.getKeyboardFocus() instanceof TextField)){
-            movement.y += ya * speed;
-            movement.x += xa * speed;
-        }
-
-        if(Core.input.keyDown(Binding.mouse_move)){
-            movement.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2f) * 0.005f, -1, 1) * speed;
-            movement.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2f) * 0.005f, -1, 1) * speed;
-        }
-
-        Vec2 vec = Core.input.mouseWorld(control.input.getMouseX(), control.input.getMouseY());
-        pointerX = vec.x;
-        pointerY = vec.y;
-        updateShooting();
-
-        movement.limit(speed).scl(Time.delta());
-
-        if(canMove){
-            velocity.add(movement.x, movement.y);
-        }else{
-            isShooting = false;
-        }
-        float prex = x, prey = y;
-        updateVelocityStatus();
-        moved = dst(prex, prey) > 0.001f;
-
-        if(canMove){
-            float baseLerp = mech.getRotationAlpha(this);
-            if(!isShooting() || !mech.faceTarget){
-                if(!movement.isZero()){
-                    rotation = Mathf.slerpDelta(rotation, mech.flying ? velocity.angle() : movement.angle(), 0.13f * baseLerp);
-                }
-            }else{
-                float angle = control.input.mouseAngle(x, y);
-                this.rotation = Mathf.slerpDelta(this.rotation, angle, 0.1f * baseLerp);
-            }
-        }
-    }
-
-    protected void updateShooting(){
-        if(!state.isEditor() && isShooting() && mech.canShoot(this)){
-            weapons.update(this);
-            //if(!mech.turnCursor){
-                //shoot forward ignoring cursor
-                //mech.weapon.update(this, x + Angles.trnsx(rotation, mech.weapon.targetDistance), y + Angles.trnsy(rotation, mech.weapon.targetDistance));
-            //}else{
-                //mech.weapon.update(this, pointerX, pointerY);
-            //}
-        }
-    }
-
-    protected void updateTouch(){
-        if(Units.invalidateTarget(target, this) &&
-            !(target instanceof Building && ((Building)target).damaged() && target.isValid() && target.team() == team && mech.canHeal && dst(target) < mech.range && !(((Building)target).block instanceof BuildBlock))){
-            target = null;
-        }
-
-        if(state.isEditor()){
-            target = null;
-        }
-
-        float targetX = Core.camera.position.x, targetY = Core.camera.position.y;
-        float attractDst = 15f;
-        float speed = isBoosting && !mech.flying ? mech.boostSpeed : mech.speed;
-
-        if(moveTarget != null && !moveTarget.dead()){
-            targetX = moveTarget.getX();
-            targetY = moveTarget.getY();
-            boolean tapping = moveTarget instanceof Building && moveTarget.team() == team;
-            attractDst = 0f;
-
-            if(tapping){
-                velocity.setAngle(angleTo(moveTarget));
-            }
-
-            if(dst(moveTarget) <= 2f * Time.delta()){
-                if(tapping && !dead()){
-                    Tile tile = ((Building)moveTarget).tile;
-                    tile.tapped(this);
-                }
-
-                moveTarget = null;
-            }
-        }else{
-            moveTarget = null;
-        }
-
-        movement.set((targetX - x) / Time.delta(), (targetY - y) / Time.delta()).limit(speed);
-        movement.setAngle(Mathf.slerp(movement.angle(), velocity.angle(), 0.05f));
-
-        if(dst(targetX, targetY) < attractDst){
-            movement.setZero();
-        }
-
-        float expansion = 3f;
-
-        hitbox(rect);
-        rect.x -= expansion;
-        rect.y -= expansion;
-        rect.width += expansion * 2f;
-        rect.height += expansion * 2f;
-
-        isBoosting = collisions.overlapsTile(rect) || dst(targetX, targetY) > 85f;
-
-        velocity.add(movement.scl(Time.delta()));
-
-        if(velocity.len() <= 0.2f && mech.flying){
-            rotation += Mathf.sin(Time.time() + id * 99, 10f, 1f);
-        }else if(target == null){
-            rotation = Mathf.slerpDelta(rotation, velocity.angle(), velocity.len() / 10f);
-        }
-
-        float lx = x, ly = y;
-        updateVelocityStatus();
-        moved = dst(lx, ly) > 0.001f;
-
-        if(mech.flying){
-            //hovering effect
-            x += Mathf.sin(Time.time() + id * 999, 25f, 0.08f);
-            y += Mathf.cos(Time.time() + id * 999, 25f, 0.08f);
-        }
-
-        //update shooting if not building, not mining and there's ammo left
-        if(!isBuilding() && mineTile() == null){
-
-            //autofire
-            if(target == null){
-                isShooting = false;
-                if(Core.settings.getBool("autotarget")){
-                    target = Units.closestTarget(team, x, y, mech.range, u -> u.team() != Team.derelict, u -> u.team() != Team.derelict);
-
-                    if(mech.canHeal && target == null){
-                        target = Geometry.findClosest(x, y, indexer.getDamaged(Team.sharded));
-                        if(target != null && dst(target) > mech.range){
-                            target = null;
-                        }else if(target != null){
-                            target = ((Tile)target).entity;
-                        }
-                    }
-
-                    if(target != null){
-                        mineTile(null);
-                    }
-                }
-            }else if(target.isValid() || (target instanceof Building && ((Building)target).damaged() && target.team() == team && mech.canHeal && dst(target) < mech.range)){
-                //rotate toward and shoot the target
-                if(mech.faceTarget){
-                    rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.2f);
-                }
-
-                Vec2 intercept = Predict.intercept(this, target, getWeapon().bullet.speed);
-
-                pointerX = intercept.x;
-                pointerY = intercept.y;
-
-                updateShooting();
-                isShooting = true;
-            }
-
-        }
-    }
-     */
 }
diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java
index 709da87626..07b543c704 100644
--- a/core/src/mindustry/input/MobileInput.java
+++ b/core/src/mindustry/input/MobileInput.java
@@ -31,39 +31,39 @@ public class MobileInput extends InputHandler implements GestureListener{
     /** Maximum speed the player can pan. */
     private static final float maxPanSpeed = 1.3f;
     /** Distance to edge of screen to start panning. */
-    private final float edgePan = Scl.scl(60f);
+    public final float edgePan = Scl.scl(60f);
 
     //gesture data
-    private Vec2 vector = new Vec2(), movement = new Vec2(), targetPos = new Vec2();
-    private float lastZoom = -1;
+    public Vec2 vector = new Vec2(), movement = new Vec2(), targetPos = new Vec2();
+    public float lastZoom = -1;
 
     /** Position where the player started dragging a line. */
-    private int lineStartX, lineStartY, lastLineX, lastLineY;
+    public int lineStartX, lineStartY, lastLineX, lastLineY;
 
     /** Animation scale for line. */
-    private float lineScale;
+    public float lineScale;
     /** Animation data for crosshair. */
-    private float crosshairScale;
-    private Teamc lastTarget;
+    public float crosshairScale;
+    public Teamc lastTarget;
     /** Used for shifting build requests. */
-    private float shiftDeltaX, shiftDeltaY;
+    public float shiftDeltaX, shiftDeltaY;
 
     /** Place requests to be removed. */
-    private Seq<BuildPlan> removals = new Seq<>();
+    public Seq<BuildPlan> removals = new Seq<>();
     /** Whether or not the player is currently shifting all placed tiles. */
-    private boolean selecting;
+    public boolean selecting;
     /** Whether the player is currently in line-place mode. */
-    private boolean lineMode, schematicMode;
+    public boolean lineMode, schematicMode;
     /** Current place mode. */
-    private PlaceMode mode = none;
+    public PlaceMode mode = none;
     /** Whether no recipe was available when switching to break mode. */
-    private Block lastBlock;
+    public Block lastBlock;
     /** Last placed request. Used for drawing block overlay. */
-    private BuildPlan lastPlaced;
+    public BuildPlan lastPlaced;
     /** Down tracking for panning.*/
-    private boolean down = false;
+    public boolean down = false;
 
-    private Teamc target, moveTarget;
+    public Teamc target, moveTarget;
 
     //region utility methods
 
@@ -77,7 +77,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         }else{
             Building tile = world.buildWorld(x, y);
 
-            if(tile != null && player.team().isEnemy(tile.team())){
+            if(tile != null && player.team().isEnemy(tile.team)){
                 player.miner().mineTile(null);
                 target = tile;
             }else if(tile != null && player.unit().type().canHeal && tile.team == player.team() && tile.damaged()){
@@ -243,7 +243,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         group.fill(t -> {
             t.visible(() -> (player.builder().isBuilding() || block != null || mode == breaking || !selectRequests.isEmpty()) && !schem.get());
             t.bottom().left();
-            t.button("$cancel", Icon.cancel, () -> {
+            t.button("@cancel", Icon.cancel, () -> {
                 player.builder().clearBuilding();
                 selectRequests.clear();
                 mode = none;
@@ -277,7 +277,7 @@ public class MobileInput extends InputHandler implements GestureListener{
     public void drawBottom(){
         Lines.stroke(1f);
 
-        //draw removals
+        //draw requests about to be removed
         for(BuildPlan request : removals){
             Tile tile = request.tile();
 
@@ -292,6 +292,43 @@ public class MobileInput extends InputHandler implements GestureListener{
             }
         }
 
+        Draw.mixcol();
+        Draw.color(Pal.accent);
+
+        //Draw lines
+        if(lineMode){
+            int tileX = tileX(Core.input.mouseX());
+            int tileY = tileY(Core.input.mouseY());
+
+            if(mode == placing && block != null){
+                //draw placing
+                for(int i = 0; i < lineRequests.size; i++){
+                    BuildPlan request = lineRequests.get(i);
+                    if(i == lineRequests.size - 1 && request.block.rotate){
+                        drawArrow(block, request.x, request.y, request.rotation);
+                    }
+                    request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(request.x, request.y, request.block.size, null) == null);
+                    drawSelected(request.x, request.y, request.block, Pal.accent);
+                }
+            }else if(mode == breaking){
+                drawBreakSelection(lineStartX, lineStartY, tileX, tileY);
+            }
+        }
+
+        Draw.reset();
+    }
+
+    @Override
+    public void drawTop(){
+
+        //draw schematic selection
+        if(mode == schematicSelect){
+            drawSelection(lineStartX, lineStartY, lastLineX, lastLineY, Vars.maxSchematicSize);
+        }
+    }
+
+    @Override
+    public void drawOverSelect(){
         //draw list of requests
         for(BuildPlan request : selectRequests){
             Tile tile = request.tile();
@@ -322,29 +359,6 @@ public class MobileInput extends InputHandler implements GestureListener{
             }
         }
 
-        Draw.mixcol();
-        Draw.color(Pal.accent);
-
-        //Draw lines
-        if(lineMode){
-            int tileX = tileX(Core.input.mouseX());
-            int tileY = tileY(Core.input.mouseY());
-
-            if(mode == placing && block != null){
-                //draw placing
-                for(int i = 0; i < lineRequests.size; i++){
-                    BuildPlan request = lineRequests.get(i);
-                    if(i == lineRequests.size - 1 && request.block.rotate){
-                        drawArrow(block, request.x, request.y, request.rotation);
-                    }
-                    request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(request.x, request.y, request.block.size, null) == null);
-                    drawSelected(request.x, request.y, request.block, Pal.accent);
-                }
-            }else if(mode == breaking){
-                drawBreakSelection(lineStartX, lineStartY, tileX, tileY);
-            }
-        }
-
         //draw targeting crosshair
         if(target != null && !state.isEditor()){
             if(target != lastTarget){
@@ -366,15 +380,6 @@ public class MobileInput extends InputHandler implements GestureListener{
         Draw.reset();
     }
 
-    @Override
-    public void drawTop(){
-
-        //draw schematic selection
-        if(mode == schematicSelect){
-            drawSelection(lineStartX, lineStartY, lastLineX, lastLineY, Vars.maxSchematicSize);
-        }
-    }
-
     @Override
     protected void drawRequest(BuildPlan request){
         if(request.tile() == null) return;
@@ -422,7 +427,6 @@ public class MobileInput extends InputHandler implements GestureListener{
         lastSchematic = schem;
     }
 
-
     @Override
     public boolean touchDown(int screenX, int screenY, int pointer, KeyCode button){
         if(state.isMenu()) return false;
@@ -497,9 +501,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         }else{
             Tile tile = tileAt(screenX, screenY);
 
-            if(tile == null || tile.build == null) return false;
-
-            tryDropItems(tile.build, Core.input.mouseWorld(screenX, screenY).x, Core.input.mouseWorld(screenX, screenY).y);
+            tryDropItems(tile == null ? null : tile.build, Core.input.mouseWorld(screenX, screenY).x, Core.input.mouseWorld(screenX, screenY).y);
         }
         return false;
     }
@@ -535,10 +537,10 @@ public class MobileInput extends InputHandler implements GestureListener{
             lineMode = true;
 
             if(mode == breaking){
-                Fx.tapBlock.at(cursor.worldx(), cursor.worldy(), 1f);
+                if(!state.isPaused()) Fx.tapBlock.at(cursor.worldx(), cursor.worldy(), 1f);
             }else if(block != null){
                 updateLine(lineStartX, lineStartY, cursor.x, cursor.y);
-                Fx.tapBlock.at(cursor.worldx() + block.offset, cursor.worldy() + block.offset, block.size);
+                if(!state.isPaused()) Fx.tapBlock.at(cursor.worldx() + block.offset, cursor.worldy() + block.offset, block.size);
             }
         }
 
@@ -556,16 +558,21 @@ public class MobileInput extends InputHandler implements GestureListener{
 
         //ignore off-screen taps
         if(cursor == null || Core.scene.hasMouse(x, y)) return false;
-        Tile linked = cursor.build == null ? cursor : cursor.build.tile();
 
-        checkTargets(worldx, worldy);
+        Call.tileTap(player, cursor);
+
+        Tile linked = cursor.build == null ? cursor : cursor.build.tile;
+
+        if(!player.dead()){
+            checkTargets(worldx, worldy);
+        }
 
         //remove if request present
         if(hasRequest(cursor)){
             removeRequest(getRequest(cursor));
         }else if(mode == placing && isPlacing() && validPlace(cursor.x, cursor.y, block, rotation) && !checkOverlapPlacement(cursor.x, cursor.y, block)){
             //add to selection queue if it's a valid place position
-            selectRequests.add(lastPlaced = new BuildPlan(cursor.x, cursor.y, rotation, block));
+            selectRequests.add(lastPlaced = new BuildPlan(cursor.x, cursor.y, rotation, block, block.nextConfig()));
         }else if(mode == breaking && validBreak(linked.x,linked.y) && !hasRequest(linked)){
             //add to selection queue if it's a valid BREAK position
             selectRequests.add(new BuildPlan(linked.x, linked.y));
@@ -575,9 +582,18 @@ public class MobileInput extends InputHandler implements GestureListener{
             }
 
             //apply command on double tap
-            if(count == 2 && Mathf.within(worldx, worldy, player.unit().x, player.unit().y, player.unit().hitSize * 2f) &&
-                player.unit() instanceof Commanderc){
-                Call.unitCommand(player);
+            if(count == 2 && Mathf.within(worldx, worldy, player.unit().x, player.unit().y, player.unit().hitSize * 2f)){
+                if(player.unit() instanceof Commanderc){
+                    Call.unitCommand(player);
+                }
+
+                if(player.unit() instanceof Payloadc){
+                    if(((Payloadc)player.unit()).hasPayload()){
+                        tryDropPayload();
+                    }else{
+                        tryPickupPayload();
+                    }
+                }
             }
         }
 
@@ -755,7 +771,7 @@ public class MobileInput extends InputHandler implements GestureListener{
                 shiftDeltaX %= tilesize;
                 shiftDeltaY %= tilesize;
             }
-        }else{
+        }else if(!renderer.isLanding()){
             //pan player
             Core.camera.position.x -= deltaX;
             Core.camera.position.y -= deltaY;
@@ -788,8 +804,10 @@ public class MobileInput extends InputHandler implements GestureListener{
         Rect rect = Tmp.r3;
 
         UnitType type = unit.type();
+        if(type == null) return;
+
         boolean flying = type.flying;
-        boolean omni = !(unit instanceof WaterMovec);
+        boolean omni = unit.type().omniMovement;
         boolean legs = unit.isGrounded();
         boolean allowHealing = type.canHeal;
         boolean validHealTarget = allowHealing && target instanceof Building && ((Building)target).isValid() && target.team() == unit.team &&
@@ -806,7 +824,16 @@ public class MobileInput extends InputHandler implements GestureListener{
         targetPos.set(Core.camera.position);
         float attractDst = 15f;
         float strafePenalty = legs ? 1f : Mathf.lerp(1f, type.strafePenalty, Angles.angleDist(unit.vel.angle(), unit.rotation) / 180f);
-        float speed = type.speed * Mathf.lerp(1f, type.canBoost ? type.boostMultiplier : 1f, unit.elevation()) * strafePenalty;
+
+        float baseSpeed = unit.type().speed;
+
+        //limit speed to minimum formation speed to preserve formation
+        if(unit instanceof Commanderc && ((Commanderc)unit).isCommanding()){
+            //add a tiny multiplier to let units catch up just in case
+            baseSpeed = ((Commanderc)unit).minFormationSpeed() * 0.98f;
+        }
+
+        float speed = baseSpeed * Mathf.lerp(1f, type.canBoost ? type.boostMultiplier : 1f, unit.elevation) * strafePenalty;
         float range = unit.hasWeapons() ? unit.range() : 0f;
         float bulletSpeed = unit.hasWeapons() ? type.weapons.first().bullet.speed : 0f;
         float mouseAngle = unit.angleTo(unit.aimX(), unit.aimY());
@@ -833,19 +860,9 @@ public class MobileInput extends InputHandler implements GestureListener{
         movement.set(targetPos).sub(player).limit(speed);
         movement.setAngle(Mathf.slerp(movement.angle(), unit.vel.angle(), 0.05f));
 
-        //pathfind for ground units
-        if(!flying && !type.canBoost && !(unit instanceof WaterMovec)){
-            Tile on = unit.tileOn();
-            if(on != null && !on.solid()){
-                Tile to = pathfinder.getTargetTile(unit.tileOn(), unit.team, targetPos);
-                if(to != null){
-                    movement.set(to).sub(unit).setLength(speed);
-                }
-            }
-        }
-
         if(player.within(targetPos, attractDst)){
             movement.setZero();
+            unit.vel.approachDelta(Vec2.ZERO, type.speed * type.accel / 2f);
         }
 
         float expansion = 3f;
@@ -863,16 +880,10 @@ public class MobileInput extends InputHandler implements GestureListener{
         }else{
             unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len()));
             if(!movement.isZero() && legs){
-                unit.vel.rotateTo(movement.angle(), type.rotateSpeed * Time.delta);
+                unit.vel.rotateTo(movement.angle(), type.rotateSpeed);
             }
         }
 
-        if(flying){
-            //hovering effect
-            unit.x += Mathf.sin(Time.time(), 25f, 0.08f);
-            unit.y += Mathf.cos(Time.time(), 25f, 0.08f);
-        }
-
         //update shooting if not building + not mining
         if(!player.builder().isBuilding() && player.miner().mineTile() == null){
 
@@ -898,7 +909,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
                 player.mouseX = intercept.x;
                 player.mouseY = intercept.y;
-                player.shooting = true;
+                player.shooting = !boosted;
 
                 unit.aim(player.mouseX, player.mouseY);
             }
diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java
index 3629ddebae..39c3a1a821 100644
--- a/core/src/mindustry/io/JsonIO.java
+++ b/core/src/mindustry/io/JsonIO.java
@@ -68,14 +68,14 @@ public class JsonIO{
         return json.prettyPrint(in);
     }
 
-    private static void apply(Json json){
+    static void apply(Json json){
         json.setIgnoreUnknownFields(true);
         json.setElementType(Rules.class, "spawns", SpawnGroup.class);
         json.setElementType(Rules.class, "loadout", ItemStack.class);
 
         //TODO this is terrible
 
-        json.setSerializer(Sector.class, new Serializer<Sector>(){
+        json.setSerializer(Sector.class, new Serializer<>(){
             @Override
             public void write(Json json, Sector object, Class knownType){
                 json.writeValue(object.planet.name + "-" + object.id);
@@ -88,7 +88,7 @@ public class JsonIO{
             }
         });
 
-        json.setSerializer(SectorPreset.class, new Serializer<SectorPreset>(){
+        json.setSerializer(SectorPreset.class, new Serializer<>(){
             @Override
             public void write(Json json, SectorPreset object, Class knownType){
                 json.writeValue(object.name);
@@ -100,7 +100,21 @@ public class JsonIO{
             }
         });
 
-        json.setSerializer(Item.class, new Serializer<Item>(){
+        json.setSerializer(Liquid.class, new Serializer<>(){
+            @Override
+            public void write(Json json, Liquid object, Class knownType){
+                json.writeValue(object.name);
+            }
+
+            @Override
+            public Liquid read(Json json, JsonValue jsonData, Class type){
+                if(jsonData.asString() == null) return Liquids.water;
+                Liquid i = Vars.content.getByName(ContentType.liquid, jsonData.asString());
+                return i == null ? Liquids.water : i;
+            }
+        });
+
+        json.setSerializer(Item.class, new Serializer<>(){
             @Override
             public void write(Json json, Item object, Class knownType){
                 json.writeValue(object.name);
@@ -109,12 +123,12 @@ public class JsonIO{
             @Override
             public Item read(Json json, JsonValue jsonData, Class type){
                 if(jsonData.asString() == null) return Items.copper;
-                Item i =  Vars.content.getByName(ContentType.item, jsonData.asString());
+                Item i = Vars.content.getByName(ContentType.item, jsonData.asString());
                 return i == null ? Items.copper : i;
             }
         });
 
-        json.setSerializer(Team.class, new Serializer<Team>(){
+        json.setSerializer(Team.class, new Serializer<>(){
             @Override
             public void write(Json json, Team object, Class knownType){
                 json.writeValue(object.id);
@@ -126,7 +140,7 @@ public class JsonIO{
             }
         });
 
-        json.setSerializer(Block.class, new Serializer<Block>(){
+        json.setSerializer(Block.class, new Serializer<>(){
             @Override
             public void write(Json json, Block object, Class knownType){
                 json.writeValue(object.name);
@@ -139,7 +153,7 @@ public class JsonIO{
             }
         });
 
-        json.setSerializer(Weather.class, new Serializer<Weather>(){
+        json.setSerializer(Weather.class, new Serializer<>(){
             @Override
             public void write(Json json, Weather object, Class knownType){
                 json.writeValue(object.name);
@@ -151,7 +165,7 @@ public class JsonIO{
             }
         });
 
-        json.setSerializer(ItemStack.class, new Serializer<ItemStack>(){
+        json.setSerializer(ItemStack.class, new Serializer<>(){
             @Override
             public void write(Json json, ItemStack object, Class knownType){
                 json.writeObjectStart();
@@ -165,6 +179,21 @@ public class JsonIO{
                 return new ItemStack(json.getSerializer(Item.class).read(json, jsonData.get("item"), Item.class), jsonData.getInt("amount"));
             }
         });
+
+        json.setSerializer(UnlockableContent.class, new Serializer<>(){
+            @Override
+            public void write(Json json, UnlockableContent object, Class knownType){
+                json.writeValue(object.name);
+            }
+
+            @Override
+            public UnlockableContent read(Json json, JsonValue jsonData, Class type){
+                String str = jsonData.asString();
+                Item item = Vars.content.getByName(ContentType.item, str);
+                Liquid liquid = Vars.content.getByName(ContentType.liquid, str);
+                return item != null ? item : liquid;
+            }
+        });
     }
 
     static class CustomJson extends Json{
diff --git a/core/src/mindustry/io/SaveFileReader.java b/core/src/mindustry/io/SaveFileReader.java
index 857551860f..0aef1a19df 100644
--- a/core/src/mindustry/io/SaveFileReader.java
+++ b/core/src/mindustry/io/SaveFileReader.java
@@ -8,11 +8,7 @@ import mindustry.world.*;
 import java.io.*;
 
 public abstract class SaveFileReader{
-    protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();
-    protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput);
-    protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
-    protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall);
-    protected final ObjectMap<String, String> fallback = ObjectMap.of(
+    public static final ObjectMap<String, String> fallback = ObjectMap.of(
     "dart-mech-pad", "legacy-mech-pad",
     "dart-ship-pad", "legacy-mech-pad",
     "javelin-ship-pad", "legacy-mech-pad",
@@ -34,9 +30,37 @@ public abstract class SaveFileReader{
     "titan-factory", "legacy-unit-factory",
     "fortress-factory", "legacy-unit-factory",
 
-    "command-center", "legacy-command-center"
+    "mass-conveyor", "payload-conveyor",
+    "vestige", "scepter",
+    "turbine-generator", "steam-generator",
+
+    "rocks", "stone-wall",
+    "sporerocks", "spore-wall",
+    "icerocks", "ice-wall",
+    "dunerocks", "dune-wall",
+    "sandrocks", "sand-wall",
+    "shalerocks", "shale-wall",
+    "snowrocks", "snow-wall",
+    "saltrocks", "salt-wall",
+    "dirtwall", "dirt-wall",
+
+    "ignarock", "basalt",
+    "holostone", "dacite",
+    "holostone-wall", "dacite-wall",
+    "rock", "boulder",
+    "snowrock", "snow-boulder",
+    "cliffs", "stone-wall", 
+
+    "cryofluidmixer", "cryofluid-mixer"
     );
 
+    protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();
+    protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput);
+    protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream();
+    protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall);
+
+    protected int lastRegionLength;
+
     protected void region(String name, DataInput stream, CounterInputStream counter, IORunner<DataInput> cons) throws IOException{
         counter.resetCount();
         int length;
@@ -90,6 +114,7 @@ public abstract class SaveFileReader{
     /** Reads a chunk of some length. Use the runner for reading to catch more descriptive errors. */
     public int readChunk(DataInput input, boolean isShort, IORunner<DataInput> runner) throws IOException{
         int length = isShort ? input.readUnsignedShort() : input.readInt();
+        lastRegionLength = length;
         runner.accept(input);
         return length;
     }
diff --git a/core/src/mindustry/io/SaveIO.java b/core/src/mindustry/io/SaveIO.java
index 3ae3996d23..8b56ef2a61 100644
--- a/core/src/mindustry/io/SaveIO.java
+++ b/core/src/mindustry/io/SaveIO.java
@@ -3,6 +3,7 @@ package mindustry.io;
 import arc.*;
 import arc.files.*;
 import arc.struct.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
 import mindustry.game.EventType.*;
@@ -41,7 +42,7 @@ public class SaveIO{
         if(exists) file.moveTo(backupFileFor(file));
         try{
             write(file);
-        }catch(Exception e){
+        }catch(Throwable e){
             if(exists) backupFileFor(file).moveTo(file);
             throw new RuntimeException(e);
         }
@@ -56,9 +57,9 @@ public class SaveIO{
     }
 
     public static boolean isSaveValid(Fi file){
-        try{
-            return isSaveValid(new DataInputStream(new InflaterInputStream(file.read(bufferSize))));
-        }catch(Exception e){
+        try(DataInputStream stream = new DataInputStream(new InflaterInputStream(file.read(bufferSize)))){
+            return isSaveValid(stream);
+        }catch(Throwable e){
             return false;
         }
     }
@@ -67,8 +68,8 @@ public class SaveIO{
         try{
             getMeta(stream);
             return true;
-        }catch(Exception e){
-            e.printStackTrace();
+        }catch(Throwable e){
+            Log.err(e);
             return false;
         }
     }
@@ -76,7 +77,8 @@ public class SaveIO{
     public static SaveMeta getMeta(Fi file){
         try{
             return getMeta(getStream(file));
-        }catch(Exception e){
+        }catch(Throwable e){
+            Log.err(e);
             return getMeta(getBackupStream(file));
         }
     }
@@ -119,11 +121,15 @@ public class SaveIO{
             }else{
                 getVersion().write(stream, tags);
             }
-        }catch(Exception e){
+        }catch(Throwable e){
             throw new RuntimeException(e);
         }
     }
 
+    public static void load(String saveName) throws SaveException{
+        load(saveDirectory.child(saveName + ".msav"));
+    }
+
     public static void load(Fi file) throws SaveException{
         load(file, world.context);
     }
@@ -133,7 +139,7 @@ public class SaveIO{
             //try and load; if any exception at all occurs
             load(new InflaterInputStream(file.read(bufferSize)), context);
         }catch(SaveException e){
-            e.printStackTrace();
+            Log.err(e);
             Fi backup = file.sibling(file.name() + "-backup." + file.extension());
             if(backup.exists()){
                 load(new InflaterInputStream(backup.read(bufferSize)), context);
@@ -153,7 +159,7 @@ public class SaveIO{
 
             ver.read(stream, counter, context);
             Events.fire(new SaveLoadEvent());
-        }catch(Exception e){
+        }catch(Throwable e){
             throw new SaveException(e);
         }finally{
             world.setGenerating(false);
diff --git a/core/src/mindustry/io/SaveMeta.java b/core/src/mindustry/io/SaveMeta.java
index 0a3730d8e1..4aeb7d2f99 100644
--- a/core/src/mindustry/io/SaveMeta.java
+++ b/core/src/mindustry/io/SaveMeta.java
@@ -31,6 +31,6 @@ public class SaveMeta{
         this.mods = JsonIO.read(String[].class, tags.get("mods", "[]"));
         this.secinfo = secinfo;
 
-        secinfo.exportRates().each(e -> hasProduction |= e.value > 0.001f);
+        secinfo.production.each((e, amount) -> hasProduction |= amount.mean > 0.001f);
     }
 }
diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java
index e03a22b2a5..cacac7700a 100644
--- a/core/src/mindustry/io/SaveVersion.java
+++ b/core/src/mindustry/io/SaveVersion.java
@@ -168,8 +168,11 @@ public abstract class SaveVersion extends SaveFileReader{
             Tile tile = world.rawTile(i % world.width(), i / world.width());
             stream.writeShort(tile.blockID());
 
-            //make note of whether there was an entity here
-            stream.writeBoolean(tile.build != null);
+            boolean savedata = tile.block().saveData;
+            byte packed = (byte)((tile.build != null ? 1 : 0) | (savedata ? 2 : 0));
+
+            //make note of whether there was an entity/rotation here
+            stream.writeByte(packed);
 
             //only write the entity for multiblocks once - in the center
             if(tile.build != null){
@@ -182,6 +185,8 @@ public abstract class SaveVersion extends SaveFileReader{
                 }else{
                     stream.writeBoolean(false);
                 }
+            }else if(savedata){
+                stream.writeByte(tile.data);
             }else{
                 //write consecutive non-entity blocks
                 int consecutives = 0;
@@ -237,7 +242,9 @@ public abstract class SaveVersion extends SaveFileReader{
                 Tile tile = context.tile(i);
                 if(block == null) block = Blocks.air;
                 boolean isCenter = true;
-                boolean hadEntity = stream.readBoolean();
+                byte packedCheck = stream.readByte();
+                boolean hadEntity = (packedCheck & 1) != 0;
+                boolean hadData = (packedCheck & 2) != 0;
 
                 if(hadEntity){
                     isCenter = stream.readBoolean();
@@ -250,7 +257,7 @@ public abstract class SaveVersion extends SaveFileReader{
 
                 if(hadEntity){
                     if(isCenter){ //only read entity for center blocks
-                        if(block.hasEntity()){
+                        if(block.hasBuilding()){
                             try{
                                 readChunk(stream, true, in -> {
                                     byte revision = in.readByte();
@@ -264,6 +271,9 @@ public abstract class SaveVersion extends SaveFileReader{
                             skipChunk(stream, true);
                         }
                     }
+                }else if(hadData){
+                    tile.setBlock(block);
+                    tile.data = stream.readByte();
                 }else{
                     int consecutives = stream.readUnsignedByte();
 
@@ -321,6 +331,11 @@ public abstract class SaveVersion extends SaveFileReader{
         for(int j = 0; j < amount; j++){
             readChunk(stream, true, in -> {
                 byte typeid = in.readByte();
+                if(EntityMapping.map(typeid) == null){
+                    in.skipBytes(lastRegionLength - 1);
+                    return;
+                }
+
                 Entityc entity = (Entityc)EntityMapping.map(typeid).get();
                 entity.read(Reads.get(in));
                 entity.add();
diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java
index 5330f89af2..733bb27c28 100644
--- a/core/src/mindustry/io/TypeIO.java
+++ b/core/src/mindustry/io/TypeIO.java
@@ -3,6 +3,7 @@ package mindustry.io;
 import arc.graphics.*;
 import arc.math.geom.*;
 import arc.struct.*;
+import arc.util.ArcAnnotate.*;
 import arc.util.io.*;
 import arc.util.pooling.*;
 import mindustry.ai.types.*;
@@ -10,10 +11,12 @@ import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.ctype.*;
+import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.units.*;
 import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.logic.*;
 import mindustry.net.Administration.*;
 import mindustry.net.Packets.*;
 import mindustry.type.*;
@@ -46,7 +49,6 @@ public class TypeIO{
         }else if(object instanceof String){
             write.b((byte)4);
             writeString(write, (String)object);
-            writeString(write, (String)object);
         }else if(object instanceof Content){
             Content map = (Content)object;
             write.b((byte)5);
@@ -74,11 +76,31 @@ public class TypeIO{
             write.b(9);
             write.b((byte)map.content.getContentType().ordinal());
             write.s(map.content.id);
+        }else if(object instanceof Boolean){
+            write.b((byte)10);
+            write.bool((Boolean)object);
+        }else if(object instanceof Double){
+            write.b((byte)11);
+            write.d((Double)object);
+        }else if(object instanceof Building){
+            write.b((byte)12);
+            write.i(((Building)object).pos());
+        }else if(object instanceof LAccess){
+            write.b((byte)13);
+            write.s(((LAccess)object).ordinal());
+        }else if(object instanceof byte[]){
+            write.b((byte)14);
+            write.i(((byte[])object).length);
+            write.b((byte[])object);
+        }else if(object instanceof UnitCommand){
+            write.b((byte)15);
+            write.b(((UnitCommand)object).ordinal());
         }else{
             throw new IllegalArgumentException("Unknown object type: " + object.getClass());
         }
     }
 
+    @Nullable
     public static Object readObject(Reads read){
         byte type = read.b();
         switch(type){
@@ -92,6 +114,12 @@ public class TypeIO{
             case 7: return new Point2(read.i(), read.i());
             case 8: byte len = read.b(); Point2[] out = new Point2[len]; for(int i = 0; i < len; i ++) out[i] = Point2.unpack(read.i()); return out;
             case 9: return TechTree.getNotNull(content.getByID(ContentType.all[read.b()], read.s()));
+            case 10: return read.bool();
+            case 11: return read.d();
+            case 12: return world.build(read.i());
+            case 13: return LAccess.all[read.s()];
+            case 14: int blen = read.i(); byte[] bytes = new byte[blen]; read.b(bytes); return bytes;
+            case 15: return UnitCommand.all[read.b()];
             default: throw new IllegalArgumentException("Unknown object type: " + type);
         }
     }
@@ -203,7 +231,7 @@ public class TypeIO{
         if(!request.breaking){
             write.s(request.block.id);
             write.b((byte)request.rotation);
-            write.b(request.hasConfig ? (byte)1 : 0);
+            write.b(1); //always has config
             writeObject(write, request.config);
         }
     }
@@ -226,8 +254,9 @@ public class TypeIO{
             boolean hasConfig = read.b() == 1;
             Object config = readObject(read);
             currentRequest = new BuildPlan(Point2.x(position), Point2.y(position), rotation, content.block(block));
+            //should always happen, but is kept for legacy reasons just in case
             if(hasConfig){
-                currentRequest.configure(config);
+                currentRequest.config = config;
             }
         }
 
@@ -283,7 +312,7 @@ public class TypeIO{
             //make sure player exists
             if(player == null) return prev;
             return player;
-        }else if(type == 1){
+        }else if(type == 1){ //formation controller
             int id = read.i();
             return prev instanceof FormationAI ? prev : new FormationAI(Groups.unit.getByID(id), null);
         }else{
@@ -380,14 +409,22 @@ public class TypeIO{
         return AdminAction.values()[read.b()];
     }
 
-    public static void writeUnitDef(Writes write, UnitType effect){
+    public static void writeUnitType(Writes write, UnitType effect){
         write.s(effect.id);
     }
 
-    public static UnitType readUnitDef(Reads read){
+    public static UnitType readUnitType(Reads read){
         return content.getByID(ContentType.unit, read.s());
     }
 
+    public static void writeEffect(Writes write, Effect effect){
+        write.s(effect.id);
+    }
+
+    public static Effect readEffect(Reads read){
+        return Effect.get(read.us());
+    }
+
     public static void writeColor(Writes write, Color color){
         write.i(color.rgba());
     }
diff --git a/core/src/mindustry/io/legacy/LegacyIO.java b/core/src/mindustry/io/legacy/LegacyIO.java
index 1d0a790159..545487d8ca 100644
--- a/core/src/mindustry/io/legacy/LegacyIO.java
+++ b/core/src/mindustry/io/legacy/LegacyIO.java
@@ -10,8 +10,8 @@ public class LegacyIO{
     /** Maps old unit names to new ones. */
     public static final StringMap unitMap = StringMap.of(
     "titan", "mace",
-    "chaos-array", "vestige",
-    "eradicator", "cataclyst",
+    "chaos-array", "scepter",
+    "eradicator", "reign",
     "eruptor", "atrax",
     "wraith", "flare",
     "ghoul", "horizon",
diff --git a/core/src/mindustry/io/legacy/LegacySaveVersion.java b/core/src/mindustry/io/legacy/LegacySaveVersion.java
index 3af8e1fcb5..7e84526bec 100644
--- a/core/src/mindustry/io/legacy/LegacySaveVersion.java
+++ b/core/src/mindustry/io/legacy/LegacySaveVersion.java
@@ -54,30 +54,30 @@ public abstract class LegacySaveVersion extends SaveVersion{
                 if(block == null) block = Blocks.air;
 
                 //occupied by multiblock part
-                boolean occupied = tile.build != null && !tile.isCenter() && (tile.build.block() == block || block == Blocks.air);
+                boolean occupied = tile.build != null && !tile.isCenter() && (tile.build.block == block || block == Blocks.air);
 
                 //do not override occupied cells
                 if(!occupied){
                     tile.setBlock(block);
                 }
 
-                if(block.hasEntity()){
+                if(block.hasBuilding()){
                     try{
                         readChunk(stream, true, in -> {
                             byte version = in.readByte();
                             //legacy impl of Building#read()
-                            tile.build.health(stream.readUnsignedShort());
+                            tile.build.health = stream.readUnsignedShort();
                             byte packedrot = stream.readByte();
                             byte team = Pack.leftByte(packedrot) == 8 ? stream.readByte() : Pack.leftByte(packedrot);
                             byte rotation = Pack.rightByte(packedrot);
 
                             tile.setTeam(Team.get(team));
-                            tile.rotation(rotation);
+                            tile.build.rotation = rotation;
 
-                            if(tile.build.items != null) tile.build.items.read(Reads.get(stream));
-                            if(tile.build.power != null) tile.build.power.read(Reads.get(stream));
-                            if(tile.build.liquids != null) tile.build.liquids.read(Reads.get(stream));
-                            if(tile.build.cons() != null) tile.build.cons().read(Reads.get(stream));
+                            if(tile.build.items != null) tile.build.items.read(Reads.get(stream), true);
+                            if(tile.build.power != null) tile.build.power.read(Reads.get(stream), true);
+                            if(tile.build.liquids != null) tile.build.liquids.read(Reads.get(stream), true);
+                            if(tile.build.cons != null) tile.build.cons.read(Reads.get(stream), true);
 
                             //read only from subclasses!
                             tile.build.read(Reads.get(in), version);
diff --git a/core/src/mindustry/logic/ConditionOp.java b/core/src/mindustry/logic/ConditionOp.java
new file mode 100644
index 0000000000..0954567c06
--- /dev/null
+++ b/core/src/mindustry/logic/ConditionOp.java
@@ -0,0 +1,40 @@
+package mindustry.logic;
+
+public enum ConditionOp{
+    equal("==", (a, b) -> Math.abs(a - b) < 0.000001, (a, b) -> a == b),
+    notEqual("not", (a, b) -> Math.abs(a - b) >= 0.000001, (a, b) -> a != b),
+    lessThan("<", (a, b) -> a < b),
+    lessThanEq("<=", (a, b) -> a <= b),
+    greaterThan(">", (a, b) -> a > b),
+    greaterThanEq(">=", (a, b) -> a >= b),
+    always("always", (a, b) -> true);
+
+    public static final ConditionOp[] all = values();
+
+    public final CondObjOpLambda objFunction;
+    public final CondOpLambda function;
+    public final String symbol;
+
+    ConditionOp(String symbol, CondOpLambda function){
+        this(symbol, function, null);
+    }
+
+    ConditionOp(String symbol, CondOpLambda function, CondObjOpLambda objFunction){
+        this.symbol = symbol;
+        this.function = function;
+        this.objFunction = objFunction;
+    }
+
+    @Override
+    public String toString(){
+        return symbol;
+    }
+
+    interface CondObjOpLambda{
+        boolean get(Object a, Object b);
+    }
+
+    interface CondOpLambda{
+        boolean get(double a, double b);
+    }
+}
diff --git a/core/src/mindustry/logic/Controllable.java b/core/src/mindustry/logic/Controllable.java
new file mode 100644
index 0000000000..31baf31a1e
--- /dev/null
+++ b/core/src/mindustry/logic/Controllable.java
@@ -0,0 +1,6 @@
+package mindustry.logic;
+
+/** An object that can be controlled with logic. */
+public interface Controllable{
+    void control(LAccess type, double p1, double p2, double p3, double p4);
+}
diff --git a/core/src/mindustry/logic/DataType.java b/core/src/mindustry/logic/DataType.java
new file mode 100644
index 0000000000..49090d69f6
--- /dev/null
+++ b/core/src/mindustry/logic/DataType.java
@@ -0,0 +1,24 @@
+package mindustry.logic;
+
+import arc.graphics.*;
+import mindustry.graphics.*;
+
+/** The types of data a node field can be. */
+public enum DataType{
+    /** A double. Used for integer calculations as well. */
+    number(Pal.place),
+    /** Any type of content, e.g. item. */
+    content(Color.cyan),
+    /** A building of a tile. */
+    building(Pal.items),
+    /** A unit on the map. */
+    unit(Pal.health),
+    /** Java string */
+    string(Color.royal);
+
+    public final Color color;
+
+    DataType(Color color){
+        this.color = color;
+    }
+}
\ No newline at end of file
diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java
new file mode 100644
index 0000000000..30eacf2402
--- /dev/null
+++ b/core/src/mindustry/logic/LAccess.java
@@ -0,0 +1,43 @@
+package mindustry.logic;
+
+import arc.struct.*;
+
+/** Setter/getter enum for logic-controlled objects. */
+public enum LAccess{
+    totalItems,
+    totalLiquids,
+    totalPower,
+    itemCapacity,
+    liquidCapacity,
+    powerCapacity,
+    powerNetStored,
+    powerNetCapacity,
+    powerNetIn,
+    powerNetOut,
+    health,
+    maxHealth,
+    heat,
+    efficiency,
+    rotation,
+    x,
+    y,
+    shootX,
+    shootY,
+    shooting,
+    team,
+    type,
+
+    //values with parameters are considered controllable
+    enabled("to"), //"to" is standard for single parameter access
+    shoot("x", "y", "shoot"),;
+
+    public final String[] parameters;
+
+    public static final LAccess[] all = values();
+    public static final LAccess[] senseable = Seq.select(all, t -> t.parameters.length <= 1).toArray(LAccess.class);
+    public static final LAccess[] controls = Seq.select(all, t -> t.parameters.length > 0).toArray(LAccess.class);
+
+    LAccess(String... parameters){
+        this.parameters = parameters;
+    }
+}
diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java
new file mode 100644
index 0000000000..7ca74ca83c
--- /dev/null
+++ b/core/src/mindustry/logic/LAssembler.java
@@ -0,0 +1,230 @@
+package mindustry.logic;
+
+import arc.func.*;
+import arc.struct.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.logic.LExecutor.*;
+import mindustry.logic.LStatements.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+/** "Compiles" a sequence of statements into instructions. */
+public class LAssembler{
+    public static ObjectMap<String, Func<String[], LStatement>> customParsers = new ObjectMap<>();
+
+    private int lastVar;
+    /** Maps names to variable IDs. */
+    ObjectMap<String, BVar> vars = new ObjectMap<>();
+    /** All instructions to be executed. */
+    LInstruction[] instructions;
+
+    public LAssembler(){
+        putVar("@counter").value = 0;
+        putConst("@time", 0);
+
+        //add default constants
+        putConst("false", 0);
+        putConst("true", 1);
+        putConst("null", null);
+
+        //store base content (TODO hacky?)
+
+        for(Item item : Vars.content.items()){
+            putConst("@" + item.name, item);
+        }
+
+        for(Liquid liquid : Vars.content.liquids()){
+            putConst("@" + liquid.name, liquid);
+        }
+
+        for(Block block : Vars.content.blocks()){
+            if(block.synthetic()){
+                putConst("@" + block.name, block);
+            }
+        }
+
+        //store sensor constants
+
+        for(LAccess sensor : LAccess.all){
+            putConst("@" + sensor.name(), sensor);
+        }
+    }
+
+    public static LAssembler assemble(String data, int maxInstructions){
+        LAssembler asm = new LAssembler();
+
+        Seq<LStatement> st = read(data, maxInstructions);
+
+        asm.instructions = st.map(l -> l.build(asm)).filter(l -> l != null).toArray(LInstruction.class);
+        return asm;
+    }
+
+    public static String write(Seq<LStatement> statements){
+        StringBuilder out = new StringBuilder();
+        for(LStatement s : statements){
+            s.write(out);
+            out.append("\n");
+        }
+
+        return out.toString();
+    }
+
+    public static Seq<LStatement> read(String data){
+        return read(data, LExecutor.maxInstructions);
+    }
+
+    public static Seq<LStatement> read(String data, int max){
+        //empty data check
+        if(data == null || data.isEmpty()) return new Seq<>();
+
+        Seq<LStatement> statements = new Seq<>();
+        String[] lines = data.split("[;\n]+");
+        int index = 0;
+        for(String line : lines){
+            //comments
+            if(line.startsWith("#")) continue;
+
+            if(index++ > max) break;
+
+            line = line.replace("\t", "").trim();
+            
+            try{
+                String[] arr;
+
+                //yes, I am aware that this can be split with regex, but that's slow and even more incomprehensible
+                if(line.contains(" ")){
+                    Seq<String> tokens = new Seq<>();
+                    boolean inString = false;
+                    int lastIdx = 0;
+
+                    for(int i = 0; i < line.length() + 1; i++){
+                        char c = i == line.length() ? ' ' : line.charAt(i);
+                        if(c == '"'){
+                            inString = !inString;
+                        }else if(c == ' ' && !inString){
+                            tokens.add(line.substring(lastIdx, i));
+                            lastIdx = i + 1;
+                        }
+                    }
+
+                    arr = tokens.toArray(String.class);
+                }else{
+                    arr = new String[]{line};
+                }
+
+                String type = arr[0];
+
+                //legacy stuff
+                if(type.equals("bop")){
+                    arr[0] = "op";
+
+                    //field order for bop used to be op a, b, result, but now it's op result a b
+                    String res = arr[4];
+                    arr[4] = arr[3];
+                    arr[3] = arr[2];
+                    arr[2] = res;
+                }else if(type.equals("uop")){
+                    arr[0] = "op";
+
+                    if(arr[1].equals("negate")){
+                        arr = new String[]{
+                            "op", "mul", arr[3], arr[2], "-1"
+                        };
+                    }else{
+                        //field order for uop used to be op a, result, but now it's op result a
+                        String res = arr[3];
+                        arr[3] = arr[2];
+                        arr[2] = res;
+                    }
+                }
+
+                LStatement st = LogicIO.read(arr);
+
+                if(st != null){
+                    statements.add(st);
+                }else{
+                    //attempt parsing using custom parser if a match is found - this is for mods
+                    String first = arr[0];
+                    if(customParsers.containsKey(first)){
+                        statements.add(customParsers.get(first).get(arr));
+                    }else{
+                        //unparseable statement
+                        statements.add(new InvalidStatement());
+                    }
+                }
+            }catch(Exception parseFailed){
+                parseFailed.printStackTrace();
+                //when parsing fails, add a dummy invalid statement
+                statements.add(new InvalidStatement());
+            }
+        }
+        return statements;
+    }
+
+    /** @return a variable ID by name.
+     * This may be a constant variable referring to a number or object. */
+    public int var(String symbol){
+        symbol = symbol.trim();
+
+        //string case
+        if(symbol.startsWith("\"") && symbol.endsWith("\"")){
+            return putConst("___" + symbol, symbol.substring(1, symbol.length() - 1).replace("\\n", "\n")).id;
+        }
+
+        try{
+            double value = Double.parseDouble(symbol);
+            //this creates a hidden const variable with the specified value
+            String key = "___" + value;
+            return putConst(key, value).id;
+        }catch(NumberFormatException e){
+            return putVar(symbol).id;
+        }
+    }
+
+    /** Adds a constant value by name. */
+    public BVar putConst(String name, Object value){
+        BVar var = putVar(name);
+        var.constant = true;
+        var.value = value;
+        return var;
+    }
+
+    /** Registers a variable name mapping. */
+    public BVar putVar(String name){
+        if(vars.containsKey(name)){
+            return vars.get(name);
+        }else{
+            BVar var = new BVar(lastVar++);
+            vars.put(name, var);
+            return var;
+        }
+    }
+
+    public @Nullable BVar getVar(String name){
+        return vars.get(name);
+    }
+
+    /** A variable "builder". */
+    public static class BVar{
+        public int id;
+        public boolean constant;
+        public Object value;
+
+        public BVar(int id){
+            this.id = id;
+        }
+
+        BVar(){}
+
+        @Override
+        public String toString(){
+            return "BVar{" +
+            "id=" + id +
+            ", constant=" + constant +
+            ", value=" + value +
+            '}';
+        }
+    }
+}
diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java
new file mode 100644
index 0000000000..1c8d61b91a
--- /dev/null
+++ b/core/src/mindustry/logic/LCanvas.java
@@ -0,0 +1,502 @@
+package mindustry.logic;
+
+import arc.*;
+import arc.func.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.input.*;
+import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+
+public class LCanvas extends Table{
+    //ew static variables
+    static LCanvas canvas;
+
+    DragLayout statements;
+    StatementElem dragging;
+    ScrollPane pane;
+    Group jumps;
+    float targetWidth;
+
+    public LCanvas(){
+        canvas = this;
+
+        rebuild();
+    }
+
+    /** @return if statement elements should have rows. */
+    public static boolean useRows(){
+        return Core.graphics.getWidth() < Scl.scl(900f) * 1.2f;
+    }
+
+    public void rebuild(){
+        targetWidth = useRows() ? 400f : 900f;
+        float s = pane != null ? pane.getScrollPercentY() : 0f;
+        String toLoad = statements != null ? save() : null;
+
+        clear();
+
+        statements = new DragLayout();
+        jumps = new WidgetGroup();
+
+        pane = pane(t -> {
+            t.center();
+            t.add(statements).pad(2f).center().width(targetWidth);
+            t.addChild(jumps);
+
+            jumps.cullable = false;
+        }).grow().get();
+        //pane.setClip(false);
+        pane.setFlickScroll(false);
+
+        //load old scroll percent
+        Core.app.post(() -> {
+            pane.setScrollPercentY(s);
+            pane.updateVisualScroll();
+        });
+
+        if(toLoad != null){
+            load(toLoad);
+        }
+    }
+
+    void add(LStatement statement){
+        statements.addChild(new StatementElem(statement));
+    }
+
+    String save(){
+        Seq<LStatement> st = statements.getChildren().<StatementElem>as().map(s -> s.st);
+        st.each(LStatement::saveUI);
+
+        return LAssembler.write(st);
+    }
+
+    void load(String asm){
+        jumps.clear();
+
+        Seq<LStatement> statements = LAssembler.read(asm);
+        statements.truncate(LExecutor.maxInstructions);
+        this.statements.clearChildren();
+        for(LStatement st : statements){
+            add(st);
+        }
+
+        for(LStatement st : statements){
+            st.setupUI();
+        }
+
+        this.statements.layout();
+    }
+
+    @Override
+    public void act(float delta){
+        super.act(delta);
+
+        if(Core.input.isTouched()){
+            float y = Core.input.mouseY();
+            float dst = Math.min(y - this.y, Core.graphics.getHeight() - y);
+            if(dst < Scl.scl(100f)){ //scroll margin
+                int sign = Mathf.sign(Core.graphics.getHeight()/2f - y);
+                pane.setScrollY(pane.getScrollY() + sign * Scl.scl(15f));
+            }
+        }
+    }
+
+    public class DragLayout extends WidgetGroup{
+        float space = Scl.scl(10f), prefWidth, prefHeight;
+        Seq<Element> seq = new Seq<>();
+        int insertPosition = 0;
+        boolean invalidated;
+
+        {
+            setTransform(true);
+        }
+
+        @Override
+        public void layout(){
+            invalidated = true;
+            float cy = 0;
+            seq.clear();
+
+            float totalHeight = getChildren().sumf(e -> e.getHeight() + space);
+
+            height = prefHeight = totalHeight;
+            width = prefWidth = Scl.scl(targetWidth);
+
+            //layout everything normally
+            for(int i = 0; i < getChildren().size; i++){
+                Element e = getChildren().get(i);
+
+                //ignore the dragged element
+                if(dragging == e) continue;
+
+                e.setSize(width, e.getPrefHeight());
+                e.setPosition(0, height - cy, Align.topLeft);
+
+                cy += e.getPrefHeight() + space;
+                seq.add(e);
+            }
+
+            //insert the dragged element if necessary
+            if(dragging != null){
+                //find real position of dragged element top
+                float realY = dragging.getY(Align.top) + dragging.translation.y;
+
+                insertPosition = 0;
+
+                for(int i = 0; i < seq.size; i++){
+                    Element cur = seq.get(i);
+                    //find fit point
+                    if(realY < cur.y && (i == seq.size - 1 || realY > seq.get(i + 1).y)){
+                        insertPosition = i + 1;
+                        break;
+                    }
+                }
+
+                float shiftAmount = dragging.getHeight() + space;
+
+                //shift elements below insertion point down
+                for(int i = insertPosition; i < seq.size; i++){
+                    seq.get(i).y -= shiftAmount;
+                }
+            }
+
+            invalidateHierarchy();
+
+            if(parent != null && parent instanceof Table){
+                setCullingArea(parent.getCullingArea());
+            }
+        }
+
+        @Override
+        public float getPrefWidth(){
+            return prefWidth;
+        }
+
+        @Override
+        public float getPrefHeight(){
+            return prefHeight;
+        }
+
+        @Override
+        public void draw(){
+            Draw.alpha(parentAlpha);
+
+            //draw selection box indicating placement position
+            if(dragging != null && insertPosition <= seq.size){
+                float shiftAmount = dragging.getHeight();
+                float lastX = x;
+                float lastY = insertPosition == 0 ? height + y : seq.get(insertPosition - 1).y + y - space;
+
+                Tex.pane.draw(lastX, lastY - shiftAmount, width, dragging.getHeight());
+            }
+
+            if(invalidated){
+                children.each(c -> c.cullable = false);
+            }
+
+            super.draw();
+
+            if(invalidated){
+                children.each(c -> c.cullable = true);
+                invalidated = false;
+            }
+        }
+
+        void finishLayout(){
+            if(dragging != null){
+                //reset translation first
+                for(Element child : getChildren()){
+                    child.setTranslation(0, 0);
+                }
+                clearChildren();
+
+                //reorder things
+                for(int i = 0; i <= insertPosition - 1 && i < seq.size; i++){
+                    addChild(seq.get(i));
+                }
+
+                addChild(dragging);
+
+                for(int i = insertPosition; i < seq.size; i++){
+                    addChild(seq.get(i));
+                }
+
+                dragging = null;
+            }
+
+            layout();
+        }
+    }
+
+    public class StatementElem extends Table{
+        LStatement st;
+
+        public StatementElem(LStatement st){
+            this.st = st;
+            st.elem = this;
+
+            background(Tex.whitePane);
+            setColor(st.category().color);
+            margin(0f);
+            touchable = Touchable.enabled;
+
+            table(Tex.whiteui, t -> {
+                t.color.set(color);
+                t.addListener(new HandCursorListener());
+
+                t.margin(6f);
+                t.touchable = Touchable.enabled;
+
+                t.add(st.name()).style(Styles.outlineLabel).color(color).padRight(8);
+                t.add().growX();
+
+                t.button(Icon.copy, Styles.logici, () -> {
+                }).padRight(6).get().tapped(() -> copy());
+
+                t.button(Icon.cancel, Styles.logici, () -> {
+                    remove();
+                    dragging = null;
+                    statements.layout();
+                });
+
+                t.addListener(new InputListener(){
+                    float lastx, lasty;
+
+                    @Override
+                    public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
+
+                        if(button == KeyCode.mouseMiddle){
+                            copy();
+                            return false;
+                        }
+
+                        Vec2 v = localToParentCoordinates(Tmp.v1.set(x, y));
+                        lastx = v.x;
+                        lasty = v.y;
+                        dragging = StatementElem.this;
+                        toFront();
+                        statements.layout();
+                        return true;
+                    }
+
+                    @Override
+                    public void touchDragged(InputEvent event, float x, float y, int pointer){
+                        Vec2 v = localToParentCoordinates(Tmp.v1.set(x, y));
+
+                        translation.add(v.x - lastx, v.y - lasty);
+                        lastx = v.x;
+                        lasty = v.y;
+
+                        statements.layout();
+                    }
+
+                    @Override
+                    public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
+                        statements.finishLayout();
+                    }
+                });
+            }).growX();
+
+            row();
+
+            table(t -> {
+                t.left();
+                t.marginLeft(4);
+                t.setColor(color);
+                st.build(t);
+            }).pad(4).padTop(2).left().grow();
+
+            marginBottom(7);
+        }
+
+        void copy(){
+            LStatement copy = st.copy();
+            if(copy != null){
+                StatementElem s = new StatementElem(copy);
+
+                statements.addChildAfter(StatementElem.this,s);
+                statements.layout();
+                copy.elem = s;
+                copy.setupUI();
+            }
+        }
+
+        @Override
+        public void draw(){
+            float pad = 5f;
+            Fill.dropShadow(x + width/2f, y + height/2f, width + pad, height + pad, 10f, 0.9f * parentAlpha);
+
+            Draw.color(0, 0, 0, 0.3f * parentAlpha);
+            Fill.crect(x, y, width, height);
+            Draw.reset();
+
+            super.draw();
+        }
+    }
+
+    public static class JumpButton extends ImageButton{
+        Color hoverColor = Pal.place;
+        Color defaultColor = Color.white;
+        Prov<StatementElem> to;
+        boolean selecting;
+        float mx, my;
+        ClickListener listener;
+        StatementElem hovered;
+
+        JumpCurve curve;
+
+        public JumpButton(Prov<StatementElem> getter, Cons<StatementElem> setter){
+            super(Tex.logicNode, Styles.colori);
+
+            to = getter;
+            addListener(listener = new ClickListener());
+
+            addListener(new InputListener(){
+                @Override
+                public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode code){
+                    selecting = true;
+                    setter.get(null);
+                    mx = x;
+                    my = y;
+                    return true;
+                }
+
+                @Override
+                public void touchDragged(InputEvent event, float x, float y, int pointer){
+                    mx = x;
+                    my = y;
+                }
+
+                @Override
+                public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode code){
+                    localToStageCoordinates(Tmp.v1.set(x, y));
+                    StatementElem elem = hovered();
+
+                    if(elem != null && !isDescendantOf(elem)){
+                        setter.get(elem);
+                    }else{
+                        setter.get(null);
+                    }
+                    selecting = false;
+                }
+            });
+
+            update(() -> {
+                if(to.get() != null && to.get().parent == null){
+                    setter.get(null);
+                }
+
+                setColor(listener.isOver() ? hoverColor : defaultColor);
+                getStyle().imageUpColor = this.color;
+            });
+
+            curve = new JumpCurve(this);
+        }
+
+        @Override
+        public void act(float delta){
+            super.act(delta);
+
+            hovered = hovered();
+        }
+
+        @Override
+        protected void setScene(Scene stage){
+            super.setScene(stage);
+
+            if(stage == null){
+                curve.remove();
+            }else{
+                canvas.jumps.addChild(curve);
+            }
+        }
+
+        StatementElem hovered(){
+            Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
+            if(e != null){
+                while(e != null && !(e instanceof StatementElem)){
+                    e = e.parent;
+                }
+            }
+            if(e == null || isDescendantOf(e)) return null;
+            return (StatementElem)e;
+        }
+    }
+
+    public static class JumpCurve extends Element{
+        JumpButton button;
+
+        public JumpCurve(JumpButton button){
+            this.button = button;
+        }
+
+        @Override
+        public void act(float delta){
+            super.act(delta);
+
+            if(button.listener.isOver()){
+                toFront();
+            }
+        }
+
+        @Override
+        public void draw(){
+            Element hover = button.to.get() == null && button.selecting ? button.hovered : button.to.get();
+            boolean draw = false;
+            Vec2 t = Tmp.v1, r = Tmp.v2;
+
+            Group desc = canvas.pane;
+
+            button.localToAscendantCoordinates(desc, r.set(0, 0));
+
+            if(hover != null){
+                hover.localToAscendantCoordinates(desc, t.set(hover.getWidth(), hover.getHeight()/2f));
+
+                draw = true;
+            }else if(button.selecting){
+                t.set(r).add(button.mx, button.my);
+                draw = true;
+            }
+
+            float offset = canvas.pane.getVisualScrollY() - canvas.pane.getMaxY();
+
+            t.y += offset;
+            r.y += offset;
+
+            if(draw){
+                drawCurve(r.x + button.getWidth()/2f, r.y + button.getHeight()/2f, t.x, t.y);
+
+                float s = button.getWidth();
+                Draw.color(button.color);
+                Tex.logicNode.draw(t.x + s*0.75f, t.y - s/2f, -s, s);
+                Draw.reset();
+            }
+        }
+
+        void drawCurve(float x, float y, float x2, float y2){
+            Lines.stroke(4f, button.color);
+            Draw.alpha(parentAlpha);
+
+            float dist = 100f;
+
+            Lines.curve(
+            x, y,
+            x + dist, y,
+            x2 + dist, y2,
+            x2, y2,
+            Math.max(20, (int)(Mathf.dst(x, y, x2, y2) / 6))
+            );
+        }
+    }
+}
diff --git a/core/src/mindustry/logic/LCategory.java b/core/src/mindustry/logic/LCategory.java
new file mode 100644
index 0000000000..b576261f74
--- /dev/null
+++ b/core/src/mindustry/logic/LCategory.java
@@ -0,0 +1,17 @@
+package mindustry.logic;
+
+import arc.graphics.*;
+import mindustry.graphics.*;
+
+public enum LCategory{
+    blocks(Pal.accentBack),
+    control(Color.cyan.cpy().shiftSaturation(-0.6f).mul(0.7f)),
+    operations(Pal.place.cpy().shiftSaturation(-0.5f).mul(0.7f)),
+    io(Pal.remove.cpy().shiftSaturation(-0.5f).mul(0.7f));
+
+    public final Color color;
+
+    LCategory(Color color){
+        this.color = color;
+    }
+}
\ No newline at end of file
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
new file mode 100644
index 0000000000..82bcc02ab3
--- /dev/null
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -0,0 +1,597 @@
+package mindustry.logic;
+
+import arc.struct.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.*;
+import arc.util.noise.*;
+import mindustry.*;
+import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.world.blocks.logic.LogicDisplay.*;
+import mindustry.world.blocks.logic.MemoryBlock.*;
+import mindustry.world.blocks.logic.MessageBlock.*;
+
+import static mindustry.Vars.*;
+
+public class LExecutor{
+    public static final int maxInstructions = 1000;
+
+    //for noise operations
+    public static final Simplex noise = new Simplex();
+
+    //special variables
+    public static final int
+        varCounter = 0,
+        varTime = 1;
+
+    public static final int
+        maxGraphicsBuffer = 256,
+        maxDisplayBuffer = 1024,
+        maxTextBuffer = 256;
+
+    public LInstruction[] instructions = {};
+    public Var[] vars = {};
+
+    public LongSeq graphicsBuffer = new LongSeq();
+    public StringBuilder textBuffer = new StringBuilder();
+    public Building[] links = {};
+
+    public boolean initialized(){
+        return instructions != null && vars != null && instructions.length > 0;
+    }
+
+    /** Runs a single instruction. */
+    public void runOnce(){
+        //set time
+        vars[varTime].numval = Time.millis();
+
+        //reset to start
+        if(vars[varCounter].numval >= instructions.length
+            || vars[varCounter].numval < 0) vars[varCounter].numval = 0;
+
+        if(vars[varCounter].numval < instructions.length){
+            instructions[(int)(vars[varCounter].numval++)].run(this);
+        }
+    }
+
+    public void load(String data, int maxInstructions){
+        load(LAssembler.assemble(data, maxInstructions));
+    }
+
+    /** Loads with a specified assembler. Resets all variables. */
+    public void load(LAssembler builder){
+        vars = new Var[builder.vars.size];
+        instructions = builder.instructions;
+
+        builder.vars.each((name, var) -> {
+            Var dest = new Var(name);
+            vars[var.id] = dest;
+
+            dest.constant = var.constant;
+
+            if(var.value instanceof Number){
+                dest.isobj = false;
+                dest.numval = ((Number)var.value).doubleValue();
+            }else{
+                dest.isobj = true;
+                dest.objval = var.value;
+            }
+        });
+    }
+
+    //region utility
+
+    public @Nullable Building building(int index){
+        Object o = vars[index].objval;
+        return vars[index].isobj && o instanceof Building ? (Building)o : null;
+    }
+
+    public @Nullable Object obj(int index){
+        Object o = vars[index].objval;
+        return vars[index].isobj ? o : null;
+    }
+
+    public boolean bool(int index){
+        Var v = vars[index];
+        return v.isobj ? v.objval != null : Math.abs(v.numval) >= 0.00001;
+    }
+
+    public double num(int index){
+        Var v = vars[index];
+        return v.isobj ? v.objval != null ? 1 : 0 : v.numval;
+    }
+
+    public int numi(int index){
+        return (int)num(index);
+    }
+
+    public void setnum(int index, double value){
+        Var v = vars[index];
+        if(v.constant) return;
+        v.numval = value;
+        v.objval = null;
+        v.isobj = false;
+    }
+
+    public void setobj(int index, Object value){
+        Var v = vars[index];
+        if(v.constant) return;
+        v.objval = value;
+        v.isobj = true;
+    }
+
+    //endregion
+
+    public static class Var{
+        public final String name;
+
+        public boolean isobj, constant;
+
+        public Object objval;
+        public double numval;
+
+        public Var(String name){
+            this.name = name;
+        }
+    }
+
+    //region instruction types
+
+    public interface LInstruction{
+        void run(LExecutor exec);
+    }
+
+    /** Controls a building's state. */
+    public static class ControlI implements LInstruction{
+        public int target;
+        public LAccess type = LAccess.enabled;
+        public int p1, p2, p3, p4;
+
+        public ControlI(LAccess type, int target, int p1, int p2, int p3, int p4){
+            this.type = type;
+            this.target = target;
+            this.p1 = p1;
+            this.p2 = p2;
+            this.p3 = p3;
+            this.p4 = p4;
+        }
+
+        ControlI(){}
+
+        @Override
+        public void run(LExecutor exec){
+            Object obj = exec.obj(target);
+            if(obj instanceof Controllable){
+                Controllable cont = (Controllable)obj;
+                cont.control(type, exec.num(p1), exec.num(p2), exec.num(p3), exec.num(p4));
+            }
+        }
+    }
+
+    public static class GetLinkI implements LInstruction{
+        public int output, index;
+
+        public GetLinkI(int output, int index){
+            this.index = index;
+            this.output = output;
+        }
+
+        public GetLinkI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            int address = exec.numi(index);
+
+            exec.setobj(output, address >= 0 && address < exec.links.length ? exec.links[address] : null);
+        }
+    }
+
+    public static class ReadI implements LInstruction{
+        public int target, position, output;
+
+        public ReadI(int target, int position, int output){
+            this.target = target;
+            this.position = position;
+            this.output = output;
+        }
+
+        public ReadI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            int address = exec.numi(position);
+            Building from = exec.building(target);
+
+            if(from instanceof MemoryBuild){
+                MemoryBuild mem = (MemoryBuild)from;
+
+                exec.setnum(output, address < 0 || address >= mem.memory.length ? 0 : mem.memory[address]);
+            }
+        }
+    }
+
+    public static class WriteI implements LInstruction{
+        public int target, position, value;
+
+        public WriteI(int target, int position, int value){
+            this.target = target;
+            this.position = position;
+            this.value = value;
+        }
+
+        public WriteI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            int address = exec.numi(position);
+            Building from = exec.building(target);
+
+            if(from instanceof MemoryBuild){
+                MemoryBuild mem = (MemoryBuild)from;
+
+                if(address >= 0 && address < mem.memory.length){
+                    mem.memory[address] = exec.num(value);
+                }
+
+            }
+        }
+    }
+
+    public static class SenseI implements LInstruction{
+        public int from, to, type;
+
+        public SenseI(int from, int to, int type){
+            this.from = from;
+            this.to = to;
+            this.type = type;
+        }
+
+        public SenseI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            Object target = exec.obj(from);
+            Object sense = exec.obj(type);
+
+            if(target instanceof Senseable){
+                Senseable se = (Senseable)target;
+                if(sense instanceof Content){
+                    exec.setnum(to, se.sense(((Content)sense)));
+                }else if(sense instanceof LAccess){
+                    Object objOut = se.senseObject((LAccess)sense);
+
+                    if(objOut == Senseable.noSensed){
+                        //numeric output
+                        exec.setnum(to, se.sense((LAccess)sense));
+                    }else{
+                        //object output
+                        exec.setobj(to, objOut);
+                    }
+                }
+            }else{
+                exec.setnum(to, 0);
+            }
+        }
+    }
+
+    public static class RadarI implements LInstruction{
+        public RadarTarget target1 = RadarTarget.enemy, target2 = RadarTarget.any, target3 = RadarTarget.any;
+        public RadarSort sort = RadarSort.distance;
+        public int radar, sortOrder, output;
+
+        //radar instructions are special in that they cache their output and only change it at fixed intervals.
+        //this prevents lag from spam of radar instructions
+        public Healthc lastTarget;
+        public Interval timer = new Interval();
+
+        static float bestValue = 0f;
+        static Unit best = null;
+
+        public RadarI(RadarTarget target1, RadarTarget target2, RadarTarget target3, RadarSort sort, int radar, int sortOrder, int output){
+            this.target1 = target1;
+            this.target2 = target2;
+            this.target3 = target3;
+            this.sort = sort;
+            this.radar = radar;
+            this.sortOrder = sortOrder;
+            this.output = output;
+        }
+
+        public RadarI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            Building target = exec.building(radar);
+
+            int sortDir = exec.bool(sortOrder) ? 1 : -1;
+
+            if(target instanceof Ranged){
+                float range = ((Ranged)target).range();
+
+                Healthc targeted;
+
+                if(timer.get(30f)){
+                    //if any of the targets involve enemies
+                    boolean enemies = target1 == RadarTarget.enemy || target2 == RadarTarget.enemy || target3 == RadarTarget.enemy;
+
+                    best = null;
+                    bestValue = 0;
+
+                    if(enemies){
+                        for(Team enemy : state.teams.enemiesOf(target.team)){
+                            find(target, range, sortDir, enemy);
+                        }
+                    }else{
+                        find(target, range, sortDir, target.team);
+                    }
+
+                    lastTarget = targeted = best;
+                }else{
+                    targeted = lastTarget;
+                }
+
+                exec.setobj(output, targeted);
+            }else{
+                exec.setobj(output, null);
+            }
+        }
+
+        void find(Building b, float range, int sortDir, Team team){
+            Units.nearby(team, b.x, b.y, range, u -> {
+                if(!u.within(b, range)) return;
+
+                boolean valid =
+                    target1.func.get(b.team, u) &&
+                    target2.func.get(b.team, u) &&
+                    target3.func.get(b.team, u);
+
+                if(!valid) return;
+
+                float val = sort.func.get(b, u) * sortDir;
+                if(val > bestValue || best == null){
+                    bestValue = val;
+                    best = u;
+                }
+            });
+        }
+    }
+
+    public static class SetI implements LInstruction{
+        public int from, to;
+
+        public SetI(int from, int to){
+            this.from = from;
+            this.to = to;
+        }
+
+        SetI(){}
+
+        @Override
+        public void run(LExecutor exec){
+            Var v = exec.vars[to];
+            Var f = exec.vars[from];
+
+            //TODO error out when the from-value is a constant
+            if(!v.constant){
+                if(f.isobj){
+                    v.objval = f.objval;
+                    v.isobj = true;
+                }else{
+                    v.numval = f.numval;
+                    v.isobj = false;
+                }
+            }
+        }
+    }
+
+    public static class OpI implements LInstruction{
+        public LogicOp op = LogicOp.add;
+        public int a, b, dest;
+
+        public OpI(LogicOp op, int a, int b, int dest){
+            this.op = op;
+            this.a = a;
+            this.b = b;
+            this.dest = dest;
+        }
+
+        OpI(){}
+
+        @Override
+        public void run(LExecutor exec){
+            if(op.unary){
+                exec.setnum(dest, op.function1.get(exec.num(a)));
+            }else{
+                Var va = exec.vars[a];
+                Var vb = exec.vars[b];
+
+                if(op.objFunction2 != null && (va.isobj || vb.isobj)){
+                    //use object function if provided, and one of the variables is an object
+                    exec.setnum(dest, op.objFunction2.get(exec.obj(a), exec.obj(b)));
+                }else{
+                    //otherwise use the numeric function
+                    exec.setnum(dest, op.function2.get(exec.num(a), exec.num(b)));
+                }
+
+            }
+        }
+    }
+
+    public static class EndI implements LInstruction{
+
+        @Override
+        public void run(LExecutor exec){
+            exec.vars[varCounter].numval = exec.instructions.length;
+        }
+    }
+
+    public static class NoopI implements LInstruction{
+        @Override
+        public void run(LExecutor exec){}
+    }
+
+    public static class DrawI implements LInstruction{
+        public byte type;
+        public int target;
+        public int x, y, p1, p2, p3, p4;
+
+        public DrawI(byte type, int target, int x, int y, int p1, int p2, int p3, int p4){
+            this.type = type;
+            this.target = target;
+            this.x = x;
+            this.y = y;
+            this.p1 = p1;
+            this.p2 = p2;
+            this.p3 = p3;
+            this.p4 = p4;
+        }
+
+        public DrawI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            //graphics on headless servers are useless.
+            if(Vars.headless) return;
+
+            //add graphics calls, cap graphics buffer size
+            if(exec.graphicsBuffer.size < maxGraphicsBuffer){
+                exec.graphicsBuffer.add(DisplayCmd.get(type, exec.numi(x), exec.numi(y), exec.numi(p1), exec.numi(p2), exec.numi(p3), exec.numi(p4)));
+            }
+        }
+    }
+
+    public static class DrawFlushI implements LInstruction{
+        public int target;
+
+        public DrawFlushI(int target){
+            this.target = target;
+        }
+
+        public DrawFlushI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            //graphics on headless servers are useless.
+            if(Vars.headless) return;
+
+            Building build = exec.building(target);
+            if(build instanceof LogicDisplayBuild){
+                LogicDisplayBuild d = (LogicDisplayBuild)build;
+                if(d.commands.size + exec.graphicsBuffer.size < maxDisplayBuffer){
+                    for(int i = 0; i < exec.graphicsBuffer.size; i++){
+                        d.commands.addLast(exec.graphicsBuffer.items[i]);
+                    }
+                }
+                exec.graphicsBuffer.clear();
+            }
+        }
+    }
+
+    public static class PrintI implements LInstruction{
+        public int value;
+
+        public PrintI(int value){
+            this.value = value;
+        }
+
+        PrintI(){}
+
+        @Override
+        public void run(LExecutor exec){
+
+            if(exec.textBuffer.length() >= maxTextBuffer) return;
+
+            //this should avoid any garbage allocation
+            Var v = exec.vars[value];
+            if(v.isobj && value != 0){
+                String strValue =
+                    v.objval == null ? "null" :
+                    v.objval instanceof String ? (String)v.objval :
+                    v.objval instanceof Content ? "[content]" :
+                    v.objval instanceof Building ? "[building]" :
+                    v.objval instanceof Unit ? "[unit]" :
+                    "[object]";
+
+                exec.textBuffer.append(strValue);
+            }else{
+                //display integer version when possible
+                if(Math.abs(v.numval - (long)v.numval) < 0.000001){
+                    exec.textBuffer.append((long)v.numval);
+                }else{
+                    exec.textBuffer.append(v.numval);
+                }
+            }
+        }
+    }
+
+    public static class PrintFlushI implements LInstruction{
+        public int target;
+
+        public PrintFlushI(int target){
+            this.target = target;
+        }
+
+        public PrintFlushI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+
+            Building build = exec.building(target);
+            if(build instanceof MessageBuild){
+                MessageBuild d = (MessageBuild)build;
+
+                d.message.setLength(0);
+                d.message.append(exec.textBuffer, 0, Math.min(exec.textBuffer.length(), maxTextBuffer));
+
+                exec.textBuffer.setLength(0);
+            }
+        }
+    }
+
+    public static class JumpI implements LInstruction{
+        public ConditionOp op = ConditionOp.notEqual;
+        public int value, compare, address;
+
+        public JumpI(ConditionOp op, int value, int compare, int address){
+            this.op = op;
+            this.value = value;
+            this.compare = compare;
+            this.address = address;
+        }
+
+        public JumpI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(address != -1){
+                Var va = exec.vars[value];
+                Var vb = exec.vars[compare];
+                boolean cmp;
+
+                if(op.objFunction != null && (va.isobj || vb.isobj)){
+                    //use object function if provided, and one of the variables is an object
+                    cmp = op.objFunction.get(exec.obj(value), exec.obj(compare));
+                }else{
+                    cmp = op.function.get(exec.num(value), exec.num(compare));
+                }
+
+                if(cmp){
+                    exec.vars[varCounter].numval = address;
+                }
+            }
+        }
+    }
+
+    //endregion
+}
diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java
new file mode 100644
index 0000000000..cbe5029d94
--- /dev/null
+++ b/core/src/mindustry/logic/LStatement.java
@@ -0,0 +1,135 @@
+package mindustry.logic;
+
+import arc.*;
+import arc.func.*;
+import arc.math.*;
+import arc.scene.*;
+import arc.scene.actions.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.gen.*;
+import mindustry.logic.LCanvas.*;
+import mindustry.logic.LExecutor.*;
+import mindustry.ui.*;
+
+/**
+ * A statement is an intermediate representation of an instruction, to be used mostly in UI.
+ * Contains all relevant variable information. */
+public abstract class LStatement{
+    public transient @Nullable StatementElem elem;
+
+    public abstract void build(Table table);
+    public abstract LCategory category();
+    public abstract LInstruction build(LAssembler builder);
+
+    public LStatement copy(){
+        StringBuilder build = new StringBuilder();
+        write(build);
+        Seq<LStatement> read = LAssembler.read(build.toString());
+        return read.size == 0 ? null : read.first();
+    }
+
+    //protected methods are only for internal UI layout utilities
+
+    protected Cell<TextField> field(Table table, String value, Cons<String> setter){
+        return table.field(value, Styles.nodeField, setter)
+            .size(144f, 40f).pad(2f).color(table.color).addInputDialog();
+    }
+
+    protected void fields(Table table, String desc, String value, Cons<String> setter){
+        table.add(desc).padLeft(10).left();
+        field(table, value, setter).width(85f).padRight(10).left();
+    }
+
+    protected void fields(Table table, String value, Cons<String> setter){
+        field(table, value, setter).width(85f);
+    }
+
+    protected void row(Table table){
+        if(LCanvas.useRows()){
+            table.row();
+        }
+    }
+
+    protected <T> void showSelect(Button b, T[] values, T current, Cons<T> getter, int cols, Cons<Cell> sizer){
+        showSelectTable(b, (t, hide) -> {
+            ButtonGroup<Button> group = new ButtonGroup<>();
+            int i = 0;
+            t.defaults().size(56f, 40f);
+
+            for(T p : values){
+                sizer.get(t.button(p.toString(), Styles.clearTogglet, () -> {
+                    getter.get(p);
+                    hide.run();
+                }).checked(current == p).group(group));
+
+                if(++i % cols == 0) t.row();
+            }
+        });
+    }
+
+    protected <T> void showSelect(Button b, T[] values, T current, Cons<T> getter){
+        showSelect(b, values, current, getter, 4, c -> {});
+    }
+
+    protected void showSelectTable(Button b, Cons2<Table, Runnable> hideCons){
+        Table t = new Table(Tex.button);
+
+        //triggers events behind the element to simulate deselection
+        Element hitter = new Element();
+
+        Runnable hide = () -> {
+            Core.app.post(hitter::remove);
+            t.actions(Actions.fadeOut(0.3f, Interp.fade), Actions.remove());
+        };
+
+        hitter.fillParent = true;
+        hitter.tapped(hide);
+        Core.scene.add(hitter);
+
+        Core.scene.add(t);
+
+        t.update(() -> {
+            if(b.parent == null || !b.isDescendantOf(Core.scene.root)){
+                Core.app.post(() -> {
+                    hitter.remove();
+                    t.remove();
+                });
+                return;
+            }
+
+            b.localToStageCoordinates(Tmp.v1.set(b.getWidth()/2f, b.getHeight()/2f));
+            t.setPosition(Tmp.v1.x, Tmp.v1.y, Align.center);
+            t.keepInStage();
+        });
+        t.actions(Actions.alpha(0), Actions.fadeIn(0.3f, Interp.fade));
+
+        t.top().pane(inner -> {
+            inner.top();
+            hideCons.get(inner, hide);
+        }).top();
+
+        t.pack();
+    }
+
+    public void afterRead(){}
+
+    public void write(StringBuilder builder){
+        LogicIO.write(this,builder);
+    }
+
+    public void setupUI(){
+
+    }
+
+    public void saveUI(){
+
+    }
+
+    public String name(){
+        return Strings.insertSpaces(getClass().getSimpleName().replace("Statement", ""));
+    }
+}
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
new file mode 100644
index 0000000000..2ce318f4a7
--- /dev/null
+++ b/core/src/mindustry/logic/LStatements.java
@@ -0,0 +1,697 @@
+package mindustry.logic;
+
+import arc.func.*;
+import arc.graphics.*;
+import arc.scene.style.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import mindustry.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.logic.LCanvas.*;
+import mindustry.logic.LExecutor.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+
+import static mindustry.world.blocks.logic.LogicDisplay.*;
+
+public class LStatements{
+
+    //TODO broken
+    //@RegisterStatement("#")
+    public static class CommentStatement extends LStatement{
+        public String comment = "";
+
+        @Override
+        public void build(Table table){
+            table.area(comment, Styles.nodeArea, v -> comment = v).growX().height(90f).padLeft(2).padRight(6).color(table.color);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.control;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return null;
+        }
+    }
+
+    @RegisterStatement("noop")
+    public static class InvalidStatement extends LStatement{
+
+        @Override
+        public void build(Table table){
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.operations;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new NoopI();
+        }
+    }
+
+    @RegisterStatement("read")
+    public static class ReadStatement extends LStatement{
+        public String output = "result", target = "cell1", address = "0";
+
+        @Override
+        public void build(Table table){
+            table.add(" read ");
+
+            field(table, output, str -> output = str);
+
+            table.add(" = ");
+
+            fields(table, target, str -> target = str);
+
+            row(table);
+
+            table.add(" at ");
+
+            field(table, address, str -> address = str);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.io;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new ReadI(builder.var(target), builder.var(address), builder.var(output));
+        }
+    }
+
+    @RegisterStatement("write")
+    public static class WriteStatement extends LStatement{
+        public String input = "result", target = "cell1", address = "0";
+
+        @Override
+        public void build(Table table){
+            table.add(" write ");
+
+            field(table, input, str -> input = str);
+
+            table.add(" to ");
+
+            fields(table, target, str -> target = str);
+
+            row(table);
+
+            table.add(" at ");
+
+            field(table, address, str -> address = str);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.io;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new WriteI(builder.var(target), builder.var(address), builder.var(input));
+        }
+    }
+
+    @RegisterStatement("draw")
+    public static class DrawStatement extends LStatement{
+        public GraphicsType type = GraphicsType.clear;
+        public String x = "0", y = "0", p1 = "0", p2 = "0", p3 = "0", p4 = "0";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            table.left();
+
+            table.button(b -> {
+                b.label(() -> type.name());
+                b.clicked(() -> showSelect(b, GraphicsType.all, type, t -> {
+                    type = t;
+                    if(type == GraphicsType.color){
+                        p2 = "255";
+                    }
+                    rebuild(table);
+                }, 2, cell -> cell.size(100, 50)));
+            }, Styles.logict, () -> {}).size(90, 40).color(table.color).left().padLeft(2);
+
+            if(type != GraphicsType.stroke){
+                row(table);
+            }
+
+            table.table(s -> {
+                s.left();
+                s.setColor(table.color);
+
+                switch(type){
+                    case clear -> {
+                        fields(s, "r", x, v -> x = v);
+                        fields(s, "g", y, v -> y = v);
+                        fields(s, "b", p1, v -> p1 = v);
+                    }
+                    case color -> {
+                        fields(s, "r", x, v -> x = v);
+                        fields(s, "g", y, v -> y = v);
+                        fields(s, "b", p1, v -> p1 = v);
+                        row(s);
+                        fields(s, "a", p2, v -> p2 = v);
+                    }
+                    case stroke -> {
+                        s.add().width(4);
+                        fields(s, x, v -> x = v);
+                    }
+                    case line -> {
+                        fields(s, "x", x, v -> x = v);
+                        fields(s, "y", y, v -> y = v);
+                        row(s);
+                        fields(s, "x2", p1, v -> p1 = v);
+                        fields(s, "y2", p2, v -> p2 = v);
+                    }
+                    case rect, lineRect -> {
+                        fields(s, "x", x, v -> x = v);
+                        fields(s, "y", y, v -> y = v);
+                        row(s);
+                        fields(s, "width", p1, v -> p1 = v);
+                        fields(s, "height", p2, v -> p2 = v);
+                    }
+                    case poly, linePoly -> {
+                        fields(s, "x", x, v -> x = v);
+                        fields(s, "y", y, v -> y = v);
+                        row(s);
+                        fields(s, "sides", p1, v -> p1 = v);
+                        fields(s, "radius", p2, v -> p2 = v);
+                        row(s);
+                        fields(s, "rotation", p3, v -> p3 = v);
+                    }
+                    case triangle -> {
+                        fields(s, "x", x, v -> x = v);
+                        fields(s, "y", y, v -> y = v);
+                        row(s);
+                        fields(s, "x2", p1, v -> p1 = v);
+                        fields(s, "y2", p2, v -> p2 = v);
+                        row(s);
+                        fields(s, "x3", p3, v -> p3 = v);
+                        fields(s, "y3", p4, v -> p4 = v);
+                    }
+                }
+            }).expand().left();
+        }
+
+        @Override
+        public void afterRead(){
+            //0 constant alpha for colors is not allowed
+            if(type == GraphicsType.color && p2.equals("0")){
+                p2 = "255";
+            }
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.io;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new DrawI((byte)type.ordinal(), 0, builder.var(x), builder.var(y), builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4));
+        }
+    }
+
+    @RegisterStatement("print")
+    public static class PrintStatement extends LStatement{
+        public String value = "\"frog\"";
+
+        @Override
+        public void build(Table table){
+            field(table, value, str -> value = str).width(0f).growX().padRight(3);
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new PrintI(builder.var(value));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.io;
+        }
+    }
+
+    @RegisterStatement("drawflush")
+    public static class DrawFlushStatement extends LStatement{
+        public String target = "display1";
+
+        @Override
+        public void build(Table table){
+            table.add(" to ");
+            field(table, target, str -> target = str);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.blocks;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new DrawFlushI(builder.var(target));
+        }
+    }
+
+    @RegisterStatement("printflush")
+    public static class PrintFlushStatement extends LStatement{
+        public String target = "message1";
+
+        @Override
+        public void build(Table table){
+            table.add(" to ");
+            field(table, target, str -> target = str);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.blocks;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new PrintFlushI(builder.var(target));
+        }
+    }
+
+    @RegisterStatement("getlink")
+    public static class GetLinkStatement extends LStatement{
+        public String output = "result", address = "0";
+
+        @Override
+        public void build(Table table){
+            field(table, output, str -> output = str);
+
+            table.add(" = link# ");
+
+            field(table, address, str -> address = str);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.blocks;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new GetLinkI(builder.var(output), builder.var(address));
+        }
+    }
+
+    @RegisterStatement("control")
+    public static class ControlStatement extends LStatement{
+        public LAccess type = LAccess.enabled;
+        public String target = "block1", p1 = "0", p2 = "0", p3 = "0", p4 = "0";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            table.left();
+
+            table.add(" set ");
+
+            table.button(b -> {
+                b.label(() -> type.name());
+                b.clicked(() -> showSelect(b, LAccess.controls, type, t -> {
+                    type = t;
+                    rebuild(table);
+                }, 2, cell -> cell.size(100, 50)));
+            }, Styles.logict, () -> {}).size(90, 40).color(table.color).left().padLeft(2);
+
+            table.add(" of ");
+
+            field(table, target, v -> target = v);
+
+            row(table);
+
+            //Q: why don't you just use arrays for this?
+            //A: arrays aren't as easy to serialize so the code generator doesn't handle them
+            int c = 0;
+            for(int i = 0; i < type.parameters.length; i++){
+
+                fields(table, type.parameters[i], i == 0 ? p1 : i == 1 ? p2 : i == 2 ? p3 : p4, i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : i == 2 ? v -> p3 = v : v -> p4 = v);
+
+                if(++c % 2 == 0) row(table);
+            }
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.blocks;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new ControlI(type, builder.var(target), builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4));
+        }
+    }
+
+    @RegisterStatement("radar")
+    public static class RadarStatement extends LStatement{
+        public RadarTarget target1 = RadarTarget.enemy, target2 = RadarTarget.any, target3 = RadarTarget.any;
+        public RadarSort sort = RadarSort.distance;
+        public String radar = "turret1", sortOrder = "1", output = "result";
+
+        @Override
+        public void build(Table table){
+            table.defaults().left();
+
+            table.add(" from ");
+
+            fields(table, radar, v -> radar = v);
+
+            row(table);
+
+            for(int i = 0; i < 3; i++){
+                int fi = i;
+                Prov<RadarTarget> get = () -> (fi == 0 ? target1 : fi == 1 ? target2 : target3);
+
+                table.add(i == 0 ? " target " : " and ");
+
+                table.button(b -> {
+                    b.label(() -> get.get().name());
+                    b.clicked(() -> showSelect(b, RadarTarget.all, get.get(), t -> {
+                        if(fi == 0) target1 = t; else if(fi == 1) target2 = t; else target3 = t;
+                    }, 2, cell -> cell.size(100, 50)));
+                }, Styles.logict, () -> {}).size(90, 40).color(table.color).left().padLeft(2);
+
+                if(i == 1){
+                    row(table);
+                }
+            }
+
+            table.add(" order ");
+
+            fields(table, sortOrder, v -> sortOrder = v);
+
+            table.row();
+
+            table.add(" sort ");
+
+            table.button(b -> {
+                b.label(() -> sort.name());
+                b.clicked(() -> showSelect(b, RadarSort.all, sort, t -> {
+                    sort = t;
+                }, 2, cell -> cell.size(100, 50)));
+            }, Styles.logict, () -> {}).size(90, 40).color(table.color).left().padLeft(2);
+
+            table.add(" output ");
+
+            fields(table, output, v -> output = v);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.blocks;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new RadarI(target1, target2, target3, sort, builder.var(radar), builder.var(sortOrder), builder.var(output));
+        }
+    }
+
+    @RegisterStatement("sensor")
+    public static class SensorStatement extends LStatement{
+        public String to = "result";
+        public String from = "block1", type = "@copper";
+
+        private transient int selected = 0;
+        private transient TextField tfield;
+
+        @Override
+        public void build(Table table){
+            field(table, to, str -> to = str);
+
+            table.add(" = ");
+
+            row(table);
+
+            tfield = field(table, type, str -> type = str).padRight(0f).get();
+
+            table.button(b -> {
+                b.image(Icon.pencilSmall);
+                //240
+                b.clicked(() -> showSelectTable(b, (t, hide) -> {
+                    Table[] tables = {
+                        //items
+                        new Table(i -> {
+                            i.left();
+                            int c = 0;
+                            for(Item item : Vars.content.items()){
+                                if(!item.unlockedNow()) continue;
+                                i.button(new TextureRegionDrawable(item.icon(Cicon.small)), Styles.cleari, () -> {
+                                    stype("@" + item.name);
+                                    hide.run();
+                                }).size(40f);
+
+                                if(++c % 6 == 0) i.row();
+                            }
+                        }),
+                        //liquids
+                        new Table(i -> {
+                            i.left();
+                            int c = 0;
+                            for(Liquid item : Vars.content.liquids()){
+                                if(!item.unlockedNow()) continue;
+                                i.button(new TextureRegionDrawable(item.icon(Cicon.small)), Styles.cleari, () -> {
+                                    stype("@" + item.name);
+                                    hide.run();
+                                }).size(40f);
+
+                                if(++c % 6 == 0) i.row();
+                            }
+                        }),
+                        //sensors
+                        new Table(i -> {
+                            for(LAccess sensor : LAccess.senseable){
+                                i.button(sensor.name(), Styles.cleart, () -> {
+                                    stype("@" + sensor.name());
+                                    hide.run();
+                                }).size(240f, 40f).row();
+                            }
+                        })
+                    };
+
+                    Drawable[] icons = {Icon.box, Icon.liquid, Icon.tree};
+                    Stack stack = new Stack(tables[selected]);
+                    ButtonGroup<Button> group = new ButtonGroup<>();
+
+                    for(int i = 0; i < tables.length; i++){
+                        int fi = i;
+
+                        t.button(icons[i], Styles.clearTogglei, () -> {
+                            selected = fi;
+
+                            stack.clearChildren();
+                            stack.addChild(tables[selected]);
+                            t.pack();
+                        }).size(80f, 50f).growX().checked(selected == fi).group(group);
+                    }
+                    t.row();
+                    t.add(stack).colspan(3).width(240f).left();
+                }));
+            }, Styles.logict, () -> {}).size(40f).padLeft(-1).color(table.color);
+
+            table.add(" in ");
+
+            field(table, from, str -> from = str);
+        }
+
+        private void stype(String text){
+            tfield.setText(text);
+            this.type = text;
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.blocks;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SenseI(builder.var(from), builder.var(to), builder.var(type));
+        }
+    }
+
+    @RegisterStatement("set")
+    public static class SetStatement extends LStatement{
+        public String to = "result";
+        public String from = "0";
+
+        @Override
+        public void build(Table table){
+            field(table, to, str -> to = str);
+
+            table.add(" = ");
+
+            field(table, from, str -> from = str);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.operations;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetI(builder.var(from), builder.var(to));
+        }
+    }
+
+    @RegisterStatement("op")
+    public static class OperationStatement extends LStatement{
+        public LogicOp op = LogicOp.add;
+        public String dest = "result", a = "a", b = "b";
+
+        @Override
+        public void build(Table table){
+            rebuild(table);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+
+            field(table, dest, str -> dest = str);
+
+            table.add(" = ");
+
+            if(op.unary){
+                opButton(table);
+
+                field(table, a, str -> a = str);
+            }else{
+                row(table);
+
+                field(table, a, str -> a = str);
+
+                opButton(table);
+
+                field(table, b, str -> b = str);
+            }
+        }
+
+        void opButton(Table table){
+            table.button(b -> {
+                b.label(() -> op.symbol);
+                b.clicked(() -> showSelect(b, LogicOp.all, op, o -> {
+                    op = o;
+                    rebuild(table);
+                }));
+            }, Styles.logict, () -> {}).size(60f, 40f).pad(4f).color(table.color);
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new OpI(op,builder.var(a), builder.var(b), builder.var(dest));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.operations;
+        }
+    }
+
+    @RegisterStatement("end")
+    public static class EndStatement extends LStatement{
+        @Override
+        public void build(Table table){
+
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new EndI();
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.control;
+        }
+    }
+
+    @RegisterStatement("jump")
+    public static class JumpStatement extends LStatement{
+        private static Color last = new Color();
+
+        public transient StatementElem dest;
+
+        public int destIndex;
+
+        public ConditionOp op = ConditionOp.notEqual;
+        public String value = "x", compare = "false";
+
+        @Override
+        public void build(Table table){
+            table.add("if ").padLeft(4);
+
+            last = table.color;
+            table.table(this::rebuild);
+
+            table.add().growX();
+            table.add(new JumpButton(() -> dest, s -> dest = s)).size(30).right().padLeft(-8);
+        }
+
+        void rebuild(Table table){
+            table.clearChildren();
+            table.setColor(last);
+
+            if(op != ConditionOp.always) field(table, value, str -> value = str);
+
+            table.button(b -> {
+                b.label(() -> op.symbol);
+                b.clicked(() -> showSelect(b, ConditionOp.all, op, o -> {
+                    op = o;
+                    rebuild(table);
+                }));
+            }, Styles.logict, () -> {}).size(op == ConditionOp.always ? 80f : 48f, 40f).pad(4f).color(table.color);
+
+            if(op != ConditionOp.always) field(table, compare, str -> compare = str);
+        }
+
+        //elements need separate conversion logic
+        @Override
+        public void setupUI(){
+            if(elem != null && destIndex >= 0 && destIndex < elem.parent.getChildren().size){
+                dest = (StatementElem)elem.parent.getChildren().get(destIndex);
+            }
+        }
+
+        @Override
+        public void saveUI(){
+            if(elem != null){
+                destIndex = dest == null ? -1 : dest.parent.getChildren().indexOf(dest);
+            }
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new JumpI(op, builder.var(value), builder.var(compare), destIndex);
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.control;
+        }
+    }
+}
diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java
index 0eddd67f22..fb97e5c4bc 100644
--- a/core/src/mindustry/logic/LogicDialog.java
+++ b/core/src/mindustry/logic/LogicDialog.java
@@ -1,12 +1,104 @@
 package mindustry.logic;
 
+import arc.*;
+import arc.func.*;
+import arc.scene.ui.TextButton.*;
+import mindustry.gen.*;
+import mindustry.logic.LStatements.*;
+import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 
+import static mindustry.Vars.*;
+
 public class LogicDialog extends BaseDialog{
+    LCanvas canvas;
+    Cons<String> consumer = s -> {};
 
     public LogicDialog(){
-        super("");
-        clear();
+        super("logic");
+
+        clearChildren();
+
+        canvas = new LCanvas();
+        shouldPause = true;
         addCloseButton();
+
+        buttons.getCells().first().width(170f);
+
+        buttons.button("@edit", Icon.edit, () -> {
+            BaseDialog dialog = new BaseDialog("@editor.export");
+            dialog.cont.pane(p -> {
+                p.margin(10f);
+                p.table(Tex.button, t -> {
+                    TextButtonStyle style = Styles.cleart;
+                    t.defaults().size(280f, 60f).left();
+                    t.row();
+                    t.button("@schematic.copy.import", Icon.download, style, () -> {
+                        dialog.hide();
+                        try{
+                            canvas.load(Core.app.getClipboardText().replace("\r\n", "\n"));
+                        }catch(Throwable e){
+                            ui.showException(e);
+                        }
+                    }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null);
+                    t.row();
+                    t.button("@schematic.copy", Icon.copy, style, () -> {
+                        dialog.hide();
+                        Core.app.setClipboardText(canvas.save());
+                    }).marginLeft(12f);
+                });
+            });
+
+            dialog.addCloseButton();
+            dialog.show();
+        }).width(170f);
+
+        buttons.button("@add", Icon.add, () -> {
+            BaseDialog dialog = new BaseDialog("@add");
+            dialog.cont.pane(t -> {
+                t.background(Tex.button);
+                int i = 0;
+                for(Prov<LStatement> prov : LogicIO.allStatements){
+                    LStatement example = prov.get();
+                    if(example instanceof InvalidStatement) continue;
+
+                    TextButtonStyle style = new TextButtonStyle(Styles.cleart);
+                    style.fontColor = example.category().color;
+                    style.font = Fonts.outline;
+
+                    t.button(example.name(), style, () -> {
+                        canvas.add(prov.get());
+                        dialog.hide();
+                    }).size(140f, 50f);
+                    if(++i % 2 == 0) t.row();
+                }
+            });
+            dialog.addCloseButton();
+            dialog.show();
+        }).width(170f).disabled(t -> canvas.statements.getChildren().size >= LExecutor.maxInstructions);
+
+        add(canvas).grow();
+
+        row();
+
+        add(buttons).growX();
+
+        hidden(() -> consumer.get(canvas.save()));
+
+        onResize(() -> canvas.rebuild());
+    }
+
+    public void show(String code, Cons<String> consumer){
+        canvas.statements.clearChildren();
+        canvas.rebuild();
+        try{
+            canvas.load(code);
+        }catch(Throwable t){
+            t.printStackTrace();
+            canvas.load("");
+        }
+        this.consumer = consumer;
+
+        show();
     }
 }
diff --git a/core/src/mindustry/logic/LogicExecutor.java b/core/src/mindustry/logic/LogicExecutor.java
deleted file mode 100644
index 11f44bc26d..0000000000
--- a/core/src/mindustry/logic/LogicExecutor.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package mindustry.logic;
-
-import mindustry.gen.*;
-
-import java.nio.*;
-
-public class LogicExecutor{
-    Instruction[] instructions;
-    ByteBuffer memory = ByteBuffer.allocate(1024 * 512);
-    int counter;
-
-    void step(){
-        if(instructions.length == 0) return;
-
-        instructions[counter].exec();
-        counter ++;
-
-        //loop counter
-        if(counter >= instructions.length) counter = 0;
-    }
-
-    Building device(short id){
-        return null; //TODO
-    }
-
-    interface Instruction{
-        void exec();
-    }
-
-    static class RegisterI implements Instruction{
-        /** operation to perform */
-        Op op;
-        /** destination memory */
-        int dest;
-        /** memory to take data from. -1 for immediate values. */
-        int left, right;
-        /** left/right immediate values, only used if no registers are present. */
-        double ileft, iright;
-
-        @Override
-        public void exec(){
-            //memory.putDouble(dest, op.function.get(left == -1 ? ileft : registers[left], right == -1 ? iright : registers[right]));
-        }
-    }
-
-    static class ReadI implements Instruction{
-        /** register to write result to */
-        short dest;
-        /** device to read from */
-        short device;
-        /** the type of data to be read */
-        ReadOp op;
-        /** any additional read parameters */
-        int parameter;
-
-        @Override
-        public void exec(){
-            //registers[dest] = op.function.get(device(device), parameter);
-        }
-    }
-
-    static class WriteI implements Instruction{
-
-        @Override
-        public void exec(){
-
-        }
-    }
-
-    enum ReadOp{
-        item((tile, id) -> tile.items == null ? 0 : tile.items.get(id)),
-        itemTotal((tile, param) -> tile.items == null ? 0 : tile.items.total());
-
-        final ReadOpLambda function;
-        final String symbol;
-
-        ReadOp(ReadOpLambda function){
-            this.symbol = name();
-            this.function = function;
-        }
-
-        interface ReadOpLambda{
-            int get(Building tile, int parameter);
-        }
-    }
-
-    enum Op{
-        add("+", (a, b) -> a + b),
-        sub("-", (a, b) -> a - b),
-        mul("*", (a, b) -> a * b),
-        div("/", (a, b) -> a / b),
-        mod("%", (a, b) -> a % b),
-        pow("^", Math::pow),
-        shl(">>", (a, b) -> (int)a >> (int)b),
-        shr("<<", (a, b) -> (int)a << (int)b),
-        or("or", (a, b) -> (int)a | (int)b),
-        and("and", (a, b) -> (int)a & (int)b),
-        xor("xor", (a, b) -> (int)a ^ (int)b);
-
-        final OpLambda function;
-        final String symbol;
-
-        Op(String symbol, OpLambda function){
-            this.symbol = symbol;
-            this.function = function;
-        }
-
-        interface OpLambda{
-            double get(double a, double b);
-        }
-    }
-
-
-}
diff --git a/core/src/mindustry/logic/LogicNode.java b/core/src/mindustry/logic/LogicNode.java
deleted file mode 100644
index 1e9e2cc7dd..0000000000
--- a/core/src/mindustry/logic/LogicNode.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package mindustry.logic;
-
-public class LogicNode{
-}
diff --git a/core/src/mindustry/logic/LogicOp.java b/core/src/mindustry/logic/LogicOp.java
new file mode 100644
index 0000000000..b289efc1f2
--- /dev/null
+++ b/core/src/mindustry/logic/LogicOp.java
@@ -0,0 +1,88 @@
+package mindustry.logic;
+
+import arc.math.*;
+
+public enum LogicOp{
+    add("+", (a, b) -> a + b),
+    sub("-", (a, b) -> a - b),
+    mul("*", (a, b) -> a * b),
+    div("/", (a, b) -> a / b),
+    idiv("//", (a, b) -> Math.floor(a / b)),
+    mod("%", (a, b) -> a % b),
+    equal("==", (a, b) -> Math.abs(a - b) < 0.000001 ? 1 : 0, (a, b) -> a == b ? 1 : 0),
+    notEqual("not", (a, b) -> Math.abs(a - b) < 0.000001 ? 0 : 1, (a, b) -> a != b ? 1 : 0),
+    lessThan("<", (a, b) -> a < b ? 1 : 0),
+    lessThanEq("<=", (a, b) -> a <= b ? 1 : 0),
+    greaterThan(">", (a, b) -> a > b ? 1 : 0),
+    greaterThanEq(">=", (a, b) -> a >= b ? 1 : 0),
+    pow("^", Math::pow),
+    shl("<<", (a, b) -> (long)a << (long)b),
+    shr(">>", (a, b) -> (long)a >> (long)b),
+    or("or", (a, b) -> (long)a | (long)b),
+    and("and", (a, b) -> (long)a & (long)b),
+    xor("xor", (a, b) -> (long)a ^ (long)b),
+    max("max", Math::max),
+    min("min", Math::min),
+    atan2("atan2", (x, y) -> Mathf.atan2((float)x, (float)y) * Mathf.radDeg),
+    dst("dst", (x, y) -> Mathf.dst((float)x, (float)y)),
+    noise("noise", LExecutor.noise::rawNoise2D),
+
+    not("not", a -> ~(long)(a)),
+    abs("abs", a -> Math.abs(a)),
+    log("log", Math::log),
+    log10("log10", Math::log10),
+    sin("sin", d -> Math.sin(d * 0.017453292519943295D)),
+    cos("cos", d -> Math.cos(d * 0.017453292519943295D)),
+    tan("tan", d -> Math.tan(d * 0.017453292519943295D)),
+    floor("floor", Math::floor),
+    ceil("ceil", Math::ceil),
+    sqrt("sqrt", Math::sqrt),
+    rand("rand", d -> Mathf.rand.nextDouble() * d),
+
+    ;
+
+    public static final LogicOp[] all = values();
+
+    public final OpObjLambda2 objFunction2;
+    public final OpLambda2 function2;
+    public final OpLambda1 function1;
+    public final boolean unary;
+    public final String symbol;
+
+    LogicOp(String symbol, OpLambda2 function){
+        this(symbol, function, null);
+    }
+
+    LogicOp(String symbol, OpLambda2 function, OpObjLambda2 objFunction){
+        this.symbol = symbol;
+        this.function2 = function;
+        this.function1 = null;
+        this.unary = false;
+        this.objFunction2 = objFunction;
+    }
+
+    LogicOp(String symbol, OpLambda1 function){
+        this.symbol = symbol;
+        this.function1 = function;
+        this.function2 = null;
+        this.unary = true;
+        this.objFunction2 = null;
+    }
+
+    @Override
+    public String toString(){
+        return symbol;
+    }
+
+    interface OpObjLambda2{
+        double get(Object a, Object b);
+    }
+
+    interface OpLambda2{
+        double get(double a, double b);
+    }
+
+    interface OpLambda1{
+        double get(double a);
+    }
+}
diff --git a/core/src/mindustry/logic/RadarSort.java b/core/src/mindustry/logic/RadarSort.java
new file mode 100644
index 0000000000..50e553b70f
--- /dev/null
+++ b/core/src/mindustry/logic/RadarSort.java
@@ -0,0 +1,24 @@
+package mindustry.logic;
+
+import arc.math.geom.*;
+import mindustry.gen.*;
+
+public enum RadarSort{
+    distance((pos, other) -> -pos.dst2(other)),
+    health((pos, other) -> other.health()),
+    shield((pos, other) -> other.shield()),
+    armor((pos, other) -> other.armor()),
+    maxHealth((pos, other) -> other.maxHealth());
+
+    public final RadarSortFunc func;
+
+    public static final RadarSort[] all = values();
+
+    RadarSort(RadarSortFunc func){
+        this.func = func;
+    }
+
+    public interface RadarSortFunc{
+        float get(Position pos, Unit other);
+    }
+}
diff --git a/core/src/mindustry/logic/RadarTarget.java b/core/src/mindustry/logic/RadarTarget.java
new file mode 100644
index 0000000000..ddd7a1f368
--- /dev/null
+++ b/core/src/mindustry/logic/RadarTarget.java
@@ -0,0 +1,27 @@
+package mindustry.logic;
+
+import mindustry.game.*;
+import mindustry.gen.*;
+
+public enum RadarTarget{
+    any((team, other) -> true),
+    enemy((team, other) -> team != other.team),
+    ally((team, other) -> team == other.team),
+    player((team, other) -> other.isPlayer()),
+    attacker((pos, other) -> other.canShoot()),
+    flying((team, other) -> other.isFlying()),
+    boss((team, other) -> other.isBoss()),
+    ground((team, other) -> other.isGrounded());
+
+    public final RadarTargetFunc func;
+
+    public static final RadarTarget[] all = values();
+
+    RadarTarget(RadarTargetFunc func){
+        this.func = func;
+    }
+
+    public interface RadarTargetFunc{
+        boolean get(Team team, Unit other);
+    }
+}
diff --git a/core/src/mindustry/logic/Ranged.java b/core/src/mindustry/logic/Ranged.java
new file mode 100644
index 0000000000..7c1f17a903
--- /dev/null
+++ b/core/src/mindustry/logic/Ranged.java
@@ -0,0 +1,7 @@
+package mindustry.logic;
+
+import mindustry.gen.*;
+
+public interface Ranged extends Posc, Teamc{
+    float range();
+}
diff --git a/core/src/mindustry/logic/Senseable.java b/core/src/mindustry/logic/Senseable.java
new file mode 100644
index 0000000000..6ae99afbfa
--- /dev/null
+++ b/core/src/mindustry/logic/Senseable.java
@@ -0,0 +1,14 @@
+package mindustry.logic;
+
+import mindustry.ctype.*;
+
+public interface Senseable{
+    Object noSensed = new Object();
+
+    double sense(LAccess sensor);
+    double sense(Content content);
+
+    default Object senseObject(LAccess sensor){
+        return noSensed;
+    }
+}
diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java
index e47e369140..ebf2896e0e 100644
--- a/core/src/mindustry/maps/Map.java
+++ b/core/src/mindustry/maps/Map.java
@@ -130,7 +130,7 @@ public class Map implements Comparable<Map>, Publishable{
     }
 
     public String tag(String name){
-        return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name) : Core.bundle.get("unknown");
+        return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name) : Core.bundle.get("unknown", "unknown");
     }
 
     public boolean hasTag(String name){
@@ -146,7 +146,7 @@ public class Map implements Comparable<Map>, Publishable{
     public void addSteamID(String id){
         tags.put("steamid", id);
 
-        ui.editor.editor.getTags().put("steamid", id);
+        ui.editor.editor.tags.put("steamid", id);
         try{
             ui.editor.save();
         }catch(Exception e){
@@ -159,7 +159,7 @@ public class Map implements Comparable<Map>, Publishable{
     public void removeSteamID(){
         tags.remove("steamid");
 
-        ui.editor.editor.getTags().remove("steamid");
+        ui.editor.editor.tags.remove("steamid");
         try{
             ui.editor.save();
         }catch(Exception e){
@@ -203,7 +203,7 @@ public class Map implements Comparable<Map>, Publishable{
     @Override
     public boolean prePublish(){
         tags.put("author", player.name);
-        ui.editor.editor.getTags().put("author", tags.get("author"));
+        ui.editor.editor.tags.put("author", tags.get("author"));
         ui.editor.save();
 
         return true;
diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java
index e71425539f..54c3856d7d 100644
--- a/core/src/mindustry/maps/Maps.java
+++ b/core/src/mindustry/maps/Maps.java
@@ -3,11 +3,11 @@ package mindustry.maps;
 import arc.*;
 import arc.assets.*;
 import arc.assets.loaders.*;
-import arc.struct.*;
-import arc.struct.IntSet.*;
 import arc.files.*;
 import arc.func.*;
 import arc.graphics.*;
+import arc.struct.IntSet.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.async.*;
@@ -15,7 +15,7 @@ import arc.util.io.*;
 import arc.util.serialization.*;
 import mindustry.*;
 import mindustry.content.*;
-import mindustry.ctype.*;
+import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.io.*;
@@ -32,7 +32,7 @@ public class Maps{
     /** List of all built-in maps. Filenames only. */
     private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "veins", "glacier"};
     /** Maps tagged as PvP */
-    private static final String[] pvpMaps = {"veins", "glacier"};
+    static final String[] pvpMaps = {"veins", "glacier"};
     /** All maps stored in an ordered array. */
     private Seq<Map> maps = new Seq<>();
     /** Serializer for meta. */
@@ -59,6 +59,7 @@ public class Maps{
 
     /** @return the next map to shuffle to. May be null, in which case the server should be stopped. */
     public @Nullable Map getNextMap(Gamemode mode, @Nullable Map previous){
+        if(shuffler != null) return shuffler.next(mode, previous);
         return shuffleMode.next(mode, previous);
     }
 
@@ -87,7 +88,7 @@ public class Maps{
         });
 
         if(Core.assets != null){
-            ((CustomLoader) Core.assets.getLoader(Content.class)).loaded = this::createAllPreviews;
+            ((CustomLoader)Core.assets.getLoader(ContentLoader.class)).loaded = this::createAllPreviews;
         }
     }
 
@@ -266,11 +267,11 @@ public class Maps{
             Log.err(e);
 
             if("Outdated legacy map format".equals(e.getMessage())){
-                ui.showErrorMessage("$editor.errornot");
+                ui.showErrorMessage("@editor.errornot");
             }else if(e.getMessage() != null && e.getMessage().contains("Incorrect header!")){
-                ui.showErrorMessage("$editor.errorheader");
+                ui.showErrorMessage("@editor.errorheader");
             }else{
-                ui.showException("$editor.errorload", e);
+                ui.showException("@editor.errorload", e);
             }
         }
     }
@@ -292,25 +293,29 @@ public class Maps{
         if(str == null || str.isEmpty()){
             //create default filters list
             Seq<GenerateFilter> filters =  Seq.with(
-                new ScatterFilter(){{
-                    flooronto = Blocks.stone;
-                    block = Blocks.rock;
-                }},
-                new ScatterFilter(){{
-                    flooronto = Blocks.shale;
-                    block = Blocks.shaleBoulder;
-                }},
                 new ScatterFilter(){{
                     flooronto = Blocks.snow;
-                    block = Blocks.snowrock;
+                    block = Blocks.snowBoulder;
                 }},
                 new ScatterFilter(){{
                     flooronto = Blocks.ice;
-                    block = Blocks.snowrock;
+                    block = Blocks.snowBoulder;
                 }},
                 new ScatterFilter(){{
                     flooronto = Blocks.sand;
                     block = Blocks.sandBoulder;
+                }},
+                new ScatterFilter(){{
+                    flooronto = Blocks.dacite;
+                    block = Blocks.daciteBoulder;
+                }},
+                new ScatterFilter(){{
+                    flooronto = Blocks.stone;
+                    block = Blocks.boulder;
+                }},
+                new ScatterFilter(){{
+                    flooronto = Blocks.shale;
+                    block = Blocks.shaleBoulder;
                 }}
             );
 
diff --git a/core/src/mindustry/maps/SectorDamage.java b/core/src/mindustry/maps/SectorDamage.java
index cf0c785d45..5f4e267d74 100644
--- a/core/src/mindustry/maps/SectorDamage.java
+++ b/core/src/mindustry/maps/SectorDamage.java
@@ -35,7 +35,8 @@ public class SectorDamage{
         if(core != null && !frontier.isEmpty()){
             for(Tile spawner : frontier){
                 //find path from spawn to core
-                Seq<Tile> path = Astar.pathfind(spawner, core.tile, t -> t.cost, t -> !(t.block().isStatic() && t.solid()));
+                //TODO this is broken
+                Seq<Tile> path = Astar.pathfind(spawner, core.tile, SectorDamage::cost, t -> !(t.block().isStatic() && t.solid()));
                 int amount = (int)(path.size * fraction);
                 for(int i = 0; i < amount; i++){
                     Tile t = path.get(i);
@@ -44,7 +45,7 @@ public class SectorDamage{
                         //just remove all the buildings in the way - as long as they're not cores!
                         if(other.build != null && other.team() == state.rules.defaultTeam && !(other.block() instanceof CoreBlock)){
                             if(rubble && !other.floor().solid && !other.floor().isLiquid && Mathf.chance(0.4)){
-                                Effects.rubble(other.build.x, other.build.y, other.block().size);
+                                Effect.rubble(other.build.x, other.build.y, other.block().size);
                             }
 
                             other.remove();
@@ -86,7 +87,7 @@ public class SectorDamage{
                             if(other.build.health < 0){
                                 //rubble
                                 if(rubble && !other.floor().solid && !other.floor().isLiquid && Mathf.chance(0.4)){
-                                    Effects.rubble(other.build.x, other.build.y, other.block().size);
+                                    Effect.rubble(other.build.x, other.build.y, other.block().size);
                                 }
 
                                 other.remove();
@@ -104,8 +105,12 @@ public class SectorDamage{
                 }
             }
         }
+    }
 
-
-
+    static float cost(Tile tile){
+        return 1f +
+            (tile.block().isStatic() && tile.solid() ? 200f : 0f) +
+            (tile.build != null ? tile.build.health / 40f : 0f) +
+            (tile.floor().isLiquid ? 10f : 0f);
     }
 }
diff --git a/core/src/mindustry/maps/filters/FilterOption.java b/core/src/mindustry/maps/filters/FilterOption.java
index cdac5c9d4d..dedebfe713 100644
--- a/core/src/mindustry/maps/filters/FilterOption.java
+++ b/core/src/mindustry/maps/filters/FilterOption.java
@@ -17,13 +17,13 @@ import mindustry.world.blocks.environment.*;
 import static mindustry.Vars.*;
 
 public abstract class FilterOption{
-    public static final Boolf<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full));
-    public static final Boolf<Block> wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full));
-    public static final Boolf<Block> floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)));
-    public static final Boolf<Block> wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)));
-    public static final Boolf<Block> wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)));
+    public static final Boolf<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full));
+    public static final Boolf<Block> wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full)) && b.inEditor;
+    public static final Boolf<Block> floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full)));
+    public static final Boolf<Block> wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full)));
+    public static final Boolf<Block> wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full))) && b.inEditor;
     public static final Boolf<Block> oresOnly = b -> b instanceof OverlayFloor && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full));
-    public static final Boolf<Block> anyOptional = b -> floorsOnly.get(b) || wallsOnly.get(b) || oresOnly.get(b) || b == Blocks.air;
+    public static final Boolf<Block> anyOptional = b -> (floorsOnly.get(b) || wallsOnly.get(b) || oresOnly.get(b) || b == Blocks.air) && b.inEditor;
 
     public abstract void build(Table table);
 
@@ -58,7 +58,7 @@ public abstract class FilterOption{
         @Override
         public void build(Table table){
             if(!display){
-                table.add("$filter.option." + name);
+                table.add("@filter.option." + name);
             }else{
                 table.label(() -> Core.bundle.get("filter.option." + name) + ": " + (int)getter.get());
             }
@@ -107,7 +107,7 @@ public abstract class FilterOption{
                 dialog.show();
             }).pad(4).margin(12f);
 
-            table.add("$filter.option." + name);
+            table.add("@filter.option." + name);
         }
     }
 }
diff --git a/core/src/mindustry/maps/filters/GenerateFilter.java b/core/src/mindustry/maps/filters/GenerateFilter.java
index 6193dfa704..6d0f48d121 100644
--- a/core/src/mindustry/maps/filters/GenerateFilter.java
+++ b/core/src/mindustry/maps/filters/GenerateFilter.java
@@ -44,7 +44,9 @@ public abstract class GenerateFilter{
 
     /** localized display name */
     public String name(){
-        return Core.bundle.get("filter." + getClass().getSimpleName().toLowerCase().replace("filter", ""), getClass().getSimpleName().replace("Filter", ""));
+        Class c = getClass();
+        if(c.isAnonymousClass()) c = c.getSuperclass();
+        return Core.bundle.get("filter." + c.getSimpleName().toLowerCase().replace("filter", ""), c.getSimpleName().replace("Filter", ""));
     }
 
     /** set the seed to a random number */
diff --git a/core/src/mindustry/maps/filters/MirrorFilter.java b/core/src/mindustry/maps/filters/MirrorFilter.java
index d4c96a7e07..8d2e22bdbe 100644
--- a/core/src/mindustry/maps/filters/MirrorFilter.java
+++ b/core/src/mindustry/maps/filters/MirrorFilter.java
@@ -52,15 +52,13 @@ public class MirrorFilter extends GenerateFilter{
         float imageHeight = Math.max(vsize.y, vsize.x);
 
         float size = Math.max(image.getWidth() *2, image.getHeight()*2);
-        Cons<Vec2> clamper = v ->
-            v.clamp(
-                image.getX() + image.getWidth()/2f - imageWidth/2f,
-                image.getX() + image.getWidth()/2f + imageWidth/2f,
-                image.getY() + image.getHeight()/2f - imageHeight/2f,
-                image.getY() + image.getHeight()/2f + imageHeight/2f);
+        Cons<Vec2> clamper = v -> v.clamp(
+            image.x + image.getWidth()/2f - imageWidth/2f,
+        image.y + image.getHeight()/2f - imageHeight/2f, image.y + image.getHeight()/2f + imageHeight/2f, image.x + image.getWidth()/2f + imageWidth/2f
+        );
 
-        clamper.get(Tmp.v1.trns(angle - 90, size).add(image.getWidth()/2f + image.getX(), image.getHeight()/2f + image.getY()));
-        clamper.get(Tmp.v2.set(Tmp.v1).sub(image.getWidth()/2f + image.getX(), image.getHeight()/2f + image.getY()).rotate(180f).add(image.getWidth()/2f + image.getX(), image.getHeight()/2f + image.getY()));
+        clamper.get(Tmp.v1.trns(angle - 90, size).add(image.getWidth()/2f + image.x, image.getHeight()/2f + image.y));
+        clamper.get(Tmp.v2.set(Tmp.v1).sub(image.getWidth()/2f + image.x, image.getHeight()/2f + image.y).rotate(180f).add(image.getWidth()/2f + image.x, image.getHeight()/2f + image.y));
 
         Lines.stroke(Scl.scl(3f), Pal.accent);
         Lines.line(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
diff --git a/core/src/mindustry/maps/filters/NoiseFilter.java b/core/src/mindustry/maps/filters/NoiseFilter.java
index 8635966486..1feba11ad1 100644
--- a/core/src/mindustry/maps/filters/NoiseFilter.java
+++ b/core/src/mindustry/maps/filters/NoiseFilter.java
@@ -11,7 +11,7 @@ import static mindustry.maps.filters.FilterOption.wallsOnly;
 
 public class NoiseFilter extends GenerateFilter{
     float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f;
-    Block floor = Blocks.stone, block = Blocks.rocks;
+    Block floor = Blocks.stone, block = Blocks.stoneWall;
 
     @Override
     public FilterOption[] options(){
diff --git a/core/src/mindustry/maps/filters/RiverNoiseFilter.java b/core/src/mindustry/maps/filters/RiverNoiseFilter.java
index 79755e1e8e..0a462548cc 100644
--- a/core/src/mindustry/maps/filters/RiverNoiseFilter.java
+++ b/core/src/mindustry/maps/filters/RiverNoiseFilter.java
@@ -11,7 +11,7 @@ import static mindustry.maps.filters.FilterOption.wallsOnly;
 
 public class RiverNoiseFilter extends GenerateFilter{
     float scl = 40, threshold = 0f, threshold2 = 0.1f;
-    Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandRocks;
+    Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandWall;
 
     @Override
     public FilterOption[] options(){
diff --git a/core/src/mindustry/maps/filters/TerrainFilter.java b/core/src/mindustry/maps/filters/TerrainFilter.java
index d525f74d14..f6dcaeaf27 100644
--- a/core/src/mindustry/maps/filters/TerrainFilter.java
+++ b/core/src/mindustry/maps/filters/TerrainFilter.java
@@ -12,7 +12,7 @@ import static mindustry.maps.filters.FilterOption.wallsOnly;
 
 public class TerrainFilter extends GenerateFilter{
     float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f;
-    Block floor = Blocks.stone, block = Blocks.rocks;
+    Block floor = Blocks.stone, block = Blocks.stoneWall;
 
     @Override
     public FilterOption[] options(){
diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java
index 90cc66418e..7a752a453a 100644
--- a/core/src/mindustry/maps/generators/BaseGenerator.java
+++ b/core/src/mindustry/maps/generators/BaseGenerator.java
@@ -15,6 +15,7 @@ import mindustry.world.blocks.defense.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.production.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -26,9 +27,10 @@ public class BaseGenerator{
     private Tiles tiles;
     private Team team;
     private ObjectMap<Item, OreBlock> ores = new ObjectMap<>();
+    private ObjectMap<Item, Floor> oreFloors = new ObjectMap<>();
     private Seq<Tile> cores;
 
-    public void generate(Tiles tiles, Seq<Tile> cores, Tile spawn, Team team, Sector sector){
+    public void generate(Tiles tiles, Seq<Tile> cores, Tile spawn, Team team, Sector sector, float difficulty){
         this.tiles = tiles;
         this.team = team;
         this.cores = cores;
@@ -36,21 +38,29 @@ public class BaseGenerator{
         //don't generate bases when there are no loaded schematics
         if(bases.cores.isEmpty()) return;
 
-        Mathf.random.setSeed(sector.id);
+        Mathf.rand.setSeed(sector.id);
 
         for(Block block : content.blocks()){
             if(block instanceof OreBlock && block.asFloor().itemDrop != null){
                 ores.put(block.asFloor().itemDrop, (OreBlock)block);
+            }else if(block.isFloor() && block.asFloor().itemDrop != null && !oreFloors.containsKey(block.asFloor().itemDrop)){
+                oreFloors.put(block.asFloor().itemDrop, block.asFloor());
             }
         }
 
         //TODO limit base size
         float costBudget = 1000;
 
-        Seq<Block> wallsSmall = content.blocks().select(b -> b instanceof Wall && b.size == 1);
-        Seq<Block> wallsLarge = content.blocks().select(b -> b instanceof Wall && b.size == 2);
+        Seq<Block> wallsSmall = content.blocks().select(b -> b instanceof Wall && b.size == 1 && b.buildVisibility == BuildVisibility.shown && !(b instanceof Door));
+        Seq<Block> wallsLarge = content.blocks().select(b -> b instanceof Wall && b.size == 2 && b.buildVisibility == BuildVisibility.shown && !(b instanceof Door));
 
-        float bracket = 0.1f;
+        //sort by cost for correct fraction
+        wallsSmall.sort(b -> b.buildCost);
+        wallsLarge.sort(b -> b.buildCost);
+
+        //TODO proper difficulty selection
+        float bracket = difficulty;
+        float bracketRange = 0.2f;
         int wallAngle = 70; //180 for full coverage
         double resourceChance = 0.5;
         double nonResourceChance = 0.0005;
@@ -65,7 +75,7 @@ public class BaseGenerator{
             //fill core with every type of item (even non-material)
             Building entity = tile.build;
             for(Item item : content.items()){
-                entity.items.add(item, entity.block().itemCapacity);
+                entity.items.add(item, entity.block.itemCapacity);
             }
         }
 
@@ -73,13 +83,22 @@ public class BaseGenerator{
         pass(tile -> {
             if(!tile.block().alwaysReplace) return;
 
-            if((tile.drop() != null || (tile.floor().liquidDrop != null && Mathf.chance(nonResourceChance * 2))) && Mathf.chance(resourceChance)){
+            if(((tile.overlay().asFloor().itemDrop != null || (tile.drop() != null && Mathf.chance(nonResourceChance)))
+                || (tile.floor().liquidDrop != null && Mathf.chance(nonResourceChance * 2))) && Mathf.chance(resourceChance)){
                 Seq<BasePart> parts = bases.forResource(tile.drop() != null ? tile.drop() : tile.floor().liquidDrop);
                 if(!parts.isEmpty()){
-                    tryPlace(parts.random(), tile.x, tile.y);
+                    tryPlace(parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y);
                 }
             }else if(Mathf.chance(nonResourceChance)){
-                tryPlace(bases.parts.random(), tile.x, tile.y);
+                tryPlace(bases.parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y);
+            }
+        });
+
+        //replace walls with the correct type (disabled)
+        if(false)
+        pass(tile -> {
+            if(tile.block() instanceof Wall && tile.team() == team && tile.block() != wall && tile.block() != wallLarge){
+                tile.setBlock(tile.block().size == 2 ? wallLarge : wall, team);
             }
         });
 
@@ -87,6 +106,7 @@ public class BaseGenerator{
 
             //small walls
             pass(tile -> {
+
                 if(tile.block().alwaysReplace){
                     boolean any = false;
 
@@ -163,19 +183,20 @@ public class BaseGenerator{
         }
 
         if(part.required instanceof Item){
+            Item item = (Item)part.required;
             for(Stile tile : result.tiles){
                 if(tile.block instanceof Drill){
 
                     tile.block.iterateTaken(tile.x + cx, tile.y + cy, (ex, ey) -> {
 
                         if(!tiles.getn(ex, ey).floor().isLiquid){
-                            tiles.getn(ex, ey).setOverlay(ores.get((Item)part.required));
+                            set(tiles.getn(ex, ey), item);
                         }
 
                         Tile rand = tiles.getc(ex + Mathf.range(1), ey + Mathf.range(1));
                         if(!rand.floor().isLiquid){
                             //random ores nearby to make it look more natural
-                            rand.setOverlay(ores.get((Item)part.required));
+                            set(rand, item);
                         }
                     });
                 }
@@ -184,24 +205,43 @@ public class BaseGenerator{
 
         Schematics.place(result, cx + result.width/2, cy + result.height/2, team);
 
-        return true;
-    }
+        //fill drills with items after placing
+        if(part.required instanceof Item){
+            Item item = (Item)part.required;
+            for(Stile tile : result.tiles){
+                if(tile.block instanceof Drill){
 
-    boolean isTaken(Block block, int x, int y){
-        if(block.isMultiblock()){
-            int offsetx = -(block.size - 1) / 2;
-            int offsety = -(block.size - 1) / 2;
+                    Building build = world.tile(tile.x + cx, tile.y + cy).build;
 
-            for(int dx = 0; dx < block.size; dx++){
-                for(int dy = 0; dy < block.size; dy++){
-                    if(overlaps(dx + offsetx + x, dy + offsety + y)){
-                        return true;
+                    if(build != null){
+                        build.items.add(item, build.block.itemCapacity);
                     }
                 }
             }
+        }
 
-        }else{
-            return overlaps(x, y);
+        return true;
+    }
+
+    void set(Tile tile, Item item){
+        if(ores.containsKey(item)){
+            tile.setOverlay(ores.get(item));
+        }else if(oreFloors.containsKey(item)){
+            tile.setFloor(oreFloors.get(item));
+        }
+    }
+
+    boolean isTaken(Block block, int x, int y){
+        int offsetx = -(block.size - 1) / 2;
+        int offsety = -(block.size - 1) / 2;
+        int pad = 1;
+
+        for(int dx = -pad; dx < block.size + pad; dx++){
+            for(int dy = -pad; dy < block.size + pad; dy++){
+                if(overlaps(dx + offsetx + x, dy + offsety + y)){
+                    return true;
+                }
+            }
         }
 
         return false;
diff --git a/core/src/mindustry/maps/generators/BasicGenerator.java b/core/src/mindustry/maps/generators/BasicGenerator.java
index ac5323fa16..542f84cf29 100644
--- a/core/src/mindustry/maps/generators/BasicGenerator.java
+++ b/core/src/mindustry/maps/generators/BasicGenerator.java
@@ -39,63 +39,6 @@ public abstract class BasicGenerator implements WorldGenerator{
 
     }
 
-    //for visual testing only
-    public void cliffs2(){
-        for(Tile tile : tiles){
-            tile.setBlock(Blocks.air);
-            tile.cost = tile.floor().isLiquid ? 0 : (byte)(noise(tile.x, tile.y, 4, 0.5f, 90f, 1) * 5);
-        }
-
-        for(Tile tile : tiles){
-            if(tile.floor().isLiquid) continue;
-
-            int rotation = 0;
-            for(int i = 0; i < 8; i++){
-                Tile other = tiles.get(tile.x + Geometry.d8[i].x, tile.y + Geometry.d8[i].y);
-                if(other != null && other.cost < tile.cost){ //down slope
-                    rotation |= (1 << i);
-                }
-            }
-
-            tile.rotation(rotation);
-        }
-
-        for(Tile tile : tiles){
-            if(tile.rotation() != 0){
-                int rotation = tile.rotation();
-                tile.setBlock(Blocks.cliff);
-                tile.setOverlay(Blocks.air);
-                tile.rotation(rotation);
-            }
-        }
-    }
-
-    public void cliffs(){
-        for(Tile tile : tiles){
-            if(!tile.block().isStatic()) continue;
-
-            int rotation = 0;
-            for(int i = 0; i < 8; i++){
-                Tile other = tiles.get(tile.x + Geometry.d8[i].x, tile.y + Geometry.d8[i].y);
-                if(other != null && !other.block().isStatic()){
-                    rotation |= (1 << i);
-                }
-            }
-
-            if(rotation != 0){
-                tile.setBlock(Blocks.cliff);
-            }
-
-            tile.rotation(rotation);
-        }
-
-        for(Tile tile : tiles){
-            if(tile.block() != Blocks.cliff && tile.block().isStatic()){
-                tile.setBlock(Blocks.air);
-            }
-        }
-    }
-
     public void median(int radius){
         median(radius, 0.5);
     }
@@ -331,18 +274,20 @@ public abstract class BasicGenerator implements WorldGenerator{
     }
 
     public void inverseFloodFill(Tile start){
+        GridBits used = new GridBits(tiles.width, tiles.height);
+
         IntSeq arr = new IntSeq();
         arr.add(start.pos());
         while(!arr.isEmpty()){
             int i = arr.pop();
             int x = Point2.x(i), y = Point2.y(i);
-            tiles.getn(x, y).cost = 2;
+            used.set(x, y);
             for(Point2 point : Geometry.d4){
                 int newx = x + point.x, newy = y + point.y;
                 if(tiles.in(newx, newy)){
                     Tile child = tiles.getn(newx, newy);
-                    if(child.block() == Blocks.air && child.cost != 2){
-                        child.cost = 2;
+                    if(child.block() == Blocks.air && !used.get(child.x, child.y)){
+                        used.set(child.x, child.y);
                         arr.add(child.pos());
                     }
                 }
@@ -350,7 +295,7 @@ public abstract class BasicGenerator implements WorldGenerator{
         }
 
         for(Tile tile : tiles){
-            if(tile.cost != 2 && tile.block() == Blocks.air){
+            if(!used.get(tile.x, tile.y) && tile.block() == Blocks.air){
                 tile.setBlock(tile.floor().wall);
             }
         }
diff --git a/core/src/mindustry/maps/generators/FileMapGenerator.java b/core/src/mindustry/maps/generators/FileMapGenerator.java
index e0b8bf3946..dab00370ed 100644
--- a/core/src/mindustry/maps/generators/FileMapGenerator.java
+++ b/core/src/mindustry/maps/generators/FileMapGenerator.java
@@ -3,7 +3,6 @@ package mindustry.maps.generators;
 import arc.math.*;
 import arc.math.geom.*;
 import mindustry.content.*;
-import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.io.*;
 import mindustry.maps.*;
@@ -29,12 +28,13 @@ public class FileMapGenerator implements WorldGenerator{
         world.setGenerating(true);
 
         tiles = world.tiles;
+        Item[] items = {Items.blastCompound, Items.pyratite, Items.copper, Items.thorium, Items.copper, Items.lead};
 
         for(Tile tile : tiles){
             if(tile.block() instanceof StorageBlock && !(tile.block() instanceof CoreBlock) && state.hasSector()){
-                for(Content content : state.getSector().data.resources){
-                    if(content instanceof Item && Mathf.chance(0.3)){
-                        tile.build.items.add((Item)content, Math.min(Mathf.random(500), tile.block().itemCapacity));
+                for(Item content : items){
+                    if(Mathf.chance(0.2)){
+                        tile.build.items.add(content, Math.min(Mathf.random(500), tile.block().itemCapacity));
                     }
                 }
             }
diff --git a/core/src/mindustry/maps/generators/PlanetGenerator.java b/core/src/mindustry/maps/generators/PlanetGenerator.java
index 2ce0bbae27..6bbc15ed2f 100644
--- a/core/src/mindustry/maps/generators/PlanetGenerator.java
+++ b/core/src/mindustry/maps/generators/PlanetGenerator.java
@@ -5,7 +5,6 @@ import arc.util.noise.*;
 import mindustry.graphics.g3d.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.type.*;
-import mindustry.type.Sector.*;
 import mindustry.world.*;
 
 public abstract class PlanetGenerator extends BasicGenerator implements HexMesher{
@@ -24,7 +23,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
 
         if(noise < 0.15){
             for(Ptile other : tile.tiles){
-                if(sector.planet.getSector(other).is(SectorAttribute.base)){
+                if(sector.planet.getSector(other).generateEnemyBase){
                     any = false;
                     break;
                 }
@@ -32,7 +31,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
         }
 
         if(any){
-            sector.data.attributes |= (1 << SectorAttribute.base.ordinal());
+            sector.generateEnemyBase = true;
         }
     }
 
diff --git a/core/src/mindustry/maps/planet/TODOPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
similarity index 94%
rename from core/src/mindustry/maps/planet/TODOPlanetGenerator.java
rename to core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
index 648e113558..6c5f047a90 100644
--- a/core/src/mindustry/maps/planet/TODOPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
@@ -14,7 +14,7 @@ import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
-public class TODOPlanetGenerator extends PlanetGenerator{
+public class SerpuloPlanetGenerator extends PlanetGenerator{
     Simplex noise = new Simplex();
     RidgedPerlin rid = new RidgedPerlin(1, 2);
     BaseGenerator basegen = new BaseGenerator();
@@ -27,10 +27,10 @@ public class TODOPlanetGenerator extends PlanetGenerator{
     {Blocks.water, Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.darksandTaintedWater, Blocks.stone, Blocks.stone, Blocks.stone},
     {Blocks.water, Blocks.darksandWater, Blocks.darksand, Blocks.sand, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.darksandTaintedWater, Blocks.stone, Blocks.stone, Blocks.stone},
     {Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.salt, Blocks.salt, Blocks.sand, Blocks.stone, Blocks.stone, Blocks.stone, Blocks.snow, Blocks.iceSnow, Blocks.ice},
-    {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.ignarock, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice},
+    {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.basalt, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice},
     {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.iceSnow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice},
     {Blocks.deepwater, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.ice},
-    {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.ignarock, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice},
+    {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.basalt, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice},
     {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.darksand, Blocks.moss, Blocks.sporeMoss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice},
     {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice},
     {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice},
@@ -92,7 +92,7 @@ public class TODOPlanetGenerator extends PlanetGenerator{
         position = Tmp.v33.set(position).scl(scl);
         float rad = scl;
         float temp = Mathf.clamp(Math.abs(position.y * 2f) / (rad));
-        float tnoise = (float)noise.octaveNoise3D(7, 0.5f, 1f/3f, position.x, position.y + 999f, position.z);
+        float tnoise = (float)noise.octaveNoise3D(7, 0.56, 1f/3f, position.x, position.y + 999f, position.z);
         temp = Mathf.lerp(temp, tnoise, 0.5f);
         height *= 1.2f;
         height = Mathf.clamp(height);
@@ -242,7 +242,7 @@ public class TODOPlanetGenerator extends PlanetGenerator{
             for(int i = ores.size - 1; i >= 0; i--){
                 Block entry = ores.get(i);
                 float freq = frequencies.get(i);
-                if(Math.abs(0.5f - noise(offsetX, offsetY + i*999, 2, 0.7, (40 + i * 2))) > 0.25f &&
+                if(Math.abs(0.5f - noise(offsetX, offsetY + i*999, 2, 0.7, (40 + i * 2))) > 0.22f + i*0.01 &&
                     Math.abs(0.5f - noise(offsetX, offsetY - i*999, 1, 1, (30 + i * 4))) > 0.37f + freq){
                     ore = entry;
                     break;
@@ -281,23 +281,20 @@ public class TODOPlanetGenerator extends PlanetGenerator{
 
         Schematics.placeLaunchLoadout(spawn.x, spawn.y);
 
+        float difficulty = sector.baseCoverage;
+
         if(sector.hasEnemyBase()){
-            basegen.generate(tiles, enemies.map(r -> tiles.getn(r.x, r.y)), tiles.get(spawn.x, spawn.y), state.rules.waveTeam, sector);
+            basegen.generate(tiles, enemies.map(r -> tiles.getn(r.x, r.y)), tiles.get(spawn.x, spawn.y), state.rules.waveTeam, sector, difficulty);
 
             state.rules.attackMode = true;
+        }else{
+            state.rules.winWave = 15 * (int)Math.max(difficulty * 5, 1);
         }
 
         state.rules.waves = true;
 
-        float difficulty = sector.baseCoverage;
-
-        //scale up the spawning base on difficulty (this is just for testing)
-        for(SpawnGroup group : state.rules.spawns){
-            group.unitAmount *= difficulty;
-            if(group.unitScaling != SpawnGroup.never){
-                group.unitScaling *= difficulty;
-            }
-        }
+        //TODO better waves
+        state.rules.spawns = defaultWaves.get();
     }
 
     @Override
diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index d093918062..94e5c5a934 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -35,9 +35,9 @@ import java.lang.reflect.*;
 @SuppressWarnings("unchecked")
 public class ContentParser{
     private static final boolean ignoreUnknownFields = true;
-    private ObjectMap<Class<?>, ContentType> contentTypes = new ObjectMap<>();
+    ObjectMap<Class<?>, ContentType> contentTypes = new ObjectMap<>();
 
-    private ObjectMap<Class<?>, FieldParser> classParsers = new ObjectMap<Class<?>, FieldParser>(){{
+    ObjectMap<Class<?>, FieldParser> classParsers = new ObjectMap<>(){{
         put(Effect.class, (type, data) -> field(Fx.class, data));
         put(Schematic.class, (type, data) -> {
             Object result = fieldOpt(Loadouts.class, data);
@@ -45,7 +45,7 @@ public class ContentParser{
                 return result;
             }else{
                 String str = data.asString();
-                if(str.startsWith(Schematics.base64Header)){
+                if(str.startsWith(Vars.schematicBaseStart)){
                     return Schematics.readBase64(str);
                 }else{
                     return Schematics.read(Vars.tree.get("schematics/" + str + "." + Vars.schematicExtension));
@@ -87,7 +87,7 @@ public class ContentParser{
             return sound;
         });
         put(Objectives.Objective.class, (type, data) -> {
-            Class<? extends Objectives.Objective> oc = data.has("type") ? resolve(data.getString("type"), "mindustry.game.Objectives") : SectorWave.class;
+            Class<? extends Objectives.Objective> oc = data.has("type") ? resolve(data.getString("type"), "mindustry.game.Objectives") : SectorComplete.class;
             data.remove("type");
             Objectives.Objective obj = make(oc);
             readFields(obj, data);
@@ -105,7 +105,7 @@ public class ContentParser{
     private Seq<Runnable> reads = new Seq<>();
     private Seq<Runnable> postreads = new Seq<>();
     private ObjectSet<Object> toBeParsed = new ObjectSet<>();
-    private LoadedMod currentMod;
+    LoadedMod currentMod;
     private Content currentContent;
 
     private Json parser = new Json(){
@@ -241,8 +241,8 @@ public class ContentParser{
 
                 readFields(block, value, true);
 
-                if(block.size > BuildBlock.maxSize){
-                    throw new IllegalArgumentException("Blocks cannot be larger than " + BuildBlock.maxSize);
+                if(block.size > ConstructBlock.maxSize){
+                    throw new IllegalArgumentException("Blocks cannot be larger than " + ConstructBlock.maxSize);
                 }
 
                 //add research tech node
@@ -440,6 +440,8 @@ public class ContentParser{
     }
 
     public void markError(Content content, LoadedMod mod, Fi file, Throwable error){
+        Log.err("Error for @ / @:\n@\n", content, file, Strings.getStackTrace(error));
+
         content.minfo.mod = mod;
         content.minfo.sourceFile = file;
         content.minfo.error = makeError(error, file);
@@ -480,7 +482,7 @@ public class ContentParser{
         return first != null ? first : Vars.content.getByName(type, currentMod.name + "-" + name);
     }
 
-    private <T> T make(Class<T> type){
+    <T> T make(Class<T> type){
         try{
             Constructor<T> cons = type.getDeclaredConstructor();
             cons.setAccessible(true);
@@ -515,7 +517,7 @@ public class ContentParser{
         }
     }
 
-    private Object field(Class<?> type, JsonValue value){
+    Object field(Class<?> type, JsonValue value){
         return field(type, value.asString());
     }
 
@@ -530,7 +532,7 @@ public class ContentParser{
         }
     }
 
-    private Object fieldOpt(Class<?> type, JsonValue value){
+    Object fieldOpt(Class<?> type, JsonValue value){
         try{
             return type.getField(value.asString()).get(null);
         }catch(Exception e){
@@ -538,14 +540,14 @@ public class ContentParser{
         }
     }
 
-    private void checkNullFields(Object object){
+    void checkNullFields(Object object){
         if(object instanceof Number || object instanceof String || toBeParsed.contains(object)) return;
 
         parser.getFields(object.getClass()).values().toSeq().each(field -> {
             try{
                 if(field.field.getType().isPrimitive()) return;
 
-                if(field.field.isAnnotationPresent(NonNull.class) && field.field.get(object) == null){
+                if(!field.field.isAnnotationPresent(Nullable.class) && field.field.get(object) == null){
                     throw new RuntimeException("'" + field.field.getName() + "' in " + object.getClass().getSimpleName() + " is missing!");
                 }
             }catch(Exception e){
@@ -559,7 +561,7 @@ public class ContentParser{
         readFields(object, jsonMap);
     }
 
-    private void readFields(Object object, JsonValue jsonMap){
+    void readFields(Object object, JsonValue jsonMap){
         toBeParsed.remove(object);
         Class type = object.getClass();
         ObjectMap<String, FieldMetadata> fields = parser.getFields(type);
@@ -593,7 +595,7 @@ public class ContentParser{
     }
 
     /** Tries to resolve a class from a list of potential class names. */
-    private <T> Class<T> resolve(String base, String... potentials){
+    <T> Class<T> resolve(String base, String... potentials){
         if(!base.isEmpty() && Character.isLowerCase(base.charAt(0))) base = Strings.capitalize(base);
 
         for(String type : potentials){
diff --git a/core/src/mindustry/mod/ModListing.java b/core/src/mindustry/mod/ModListing.java
index d0c1d80094..5596853b19 100644
--- a/core/src/mindustry/mod/ModListing.java
+++ b/core/src/mindustry/mod/ModListing.java
@@ -2,7 +2,7 @@ package mindustry.mod;
 
 /** Mod listing as a data class. */
 public class ModListing{
-    public String repo, name, author, lastUpdated, description;
+    public String repo, name, author, lastUpdated, description, minGameVersion;
     public int stars;
 
     @Override
@@ -13,6 +13,7 @@ public class ModListing{
         ", author='" + author + '\'' +
         ", lastUpdated='" + lastUpdated + '\'' +
         ", description='" + description + '\'' +
+        ", minGameVersion='" + minGameVersion + '\'' +
         ", stars=" + stars +
         '}';
     }
diff --git a/core/src/mindustry/mod/ModLoadingMusic.java b/core/src/mindustry/mod/ModLoadingMusic.java
new file mode 100644
index 0000000000..15cfb047ad
--- /dev/null
+++ b/core/src/mindustry/mod/ModLoadingMusic.java
@@ -0,0 +1,79 @@
+package mindustry.mod;
+
+import arc.audio.*;
+import arc.mock.*;
+import arc.util.ArcAnnotate.*;
+
+public class ModLoadingMusic implements Music{
+    public Music music = new MockMusic();
+
+    @Override
+    public void play(){
+        music.play();
+    }
+
+    @Override
+    public void pause(){
+        music.pause();
+    }
+
+    @Override
+    public void stop(){
+        music.stop();
+    }
+
+    @Override
+    public boolean isPlaying(){
+        return music.isPlaying();
+    }
+
+    @Override
+    public boolean isLooping(){
+        return music.isLooping();
+    }
+
+    @Override
+    public void setLooping(boolean isLooping){
+        music.setLooping(isLooping);
+    }
+
+    @Override
+    public float getVolume(){
+        return music.getVolume();
+    }
+
+    @Override
+    public void setVolume(float volume){
+        music.setVolume(volume);
+    }
+
+    @Override
+    public void setPan(float pan, float volume){
+        music.setPan(pan, volume);
+    }
+
+    @Override
+    public float getPosition(){
+        return music.getPosition();
+    }
+
+    @Override
+    public void setPosition(float position){
+        music.setPosition(position);
+    }
+
+    @Override
+    public void dispose(){
+        music.dispose();
+    }
+
+    @Override
+    public void setCompletionListener(OnCompletionListener listener){
+        music.setCompletionListener(listener);
+    }
+
+    @Override
+    public boolean isDisposed(){
+        return music.isDisposed();
+    }
+}
diff --git a/core/src/mindustry/mod/ModLoadingSound.java b/core/src/mindustry/mod/ModLoadingSound.java
index 7bae2f5a6b..8440bf6a33 100644
--- a/core/src/mindustry/mod/ModLoadingSound.java
+++ b/core/src/mindustry/mod/ModLoadingSound.java
@@ -6,7 +6,7 @@ import arc.mock.*;
 import arc.util.ArcAnnotate.*;
 
 public class ModLoadingSound implements Sound{
-    public @NonNull Sound sound = new MockSound();
+    public Sound sound = new MockSound();
 
     @Override
     public float calcPan(float x, float y){
diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index c2aad25a20..6da163bab7 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -25,7 +25,6 @@ import mindustry.type.*;
 import mindustry.ui.*;
 
 import java.io.*;
-import java.net.*;
 
 import static mindustry.Vars.*;
 
@@ -39,7 +38,7 @@ public class Mods implements Loadable{
     private int totalSprites;
     private MultiPacker packer;
 
-    private Seq<LoadedMod> mods = new Seq<>();
+    Seq<LoadedMod> mods = new Seq<>();
     private ObjectMap<Class<?>, ModMeta> metas = new ObjectMap<>();
     private boolean requiresReload, createdAtlas;
 
@@ -192,10 +191,10 @@ public class Mods implements Loadable{
 
     private PageType getPage(AtlasRegion region){
         return
-            region.getTexture() == Core.atlas.find("white").getTexture() ? PageType.main :
-            region.getTexture() == Core.atlas.find("stone1").getTexture() ? PageType.environment :
-            region.getTexture() == Core.atlas.find("clear-editor").getTexture() ? PageType.editor :
-            region.getTexture() == Core.atlas.find("whiteui").getTexture() ? PageType.ui :
+            region.texture == Core.atlas.find("white").texture ? PageType.main :
+            region.texture == Core.atlas.find("stone1").texture ? PageType.environment :
+            region.texture == Core.atlas.find("clear-editor").texture ? PageType.editor :
+            region.texture == Core.atlas.find("whiteui").texture ? PageType.ui :
             PageType.main;
     }
 
@@ -217,7 +216,7 @@ public class Mods implements Loadable{
         boolean deleted = mod.file.isDirectory() ? mod.file.deleteDirectory() : mod.file.delete();
 
         if(!deleted){
-            ui.showErrorMessage("$mod.delete.error");
+            ui.showErrorMessage("@mod.delete.error");
             return;
         }
         mods.remove(mod);
@@ -371,7 +370,7 @@ public class Mods implements Loadable{
     private void checkWarnings(){
         //show 'scripts have errored' info
         if(scripts != null && scripts.hasErrored()){
-           ui.showErrorMessage("$mod.scripts.disable");
+           ui.showErrorMessage("@mod.scripts.disable");
         }
 
         //show list of errored content
@@ -381,11 +380,11 @@ public class Mods implements Loadable{
 
                 setFillParent(true);
                 cont.margin(15);
-                cont.add("$error.title");
+                cont.add("@error.title");
                 cont.row();
                 cont.image().width(300f).pad(2).colspan(2).height(4f).color(Color.scarlet);
                 cont.row();
-                cont.add("$mod.errors").wrap().growX().center().get().setAlignment(Align.center);
+                cont.add("@mod.errors").wrap().growX().center().get().setAlignment(Align.center);
                 cont.row();
                 cont.pane(p -> {
                     mods.each(m -> m.enabled() && m.hasContentErrors(), m -> {
@@ -397,12 +396,12 @@ public class Mods implements Loadable{
                             d.left().marginLeft(15f);
                             for(Content c : m.erroredContent){
                                 d.add(c.minfo.sourceFile.nameWithoutExtension()).left().padRight(10);
-                                d.button("$details", Icon.downOpen, Styles.transt, () -> {
+                                d.button("@details", Icon.downOpen, Styles.transt, () -> {
                                     new Dialog(""){{
                                         setFillParent(true);
-                                        cont.pane(e -> e.add(c.minfo.error).wrap().grow()).grow();
+                                        cont.pane(e -> e.add(c.minfo.error).wrap().grow().labelAlign(Align.center, Align.left)).grow();
                                         cont.row();
-                                        cont.button("$ok", Icon.left, this::hide).size(240f, 60f);
+                                        cont.button("@ok", Icon.left, this::hide).size(240f, 60f);
                                     }}.show();
                                 }).size(190f, 50f).left().marginLeft(6);
                                 d.row();
@@ -413,7 +412,7 @@ public class Mods implements Loadable{
                 });
 
                 cont.row();
-                cont.button("$ok", this::hide).size(300, 50);
+                cont.button("@ok", this::hide).size(300, 50);
             }}.show();
         }
     }
@@ -425,6 +424,7 @@ public class Mods implements Loadable{
     /** This must be run on the main thread! */
     public void loadScripts(){
         Time.mark();
+        boolean[] any = {false};
 
         try{
             eachEnabled(mod -> {
@@ -438,6 +438,7 @@ public class Mods implements Loadable{
                             if(scripts == null){
                                 scripts = platform.createScripts();
                             }
+                            any[0] = true;
                             scripts.run(mod, main);
                         }catch(Throwable e){
                             Core.app.post(() -> {
@@ -454,7 +455,9 @@ public class Mods implements Loadable{
             content.setCurrentMod(null);
         }
 
-        Log.debug("Time to initialize modded scripts: @", Time.elapsed());
+        if(any[0]){
+            Log.info("Time to initialize modded scripts: @", Time.elapsed());
+        }
     }
 
     /** Creates all the content found in mod files. */
@@ -586,57 +589,76 @@ public class Mods implements Loadable{
     /** Loads a mod file+meta, but does not add it to the list.
      * Note that directories can be loaded as mods.*/
     private LoadedMod loadMod(Fi sourceFile) throws Exception{
-        Fi zip = sourceFile.isDirectory() ? sourceFile : new ZipFi(sourceFile);
-        if(zip.list().length == 1 && zip.list()[0].isDirectory()){
-            zip = zip.list()[0];
-        }
+        Time.mark();
 
-        Fi metaf = zip.child("mod.json").exists() ? zip.child("mod.json") : zip.child("mod.hjson").exists() ? zip.child("mod.hjson") : zip.child("plugin.json");
-        if(!metaf.exists()){
-            Log.warn("Mod @ doesn't have a 'mod.json'/'mod.hjson'/'plugin.json' file, skipping.", sourceFile);
-            throw new IllegalArgumentException("Invalid file: No mod.json found.");
-        }
+        ZipFi rootZip = null;
 
-        ModMeta meta = json.fromJson(ModMeta.class, Jval.read(metaf.readString()).toString(Jformat.plain));
-        String camelized = meta.name.replace(" ", "");
-        String mainClass = meta.main == null ? camelized.toLowerCase() + "." + camelized + "Mod" : meta.main;
-        String baseName = meta.name.toLowerCase().replace(" ", "-");
-
-        if(mods.contains(m -> m.name.equals(baseName))){
-            throw new IllegalArgumentException("A mod with the name '" + baseName + "' is already imported.");
-        }
-
-        Mod mainMod;
-
-        Fi mainFile = zip;
-        String[] path = (mainClass.replace('.', '/') + ".class").split("/");
-        for(String str : path){
-            if(!str.isEmpty()){
-                mainFile = mainFile.child(str);
-            }
-        }
-
-        //make sure the main class exists before loading it; if it doesn't just don't put it there
-        if(mainFile.exists()){
-            //mobile versions don't support class mods
-            if(mobile){
-                throw new IllegalArgumentException("Java class mods are not supported on mobile.");
+        try{
+            Fi zip = sourceFile.isDirectory() ? sourceFile : (rootZip = new ZipFi(sourceFile));
+            if(zip.list().length == 1 && zip.list()[0].isDirectory()){
+                zip = zip.list()[0];
             }
 
-            URLClassLoader classLoader = new URLClassLoader(new URL[]{sourceFile.file().toURI().toURL()}, ClassLoader.getSystemClassLoader());
-            Class<?> main = classLoader.loadClass(mainClass);
-            metas.put(main, meta);
-            mainMod = (Mod)main.getDeclaredConstructor().newInstance();
-        }else{
-            mainMod = null;
-        }
+            Fi metaf =
+                zip.child("mod.json").exists() ? zip.child("mod.json") :
+                zip.child("mod.hjson").exists() ? zip.child("mod.hjson") :
+                zip.child("plugin.json").exists() ? zip.child("plugin.json") :
+                zip.child("plugin.hjson");
 
-        //all plugins are hidden implicitly
-        if(mainMod instanceof Plugin){
-            meta.hidden = true;
-        }
+            if(!metaf.exists()){
+                Log.warn("Mod @ doesn't have a '[mod/plugin].[h]json' file, skipping.", sourceFile);
+                throw new IllegalArgumentException("Invalid file: No mod.json found.");
+            }
 
-        return new LoadedMod(sourceFile, zip, mainMod, meta);
+            ModMeta meta = json.fromJson(ModMeta.class, Jval.read(metaf.readString()).toString(Jformat.plain));
+            meta.cleanup();
+            String camelized = meta.name.replace(" ", "");
+            String mainClass = meta.main == null ? camelized.toLowerCase() + "." + camelized + "Mod" : meta.main;
+            String baseName = meta.name.toLowerCase().replace(" ", "-");
+
+            if(mods.contains(m -> m.name.equals(baseName))){
+                throw new IllegalArgumentException("A mod with the name '" + baseName + "' is already imported.");
+            }
+
+            Mod mainMod;
+
+            Fi mainFile = zip;
+            String[] path = (mainClass.replace('.', '/') + ".class").split("/");
+            for(String str : path){
+                if(!str.isEmpty()){
+                    mainFile = mainFile.child(str);
+                }
+            }
+
+            //make sure the main class exists before loading it; if it doesn't just don't put it there
+            if(mainFile.exists()){
+                //mobile versions don't support class mods
+                if(ios){
+                    throw new IllegalArgumentException("Java class mods are not supported on iOS.");
+                }
+
+                Class<?> main = platform.loadJar(sourceFile, mainClass);
+                metas.put(main, meta);
+                mainMod = (Mod)main.getDeclaredConstructor().newInstance();
+            }else{
+                mainMod = null;
+            }
+
+            //all plugins are hidden implicitly
+            if(mainMod instanceof Plugin){
+                meta.hidden = true;
+            }
+
+            if(!headless){
+                Log.info("Loaded mod '@' in @ms", meta.name, Time.elapsed());
+            }
+            return new LoadedMod(sourceFile, zip, mainMod, meta);
+
+        }catch(Exception e){
+            //delete root zip file so it can be closed on windows
+            if(rootZip != null) rootZip.delete();
+            throw e;
+        }
     }
 
     /** Represents a mod's state. May be a jar file, folder or zip. */
@@ -690,14 +712,49 @@ public class Mods implements Loadable{
 
         /** @return whether this mod is supported by the game verison */
         public boolean isSupported(){
-            if(Version.build <= 0 || meta.minGameVersion == null) return true;
-            if(meta.minGameVersion.contains(".")){
-                String[] split = meta.minGameVersion.split("\\.");
+            if(isOutdated()) return false;
+
+            int major = getMinMajor(), minor = getMinMinor();
+
+            if(Version.build <= 0) return true;
+
+            return Version.build >= major && Version.revision >= minor;
+        }
+
+        /** @return whether this mod is outdated, e.g. not compatible with v6. */
+        public boolean isOutdated(){
+            //must be at least 105 to indicate v6 compat
+            return getMinMajor() < 105;
+        }
+
+        public int getMinMajor(){
+            int major = 0;
+
+            String ver = meta.minGameVersion == null ? "0" : meta.minGameVersion;
+
+            if(ver.contains(".")){
+                String[] split = ver.split("\\.");
                 if(split.length == 2){
-                    return Version.build >= Strings.parseInt(split[0], 0) && Version.revision >= Strings.parseInt(split[1], 0);
+                    major = Strings.parseInt(split[0], 0);
+                }
+            }else{
+                major = Strings.parseInt(ver, 0);
+            }
+
+            return major;
+        }
+
+        public int getMinMinor(){
+            String ver = meta.minGameVersion == null ? "0" : meta.minGameVersion;
+
+            if(ver.contains(".")){
+                String[] split = ver.split("\\.");
+                if(split.length == 2){
+                    return Strings.parseInt(split[1], 0);
                 }
             }
-            return Version.build >= Strings.parseInt(meta.minGameVersion, 0);
+
+            return 0;
         }
 
         @Override
@@ -751,12 +808,12 @@ public class Mods implements Loadable{
         @Override
         public boolean prePublish(){
             if(!file.isDirectory()){
-                ui.showErrorMessage("$mod.folder.missing");
+                ui.showErrorMessage("@mod.folder.missing");
                 return false;
             }
 
             if(!file.child("preview.png").exists()){
-                ui.showErrorMessage("$mod.preview.missing");
+                ui.showErrorMessage("@mod.preview.missing");
                 return false;
             }
 
@@ -775,7 +832,7 @@ public class Mods implements Loadable{
 
     /** Mod metadata information.*/
     public static class ModMeta{
-        public String name, displayName, author, description, version, main, minGameVersion;
+        public String name, displayName, author, description, version, main, minGameVersion = "0";
         public Seq<String> dependencies = Seq.with();
         /** Hidden mods are only server-side or client-side, and do not support adding new content. */
         public boolean hidden;
@@ -783,6 +840,13 @@ public class Mods implements Loadable{
         public String displayName(){
             return displayName == null ? name : displayName;
         }
+
+        //removes all colors
+        public void cleanup(){
+            if(displayName != null) displayName = Strings.stripColors(displayName);
+            if(author != null) author = Strings.stripColors(author);
+            if(description != null) description = Strings.stripColors(description);
+        }
     }
 
     public enum ModState{
diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java
index 13a318b383..1aa260e8fa 100644
--- a/core/src/mindustry/mod/Scripts.java
+++ b/core/src/mindustry/mod/Scripts.java
@@ -1,8 +1,10 @@
 package mindustry.mod;
 
 import arc.*;
+import arc.assets.*;
+import arc.audio.*;
 import arc.files.*;
-import arc.func.*;
+import arc.mock.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.Log.*;
@@ -17,15 +19,14 @@ import java.net.*;
 import java.util.regex.*;
 
 public class Scripts implements Disposable{
-    private final Seq<String> blacklist = Seq.with("net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk",
+    private final Seq<String> blacklist = Seq.with(".net.", "java.net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk",
         "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system",
-        ".awt", "socket", "classloader", "oracle", "invoke", "arc.events", "java.util.function", "java.util.stream");
-    private final Seq<String> whitelist = Seq.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy", "mindustry.gen.");
+        ".awt", "socket", "classloader", "oracle", "invoke", "java.util.function", "java.util.stream", "org.");
+    private final Seq<String> whitelist = Seq.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy", "mindustry.gen.", "mindustry.logic.", "mindustry.async.", "saveio");
     private final Context context;
     private final Scriptable scope;
     private boolean errored;
-    private LoadedMod currentMod = null;
-    private Seq<EventHandle> events = new Seq<>();
+    LoadedMod currentMod = null;
 
     public Scripts(){
         Time.mark();
@@ -41,7 +42,7 @@ public class Scripts implements Disposable{
             .setModuleScriptProvider(new SoftCachingModuleScriptProvider(new ScriptModuleProvider()))
             .setSandboxed(true).createRequire(context, scope).install(scope);
 
-        if(!run(Core.files.internal("scripts/global.js").readString(), "global.js")){
+        if(!run(Core.files.internal("scripts/global.js").readString(), "global.js", false)){
             errored = true;
         }
         Log.debug("Time to load script engine: @", Time.elapsed());
@@ -75,25 +76,62 @@ public class Scripts implements Disposable{
         Log.log(level, "[@]: @", source, message);
     }
 
-    public <T> void onEvent(Class<T> type, Cons<T> listener){
-        Events.on(type, listener);
-        events.add(new EventHandle(type, listener));
+    //region utility mod functions
+
+    public String readString(String path){
+        return Vars.tree.get(path, true).readString();
     }
 
+    public byte[] readBytes(String path){
+        return Vars.tree.get(path, true).readBytes();
+    }
+
+    public Sound loadSound(String soundName){
+        if(Vars.headless) return new MockSound();
+
+        String name = "sounds/" + soundName;
+        String path = Vars.tree.get(name + ".ogg").exists() && !Vars.ios ? name + ".ogg" : name + ".mp3";
+
+        if(Core.assets.contains(path, Sound.class)) return Core.assets.get(path, Sound.class);
+        ModLoadingSound sound = new ModLoadingSound();
+        AssetDescriptor<?> desc = Core.assets.load(path, Sound.class);
+        desc.loaded = result -> sound.sound = (Sound)result;
+        desc.errored = Throwable::printStackTrace;
+
+        return sound;
+    }
+
+    public Music loadMusic(String soundName){
+        if(Vars.headless) return new MockMusic();
+
+        String name = "music/" + soundName;
+        String path = Vars.tree.get(name + ".ogg").exists() && !Vars.ios ? name + ".ogg" : name + ".mp3";
+
+        if(Core.assets.contains(path, Music.class)) return Core.assets.get(path, Music.class);
+        ModLoadingMusic sound = new ModLoadingMusic();
+        AssetDescriptor<?> desc = Core.assets.load(path, Music.class);
+        desc.loaded = result -> sound.music = (Music)result;
+        desc.errored = Throwable::printStackTrace;
+
+        return sound;
+    }
+
+    //endregion
+
     public void run(LoadedMod mod, Fi file){
         currentMod = mod;
-        run(file.readString(), file.name());
+        run(file.readString(), file.name(), true);
         currentMod = null;
     }
 
-    private boolean run(String script, String file){
+    private boolean run(String script, String file, boolean wrap){
         try{
             if(currentMod != null){
-                //inject script info into file (TODO maybe rhino handles this?)
+                //inject script info into file
                 context.evaluateString(scope, "modName = \"" + currentMod.name + "\"\nscriptName = \"" + file + "\"", "initscript.js", 1, null);
             }
             context.evaluateString(scope,
-            "(function(){\n" + script + "\n})();",
+            wrap ? "(function(){'use strict';\n" + script + "\n})();" : script,
             file, 0, null);
             return true;
         }catch(Throwable t){
@@ -107,23 +145,9 @@ public class Scripts implements Disposable{
 
     @Override
     public void dispose(){
-        for(EventHandle e : events){
-            Events.remove(e.type, e.listener);
-        }
-        events.clear();
         Context.exit();
     }
 
-    private static class EventHandle{
-        Class type;
-        Cons listener;
-
-        public EventHandle(Class type, Cons listener){
-            this.type = type;
-            this.listener = listener;
-        }
-    }
-
     private class ScriptModuleProvider extends UrlModuleSourceProvider{
         private Pattern directory = Pattern.compile("^(.+?)/(.+)");
 
@@ -132,7 +156,7 @@ public class Scripts implements Disposable{
         }
 
         @Override
-        public ModuleSource loadSource(String moduleId, Scriptable paths, Object validator) throws IOException, URISyntaxException{
+        public ModuleSource loadSource(String moduleId, Scriptable paths, Object validator) throws URISyntaxException{
             if(currentMod == null) return null;
             return loadSource(moduleId, currentMod.root.child("scripts"), validator);
         }
diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java
index 9c95b467cf..8b00c4800e 100644
--- a/core/src/mindustry/net/Administration.java
+++ b/core/src/mindustry/net/Administration.java
@@ -5,6 +5,7 @@ import arc.func.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
+import arc.util.Log.*;
 import arc.util.pooling.Pool.*;
 import arc.util.pooling.*;
 import mindustry.*;
@@ -18,28 +19,19 @@ import static mindustry.Vars.*;
 import static mindustry.game.EventType.*;
 
 public class Administration{
-    /** All player info. Maps UUIDs to info. This persists throughout restarts. */
+    public Seq<String> bannedIPs = new Seq<>();
+    public Seq<String> whitelist = new Seq<>();
+    public Seq<ChatFilter> chatFilters = new Seq<>();
+    public Seq<ActionFilter> actionFilters = new Seq<>();
+    public Seq<String> subnetBans = new Seq<>();
+    public ObjectMap<String, Long> kickedIPs = new ObjectMap<>();
+
+    /** All player info. Maps UUIDs to info. This persists throughout restarts. Do not access directly. */
     private ObjectMap<String, PlayerInfo> playerInfo = new ObjectMap<>();
-    private Seq<String> bannedIPs = new Seq<>();
-    private Seq<String> whitelist = new Seq<>();
-    private Seq<ChatFilter> chatFilters = new Seq<>();
-    private Seq<ActionFilter> actionFilters = new Seq<>();
-    private Seq<String> subnetBans = new Seq<>();
-    private IntIntMap lastPlaced = new IntIntMap();
 
     public Administration(){
         load();
 
-        Events.on(ResetEvent.class, e -> lastPlaced = new IntIntMap());
-
-        //keep track of who placed what on the server
-        Events.on(BlockBuildEndEvent.class, e -> {
-            //players should be able to configure their own tiles
-            if(net.server() && e.unit != null && e.unit.isPlayer()){
-                lastPlaced.put(e.tile.pos(), e.unit.getPlayer().id());
-            }
-        });
-
         //anti-spam
         addChatFilter((player, message) -> {
             long resetTime = Config.messageRateLimit.num() * 1000;
@@ -72,22 +64,20 @@ public class Administration{
         });
 
         //block interaction rate limit
+        //TODO when someone disconnects, a different player is mistakenly kicked for spamming actions
         addActionFilter(action -> {
             if(action.type != ActionType.breakBlock &&
                 action.type != ActionType.placeBlock &&
-                action.type != ActionType.tapTile &&
-                Config.antiSpam.bool() &&
-                //make sure players can configure their own stuff, e.g. in schematics
-                lastPlaced.get(action.tile.pos(), -1) != action.player.id()){
+                Config.antiSpam.bool()){
 
                 Ratekeeper rate = action.player.getInfo().rate;
                 if(rate.allow(Config.interactRateWindow.num() * 1000, Config.interactRateLimit.num())){
                     return true;
                 }else{
                     if(rate.occurences > Config.interactRateKick.num()){
-                        player.kick("You are interacting with too many blocks.", 1000 * 30);
-                    }else{
-                        player.sendMessage("[scarlet]You are interacting with blocks too quickly.");
+                        action.player.kick("You are interacting with too many blocks.", 1000 * 30);
+                    }else if(action.player.getInfo().messageTimer.get(60f * 2f)){
+                        action.player.sendMessage("[scarlet]You are interacting with blocks too quickly.");
                     }
 
                     return false;
@@ -97,6 +87,20 @@ public class Administration{
         });
     }
 
+    /** @return time at which a player would be pardoned for a kick (0 means they were never kicked) */
+    public long getKickTime(String uuid, String ip){
+        return Math.max(getInfo(uuid).lastKicked, kickedIPs.get(ip, 0L));
+    }
+
+    /** Sets up kick duration for a player. */
+    public void handleKicked(String uuid, String ip, long duration){
+        kickedIPs.put(ip, Math.max(kickedIPs.get(ip, 0L), Time.millis() + duration));
+
+        PlayerInfo info = getInfo(uuid);
+        info.timesKicked++;
+        info.lastKicked = Math.max(Time.millis() + duration, info.lastKicked);
+    }
+
     public Seq<String> getSubnetBans(){
         return subnetBans;
     }
@@ -162,7 +166,7 @@ public class Administration{
         Core.settings.put("playerlimit", limit);
     }
 
-    public boolean getStrict(){
+    public boolean isStrict(){
         return Config.strict.bool();
     }
 
@@ -573,7 +577,8 @@ public class Administration{
         motd("The message displayed to people on connection.", "off"),
         autosave("Whether the periodically save the map when playing.", false),
         autosaveAmount("The maximum amount of autosaves. Older ones get replaced.", 10),
-        autosaveSpacing("Spacing between autosaves in seconds.", 60 * 5);
+        autosaveSpacing("Spacing between autosaves in seconds.", 60 * 5),
+        debug("Enable debug logging", false, () -> Log.setLogLevel(debug() ? LogLevel.debug : LogLevel.info));
 
         public static final Config[] all = values();
 
@@ -632,6 +637,10 @@ public class Administration{
             Core.settings.put(key, value);
             changed.run();
         }
+
+        private static boolean debug(){
+            return Config.debug.bool();
+        }
     }
 
     public static class PlayerInfo{
@@ -649,6 +658,7 @@ public class Administration{
         public transient String lastSentMessage;
         public transient int messageInfractions;
         public transient Ratekeeper rate = new Ratekeeper();
+        public transient Interval messageTimer = new Interval();
 
         PlayerInfo(String id){
             this.id = id;
@@ -685,9 +695,9 @@ public class Administration{
     /** Defines a (potentially dangerous) action that a player has done in the world.
      * These objects are pooled; do not cache them! */
     public static class PlayerAction implements Poolable{
-        public @NonNull Player player;
-        public @NonNull ActionType type;
-        public @NonNull Tile tile;
+        public Player player;
+        public ActionType type;
+        public Tile tile;
 
         /** valid for block placement events only */
         public @Nullable Block block;
@@ -720,7 +730,7 @@ public class Administration{
     }
 
     public enum ActionType{
-        breakBlock, placeBlock, rotate, configure, tapTile, withdrawItem, depositItem
+        breakBlock, placeBlock, rotate, configure, withdrawItem, depositItem
     }
 
 }
diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java
index eff7c3e95d..bd4f948f89 100644
--- a/core/src/mindustry/net/ArcNetProvider.java
+++ b/core/src/mindustry/net/ArcNetProvider.java
@@ -1,10 +1,10 @@
 package mindustry.net;
 
 import arc.*;
-import arc.struct.*;
 import arc.func.*;
 import arc.net.*;
 import arc.net.FrameworkMessage.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.async.*;
 import arc.util.pooling.*;
@@ -28,7 +28,9 @@ public class ArcNetProvider implements NetProvider{
     Thread serverThread;
 
     public ArcNetProvider(){
-        client = new Client(8192, 4096, new PacketSerializer());
+        ArcNet.errorHandler = e -> Log.debug(Strings.getStackTrace(e));
+
+        client = new Client(8192, 8192, new PacketSerializer());
         client.setDiscoveryPacket(packetSupplier);
         client.addListener(new NetListener(){
             @Override
@@ -59,14 +61,14 @@ public class ArcNetProvider implements NetProvider{
                     try{
                         net.handleClientReceived(object);
                     }catch(Throwable e){
-                        handleException(e);
+                        net.handleException(e);
                     }
                 });
 
             }
         });
 
-        server = new Server(4096 * 2, 4096, new PacketSerializer());
+        server = new Server(8192, 8192, new PacketSerializer());
         server.setMulticast(multicastGroup, multicastPort);
         server.setDiscoveryHandler((address, handler) -> {
             ByteBuffer buffer = NetworkIO.writeServerData();
@@ -142,14 +144,14 @@ public class ArcNetProvider implements NetProvider{
                     try{
                         client.run();
                     }catch(Exception e){
-                        if(!(e instanceof ClosedSelectorException)) handleException(e);
+                        if(!(e instanceof ClosedSelectorException)) net.handleException(e);
                     }
                 });
 
                 client.connect(5000, ip, port, port);
                 success.run();
             }catch(Exception e){
-                handleException(e);
+                net.handleException(e);
             }
         });
     }
@@ -180,6 +182,7 @@ public class ArcNetProvider implements NetProvider{
         Threads.daemon(() -> {
             try{
                 DatagramSocket socket = new DatagramSocket();
+                long time = Time.millis();
                 socket.send(new DatagramPacket(new byte[]{-2, 1}, 2, InetAddress.getByName(address), port));
                 socket.setSoTimeout(2000);
 
@@ -187,7 +190,7 @@ public class ArcNetProvider implements NetProvider{
                 socket.receive(packet);
 
                 ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
-                Host host = NetworkIO.readServerData(packet.getAddress().getHostAddress(), buffer);
+                Host host = NetworkIO.readServerData((int)Time.timeSinceMillis(time), packet.getAddress().getHostAddress(), buffer);
 
                 Core.app.post(() -> valid.get(host));
             }catch(Exception e){
@@ -199,6 +202,7 @@ public class ArcNetProvider implements NetProvider{
     @Override
     public void discoverServers(Cons<Host> callback, Runnable done){
         Seq<InetAddress> foundAddresses = new Seq<>();
+        long time = Time.millis();
         client.discoverHosts(port, multicastGroup, multicastPort, 3000, packet -> {
             Core.app.post(() -> {
                 try{
@@ -206,7 +210,7 @@ public class ArcNetProvider implements NetProvider{
                         return;
                     }
                     ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
-                    Host host = NetworkIO.readServerData(packet.getAddress().getHostAddress(), buffer);
+                    Host host = NetworkIO.readServerData((int)Time.timeSinceMillis(time), packet.getAddress().getHostAddress(), buffer);
                     callback.get(host);
                     foundAddresses.add(packet.getAddress());
                 }catch(Exception e){
@@ -265,16 +269,6 @@ public class ArcNetProvider implements NetProvider{
         return null;
     }
 
-    private void handleException(Throwable e){
-        if(e instanceof ArcNetException){
-            Core.app.post(() -> net.showError(new IOException("mismatch")));
-        }else if(e instanceof ClosedChannelException){
-            Core.app.post(() -> net.showError(new IOException("alreadyconnected")));
-        }else{
-            Core.app.post(() -> net.showError(e));
-        }
-    }
-
     class ArcConnection extends NetConnection{
         public final Connection connection;
 
diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java
index a31660763a..a30308ed52 100644
--- a/core/src/mindustry/net/BeControl.java
+++ b/core/src/mindustry/net/BeControl.java
@@ -10,6 +10,7 @@ import arc.util.serialization.*;
 import mindustry.core.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.io.*;
 import mindustry.net.Administration.*;
 import mindustry.net.Packets.*;
 import mindustry.ui.*;
@@ -22,7 +23,7 @@ import static mindustry.Vars.*;
 
 /** Handles control of bleeding edge builds. */
 public class BeControl{
-    private static final int updateInterval = 60 * 2;
+    private static final int updateInterval = 60 * 1;
 
     private AsyncExecutor executor = new AsyncExecutor(1);
     private boolean checkUpdates = true;
@@ -41,7 +42,18 @@ public class BeControl{
                 if(checkUpdates && !mobile){
                     checkUpdate(t -> {});
                 }
-            }, 1, updateInterval);
+            }, updateInterval, updateInterval);
+        }
+
+        if(System.getProperties().contains("becopy")){
+            try{
+                Fi dest = Fi.get(System.getProperty("becopy"));
+                Fi self = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
+
+                self.copyTo(dest);
+            }catch(Throwable e){
+                e.printStackTrace();
+            }
         }
     }
 
@@ -57,21 +69,17 @@ public class BeControl{
                     updateAvailable = true;
                     updateBuild = newBuild;
                     updateUrl = url;
-                    showUpdateDialog();
-                    Core.app.post(() -> done.get(true));
+                    Core.app.post(() -> {
+                        showUpdateDialog();
+                        done.get(true);
+                    });
                 }else{
                     Core.app.post(() -> done.get(false));
                 }
             }else{
                 Core.app.post(() -> done.get(false));
             }
-        }, error -> {
-            if(!headless){
-                ui.showException(error);
-            }else{
-                error.printStackTrace();
-            }
-        });
+        }, error -> {}); //ignore errors
     }
 
     /** @return whether a new update is available */
@@ -85,32 +93,42 @@ public class BeControl{
 
         if(!headless){
             checkUpdates = false;
-            ui.showCustomConfirm(Core.bundle.format("be.update", "") + " " + updateBuild, "$be.update.confirm", "$ok", "$be.ignore", () -> {
-                boolean[] cancel = {false};
-                float[] progress = {0};
-                int[] length = {0};
-                Fi file = bebuildDirectory.child("client-be-" + updateBuild + ".jar");
+            ui.showCustomConfirm(Core.bundle.format("be.update", "") + " " + updateBuild, "@be.update.confirm", "@ok", "@be.ignore", () -> {
+                try{
+                    boolean[] cancel = {false};
+                    float[] progress = {0};
+                    int[] length = {0};
+                    Fi file = bebuildDirectory.child("client-be-" + updateBuild + ".jar");
+                    Fi fileDest = System.getProperties().contains("becopy") ?
+                        Fi.get(System.getProperty("becopy")) :
+                        Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
 
-                BaseDialog dialog = new BaseDialog("$be.updating");
-                download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> {
-                    try{
-                        Runtime.getRuntime().exec(new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()});
-                        System.exit(0);
-                    }catch(IOException e){
+                    BaseDialog dialog = new BaseDialog("@be.updating");
+                    download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> {
+                        try{
+                            Runtime.getRuntime().exec(OS.isMac ?
+                                new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()} :
+                                new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()}
+                            );
+                            System.exit(0);
+                        }catch(IOException e){
+                            ui.showException(e);
+                        }
+                    }, e -> {
+                        dialog.hide();
                         ui.showException(e);
-                    }
-                }, e -> {
-                    dialog.hide();
-                    ui.showException(e);
-                });
+                    });
 
-                dialog.cont.add(new Bar(() -> length[0] == 0 ? Core.bundle.get("be.updating") : (int)(progress[0] * length[0]) / 1024/ 1024 + "/" + length[0]/1024/1024 + " MB", () -> Pal.accent, () -> progress[0])).width(400f).height(70f);
-                dialog.buttons.button("$cancel", Icon.cancel, () -> {
-                    cancel[0] = true;
-                    dialog.hide();
-                }).size(210f, 64f);
-                dialog.setFillParent(false);
-                dialog.show();
+                    dialog.cont.add(new Bar(() -> length[0] == 0 ? Core.bundle.get("be.updating") : (int)(progress[0] * length[0]) / 1024/ 1024 + "/" + length[0]/1024/1024 + " MB", () -> Pal.accent, () -> progress[0])).width(400f).height(70f);
+                    dialog.buttons.button("@cancel", Icon.cancel, () -> {
+                        cancel[0] = true;
+                        dialog.hide();
+                    }).size(210f, 64f);
+                    dialog.setFillParent(false);
+                    dialog.show();
+                }catch(Exception e){
+                    ui.showException(e);
+                }
             }, () -> checkUpdates = false);
         }else{
             Log.info("&lcA new update is available: &lyBleeding Edge build @", updateBuild);
@@ -127,6 +145,10 @@ public class BeControl{
                     progress -> {},
                     () -> false,
                     () -> Core.app.post(() -> {
+                        Log.info("&lcSaving...");
+                        SaveIO.save(saveDirectory.child("autosavebe." + saveExtension));
+                        Log.info("&lcAutosaved.");
+
                         netServer.kickAll(KickReason.serverRestarting);
                         Threads.sleep(32);
 
diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java
index 1a64c76e2d..9a98d87555 100644
--- a/core/src/mindustry/net/CrashSender.java
+++ b/core/src/mindustry/net/CrashSender.java
@@ -19,24 +19,33 @@ import java.text.*;
 import java.util.*;
 
 import static arc.Core.*;
+import static mindustry.Vars.mods;
 import static mindustry.Vars.net;
 
 public class CrashSender{
 
+    public static String createReport(String error){
+        String report = "Mindustry has crashed. How unforunate.\n";
+        if(mods.list().size == 0 && Version.build != -1){
+            report += "Report this at " + Vars.reportIssueURL + "\n\n";
+        }
+        return report + "Version: " + Version.combined() + (Vars.headless ? " (Server)" : "") + "\n"
+            + "OS: " + System.getProperty("os.name") + " x" + (OS.is64Bit ? "64" : "32") + "\n"
+            + "Java Version: " + System.getProperty("java.version") + "\n"
+            + "Java Architecture: " + System.getProperty("sun.arch.data.model") + "\n"
+            + mods.list().size + " Mods" + (mods.list().isEmpty() ? "" : ": " + mods.list().toString(", ", mod -> mod.name + ":" + mod.meta.version))
+            + "\n\n" + error;
+    }
+
     public static void log(Throwable exception){
         try{
-            Core.settings.getDataDirectory().child("crashes").child("crash_" + System.currentTimeMillis() + ".txt").writeString(Strings.neatError(exception));
+            Core.settings.getDataDirectory().child("crashes").child("crash_" + System.currentTimeMillis() + ".txt")
+                .writeString(createReport(Strings.neatError(exception)));
         }catch(Throwable ignored){
         }
-
-        if(exception instanceof RuntimeException){
-            throw (RuntimeException)exception;
-        }
-        throw new RuntimeException(exception);
     }
 
     public static void send(Throwable exception, Cons<File> writeListener){
-
         try{
             exception.printStackTrace();
 
@@ -75,7 +84,7 @@ public class CrashSender{
             try{
                 File file = new File(OS.getAppDataDirectoryString(Vars.appName), "crashes/crash-report-" + new SimpleDateFormat("MM_dd_yyyy_HH_mm_ss").format(new Date()) + ".txt");
                 new Fi(OS.getAppDataDirectoryString(Vars.appName)).child("crashes").mkdirs();
-                new Fi(file).writeString(parseException(exception));
+                new Fi(file).writeString(createReport(parseException(exception)));
                 writeListener.get(file);
             }catch(Throwable e){
                 Log.err("Failed to save local crash report.", e);
@@ -135,7 +144,7 @@ public class CrashSender{
             boolean[] sent = {false};
 
             Log.info("Sending crash report.");
-            //post to crash report URL
+            //post to crash report URL, exit code indicates send success
             httpPost(Vars.crashReportURL, value.toJson(OutputType.json), r -> {
                 Log.info("Crash sent successfully.");
                 sent[0] = true;
@@ -143,7 +152,7 @@ public class CrashSender{
             }, t -> {
                 t.printStackTrace();
                 sent[0] = true;
-                System.exit(1);
+                System.exit(-1);
             });
 
             //sleep until report is sent
diff --git a/core/src/mindustry/net/Host.java b/core/src/mindustry/net/Host.java
index c2319bc2b7..123fdad341 100644
--- a/core/src/mindustry/net/Host.java
+++ b/core/src/mindustry/net/Host.java
@@ -1,5 +1,6 @@
 package mindustry.net;
 
+import arc.util.ArcAnnotate.*;
 import mindustry.*;
 import mindustry.game.*;
 
@@ -12,9 +13,11 @@ public class Host{
     public final int version;
     public final String versionType;
     public final Gamemode mode;
+    public final @Nullable String modeName;
     public int ping, port = Vars.port;
 
-    public Host(String name, String address, String mapname, int wave, int players, int version, String versionType, Gamemode mode, int playerLimit, String description){
+    public Host(int ping, String name, String address, String mapname, int wave, int players, int version, String versionType, Gamemode mode, int playerLimit, String description, String modeName){
+        this.ping = ping;
         this.name = name;
         this.address = address;
         this.players = players;
@@ -25,5 +28,6 @@ public class Host{
         this.playerLimit = playerLimit;
         this.mode = mode;
         this.description = description;
+        this.modeName = modeName;
     }
 }
diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
index cd25c44143..af8d2ff739 100644
--- a/core/src/mindustry/net/Net.java
+++ b/core/src/mindustry/net/Net.java
@@ -1,10 +1,11 @@
 package mindustry.net;
 
 import arc.*;
-import arc.struct.*;
 import arc.func.*;
-import arc.util.*;
+import arc.net.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import arc.util.pooling.*;
 import mindustry.gen.*;
 import mindustry.net.Packets.*;
@@ -13,6 +14,7 @@ import net.jpountz.lz4.*;
 
 import java.io.*;
 import java.nio.*;
+import java.nio.channels.*;
 
 import static mindustry.Vars.*;
 
@@ -36,6 +38,16 @@ public class Net{
         this.provider = provider;
     }
 
+    public void handleException(Throwable e){
+        if(e instanceof ArcNetException){
+            Core.app.post(() -> showError(new IOException("mismatch")));
+        }else if(e instanceof ClosedChannelException){
+            Core.app.post(() -> showError(new IOException("alreadyconnected")));
+        }else{
+            Core.app.post(() -> showError(e));
+        }
+    }
+
     /** Display a network error. Call on the graphics thread. */
     public void showError(Throwable e){
 
@@ -70,7 +82,7 @@ public class Net{
             }
 
             if(isError){
-                ui.showException("$error.any", e);
+                ui.showException("@error.any", e);
             }else{
                 ui.showText("", Core.bundle.format("connectfail", error));
             }
@@ -152,6 +164,9 @@ public class Net{
     }
 
     public void disconnect(){
+        if(active && !server){
+            Log.info("Disconnecting.");
+        }
         provider.disconnectClient();
         server = false;
         active = false;
diff --git a/core/src/mindustry/net/NetConnection.java b/core/src/mindustry/net/NetConnection.java
index 2cad7d40e8..976bea5a74 100644
--- a/core/src/mindustry/net/NetConnection.java
+++ b/core/src/mindustry/net/NetConnection.java
@@ -1,6 +1,5 @@
 package mindustry.net;
 
-import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
@@ -12,15 +11,14 @@ import mindustry.net.Packets.*;
 
 import java.io.*;
 
-import static mindustry.Vars.netServer;
+import static mindustry.Vars.*;
 
 public abstract class NetConnection{
     public final String address;
     public String uuid = "AAAAAAAA", usid = uuid;
     public boolean mobile, modclient;
     public @Nullable Player player;
-    public @Nullable Unitc lastUnit;
-    public Vec2 lastPosition = new Vec2();
+    public boolean kicked = false;
 
     /** ID of last received client snapshot. */
     public int lastReceivedClientSnapshot = -1;
@@ -38,6 +36,8 @@ public abstract class NetConnection{
 
     /** Kick with a special, localized reason. Use this if possible. */
     public void kick(KickReason reason){
+        if(kicked) return;
+
         Log.info("Kicking connection @; Reason: @", address, reason.name());
 
         if((reason == KickReason.kick || reason == KickReason.banned || reason == KickReason.vote)){
@@ -51,6 +51,7 @@ public abstract class NetConnection{
         Time.runTask(2f, this::close);
 
         netServer.admins.save();
+        kicked = true;
     }
 
     /** Kick with an arbitrary reason. */
@@ -60,17 +61,18 @@ public abstract class NetConnection{
 
     /** Kick with an arbitrary reason, and a kick duration in milliseconds. */
     public void kick(String reason, int kickDuration){
+        if(kicked) return;
+
         Log.info("Kicking connection @; Reason: @", address, reason.replace("\n", " "));
 
-        PlayerInfo info = netServer.admins.getInfo(uuid);
-        info.timesKicked++;
-        info.lastKicked = Math.max(Time.millis() + kickDuration, info.lastKicked);
+        netServer.admins.handleKicked(uuid, address, kickDuration);
 
         Call.kick(this, reason);
 
         Time.runTask(2f, this::close);
 
         netServer.admins.save();
+        kicked = true;
     }
 
     public boolean isConnected(){
diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java
index f4b4d3a61f..05bd69fe32 100644
--- a/core/src/mindustry/net/NetworkIO.java
+++ b/core/src/mindustry/net/NetworkIO.java
@@ -68,10 +68,10 @@ public class NetworkIO{
         String description = headless && !Config.desc.string().equals("off") ? Config.desc.string() : "";
         String map = state.map.name();
 
-        ByteBuffer buffer = ByteBuffer.allocate(512);
+        ByteBuffer buffer = ByteBuffer.allocate(500);
 
         writeString(buffer, name, 100);
-        writeString(buffer, map);
+        writeString(buffer, map, 64);
 
         buffer.putInt(Core.settings.getInt("totalPlayers", Groups.player.size()));
         buffer.putInt(state.wave);
@@ -82,10 +82,13 @@ public class NetworkIO{
         buffer.putInt(netServer.admins.getPlayerLimit());
 
         writeString(buffer, description, 100);
+        if(state.rules.modeName != null){
+            writeString(buffer, state.rules.modeName, 50);
+        }
         return buffer;
     }
 
-    public static Host readServerData(String hostAddress, ByteBuffer buffer){
+    public static Host readServerData(int ping, String hostAddress, ByteBuffer buffer){
         String host = readString(buffer);
         String map = readString(buffer);
         int players = buffer.getInt();
@@ -95,8 +98,9 @@ public class NetworkIO{
         Gamemode gamemode = Gamemode.all[buffer.get()];
         int limit = buffer.getInt();
         String description = readString(buffer);
+        String modeName = readString(buffer);
 
-        return new Host(host, hostAddress, map, wave, players, version, vertype, gamemode, limit, description);
+        return new Host(ping, host, hostAddress, map, wave, players, version, vertype, gamemode, limit, description, modeName.isEmpty() ? null : modeName);
     }
 
     private static void writeString(ByteBuffer buffer, String string, int maxlen){
diff --git a/core/src/mindustry/net/Packets.java b/core/src/mindustry/net/Packets.java
index afe4016091..91d5557e52 100644
--- a/core/src/mindustry/net/Packets.java
+++ b/core/src/mindustry/net/Packets.java
@@ -171,9 +171,10 @@ public class Packets{
             TypeIO.writeString(buffer, name);
             TypeIO.writeString(buffer, usid);
 
-            buffer.put(Base64Coder.decode(uuid));
+            byte[] b = Base64Coder.decode(uuid);
+            buffer.put(b);
             CRC32 crc = new CRC32();
-            crc.update(Base64Coder.decode(uuid));
+            crc.update(Base64Coder.decode(uuid), 0, b.length);
             buffer.putLong(crc.getValue());
 
             buffer.put(mobile ? (byte)1 : 0);
diff --git a/core/src/mindustry/type/AmmoType.java b/core/src/mindustry/type/AmmoType.java
new file mode 100644
index 0000000000..afe0a9818a
--- /dev/null
+++ b/core/src/mindustry/type/AmmoType.java
@@ -0,0 +1,28 @@
+package mindustry.type;
+
+import arc.graphics.*;
+import mindustry.ctype.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+
+/** Type of ammo that a unit uses. */
+public class AmmoType extends Content{
+    public String icon = Iconc.itemCopper + "";
+    public Color color = Pal.ammo;
+    public Color barColor = Pal.ammo;
+
+    public AmmoType(char icon, Color color){
+        this.icon = icon + "";
+        this.color = color;
+    }
+
+    public AmmoType(){
+    }
+
+    public void resupply(Unit unit){}
+
+    @Override
+    public ContentType getContentType(){
+        return ContentType.ammo;
+    }
+}
diff --git a/core/src/mindustry/type/AmmoTypes.java b/core/src/mindustry/type/AmmoTypes.java
new file mode 100644
index 0000000000..b1d021ba87
--- /dev/null
+++ b/core/src/mindustry/type/AmmoTypes.java
@@ -0,0 +1,86 @@
+package mindustry.type;
+
+import arc.util.ArcAnnotate.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+public class AmmoTypes implements ContentList{
+    public static AmmoType
+    powerLow,
+    power,
+    powerHigh,
+    copper,
+    thorium;
+
+    @Override
+    public void load(){
+        powerLow = new PowerAmmoType(500);
+        power = new PowerAmmoType(1000);
+        powerHigh = new PowerAmmoType(2000);
+        copper = new ItemAmmoType(Items.copper);
+        thorium = new ItemAmmoType(Items.thorium);
+    }
+
+    public static class PowerAmmoType extends AmmoType{
+        public float totalPower = 1000;
+
+        public PowerAmmoType(){
+            super(Iconc.power, Pal.powerLight);
+            barColor = color;
+        }
+
+        public PowerAmmoType(float totalPower){
+            this();
+            this.totalPower = totalPower;
+        }
+
+        @Override
+        public void resupply(Unit unit){
+            float range = unit.hitSize + 60f;
+            Tile closest = Vars.indexer.findClosestFlag(unit.x, unit.y, unit.team, BlockFlag.powerResupply);
+
+            if(closest != null && closest.build != null && unit.within(closest.build, range) && closest.build.power != null){
+                var build = closest.build;
+
+                if(build.block.consumes.hasPower() && build.block.consumes.getPower().buffered){
+                    float amount = closest.build.power.status * build.block.consumes.getPower().capacity;
+                    float powerPerAmmo = totalPower / unit.type().ammoCapacity;
+                    float ammoRequired = unit.type().ammoCapacity - unit.ammo;
+                    float powerRequired = ammoRequired * powerPerAmmo;
+                    float powerTaken = Math.min(amount, powerRequired);
+
+                    if(powerTaken > 1){
+                        closest.build.power.status -= powerTaken / build.block.consumes.getPower().capacity;
+                        unit.ammo += powerTaken / powerPerAmmo;
+
+                        Fx.itemTransfer.at(build.x, build.y, Math.max(powerTaken / 100f, 1f), Pal.power, unit);
+                    }
+                }
+            }
+        }
+    }
+
+    public static class ItemAmmoType extends AmmoType{
+        public Item item;
+
+        public ItemAmmoType(Item item){
+            this.item = item;
+            this.color = item.color;
+        }
+
+        public ItemAmmoType(){
+        }
+
+        @Override
+        public void load(){
+            if(item != null){
+                icon = item.emoji();
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/type/Category.java b/core/src/mindustry/type/Category.java
index 537f4120d8..d1815d99c2 100644
--- a/core/src/mindustry/type/Category.java
+++ b/core/src/mindustry/type/Category.java
@@ -17,10 +17,10 @@ public enum Category{
     crafting,
     /** Blocks that create units. */
     units,
-    /** Things that upgrade the player such as mech pads. */
-    upgrade,
     /** Things for storage or passive effects. */
-    effect;
+    effect,
+    /** Blocks related to logic. */
+    logic;
 
     public static final Category[] all = values();
 
diff --git a/core/src/mindustry/type/ItemSeq.java b/core/src/mindustry/type/ItemSeq.java
new file mode 100644
index 0000000000..0407f6a3f8
--- /dev/null
+++ b/core/src/mindustry/type/ItemSeq.java
@@ -0,0 +1,117 @@
+package mindustry.type;
+
+import arc.struct.*;
+import arc.util.serialization.*;
+import arc.util.serialization.Json.*;
+import mindustry.*;
+import mindustry.io.*;
+import mindustry.world.modules.*;
+import mindustry.world.modules.ItemModule.*;
+
+import java.util.*;
+
+public class ItemSeq implements Iterable<ItemStack>, Serializable{
+    protected final int[] values = new int[Vars.content.items().size];
+    public int total;
+
+    public ItemSeq(){
+    }
+
+    public ItemSeq(Seq<ItemStack> stacks){
+        stacks.each(this::add);
+    }
+
+    public void each(ItemConsumer cons){
+        for(int i = 0; i < values.length; i++){
+            if(values[i] != 0){
+                cons.accept(Vars.content.item(i), values[i]);
+            }
+        }
+    }
+
+    public void clear(){
+        total = 0;
+        Arrays.fill(values, 0);
+    }
+
+    public Seq<ItemStack> toSeq(){
+        Seq<ItemStack> out = new Seq<>();
+        for(int i = 0; i < values.length; i++){
+            if(values[i] != 0) out.add(new ItemStack(Vars.content.item(i), values[i]));
+        }
+        return out;
+    }
+
+    public boolean has(Item item){
+        return values[item.id] > 0;
+    }
+
+    public int get(Item item){
+        return values[item.id];
+    }
+
+    public void set(Item item, int amount){
+        add(item, amount - values[item.id]);
+    }
+
+    public void add(ItemModule itemModule){
+        itemModule.each(this::add);
+    }
+
+    public void add(ItemSeq seq){
+        seq.each(this::add);
+    }
+
+    public void add(ItemStack stack){
+        add(stack.item, stack.amount);
+    }
+
+    public void add(Item item){
+        add(item, 1);
+    }
+
+    public void add(Item item, int amount){
+        values[item.id] += amount;
+        total += amount;
+    }
+
+    public void remove(ItemStack stack){
+        add(stack.item, -stack.amount);
+    }
+
+    public void remove(Item item){
+        add(item, -1);
+    }
+
+    public void remove(Item item, int amount){
+        add(item, -amount);
+    }
+
+    @Override
+    public void write(Json json){
+        for(Item item : Vars.content.items()){
+            if(values[item.id] != 0){
+                json.writeValue(item.name, values[item.id]);
+            }
+        }
+    }
+
+    @Override
+    public void read(Json json, JsonValue jsonData){
+        total = 0;
+        for(Item item : Vars.content.items()){
+            values[item.id] = jsonData.getInt(item.name, 0);
+            total += values[item.id];
+        }
+    }
+
+    @Override
+    public String toString(){
+        return JsonIO.write(this);
+    }
+
+    @Override
+    public Iterator<ItemStack> iterator(){
+        return toSeq().iterator();
+    }
+}
diff --git a/core/src/mindustry/type/ItemStack.java b/core/src/mindustry/type/ItemStack.java
index dad33a338b..a8a765c4df 100644
--- a/core/src/mindustry/type/ItemStack.java
+++ b/core/src/mindustry/type/ItemStack.java
@@ -59,15 +59,6 @@ public class ItemStack implements Comparable<ItemStack>{
         return stacks;
     }
 
-    public static void insert(Seq<ItemStack> stacks, Item item, int amount){
-        ItemStack stack = stacks.find(i -> i.item == item);
-        if(stack == null){
-            stacks.add(new ItemStack(item, amount));
-        }else{
-            stack.amount += amount;
-        }
-    }
-
     @Override
     public int compareTo(ItemStack itemStack){
         return item.compareTo(itemStack.item);
diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java
index f968a0f68a..5c9cfa6382 100644
--- a/core/src/mindustry/type/Liquid.java
+++ b/core/src/mindustry/type/Liquid.java
@@ -9,7 +9,7 @@ import mindustry.ui.*;
 
 public class Liquid extends UnlockableContent{
     /** Color used in pipes and on the ground. */
-    public final @NonNull Color color;
+    public final Color color;
     /** Color used in bars. */
     public @Nullable Color barColor;
     /** Color used to draw lights. Note that the alpha channel is used to dictate brightness. */
diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java
index f27fc0aace..b0f94c05e8 100644
--- a/core/src/mindustry/type/Planet.java
+++ b/core/src/mindustry/type/Planet.java
@@ -1,6 +1,6 @@
 package mindustry.type;
 
-import arc.files.*;
+import arc.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.math.*;
@@ -9,15 +9,12 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
-import arc.util.io.*;
 import arc.util.noise.*;
-import mindustry.*;
 import mindustry.ctype.*;
 import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.maps.generators.*;
-import mindustry.type.Sector.*;
 
 import static mindustry.Vars.*;
 
@@ -27,7 +24,7 @@ public class Planet extends UnlockableContent{
     /** intersect() temp var. */
     private static final Vec3 intersectResult = new Vec3();
     /** Mesh used for rendering. Created on load() - will be null on the server! */
-    public PlanetMesh mesh;
+    public @Nullable PlanetMesh mesh;
     /** Position in global coordinates. Will be 0,0,0 until the Universe updates it. */
     public Vec3 position = new Vec3();
     /** Grid used for the sectors on the planet. Null if this planet can't be landed on. */
@@ -35,7 +32,7 @@ public class Planet extends UnlockableContent{
     /** Generator that will make the planet. Can be null for planets that don't need to be landed on. */
     public @Nullable PlanetGenerator generator;
     /** Array of sectors; directly maps to tiles in the grid. */
-    public @NonNull Seq<Sector> sectors;
+    public Seq<Sector> sectors;
     /** Radius of this planet's sphere. Does not take into account sattelites. */
     public float radius;
     /** Orbital radius around the sun. Do not change unless you know exactly what you are doing.*/
@@ -50,6 +47,8 @@ public class Planet extends UnlockableContent{
     public float sectorApproxRadius;
     /** Whether this planet is tidally locked relative to its parent - see https://en.wikipedia.org/wiki/Tidal_locking */
     public boolean tidalLock = false;
+    /** The default starting sector displayed to the map dialog. */
+    public int startSector = 0;
     /** Whether the bloom render effect is enabled. */
     public boolean bloom = false;
     /** For suns, this is the color that shines on other planets. Does nothing for children. */
@@ -61,7 +60,7 @@ public class Planet extends UnlockableContent{
     /** Parent body that this planet orbits around. If null, this planet is considered to be in the middle of the solar system.*/
     public @Nullable Planet parent;
     /** The root parent of the whole solar system this planet is in. */
-    public @NonNull Planet solarSystem;
+    public Planet solarSystem;
     /** All planets orbiting this one, in ascending order of radius. */
     public Seq<Planet> children = new Seq<>();
     /** Sattelites orbiting this planet. */
@@ -80,25 +79,10 @@ public class Planet extends UnlockableContent{
 
             sectors = new Seq<>(grid.tiles.length);
             for(int i = 0; i < grid.tiles.length; i++){
-                sectors.add(new Sector(this, grid.tiles[i], new SectorData()));
+                sectors.add(new Sector(this, grid.tiles[i]));
             }
 
             sectorApproxRadius = sectors.first().tile.v.dst(sectors.first().tile.corners[0].v);
-
-            //read data for sectors
-            Fi data = Vars.tree.get("planets/" + name + ".dat");
-            if(data.exists()){
-                try{
-                    try(Reads read = data.reads()){
-                        short dsize = read.s();
-                        for(int i = 0; i < dsize; i++){
-                            sectors.get(i).data.read(read);
-                        }
-                    }
-                }catch(Throwable t){
-                    t.printStackTrace();
-                }
-            }
         }else{
             sectors = new Seq<>();
         }
@@ -122,6 +106,14 @@ public class Planet extends UnlockableContent{
         for(solarSystem = this; solarSystem.parent != null; solarSystem = solarSystem.parent);
     }
 
+    public @Nullable Sector getLastSector(){
+        return sectors.get(Math.min(Core.settings.getInt(name + "-last-sector", startSector), sectors.size - 1));
+    }
+
+    public void setLastSector(Sector sector){
+        Core.settings.put(name + "-last-sector", sector.id);
+    }
+
     public void preset(int index, SectorPreset preset){
         sectors.get(index).preset = preset;
     }
@@ -185,7 +177,7 @@ public class Planet extends UnlockableContent{
         for(Sector sector : sectors){
             float sum = 1f;
             for(Sector other : sector.inRange(2)){
-                if(other.is(SectorAttribute.base)){
+                if(other.generateEnemyBase){
                     sum += 1f;
                 }
             }
@@ -194,7 +186,7 @@ public class Planet extends UnlockableContent{
                 sum += 2f;
             }
 
-            sector.baseCoverage = sum;
+            sector.baseCoverage = Mathf.clamp(sum / 5f);
         }
     }
 
diff --git a/core/src/mindustry/type/Satellite.java b/core/src/mindustry/type/Satellite.java
index 4b2546c651..a30a44c136 100644
--- a/core/src/mindustry/type/Satellite.java
+++ b/core/src/mindustry/type/Satellite.java
@@ -1,12 +1,10 @@
 package mindustry.type;
 
-import arc.util.ArcAnnotate.*;
-
 /** Any object that is orbiting a planet. */
 public class Satellite{
-    public @NonNull Planet planet;
+    public Planet planet;
 
-    public Satellite(@NonNull Planet orbiting){
+    public Satellite(Planet orbiting){
         this.planet = orbiting;
     }
 }
diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java
index 579b687417..6086268ca6 100644
--- a/core/src/mindustry/type/Sector.java
+++ b/core/src/mindustry/type/Sector.java
@@ -6,12 +6,9 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
-import arc.util.io.*;
 import mindustry.*;
-import mindustry.ctype.*;
 import mindustry.game.Saves.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
-import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
@@ -26,23 +23,19 @@ public class Sector{
     public final Ptile tile;
     public final int id;
 
-    public final SectorData data;
-
     public @Nullable SaveSlot save;
     public @Nullable SectorPreset preset;
 
+    /** Number 0-1 indicating the difficulty based on nearby bases. */
     public float baseCoverage;
+    public boolean generateEnemyBase;
 
-    //TODO implement a dynamic launch period
-    public int launchPeriod = 10;
-
-    public Sector(Planet planet, Ptile tile, SectorData data){
+    public Sector(Planet planet, Ptile tile){
         this.planet = planet;
         this.tile = tile;
         this.plane = new Plane();
         this.rect = makeRect();
         this.id = tile.id;
-        this.data = data;
     }
 
     public Seq<Sector> inRange(int range){
@@ -88,7 +81,7 @@ public class Sector{
      * Only sectors adjacent to non-wave sectors can be landed on.
      * TODO also preset sectors*/
     public boolean unlocked(){
-        return hasBase() || Structs.contains(tile.tiles, p -> planet.getSector(p).isCaptured()) || (preset != null && preset.unlocked());
+        return hasBase() || (preset != null && preset.alwaysUnlocked);
     }
 
     /** @return whether the player has a base here. */
@@ -98,12 +91,12 @@ public class Sector{
 
     /** @return whether the enemy has a generated base here. */
     public boolean hasEnemyBase(){
-        return is(SectorAttribute.base) && (save == null || save.meta.rules.waves);
+        return generateEnemyBase && (save == null || save.meta.rules.waves);
     }
 
     public boolean isBeingPlayed(){
         //after the launch dialog, a sector is no longer considered being played
-        return Vars.state.isGame() && Vars.state.rules.sector == this && !Vars.state.launched && !Vars.state.gameOver;
+        return Vars.state.isGame() && Vars.state.rules.sector == this && !Vars.state.gameOver;
     }
 
     public boolean isCaptured(){
@@ -137,23 +130,93 @@ public class Sector{
         return res % 2 == 0 ? res : res + 1;
     }
 
-    //TODO implement
-    public boolean isLaunchWave(int wave){
-        return metCondition() && wave % launchPeriod == 0;
-    }
-
-    public boolean metCondition(){
-        //TODO implement
-        return false;
-    }
-
     //TODO this should be stored in a more efficient structure, and be updated each turn
-    public Seq<ItemStack> getReceivedItems(){
-        return Core.settings.getJson(key("received-items"), Seq.class, ItemStack.class, Seq::new);
+    public ItemSeq getExtraItems(){
+        return Core.settings.getJson(key("extra-items"), ItemSeq.class, ItemSeq::new);
     }
 
-    public void setReceivedItems(Seq<ItemStack> stacks){
-        Core.settings.putJson(key("received-items"), ItemStack.class, stacks);
+    public void setExtraItems(ItemSeq stacks){
+        Core.settings.putJson(key("extra-items"),  stacks);
+    }
+
+    public void addItem(Item item, int amount){
+        removeItem(item, -amount);
+    }
+
+    public void removeItem(Item item, int amount){
+        if(isBeingPlayed()){
+            if(state.rules.defaultTeam.core() != null){
+                state.rules.defaultTeam.items().remove(item, amount);
+            }
+        }else{
+            ItemSeq recv = getExtraItems();
+
+            if(save != null){
+                //"shave off" extra items
+
+                ItemSeq count = new ItemSeq();
+
+                //add items already present
+                count.add(save.meta.secinfo.coreItems);
+
+                count.add(calculateReceivedItems());
+
+                int capacity = save.meta.secinfo.storageCapacity;
+
+                //when over capacity, add that to the extra items
+                count.each((i, a) -> {
+                    if(a > capacity){
+                        recv.remove(i, (a - capacity));
+                    }
+                });
+            }
+
+            recv.remove(item, amount);
+
+            setExtraItems(recv);
+        }
+    }
+
+    public ItemSeq calculateItems(){
+        ItemSeq count = new ItemSeq();
+
+        //for sectors being played on, add items directly
+        if(isBeingPlayed()){
+            count.add(state.rules.defaultTeam.items());
+        }else if(save != null){
+            //add items already present
+            count.add(save.meta.secinfo.coreItems);
+
+            count.add(calculateReceivedItems());
+
+            int capacity = save.meta.secinfo.storageCapacity;
+
+            //validation
+            count.each((item, amount) -> {
+                //ensure positive items
+                if(amount < 0) count.set(item, 0);
+                //cap the items
+                if(amount > capacity) count.set(item, capacity);
+            });
+        }
+
+        return count;
+    }
+
+    public ItemSeq calculateReceivedItems(){
+        ItemSeq count = new ItemSeq();
+
+        if(save != null){
+            long seconds = getSecondsPassed();
+
+            //add produced items
+            save.meta.secinfo.production.each((item, stat) -> count.add(item, (int)(stat.mean * seconds)));
+
+            //add received items
+            count.add(getExtraItems());
+        }
+
+        return count;
     }
 
     //TODO these methods should maybe move somewhere else and/or be contained in a data object
@@ -198,14 +261,14 @@ public class Sector{
         return Core.settings.getFloat(key("time-spent"));
     }
 
-    public void setSecondsPassed(long number){
-        put("seconds-passed", number);
+    public void setSecondsPassed(int number){
+        put("secondsi-passed", number);
     }
 
     /** @return how much time has passed in this sector without the player resuming here.
      * Used for resource production calculations. */
-    public long getSecondsPassed(){
-        return Core.settings.getLong(key("seconds-passed"));
+    public int getSecondsPassed(){
+        return Core.settings.getInt(key("secondsi-passed"));
     }
 
     private String key(String key){
@@ -216,6 +279,10 @@ public class Sector{
         Core.settings.put(key(key), value);
     }
 
+    public String toString(){
+        return planet.name + "#" + id;
+    }
+
     /** Projects this sector onto a 4-corner square for use in map gen.
      * Allocates a new object. Do not call in the main loop. */
     private SectorRect makeRect(){
@@ -247,10 +314,6 @@ public class Sector{
         return new SectorRect(radius, center, planeTop, planeRight, angle);
     }
 
-    public boolean is(SectorAttribute attribute){
-        return (data.attributes & (1 << attribute.ordinal())) != 0;
-    }
-
     public static class SectorRect{
         public final Vec3 center, top, right;
         public final Vec3 result = new Vec3();
@@ -271,60 +334,4 @@ public class Sector{
             return result.set(center).add(right, nx).add(top, ny);
         }
     }
-
-    /** Cached data about a sector. */
-    public static class SectorData{
-        public UnlockableContent[] resources = {};
-        public int spawnX, spawnY;
-
-        public Block[] floors = {};
-        public int[] floorCounts = {};
-        public int attributes;
-
-        public void write(Writes write){
-            write.s(resources.length);
-            for(Content resource : resources){
-                write.b(resource.getContentType().ordinal());
-                write.s(resource.id);
-            }
-            write.s(spawnX);
-            write.s(spawnY);
-            write.s(floors.length);
-            for(int i = 0; i < floors.length; i++){
-                write.s(floors[i].id);
-                write.i(floorCounts[i]);
-            }
-
-            write.i(attributes);
-        }
-
-        public void read(Reads read){
-            resources = new UnlockableContent[read.s()];
-            for(int i = 0; i < resources.length; i++){
-                resources[i] = Vars.content.getByID(ContentType.all[read.b()], read.s());
-            }
-            spawnX = read.s();
-            spawnY = read.s();
-            floors = new Block[read.s()];
-            floorCounts = new int[floors.length];
-            for(int i = 0; i < floors.length; i++){
-                floors[i] = Vars.content.block(read.s());
-                floorCounts[i] = read.i();
-            }
-            attributes = read.i();
-        }
-    }
-
-    public enum SectorAttribute{
-        /** Requires naval technology to land on, e.g. mostly water */
-        naval,
-        /** Has rain. */
-        rainy,
-        /** Has snow. */
-        snowy,
-        /** Has sandstorms. */
-        desert,
-        /** Has an enemy base. */
-        base
-    }
 }
diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java
index 8c1bca2514..c38ea7ad9f 100644
--- a/core/src/mindustry/type/SectorPreset.java
+++ b/core/src/mindustry/type/SectorPreset.java
@@ -1,27 +1,21 @@
 package mindustry.type;
 
-import arc.*;
 import arc.func.*;
+import arc.graphics.g2d.*;
 import arc.scene.ui.layout.*;
-import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.ctype.*;
-import mindustry.game.EventType.*;
-import mindustry.game.Objectives.*;
 import mindustry.game.*;
+import mindustry.gen.*;
 import mindustry.maps.generators.*;
-
-import static mindustry.Vars.*;
+import mindustry.ui.*;
 
 public class SectorPreset extends UnlockableContent{
-    public @NonNull FileMapGenerator generator;
-    public @NonNull Planet planet;
-    public @NonNull Sector sector;
-    public Seq<Objective> requirements = new Seq<>();
+    public FileMapGenerator generator;
+    public Planet planet;
+    public Sector sector;
 
-    public Cons<Rules> rules = rules -> {};
-    public int conditionWave = Integer.MAX_VALUE;
-    public int launchPeriod = 10;
+    public int captureWave = 0;
+    public Cons<Rules> rules = rules -> rules.winWave = captureWave;
 
     public SectorPreset(String name, Planet planet, int sector){
         super(name);
@@ -32,54 +26,9 @@ public class SectorPreset extends UnlockableContent{
         planet.preset(sector, this);
     }
 
-    public Rules getRules(){
-        return generator.map.rules();
-    }
-
-    public boolean isLaunchWave(int wave){
-        return metCondition() && wave % launchPeriod == 0;
-    }
-
-    public boolean canUnlock(){
-        return unlocked() || !requirements.contains(r -> !r.complete());
-    }
-
-    public boolean hasLaunched(){
-        //TODO implement
-        return Core.settings.getBool(name + "-launched", false);
-    }
-
-    public void updateObjectives(Runnable closure){
-        Seq<SectorObjective> incomplete = content.sectors()
-            .flatMap(z -> z.requirements)
-            .filter(o -> o.zone() == this && !o.complete()).as();
-
-        closure.run();
-        for(SectorObjective objective : incomplete){
-            if(objective.complete()){
-                Events.fire(new ZoneRequireCompleteEvent(objective.preset, content.sectors().find(z -> z.requirements.contains(objective)), objective));
-            }
-        }
-    }
-
-    public int bestWave(){
-        //TODO implement
-        return Core.settings.getInt(name + "-wave", 0);
-    }
-
-    /** @return whether initial conditions to launch are met. */
-    public boolean isLaunchMet(){
-        return bestWave() >= conditionWave;
-    }
-
-    /** Whether this zone has met its condition; if true, the player can leave. */
-    public boolean metCondition(){
-        //players can't leave in attack mode.
-        return state.wave >= conditionWave && !state.rules.attackMode;
-    }
-
-    public boolean canConfigure(){
-        return true;
+    @Override
+    public TextureRegion icon(Cicon c){
+        return Icon.terrain.getRegion();
     }
 
     @Override
diff --git a/core/src/mindustry/type/StatusEffect.java b/core/src/mindustry/type/StatusEffect.java
index 1172b4d06c..fda8dbbbf2 100644
--- a/core/src/mindustry/type/StatusEffect.java
+++ b/core/src/mindustry/type/StatusEffect.java
@@ -56,7 +56,8 @@ public class StatusEffect extends MappableContent{
         }
 
         if(effect != Fx.none && Mathf.chanceDelta(effectChance)){
-            effect.at(unit.x + Mathf.range(unit.bounds() / 2f), unit.y + Mathf.range(unit.bounds() / 2f));
+            Tmp.v1.rnd(unit.type().hitSize /2f);
+            effect.at(unit.x + Tmp.v1.x, unit.y + Tmp.v1.y);
         }
     }
 
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 6d211e7860..bf5ce45899 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -11,10 +11,10 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.entities.abilities.*;
@@ -24,34 +24,38 @@ import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;
+import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.payloads.*;
+import mindustry.world.blocks.units.*;
+import mindustry.world.consumers.*;
 
 import static mindustry.Vars.*;
 
 public class UnitType extends UnlockableContent{
-    public static final float shadowTX = -12, shadowTY = -13, shadowColor = Color.toFloatBits(0, 0, 0, 0.22f);
+    public static final float shadowTX = -12, shadowTY = -13, outlineSpace = 0.01f;
     private static final Vec2 legOffset = new Vec2();
 
     /** If true, the unit is always at elevation 1. */
     public boolean flying;
-    public @NonNull Prov<? extends Unit> constructor;
-    public @NonNull Prov<? extends UnitController> defaultController = () -> !flying ? new GroundAI() : new FlyingAI();
+    public Prov<? extends Unit> constructor;
+    public Prov<? extends UnitController> defaultController = () -> !flying ? new GroundAI() : new FlyingAI();
     public float speed = 1.1f, boostMultiplier = 1f, rotateSpeed = 5f, baseRotateSpeed = 5f;
     public float drag = 0.3f, accel = 0.5f, landShake = 0f, rippleScale = 1f, fallSpeed = 0.018f;
     public float health = 200f, range = -1, armor = 0f;
-    public float crashDamageMultiplier = 4f;
+    public float crashDamageMultiplier = 1f;
     public boolean targetAir = true, targetGround = true;
     public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false;
     public boolean canBoost = false;
     public boolean destructibleWreck = true;
     public float groundLayer = Layer.groundUnit;
-    public float sway = 1f;
-    public int payloadCapacity = 1;
+    public float payloadCapacity = 8;
+    public float aimDst = -1f;
     public int commandLimit = 24;
     public float visualElevation = -1f;
     public boolean allowLegStep = false;
     public boolean hovering = false;
+    public boolean omniMovement = true;
     public Effect fallEffect = Fx.fallSmoke;
     public Effect fallThrusterEffect = Fx.fallSmoke;
     public Seq<Ability> abilities = new Seq<>();
@@ -61,31 +65,43 @@ public class UnitType extends UnlockableContent{
     public float legSplashDamage = 0f, legSplashRange = 5;
     public boolean flipBackLegs = true;
 
-    public int itemCapacity = 30;
-    public int ammoCapacity = 220;
+    public int ammoResupplyAmount = 10;
+    public float ammoResupplyRange = 100f;
+
+    public float mechSideSway = 0.54f, mechFrontSway = 0.1f;
+    public float mechStride = -1f;
+    public float mechStepShake = -1f;
+    public boolean mechStepParticles = false;
+    public Color mechLegColor = Pal.darkMetal;
+
+    public int itemCapacity = -1;
+    public int ammoCapacity = -1;
+    public AmmoType ammoType = AmmoTypes.copper;
     public int mineTier = -1;
     public float buildSpeed = 1f, mineSpeed = 1f;
 
+    public float clipSize = -1;
+    public boolean canDrown = true;
     public float engineOffset = 5f, engineSize = 2.5f;
     public float strafePenalty = 0.5f;
-    public float hitsize = 6f;
+    public float hitSize = 6f;
     public float itemOffsetY = 3f;
     public float lightRadius = 60f, lightOpacity = 0.6f;
     public Color lightColor = Pal.powerLight;
     public boolean drawCell = true, drawItems = true, drawShields = true;
-    public int parts = 0;
     public int trailLength = 3;
     public float trailX = 4f, trailY = -3f, trailScl = 1f;
     /** Whether the unit can heal blocks. Initialized in init() */
     public boolean canHeal = false;
+    public boolean singleTarget = false;
 
     public ObjectSet<StatusEffect> immunities = new ObjectSet<>();
     public Sound deathSound = Sounds.bang;
 
     public Seq<Weapon> weapons = new Seq<>();
     public TextureRegion baseRegion, legRegion, region, shadowRegion, cellRegion,
-        occlusionRegion, jointRegion, footRegion, legBaseRegion, baseJointRegion;
-    public TextureRegion[] partRegions, partCellRegions, wreckRegions;
+        occlusionRegion, jointRegion, footRegion, legBaseRegion, baseJointRegion, outlineRegion;
+    public TextureRegion[] wreckRegions;
 
     public UnitType(String name){
         super(name);
@@ -99,23 +115,31 @@ public class UnitType extends UnlockableContent{
 
     public Unit create(Team team){
         Unit unit = constructor.get();
-        unit.team(team);
+        unit.team = team;
         unit.type(this);
-        unit.ammo(ammoCapacity); //fill up on ammo upon creation
+        unit.ammo = ammoCapacity; //fill up on ammo upon creation
+        unit.elevation = flying ? 1f : 0;
         unit.heal();
         return unit;
     }
 
+    public Unit spawn(Team team, float x, float y){
+        Unit out = create(team);
+        out.set(x, y);
+        out.add();
+        return out;
+    }
+
+    public Unit spawn(float x, float y){
+        return spawn(state.rules.defaultTeam, x, y);
+    }
+
     public boolean hasWeapons(){
         return weapons.size > 0;
     }
 
     public void update(Unit unit){
-        if(abilities.size > 0){
-            for(Ability a : abilities){
-                a.update(unit);
-            }
-        }
+
     }
 
     public void landed(Unit unit){}
@@ -123,33 +147,43 @@ public class UnitType extends UnlockableContent{
     public void display(Unit unit, Table table){
         table.table(t -> {
             t.left();
-            t.add(new Image(icon(Cicon.medium))).size(8 * 4);
+            t.add(new Image(icon(Cicon.medium))).size(8 * 4).scaling(Scaling.fit);
             t.labelWrap(localizedName).left().width(190f).padLeft(5);
         }).growX().left();
         table.row();
 
         table.table(bars -> {
-            bars.defaults().growX().height(18f).pad(4);
+            bars.defaults().growX().height(20f).pad(4);
 
             bars.add(new Bar("blocks.health", Pal.health, unit::healthf).blink(Color.white));
             bars.row();
 
             if(state.rules.unitAmmo){
-                bars.add(new Bar("blocks.ammo", Pal.ammo, () -> unit.ammo / ammoCapacity));
+                bars.add(new Bar(ammoType.icon + " " + Core.bundle.get("blocks.ammo"), ammoType.barColor, () -> unit.ammo / ammoCapacity));
                 bars.row();
             }
         }).growX();
         
         table.row();
-        if(unit.deactivated){
-            table.table(d -> {
-                d.left();
-                d.label(() -> Core.bundle.format("bar.limitreached", unit.count(), unit.cap(), Fonts.getUnicodeStr(name)));
-            }).left().visible(() -> unit.deactivated);
-        }
-        
     }
 
+    @Override
+    public void getDependencies(Cons<UnlockableContent> cons){
+        //units require reconstructors being researched
+        for(Block block : content.blocks()){
+            if(block instanceof Reconstructor){
+                Reconstructor r = (Reconstructor)block;
+                for(UnitType[] recipe : r.upgrades){
+                    //result of reconstruction is this, so it must be a dependency
+                    if(recipe[1] == this){
+                        cons.get(block);
+                    }
+                }
+            }
+        }
+    }
+
+
     @Override
     public void displayInfo(Table table){
         ContentDisplay.displayUnit(table, this);
@@ -160,13 +194,42 @@ public class UnitType extends UnlockableContent{
     public void init(){
         if(constructor == null) throw new IllegalArgumentException("no constructor set up for unit '" + name + "'");
 
+        Unit example = constructor.get();
+
+        //water preset
+        if(example instanceof WaterMovec){
+            canDrown = false;
+            omniMovement = false;
+            immunities.add(StatusEffects.wet);
+        }
+
+        singleTarget = weapons.size <= 1;
+
+        if(itemCapacity < 0){
+            itemCapacity = Math.max(Mathf.round(hitSize * 7, 20), 20);
+        }
+
         //set up default range
         if(range < 0){
+            range = Float.MAX_VALUE;
             for(Weapon weapon : weapons){
-                range = Math.max(range, weapon.bullet.range());
+                range = Math.min(range, weapon.bullet.range() + hitSize /2f);
             }
         }
 
+        if(mechStride < 0){
+            mechStride = 4f + (hitSize -8f)/2.1f;
+        }
+
+        if(aimDst < 0){
+            aimDst = weapons.contains(w -> !w.rotate) ? hitSize * 2f : hitSize / 2f;
+        }
+
+        if(mechStepShake < 0){
+            mechStepShake = Mathf.round((hitSize - 11f) / 9f);
+            mechStepParticles = hitSize > 15f;
+        }
+
         canHeal = weapons.contains(w -> w.bullet instanceof HealBulletType);
 
         //add mirrored weapon variants
@@ -191,6 +254,15 @@ public class UnitType extends UnlockableContent{
             }
         }
         this.weapons = mapped;
+
+        //dynamically create ammo capacity based on firing rate
+        if(ammoCapacity < 0){
+            float shotsPerSecond = weapons.sumf(w -> 60f / w.reload);
+            //duration of continuous fire without reload
+            float targetSeconds = 30;
+
+            ammoCapacity = Math.max(1, (int)(shotsPerSecond * targetSeconds));
+        }
     }
 
     @CallSuper
@@ -206,22 +278,43 @@ public class UnitType extends UnlockableContent{
         baseRegion = Core.atlas.find(name + "-base");
         cellRegion = Core.atlas.find(name + "-cell", Core.atlas.find("power-cell"));
         occlusionRegion = Core.atlas.find("circle-shadow");
+        outlineRegion = Core.atlas.find(name + "-outline");
         shadowRegion = icon(Cicon.full);
 
-        partRegions = new TextureRegion[parts];
-        partCellRegions = new TextureRegion[parts];
-
-        for(int i = 0; i < parts; i++){
-            partRegions[i] = Core.atlas.find(name + "-part" + i);
-            partCellRegions[i] = Core.atlas.find(name + "-cell" + i);
-        }
-
         wreckRegions = new TextureRegion[3];
         for(int i = 0; i < wreckRegions.length; i++){
             wreckRegions[i] = Core.atlas.find(name + "-wreck" + i);
         }
     }
 
+    @Override
+    public ItemStack[] researchRequirements(){
+        ItemStack[] stacks = null;
+
+        //calculate costs based on reconstructors or factories found
+        Block rec = content.blocks().find(b -> b instanceof Reconstructor && Structs.contains(((Reconstructor)b).upgrades, u -> u[1] == this));
+
+        if(rec != null && rec.consumes.has(ConsumeType.item) && rec.consumes.get(ConsumeType.item) instanceof ConsumeItems){
+            stacks = ((ConsumeItems)rec.consumes.get(ConsumeType.item)).items;
+        }else{
+            UnitFactory factory = (UnitFactory)content.blocks().find(u -> u instanceof UnitFactory && Structs.contains(((UnitFactory)u).plans, p -> p.unit == this));
+            if(factory != null){
+                stacks = Structs.find(factory.plans, p -> p.unit == this).requirements;
+            }
+        }
+
+        if(stacks != null){
+            ItemStack[] out = new ItemStack[stacks.length];
+            for(int i = 0; i < out.length; i++){
+                out[i] = new ItemStack(stacks[i].item, UI.roundAmount((int)(Math.pow(stacks[i].amount, 1.1) * 50)));
+            }
+
+            return out;
+        }
+
+        return super.researchRequirements();
+    }
+
     @Override
     public ContentType getContentType(){
         return ContentType.unit;
@@ -230,25 +323,29 @@ public class UnitType extends UnlockableContent{
     //region drawing
 
     public void draw(Unit unit){
-        Mechc legs = unit instanceof Mechc ? (Mechc)unit : null;
-        float z = unit.elevation > 0.5f ? (lowAltitude ? Layer.flyingUnitLow : Layer.flyingUnit) : groundLayer;
+        Mechc mech = unit instanceof Mechc ? (Mechc)unit : null;
+        float z = unit.elevation > 0.5f ? (lowAltitude ? Layer.flyingUnitLow : Layer.flyingUnit) : groundLayer + Mathf.clamp(hitSize / 4000f, 0, 0.01f);
 
         if(unit.controller().isBeingControlled(player.unit())){
             drawControl(unit);
         }
 
-        if(unit.isFlying()){
+        if(unit.isFlying() || visualElevation > 0){
             Draw.z(Math.min(Layer.darkness, z - 1f));
             drawShadow(unit);
         }
 
         Draw.z(z - 0.02f);
 
-        if(legs != null){
-            drawMech((Unit & Mechc)legs);
+        if(mech != null){
+            drawMech(mech);
+
+            //side
+            legOffset.trns(mech.baseRotation(), 0f, Mathf.lerp(Mathf.sin(mech.walkExtend(true), 2f/Mathf.PI, 1) * mechSideSway, 0f, unit.elevation));
+
+            //front
+            legOffset.add(Tmp.v1.trns(mech.baseRotation() + 90, 0f, Mathf.lerp(Mathf.sin(mech.walkExtend(true), 1f/Mathf.PI, 1) * mechFrontSway, 0f, unit.elevation)));
 
-            float ft = Mathf.sin(legs.walkTime(), 3f, 3f);
-            legOffset.trns(legs.baseRotation(), 0f, Mathf.lerp(ft * 0.18f * sway, 0f, unit.elevation));
             unit.trns(legOffset.x, legOffset.y);
         }
 
@@ -262,8 +359,13 @@ public class UnitType extends UnlockableContent{
             drawPayload((Unit & Payloadc)unit);
         }
 
+        //TODO
         drawOcclusion(unit);
 
+        Draw.z(z - outlineSpace);
+
+        drawOutline(unit);
+
         Draw.z(z);
         if(engineSize > 0) drawEngine(unit);
         drawBody(unit);
@@ -276,32 +378,20 @@ public class UnitType extends UnlockableContent{
             drawShield(unit);
         }
 
-        if(legs != null){
+        if(mech != null){
             unit.trns(-legOffset.x, -legOffset.y);
         }
 
-        if(unit.deactivated){
-            drawDeactive(unit);
-        }
-
-        if(abilities.size > 0){
-            for(Ability a : abilities){
-                a.draw(unit);
+        if(unit.abilities.size > 0){
+            for(Ability a : unit.abilities){
                 Draw.reset();
+                a.draw(unit);
             }
+
+            Draw.reset();
         }
     }
 
-    public void drawDeactive(Unit unit){
-        Draw.color(Color.scarlet);
-        Draw.alpha(0.8f);
-
-        float size = 8f;
-        Draw.rect(Icon.warning.getRegion(), unit.x, unit.y, size, size);
-
-        Draw.reset();
-    }
-
     public <T extends Unit & Payloadc> void drawPayload(T unit){
         if(unit.hasPayload()){
             Payload pay = unit.payloads().first();
@@ -326,7 +416,7 @@ public class UnitType extends UnlockableContent{
     }
 
     public void drawShadow(Unit unit){
-        Draw.color(shadowColor);
+        Draw.color(Pal.shadow);
         float e = Math.max(unit.elevation, visualElevation);
         Draw.rect(shadowRegion, unit.x + shadowTX * e, unit.y + shadowTY * e, unit.rotation - 90);
         Draw.color();
@@ -335,7 +425,7 @@ public class UnitType extends UnlockableContent{
     public void drawOcclusion(Unit unit){
         Draw.color(0, 0, 0, 0.4f);
         float rad = 1.6f;
-        float size = Math.max(region.getWidth(), region.getHeight()) * Draw.scl;
+        float size = Math.max(region.width, region.height) * Draw.scl;
         Draw.rect(occlusionRegion, unit, size * rad, size * rad);
         Draw.color();
     }
@@ -361,7 +451,7 @@ public class UnitType extends UnlockableContent{
             unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY),
             (3f + Mathf.absin(Time.time(), 5f, 1f)) * unit.itemTime);
 
-            if(unit.isLocal()){
+            if(unit.isLocal() && !renderer.pixelator.enabled()){
                 Fonts.outline.draw(unit.stack.amount + "",
                 unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),
                 unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY) - 3,
@@ -407,7 +497,6 @@ public class UnitType extends UnlockableContent{
 
             float rotation = unit.rotation - 90;
             float weaponRotation  = rotation + (weapon.rotate ? mount.rotation : 0);
-            float width = weapon.region.getWidth();
             float recoil = -((mount.reload) / weapon.reload * weapon.recoil);
             float wx = unit.x + Angles.trnsx(rotation, weapon.x, weapon.y) + Angles.trnsx(weaponRotation, 0, recoil),
                 wy = unit.y + Angles.trnsy(rotation, weapon.x, weapon.y) + Angles.trnsy(weaponRotation, 0, recoil);
@@ -416,19 +505,53 @@ public class UnitType extends UnlockableContent{
                 Drawf.shadow(wx, wy, weapon.occlusion);
             }
 
-            Draw.rect(weapon.region, wx, wy,
-            width * Draw.scl * -Mathf.sign(weapon.flipSprite),
-            weapon.region.getHeight() * Draw.scl,
+            if(weapon.outlineRegion.found()){
+                float z = Draw.z();
+                if(!weapon.top) Draw.z(z - outlineSpace);
+
+                Draw.rect(weapon.outlineRegion,
+                wx, wy,
+                weapon.outlineRegion.width * Draw.scl * -Mathf.sign(weapon.flipSprite),
+                weapon.region.height * Draw.scl,
+                weaponRotation);
+
+                Draw.z(z);
+            }
+
+            Draw.rect(weapon.region,
+            wx, wy,
+            weapon.region.width * Draw.scl * -Mathf.sign(weapon.flipSprite),
+            weapon.region.height * Draw.scl,
             weaponRotation);
+
+            if(weapon.heatRegion.found() && mount.heat > 0){
+                Draw.color(weapon.heatColor, mount.heat);
+                Draw.blend(Blending.additive);
+                Draw.rect(weapon.heatRegion,
+                wx, wy,
+                weapon.heatRegion.width * Draw.scl * -Mathf.sign(weapon.flipSprite),
+                weapon.heatRegion.height * Draw.scl,
+                weaponRotation);
+                Draw.blend();
+                Draw.color();
+            }
         }
 
         Draw.reset();
     }
 
+    public void drawOutline(Unit unit){
+        Draw.reset();
+
+        if(Core.atlas.isFound(outlineRegion)){
+            Draw.rect(outlineRegion, unit.x, unit.y, unit.rotation - 90);
+        }
+    }
+
     public void drawBody(Unit unit){
         applyColor(unit);
 
-        Draw.rect(region, unit, unit.rotation - 90);
+        Draw.rect(region, unit.x, unit.y, unit.rotation - 90);
 
         Draw.reset();
     }
@@ -437,7 +560,7 @@ public class UnitType extends UnlockableContent{
         applyColor(unit);
 
         Draw.color(cellColor(unit));
-        Draw.rect(cellRegion, unit, unit.rotation - 90);
+        Draw.rect(cellRegion, unit.x, unit.y, unit.rotation - 90);
         Draw.reset();
     }
 
@@ -447,29 +570,25 @@ public class UnitType extends UnlockableContent{
 
     public void drawLight(Unit unit){
         if(lightRadius > 0){
-            Drawf.light(unit.team, unit, lightRadius, lightColor, lightOpacity);
+            Drawf.light(unit.team, unit.x, unit.y, lightRadius, lightColor, lightOpacity);
         }
     }
 
     public <T extends Unit & Legsc> void drawLegs(T unit){
-        //Draw.z(Layer.groundUnit - 0.02f);
+        applyColor(unit);
 
         Leg[] legs = unit.legs();
 
-        float ssize = footRegion.getWidth() * Draw.scl * 1.5f;
+        float ssize = footRegion.width * Draw.scl * 1.5f;
         float rotation = unit.baseRotation();
 
         for(Leg leg : legs){
             Drawf.shadow(leg.base.x, leg.base.y, ssize);
         }
 
-        //TODO should be below/above legs
-        if(baseRegion.found()){
-            Draw.rect(baseRegion, unit.x, unit.y, rotation);
-        }
-
-        //TODO figure out layering
-        for(int i = 0; i < legs.length; i++){
+        //legs are drawn front first
+        for(int j = legs.length - 1; j >= 0; j--){
+            int i = (j % 2 == 0 ? j/2 : legs.length - 1 - j/2);
             Leg leg = legs[i];
             float angle = unit.legAngle(rotation, i);
             boolean flip = i >= legs.length/2f;
@@ -482,18 +601,18 @@ public class UnitType extends UnlockableContent{
             if(leg.moving && visualElevation > 0){
                 float scl = visualElevation;
                 float elev = Mathf.slope(1f - leg.stage) * scl;
-                Draw.color(shadowColor);
+                Draw.color(Pal.shadow);
                 Draw.rect(footRegion, leg.base.x + shadowTX * elev, leg.base.y + shadowTY * elev, position.angleTo(leg.base));
                 Draw.color();
             }
 
             Draw.rect(footRegion, leg.base.x, leg.base.y, position.angleTo(leg.base));
 
-            Lines.stroke(legRegion.getHeight() * Draw.scl * flips);
-            Lines.line(legRegion, position.x, position.y, leg.joint.x, leg.joint.y, CapStyle.none, 0);
+            Lines.stroke(legRegion.height * Draw.scl * flips);
+            Lines.line(legRegion, position.x, position.y, leg.joint.x, leg.joint.y, false);
 
-            Lines.stroke(legBaseRegion.getHeight() * Draw.scl * flips);
-            Lines.line(legBaseRegion, leg.joint.x + Tmp.v1.x, leg.joint.y + Tmp.v1.y, leg.base.x, leg.base.y, CapStyle.none, 0);
+            Lines.stroke(legBaseRegion.height * Draw.scl * flips);
+            Lines.line(legBaseRegion, leg.joint.x + Tmp.v1.x, leg.joint.y + Tmp.v1.y, leg.base.x, leg.base.y, false);
 
             if(jointRegion.found()){
                 Draw.rect(jointRegion, leg.joint.x, leg.joint.y);
@@ -504,17 +623,23 @@ public class UnitType extends UnlockableContent{
             }
         }
 
+        //TODO should be below/above legs
+        if(baseRegion.found()){
+            Draw.rect(baseRegion, unit.x, unit.y, rotation - 90);
+        }
+
         Draw.reset();
     }
 
-    public <T extends Unit & Mechc> void drawMech(T unit){
+    public void drawMech(Mechc mech){
+        Unit unit = (Unit)mech;
+
         Draw.reset();
 
-        Draw.mixcol(Color.white, unit.hitTime);
-
         float e = unit.elevation;
-        float sin = Mathf.lerp(Mathf.sin(unit.walkTime(), 3f, 1f), 0f, e);
-        float ft = sin*(2.5f + (unit.hitSize-8f)/2f);
+
+        float sin = Mathf.lerp(Mathf.sin(mech.walkExtend(true), 2f / Mathf.PI, 1f), 0f, e);
+        float extension = Mathf.lerp(mech.walkExtend(false), 0, e);
         float boostTrns = e * 2f;
 
         Floor floor = unit.isFlying() ? Blocks.air.asFloor() : unit.floorOn();
@@ -524,26 +649,31 @@ public class UnitType extends UnlockableContent{
         }
 
         for(int i : Mathf.signs){
+            Draw.mixcol(Tmp.c1.set(mechLegColor).lerp(Color.white, Mathf.clamp(unit.hitTime)), Math.max(Math.max(0, i * extension / mechStride), unit.hitTime));
+
             Draw.rect(legRegion,
-            unit.x + Angles.trnsx(unit.baseRotation(), ft * i - boostTrns, -boostTrns*i),
-            unit.y + Angles.trnsy(unit.baseRotation(), ft * i - boostTrns, -boostTrns*i),
-            legRegion.getWidth() * i * Draw.scl,
-            legRegion.getHeight() * Draw.scl - Math.max(-sin * i, 0) * legRegion.getHeight() * 0.5f * Draw.scl,
-            unit.baseRotation() - 90 + 35f*i*e);
+            unit.x + Angles.trnsx(mech.baseRotation(), extension * i - boostTrns, -boostTrns*i),
+            unit.y + Angles.trnsy(mech.baseRotation(), extension * i - boostTrns, -boostTrns*i),
+            legRegion.width * i * Draw.scl,
+            legRegion.height * Draw.scl - Math.max(-sin * i, 0) * legRegion.height * 0.5f * Draw.scl,
+            mech.baseRotation() - 90 + 35f*i*e);
         }
 
+        Draw.mixcol(Color.white, unit.hitTime);
+
         if(floor.isLiquid){
             Draw.color(Color.white, floor.mapColor, unit.drownTime() * 0.4f);
         }else{
             Draw.color(Color.white);
         }
 
-        Draw.rect(baseRegion, unit, unit.baseRotation() - 90);
+        Draw.rect(baseRegion, unit, mech.baseRotation() - 90);
 
         Draw.mixcol();
     }
 
     public void applyColor(Unit unit){
+        Draw.color();
         Draw.mixcol(Color.white, unit.hitTime);
         if(unit.drownTime > 0 && unit.floorOn().isDeep()){
             Draw.mixcol(unit.floorOn().mapColor, unit.drownTime * 0.8f);
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 744011df74..63a6c33ce7 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -2,19 +2,20 @@ package mindustry.type;
 
 import arc.*;
 import arc.audio.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.io.*;
 
 public class Weapon{
     /** displayed weapon region */
     public String name;
     /** bullet shot */
-    public @NonNull BulletType bullet;
+    public BulletType bullet;
     /** shell ejection effect */
     public Effect ejectEffect = Fx.none;
     /** whether to create a flipped copy of this weapon upon initialization. default: true */
@@ -25,6 +26,10 @@ public class Weapon{
     public boolean alternate = true;
     /** whether to rotate toward the target independently of unit */
     public boolean rotate = false;
+    /** whether to draw the outline on top. */
+    public boolean top = true;
+    /** whether to hold the bullet in place while firing */
+    public boolean continuous;
     /** rotation speed of weapon when rotation is enabled, in degrees/t*/
     public float rotateSpeed = 20f;
     /** weapon reload in frames */
@@ -43,22 +48,42 @@ public class Weapon{
     public float shootX = 0f, shootY = 3f;
     /** offsets of weapon position on unit */
     public float x = 5f, y = 0f;
+    /** random spread on the X axis */
+    public float xRand = 0f;
     /** radius of occlusion drawn under the weapon; <0 to diable */
     public float occlusion = -1f;
     /** fraction of velocity that is random */
     public float velocityRnd = 0f;
     /** delay in ticks between shots */
+    public float firstShotDelay = 0;
+    /** delay in ticks between shots */
     public float shotDelay = 0;
     /** The half-radius of the cone in which shooting will start. */
     public float shootCone = 5f;
+    /** ticks to cool down the heat region */
+    public float cooldownTime = 20f;
     /** whether shooter rotation is ignored when shooting. */
     public boolean ignoreRotation = false;
+    /** min velocity required for this weapon to shoot */
+    public float minShootVelocity = -1f;
     /** internal value used for alternation - do not change! */
     public int otherSide = -1;
     /** sound used for shooting */
     public Sound shootSound = Sounds.pew;
+    /** sound played when there is nothing to shoot */
+    public Sound noAmmoSound = Sounds.click;
     /** displayed region (autoloaded) */
     public TextureRegion region;
+    /** heat region, must be same size as region (optional) */
+    public TextureRegion heatRegion;
+    /** outline region to display if top is false */
+    public TextureRegion outlineRegion;
+    /** heat region tint */
+    public Color heatColor = Pal.turretHeat;
+    /** status effect applied when shooting */
+    public StatusEffect shootStatus = StatusEffects.none;
+    /** status effect duration when shot */
+    public float shootStatusDuration = 60f * 5f;
 
     public Weapon(String name){
         this.name = name;
@@ -76,6 +101,8 @@ public class Weapon{
 
     public void load(){
         region = Core.atlas.find(name, Core.atlas.find("clear"));
+        heatRegion = Core.atlas.find(name + "-heat");
+        outlineRegion = Core.atlas.find(name + "-outline");
     }
 
 }
diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java
index a1d23a0a76..8fb30aecb6 100644
--- a/core/src/mindustry/type/Weather.java
+++ b/core/src/mindustry/type/Weather.java
@@ -3,21 +3,30 @@ package mindustry.type;
 import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
 import mindustry.ctype.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.world.blocks.*;
 
-import static mindustry.Vars.renderer;
+import static mindustry.Vars.*;
 
-public abstract class Weather extends MappableContent{
+public abstract class Weather extends UnlockableContent{
     /** Default duration of this weather event in ticks. */
-    public float duration = 15f * Time.toMinutes;
+    public float duration = 9f * Time.toMinutes;
+    public float opacityMultiplier = 1f;
+    public Attributes attrs = new Attributes();
 
     //internals
     public Rand rand = new Rand();
     public Prov<WeatherState> type = WeatherState::create;
+    public StatusEffect status = StatusEffects.none;
+    public float statusDuration = 60f * 2;
+    public boolean statusAir = true, statusGround = true;
 
     public Weather(String name, Prov<WeatherState> type){
         super(name);
@@ -58,6 +67,22 @@ public abstract class Weather extends MappableContent{
 
     }
 
+    public void updateEffect(WeatherState state){
+        if(status != StatusEffects.none){
+            if(state.effectTimer <= 0){
+                state.effectTimer = statusDuration - 5f;
+
+                Groups.unit.each(u -> {
+                    if(u.checkTarget(statusAir, statusGround)){
+                        u.apply(status, statusDuration);
+                    }
+                });
+            }else{
+                state.effectTimer -= Time.delta;
+            }
+        }
+    }
+
     public void drawOver(WeatherState state){
 
     }
@@ -66,14 +91,24 @@ public abstract class Weather extends MappableContent{
 
     }
 
+    @Override
+    public void displayInfo(Table table){
+        //do not
+    }
+
+    @Override
+    public boolean isHidden(){
+        return true;
+    }
+
     @Override
     public ContentType getContentType(){
         return ContentType.weather;
     }
 
     @Remote(called = Loc.server)
-    public static void createWeather(Weather weather, float intensity, float duration){
-        weather.create(intensity, duration);
+    public static void createWeather(Weather weather, float intensity, float duration, float windX, float windY){
+        weather.create(intensity, duration).windVector.set(windX, windY);
     }
 
     public static class WeatherEntry{
@@ -81,14 +116,14 @@ public abstract class Weather extends MappableContent{
         public Weather weather;
         /** Minimum and maximum spacing between weather events. Does not include the time of the event itself. */
         public float minFrequency, maxFrequency, minDuration, maxDuration;
-        /** Cooldown time before the next weather event takes place. */
+        /** Cooldown time before the next weather event takes place This is *state*, not configuration. */
         public float cooldown;
         /** Intensity of the weather produced. */
         public float intensity = 1f;
 
         /** Creates a weather entry with some approximate weather values. */
         public WeatherEntry(Weather weather){
-            this(weather, weather.duration/2f, weather.duration * 1.5f, weather.duration/2f, weather.duration * 1.5f);
+            this(weather, weather.duration * 3f, weather.duration * 6f, weather.duration / 2f, weather.duration * 1.5f);
         }
 
         public WeatherEntry(Weather weather, float minFrequency, float maxFrequency, float minDuration, float maxDuration){
@@ -109,11 +144,12 @@ public abstract class Weather extends MappableContent{
 
     @EntityDef(value = {WeatherStatec.class}, pooled = true, isFinal = false)
     @Component(base = true)
-    abstract static class WeatherStateComp implements Drawc{
+    abstract static class WeatherStateComp implements Drawc, Syncc{
         private static final float fadeTime = 60 * 4;
 
         Weather weather;
-        float intensity = 1f, opacity = 0f, life;
+        float intensity = 1f, opacity = 0f, life, effectTimer;
+        Vec2 windVector = new Vec2().setToRandomDirection();
 
         void init(Weather weather){
             this.weather = weather;
@@ -122,14 +158,15 @@ public abstract class Weather extends MappableContent{
         @Override
         public void update(){
             if(life < fadeTime){
-                opacity = life / fadeTime;
+                opacity = Math.min(life / fadeTime, opacity);
             }else{
                 opacity = Mathf.lerpDelta(opacity, 1f, 0.004f);
             }
 
             life -= Time.delta;
 
-            weather.update(base());
+            weather.update(self());
+            weather.updateEffect(self());
 
             if(life < 0){
                 remove();
@@ -141,15 +178,15 @@ public abstract class Weather extends MappableContent{
             if(renderer.weatherAlpha() > 0.0001f){
                 Draw.draw(Layer.weather, () -> {
                     weather.rand.setSeed(0);
-                    Draw.alpha(renderer.weatherAlpha() * opacity);
-                    weather.drawOver(base());
+                    Draw.alpha(renderer.weatherAlpha() * opacity * weather.opacityMultiplier);
+                    weather.drawOver(self());
                     Draw.reset();
                 });
 
                 Draw.draw(Layer.debris, () -> {
                     weather.rand.setSeed(0);
-                    Draw.alpha(renderer.weatherAlpha() * opacity);
-                    weather.drawUnder(base());
+                    Draw.alpha(renderer.weatherAlpha() * opacity * weather.opacityMultiplier);
+                    weather.drawUnder(self());
                     Draw.reset();
                 });
             }
diff --git a/core/src/mindustry/ui/Bar.java b/core/src/mindustry/ui/Bar.java
index d72d602497..d58ad53c37 100644
--- a/core/src/mindustry/ui/Bar.java
+++ b/core/src/mindustry/ui/Bar.java
@@ -21,7 +21,7 @@ public class Bar extends Element{
 
     public Bar(String name, Color color, Floatp fraction){
         this.fraction = fraction;
-        this.name = Core.bundle.get(name);
+        this.name = Core.bundle.get(name, name);
         this.blinkColor.set(color);
         lastValue = value = fraction.get();
         setColor(color);
@@ -63,7 +63,7 @@ public class Bar extends Element{
         if(fraction == null) return;
 
         float computed = Mathf.clamp(fraction.get());
-        if(!Mathf.equal(lastValue, computed)){
+        if(lastValue > computed){
             blink = 1f;
             lastValue = computed;
         }
@@ -80,18 +80,18 @@ public class Bar extends Element{
         Drawable top = Tex.barTop;
         float topWidth = width * value;
 
-        if(topWidth > Core.atlas.find("bar-top").getWidth()){
+        if(topWidth > Core.atlas.find("bar-top").width){
             top.draw(x, y, topWidth, height);
         }else{
             if(ScissorStack.push(scissor.set(x, y, topWidth, height))){
-                top.draw(x, y, Core.atlas.find("bar-top").getWidth(), height);
+                top.draw(x, y, Core.atlas.find("bar-top").width, height);
                 ScissorStack.pop();
             }
         }
 
         Draw.color();
 
-        BitmapFont font = Fonts.outline;
+        Font font = Fonts.outline;
         GlyphLayout lay = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
         lay.setText(font, name);
 
diff --git a/core/src/mindustry/ui/BorderImage.java b/core/src/mindustry/ui/BorderImage.java
index df077a0c13..fc1c94f044 100644
--- a/core/src/mindustry/ui/BorderImage.java
+++ b/core/src/mindustry/ui/BorderImage.java
@@ -37,9 +37,6 @@ public class BorderImage extends Image{
     public void draw(){
         super.draw();
 
-        float scaleX = getScaleX();
-        float scaleY = getScaleY();
-
         Draw.color(borderColor);
         Draw.alpha(parentAlpha);
         Lines.stroke(Scl.scl(thickness));
diff --git a/core/src/mindustry/ui/ContentDisplay.java b/core/src/mindustry/ui/ContentDisplay.java
index 524c1dfb7b..3e82412f0e 100644
--- a/core/src/mindustry/ui/ContentDisplay.java
+++ b/core/src/mindustry/ui/ContentDisplay.java
@@ -5,6 +5,7 @@ import arc.struct.*;
 import arc.graphics.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.*;
@@ -42,7 +43,7 @@ public class ContentDisplay{
 
             if(map.size == 0) continue;
 
-            table.add("$category." + cat.name()).color(Pal.accent).fillX();
+            table.add("@category." + cat.name()).color(Pal.accent).fillX();
             table.row();
 
             for(BlockStat stat : map.keys()){
@@ -129,7 +130,7 @@ public class ContentDisplay{
 
     public static void displayUnit(Table table, UnitType unit){
         table.table(title -> {
-            title.image(unit.icon(Cicon.xlarge)).size(8 * 6);
+            title.image(unit.icon(Cicon.xlarge)).size(8 * 6).scaling(Scaling.fit);
             title.add("[accent]" + unit.localizedName).padLeft(5);
         });
 
@@ -149,10 +150,16 @@ public class ContentDisplay{
 
         table.left().defaults().fillX();
 
-        table.add(Core.bundle.format("unit.health", unit.health));
-        table.row();
-        table.add(Core.bundle.format("unit.speed", Strings.fixed(unit.speed, 1)));
-        table.row();
+        Unit inst = unit.constructor.get();
+
+        //TODO more stats
+        table.add(Core.bundle.format("unit.health", unit.health)).row();
+        table.add(Core.bundle.format("unit.speed", Strings.fixed(unit.speed, 1))).row();
+        table.add(Core.bundle.format("unit.itemcapacity", unit.itemCapacity)).row();
+
+        if(inst instanceof Minerc) table.add(Core.bundle.format("unit.minespeed", (int)(unit.mineSpeed * 100f))).row();
+        if(inst instanceof Builderc) table.add(Core.bundle.format("unit.buildspeed", (int)(unit.buildSpeed * 100f))).row();
+
         table.row();
     }
 }
diff --git a/core/src/mindustry/ui/CoreItemsDisplay.java b/core/src/mindustry/ui/CoreItemsDisplay.java
index cb9e92fd47..7322f15e70 100644
--- a/core/src/mindustry/ui/CoreItemsDisplay.java
+++ b/core/src/mindustry/ui/CoreItemsDisplay.java
@@ -3,6 +3,7 @@ package mindustry.ui;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import mindustry.*;
+import mindustry.core.*;
 import mindustry.type.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
@@ -10,6 +11,7 @@ import static mindustry.Vars.*;
 
 public class CoreItemsDisplay extends Table{
     private final ObjectSet<Item> usedItems = new ObjectSet<>();
+    private CoreBuild core;
 
     public CoreItemsDisplay(){
         rebuild();
@@ -25,23 +27,20 @@ public class CoreItemsDisplay extends Table{
         margin(4);
 
         update(() -> {
-            CoreEntity core = Vars.player.team().core();
+            core = Vars.player.team().core();
 
-            for(Item item : content.items()){
-                if(core != null && core.items.get(item) > 0 && usedItems.add(item)){
-                    rebuild();
-                    break;
-                }
+            if(content.items().contains(item -> core != null && core.items.get(item) > 0 && usedItems.add(item))){
+                rebuild();
             }
         });
 
         int i = 0;
 
-        CoreEntity core = Vars.player.team().core();
         for(Item item : content.items()){
             if(usedItems.contains(item)){
                 image(item.icon(Cicon.small)).padRight(3);
-                label(() -> core == null ? "0" : ui.formatAmount(core.items.get(item))).padRight(3);
+                //TODO leaks garbage
+                label(() -> core == null ? "0" : UI.formatAmount(core.items.get(item))).padRight(3).left();
 
                 if(++i % 4 == 0){
                     row();
diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java
index ef10ba3f54..cbc0100943 100644
--- a/core/src/mindustry/ui/Fonts.java
+++ b/core/src/mindustry/ui/Fonts.java
@@ -13,7 +13,7 @@ import arc.graphics.*;
 import arc.graphics.Pixmap.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
-import arc.graphics.g2d.BitmapFont.*;
+import arc.graphics.g2d.Font.*;
 import arc.graphics.g2d.PixmapPacker.*;
 import arc.graphics.g2d.TextureAtlas.*;
 import arc.math.*;
@@ -27,14 +27,15 @@ import mindustry.core.*;
 import java.util.*;
 
 public class Fonts{
+    private static final String mainFont = "fonts/font.woff";
     private static ObjectIntMap<String> unicodeIcons = new ObjectIntMap<>();
     private static ObjectMap<String, String> stringIcons = new ObjectMap<>();
 
-    public static BitmapFont def;
-    public static BitmapFont outline;
-    public static BitmapFont chat;
-    public static BitmapFont icon;
-    public static BitmapFont tech;
+    public static Font def;
+    public static Font outline;
+    public static Font chat;
+    public static Font icon;
+    public static Font tech;
 
     public static int getUnicode(String content){
         return unicodeIcons.get(content, 0);
@@ -58,22 +59,20 @@ public class Fonts{
     }
 
     public static void loadFonts(){
-        String fontName = "fonts/font.ttf";
-
         FreeTypeFontParameter param = fontParameter();
 
-        Core.assets.load("default", BitmapFont.class, new FreeTypeFontLoaderParameter(fontName, param)).loaded = f -> Fonts.def = (BitmapFont)f;
-        Core.assets.load("chat", BitmapFont.class, new FreeTypeFontLoaderParameter(fontName, param)).loaded = f -> Fonts.chat = (BitmapFont)f;
-        Core.assets.load("icon", BitmapFont.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
+        Core.assets.load("default", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.def = (Font)f;
+        Core.assets.load("chat", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.chat = (Font)f;
+        Core.assets.load("icon", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
             size = 30;
             incremental = true;
             characters = "\0";
-        }})).loaded = f -> Fonts.icon = (BitmapFont)f;
+        }})).loaded = f -> Fonts.icon = (Font)f;
     }
 
     public static void loadContentIcons(){
-        Seq<BitmapFont> fonts = Seq.with(Fonts.chat, Fonts.def, Fonts.outline);
-        Texture uitex = Core.atlas.find("logo").getTexture();
+        Seq<Font> fonts = Seq.with(Fonts.chat, Fonts.def, Fonts.outline);
+        Texture uitex = Core.atlas.find("logo").texture;
         int size = (int)(Fonts.def.getData().lineHeight/Fonts.def.getData().scaleY);
 
         try(Scanner scan = new Scanner(Core.files.internal("icons/icons.properties").read(512))){
@@ -85,7 +84,7 @@ public class Fonts{
                 int ch = Integer.parseInt(character);
                 TextureRegion region = Core.atlas.find(texture);
 
-                if(region.getTexture() != uitex){
+                if(region.texture != uitex){
                     continue;
                     //throw new IllegalArgumentException("Font icon '" + texture + "' is not in the UI texture.");
                 }
@@ -99,10 +98,10 @@ public class Fonts{
                 glyph.srcY = 0;
                 glyph.width = size;
                 glyph.height = size;
-                glyph.u = region.getU();
-                glyph.v = region.getV2();
-                glyph.u2 = region.getU2();
-                glyph.v2 = region.getV();
+                glyph.u = region.u;
+                glyph.v = region.v2;
+                glyph.u2 = region.u2;
+                glyph.v2 = region.v;
                 glyph.xoffset = 0;
                 glyph.yoffset = -size;
                 glyph.xadvance = size;
@@ -116,14 +115,16 @@ public class Fonts{
 
     /** Called from a static context for use in the loading screen.*/
     public static void loadDefaultFont(){
-        UI.packer = new PixmapPacker(2048, 2048, Format.rgba8888, 2, true);
+        int max = Gl.getInt(Gl.maxTextureSize);
+
+        UI.packer = new PixmapPacker(max >= 4096 ? 4096 : 2048, 2048, Format.rgba8888, 2, true);
         FileHandleResolver resolver = new InternalFileHandleResolver();
         Core.assets.setLoader(FreeTypeFontGenerator.class, new FreeTypeFontGeneratorLoader(resolver));
-        Core.assets.setLoader(BitmapFont.class, null, new FreetypeFontLoader(resolver){
+        Core.assets.setLoader(Font.class, null, new FreetypeFontLoader(resolver){
             ObjectSet<FreeTypeFontParameter> scaled = new ObjectSet<>();
 
             @Override
-            public BitmapFont loadSync(AssetManager manager, String fileName, Fi file, FreeTypeFontLoaderParameter parameter){
+            public Font loadSync(AssetManager manager, String fileName, Fi file, FreeTypeFontLoaderParameter parameter){
                 if(fileName.equals("outline")){
                     parameter.fontParameters.borderWidth = Scl.scl(2f);
                     parameter.fontParameters.spaceX -= parameter.fontParameters.borderWidth;
@@ -146,11 +147,14 @@ public class Fonts{
             size = 18;
         }};
 
-        Core.assets.load("outline", BitmapFont.class, new FreeTypeFontLoaderParameter("fonts/font.ttf", param)).loaded = t -> Fonts.outline = (BitmapFont)t;
+        Core.assets.load("outline", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = t -> Fonts.outline = (Font)t;
 
-        Core.assets.load("tech", BitmapFont.class, new FreeTypeFontLoaderParameter("fonts/tech.ttf", new FreeTypeFontParameter(){{
+        Core.assets.load("tech", Font.class, new FreeTypeFontLoaderParameter("fonts/tech.ttf", new FreeTypeFontParameter(){{
             size = 18;
-        }})).loaded = f -> Fonts.tech = (BitmapFont)f;
+        }})).loaded = f -> {
+            Fonts.tech = (Font)f;
+            ((Font)f).getData().down *= 1.5f;
+        };
     }
 
     /** Merges the UI and font atlas together for better performance. */
@@ -158,21 +162,21 @@ public class Fonts{
         //grab all textures from the ui page, remove all the regions assigned to it, then copy them over to Fonts.packer and replace the texture in this atlas.
 
         //grab old UI texture and regions...
-        Texture texture = atlas.find("logo").getTexture();
+        Texture texture = atlas.find("logo").texture;
 
         Page page = UI.packer.getPages().first();
 
-        Seq<AtlasRegion> regions = atlas.getRegions().select(t -> t.getTexture() == texture);
+        Seq<AtlasRegion> regions = atlas.getRegions().select(t -> t.texture == texture);
         for(AtlasRegion region : regions){
             //get new pack rect
             page.setDirty(false);
             Rect rect = UI.packer.pack(region.name + (region.splits != null ? ".9" : ""), atlas.getPixmap(region));
             //set new texture
-            region.setTexture(UI.packer.getPages().first().getTexture());
+            region.texture = UI.packer.getPages().first().getTexture();
             //set its new position
             region.set((int)rect.x, (int)rect.y, (int)rect.width, (int)rect.height);
             //add old texture
-            atlas.getTextures().add(region.getTexture());
+            atlas.getTextures().add(region.texture);
         }
 
         //remove old texture, it will no longer be used
@@ -184,12 +188,12 @@ public class Fonts{
         page.updateTexture(TextureFilter.linear, TextureFilter.linear, false);
     }
 
-    public static TextureRegionDrawable getGlyph(BitmapFont font, char glyph){
+    public static TextureRegionDrawable getGlyph(Font font, char glyph){
         Glyph g = font.getData().getGlyph(glyph);
         if(g == null) throw new IllegalArgumentException("No glyph: " + glyph + " (" + (int)glyph + ")");
 
         float size = Math.max(g.width, g.height);
-        TextureRegionDrawable draw = new TextureRegionDrawable(new TextureRegion(font.getRegion().getTexture(), g.u, g.v2, g.u2, g.v)){
+        TextureRegionDrawable draw = new TextureRegionDrawable(new TextureRegion(font.getRegion().texture, g.u, g.v2, g.u2, g.v)){
             @Override
             public void draw(float x, float y, float width, float height){
                 Draw.color(Tmp.c1.set(tint).mul(Draw.getColor()).toFloatBits());
diff --git a/core/src/mindustry/ui/GridImage.java b/core/src/mindustry/ui/GridImage.java
index b561ffc423..13d786a5be 100644
--- a/core/src/mindustry/ui/GridImage.java
+++ b/core/src/mindustry/ui/GridImage.java
@@ -23,11 +23,11 @@ public class GridImage extends Element{
         int jumpy = (int)(Math.max(minspace, yspace) / yspace);
 
         for(int x = 0; x <= imageWidth; x += jumpx){
-            Fill.crect((int)(getX() + xspace * x - s), getY() - s, 2, getHeight() + (x == imageWidth ? 1 : 0));
+            Fill.crect((int)(this.x + xspace * x - s), y - s, 2, getHeight() + (x == imageWidth ? 1 : 0));
         }
 
         for(int y = 0; y <= imageHeight; y += jumpy){
-            Fill.crect(getX() - s, (int)(getY() + y * yspace - s), getWidth(), 2);
+            Fill.crect(x - s, (int)(this.y + y * yspace - s), getWidth(), 2);
         }
     }
 
diff --git a/core/src/mindustry/ui/ItemDisplay.java b/core/src/mindustry/ui/ItemDisplay.java
index 6407a95d0a..721fbc8b33 100644
--- a/core/src/mindustry/ui/ItemDisplay.java
+++ b/core/src/mindustry/ui/ItemDisplay.java
@@ -14,7 +14,7 @@ public class ItemDisplay extends Table{
     }
 
     public ItemDisplay(Item item, int amount, boolean showName){
-        add(new ItemImage(new ItemStack(item, amount))).size(8 * 4).padRight(amount > 99 ? 12 : 0);
+        add(new ItemImage(new ItemStack(item, amount)));
         if(showName) add(item.localizedName).padLeft(4 + amount > 99 ? 4 : 0);
 
         this.item = item;
diff --git a/core/src/mindustry/ui/ItemImage.java b/core/src/mindustry/ui/ItemImage.java
index aed8997f5f..fb26769c98 100644
--- a/core/src/mindustry/ui/ItemImage.java
+++ b/core/src/mindustry/ui/ItemImage.java
@@ -8,11 +8,17 @@ import mindustry.type.*;
 public class ItemImage extends Stack{
 
     public ItemImage(TextureRegion region, int amount){
-        Table t = new Table().left().bottom();
-        t.add(amount + "").name("item-label");
 
-        add(new Image(region));
-        add(t);
+        add(new Table(o -> {
+            o.left();
+            o.add(new Image(region)).size(32f);
+        }));
+
+        add(new Table(t -> {
+            t.left().bottom();
+            t.add(amount + "");
+            t.pack();
+        }));
     }
 
     public ItemImage(TextureRegion region){
@@ -23,12 +29,18 @@ public class ItemImage extends Stack{
     }
 
     public ItemImage(ItemStack stack){
-        add(new Image(stack.item.icon(Cicon.medium)));
+
+        add(new Table(o -> {
+            o.left();
+            o.add(new Image(stack.item.icon(Cicon.medium))).size(32f);
+        }));
 
         if(stack.amount != 0){
-            Table t = new Table().left().bottom();
-            t.add(stack.amount + "").name("item-label").style(Styles.outlineLabel);
-            add(t);
+            add(new Table(t -> {
+                t.left().bottom();
+                t.add(stack.amount + "").style(Styles.outlineLabel);
+                t.pack();
+            }));
         }
     }
 }
diff --git a/core/src/mindustry/ui/ItemsDisplay.java b/core/src/mindustry/ui/ItemsDisplay.java
index 351b3f17f2..a1dc45d7a0 100644
--- a/core/src/mindustry/ui/ItemsDisplay.java
+++ b/core/src/mindustry/ui/ItemsDisplay.java
@@ -1,22 +1,30 @@
 package mindustry.ui;
 
 import arc.graphics.*;
+import arc.math.*;
+import arc.scene.actions.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.core.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.type.*;
 
 import static mindustry.Vars.*;
 
 /** Displays a list of items, e.g. launched items.*/
 public class ItemsDisplay extends Table{
-    private StringBuilder builder = new StringBuilder();
 
     public ItemsDisplay(){
-        rebuild();
+        rebuild(new ItemSeq());
     }
 
-    public void rebuild(){
+    public void rebuild(ItemSeq items){
+        rebuild(items, null);
+    }
+
+    public void rebuild(ItemSeq items, @Nullable boolean[] shine){
         clear();
         top().left();
         margin(0);
@@ -30,17 +38,21 @@ public class ItemsDisplay extends Table{
                 t.marginRight(30f);
                 t.left();
                 for(Item item : content.items()){
-                    if(item.unlocked()){
-                        t.label(() -> format(item)).left();
-                        t.image(item.icon(Cicon.small)).size(8 * 3).padLeft(4).padRight(4);
-                        t.add(item.localizedName).color(Color.lightGray).left();
-                        t.row();
+                    if(!items.has(item)) continue;
+
+                    Label label = t.add(UI.formatAmount(items.get(item))).left().get();
+                    t.image(item.icon(Cicon.small)).size(8 * 3).padLeft(4).padRight(4);
+                    t.add(item.localizedName).color(Color.lightGray).left();
+                    t.row();
+
+                    if(shine != null && shine[item.id]){
+                        label.setColor(Pal.accent);
+                        label.actions(Actions.color(Color.white, 0.75f, Interp.fade));
                     }
                 }
             }).get().setScrollingDisabled(true, false), false).setDuration(0.3f);
 
-            c.button("$launcheditems", Icon.downOpen, Styles.clearTogglet, col::toggle).update(t -> {
-                t.setText(state.isMenu() ? "$launcheditems" : "$launchinfo");
+            c.button("@globalitems", Icon.downOpen, Styles.clearTogglet, col::toggle).update(t -> {
                 t.setChecked(col.isCollapsed());
                 ((Image)t.getChildren().get(1)).setDrawable(col.isCollapsed() ? Icon.upOpen : Icon.downOpen);
             }).padBottom(4).left().fillX().margin(12f).minWidth(200f);
@@ -48,15 +60,4 @@ public class ItemsDisplay extends Table{
             c.add(col);
         });
     }
-
-    private String format(Item item){
-        builder.setLength(0);
-        builder.append("[TODO implement]");
-        //builder.append(ui.formatAmount(data.getItem(item)));
-        if(state.isGame() && player.team().data().hasCore() && player.team().core().items.get(item) > 0){
-            builder.append(" [unlaunched]+ ");
-            builder.append(ui.formatAmount(state.teams.get(player.team()).core().items.get(item)));
-        }
-        return builder.toString();
-    }
 }
diff --git a/core/src/mindustry/ui/Links.java b/core/src/mindustry/ui/Links.java
index ea35192d9c..4f14c746d5 100644
--- a/core/src/mindustry/ui/Links.java
+++ b/core/src/mindustry/ui/Links.java
@@ -16,7 +16,7 @@ public class Links{
             new LinkEntry("changelog", "https://github.com/Anuken/Mindustry/releases", Icon.list, Pal.accent.cpy()),
             new LinkEntry("trello", "https://trello.com/b/aE2tcUwF", Icon.trello, Color.valueOf("026aa7")),
             new LinkEntry("wiki", "https://mindustrygame.github.io/wiki/", Icon.book, Color.valueOf("0f142f")),
-            new LinkEntry("feathub", "https://github.com/Anuken/Mindustry-Suggestions/issues/new/choose/", Icon.add, Color.valueOf("ebebeb")),
+            new LinkEntry("suggestions", "https://github.com/Anuken/Mindustry-Suggestions/issues/new/choose/", Icon.add, Color.valueOf("ebebeb")),
             new LinkEntry("reddit", "https://www.reddit.com/r/Mindustry/", Icon.redditAlien, Color.valueOf("ee593b")),
             new LinkEntry("itch.io", "https://anuke.itch.io/mindustry", Icon.itchio, Color.valueOf("fa5c5c")),
             new LinkEntry("google-play", "https://play.google.com/store/apps/details?id=io.anuke.mindustry", Icon.googleplay, Color.valueOf("689f38")),
diff --git a/core/src/mindustry/ui/Minimap.java b/core/src/mindustry/ui/Minimap.java
index cac2f08993..dfec82c9fd 100644
--- a/core/src/mindustry/ui/Minimap.java
+++ b/core/src/mindustry/ui/Minimap.java
@@ -15,7 +15,7 @@ public class Minimap extends Table{
     public Minimap(){
         background(Tex.pane);
         float margin = 5f;
-        touchable(Touchable.enabled);
+        this.touchable = Touchable.enabled;
 
         add(new Element(){
             {
diff --git a/core/src/mindustry/ui/MultiReqImage.java b/core/src/mindustry/ui/MultiReqImage.java
index 53308eb51c..ebbb4fc359 100644
--- a/core/src/mindustry/ui/MultiReqImage.java
+++ b/core/src/mindustry/ui/MultiReqImage.java
@@ -19,14 +19,14 @@ public class MultiReqImage extends Stack{
 
         time += Time.delta / 60f;
 
-        displays.each(req -> req.visible(false));
+        displays.each(req -> req.visible = false);
 
         ReqImage valid = displays.find(ReqImage::valid);
         if(valid != null){
-            valid.visible(true);
+            valid.visible = true;
         }else{
             if(displays.size > 0){
-                displays.get((int)(time) % displays.size).visible(true);
+                displays.get((int)time % displays.size).visible = true;
             }
         }
     }
diff --git a/core/src/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java
index 88fde61aab..ea7babb459 100644
--- a/core/src/mindustry/ui/Styles.java
+++ b/core/src/mindustry/ui/Styles.java
@@ -25,13 +25,13 @@ import static mindustry.gen.Tex.*;
 public class Styles{
     public static Drawable black, black9, black8, black6, black3, black5, none, flatDown, flatOver;
     public static ButtonStyle defaultb, waveb;
-    public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet, transt;
-    public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, cleari, clearFulli, clearPartiali, clearPartial2i, clearTogglei, clearTransi, clearToggleTransi, clearTogglePartiali;
+    public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet, transt, fullTogglet, logict;
+    public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, logici, geni, colori, cleari, clearFulli, clearPartiali, clearPartial2i, clearTogglei, clearTransi, clearToggleTransi, clearTogglePartiali;
     public static ScrollPaneStyle defaultPane, horizontalPane, smallPane;
     public static KeybindDialogStyle defaultKeybindDialog;
     public static SliderStyle defaultSlider, vSlider;
     public static LabelStyle defaultLabel, outlineLabel, techLabel;
-    public static TextFieldStyle defaultField, areaField;
+    public static TextFieldStyle defaultField, nodeField, areaField, nodeArea;
     public static CheckBoxStyle defaultCheck;
     public static DialogStyle defaultDialog, fullDialog;
 
@@ -54,9 +54,9 @@ public class Styles{
         }};
         
         waveb = new ButtonStyle(){{
-            up = buttonEdge4;
-            over = buttonEdgeOver4;
-            disabled = buttonEdge4;
+            up = wavepane;
+            over = wavepane; //TODO wrong
+            disabled = wavepane;
         }};
 
         defaultt = new TextButtonStyle(){{
@@ -93,6 +93,14 @@ public class Styles{
             down = flatOver;
             up = black;
         }};
+        logict = new TextButtonStyle(){{
+            over = flatOver;
+            font = Fonts.def;
+            fontColor = Color.white;
+            disabledFontColor = Color.gray;
+            down = flatOver;
+            up = underlineWhite;
+        }};
         discordt = new TextButtonStyle(){{
             font = Fonts.def;
             fontColor = Color.white;
@@ -149,7 +157,16 @@ public class Styles{
             disabled = buttonDisabled;
             disabledFontColor = Color.gray;
         }};
-
+        fullTogglet = new TextButtonStyle(){{
+            font = Fonts.def;
+            fontColor = Color.white;
+            checked = flatOver;
+            down = flatOver;
+            up = black;
+            over = flatOver;
+            disabled = black;
+            disabledFontColor = Color.gray;
+        }};
         defaulti = new ImageButtonStyle(){{
             down = buttonDown;
             up = button;
@@ -166,6 +183,9 @@ public class Styles{
             over = buttonRightOver;
             down = buttonRightDown;
             up = buttonRight;
+            disabled = buttonRightDisabled;
+            imageDisabledColor = Color.clear;
+            imageUpColor = Color.white;
         }};
         emptyi = new ImageButtonStyle(){{
             imageDownColor = Pal.accent;
@@ -180,6 +200,18 @@ public class Styles{
             checked = buttonSelect;
             up = none;
         }};
+        logici = new ImageButtonStyle(){{
+            //imageDownColor = Pal.accent;
+            imageUpColor = Color.black;
+        }};
+        geni = new ImageButtonStyle(){{
+            imageDownColor = Pal.accent;
+            imageUpColor = Color.black;
+        }};
+        colori = new ImageButtonStyle(){{
+            //imageDownColor = Pal.accent;
+            imageUpColor = Color.white;
+        }};
         cleari = new ImageButtonStyle(){{
             down = flatOver;
             up = black;
@@ -289,6 +321,20 @@ public class Styles{
             messageFont = Fonts.def;
             messageFontColor = Color.gray;
         }};
+
+        nodeField = new TextFieldStyle(){{
+            font = Fonts.chat;
+            fontColor = Color.white;
+            disabledFontColor = Color.gray;
+            disabledBackground = underlineDisabled;
+            selection = Tex.selection;
+            background = underlineWhite;
+            invalidBackground = underlineRed;
+            cursor = Tex.cursor;
+            messageFont = Fonts.def;
+            messageFontColor = Color.gray;
+        }};
+
         areaField = new TextFieldStyle(){{
             font = Fonts.chat;
             fontColor = Color.white;
@@ -300,6 +346,17 @@ public class Styles{
             messageFontColor = Color.gray;
         }};
 
+        nodeArea = new TextFieldStyle(){{
+            font = Fonts.chat;
+            fontColor = Color.white;
+            disabledFontColor = Color.gray;
+            selection = Tex.selection;
+            background = underlineWhite;
+            cursor = Tex.cursor;
+            messageFont = Fonts.def;
+            messageFontColor = Color.gray;
+        }};
+
         defaultCheck = new CheckBoxStyle(){{
             checkboxOn = checkOn;
             checkboxOff = checkOff;
diff --git a/core/src/mindustry/ui/dialogs/AboutDialog.java b/core/src/mindustry/ui/dialogs/AboutDialog.java
index a930e6f3f2..3ba3b5d7e2 100644
--- a/core/src/mindustry/ui/dialogs/AboutDialog.java
+++ b/core/src/mindustry/ui/dialogs/AboutDialog.java
@@ -15,11 +15,11 @@ import mindustry.ui.Links.*;
 import static mindustry.Vars.*;
 
 public class AboutDialog extends BaseDialog{
-    private Seq<String> contributors = new Seq<>();
-    private static ObjectSet<String> bannedItems = ObjectSet.with("google-play", "itch.io", "dev-builds", "f-droid");
+    Seq<String> contributors = new Seq<>();
+    static ObjectSet<String> bannedItems = ObjectSet.with("google-play", "itch.io", "dev-builds", "f-droid");
 
     public AboutDialog(){
-        super("$about.button");
+        super("@about.button");
 
         shown(() -> {
             contributors = Seq.with(Core.files.internal("contributors").readString("UTF-8").split("\n"));
@@ -68,7 +68,7 @@ public class AboutDialog extends BaseDialog{
                 if(link.name.equals("wiki")) Events.fire(Trigger.openWiki);
 
                 if(!Core.app.openURI(link.link)){
-                    ui.showErrorMessage("$linkfail");
+                    ui.showErrorMessage("@linkfail");
                     Core.app.setClipboardText(link.link);
                 }
             }).size(h - 5, h);
@@ -82,7 +82,7 @@ public class AboutDialog extends BaseDialog{
 
         addCloseButton();
 
-        buttons.button("$credits", this::showCredits).size(200f, 64f);
+        buttons.button("@credits", this::showCredits).size(200f, 64f);
 
         if(Core.graphics.isPortrait()){
             for(Cell<?> cell : buttons.getCells()){
@@ -93,14 +93,14 @@ public class AboutDialog extends BaseDialog{
     }
 
     public void showCredits(){
-        BaseDialog dialog = new BaseDialog("$credits");
+        BaseDialog dialog = new BaseDialog("@credits");
         dialog.addCloseButton();
-        dialog.cont.add("$credits.text").fillX().wrap().get().setAlignment(Align.center);
+        dialog.cont.add("@credits.text").fillX().wrap().get().setAlignment(Align.center);
         dialog.cont.row();
         if(!contributors.isEmpty()){
             dialog.cont.image().color(Pal.accent).fillX().height(3f).pad(3f);
             dialog.cont.row();
-            dialog.cont.add("$contributors");
+            dialog.cont.add("@contributors");
             dialog.cont.row();
             dialog.cont.pane(new Table(){{
                 int i = 0;
diff --git a/core/src/mindustry/ui/dialogs/AdminsDialog.java b/core/src/mindustry/ui/dialogs/AdminsDialog.java
index 60c390c344..04bdf379d7 100644
--- a/core/src/mindustry/ui/dialogs/AdminsDialog.java
+++ b/core/src/mindustry/ui/dialogs/AdminsDialog.java
@@ -10,7 +10,7 @@ import static mindustry.Vars.*;
 public class AdminsDialog extends BaseDialog{
 
     public AdminsDialog(){
-        super("$server.admins");
+        super("@server.admins");
 
         addCloseButton();
 
@@ -29,7 +29,7 @@ public class AdminsDialog extends BaseDialog{
         pane.setFadeScrollBars(false);
 
         if(netServer.admins.getAdmins().size == 0){
-            table.add("$server.admins.none");
+            table.add("@server.admins.none");
         }
 
         for(PlayerInfo info : netServer.admins.getAdmins()){
@@ -39,7 +39,7 @@ public class AdminsDialog extends BaseDialog{
             res.labelWrap("[lightgray]" + info.lastName).width(w - h - 24f);
             res.add().growX();
             res.button(Icon.cancel, () -> {
-                ui.showConfirm("$confirm", "$confirmunadmin", () -> {
+                ui.showConfirm("@confirm", "@confirmunadmin", () -> {
                     netServer.admins.unAdminPlayer(info.id);
                     Groups.player.each(player -> {
                         if(player != null && !player.isLocal() && player.uuid().equals(info.id)){
diff --git a/core/src/mindustry/ui/dialogs/BansDialog.java b/core/src/mindustry/ui/dialogs/BansDialog.java
index 6ec0949334..c0791ee18f 100644
--- a/core/src/mindustry/ui/dialogs/BansDialog.java
+++ b/core/src/mindustry/ui/dialogs/BansDialog.java
@@ -10,7 +10,7 @@ import static mindustry.Vars.*;
 public class BansDialog extends BaseDialog{
 
     public BansDialog(){
-        super("$server.bans");
+        super("@server.bans");
 
         addCloseButton();
 
@@ -30,7 +30,7 @@ public class BansDialog extends BaseDialog{
         pane.setFadeScrollBars(false);
 
         if(netServer.admins.getBanned().size == 0){
-            table.add("$server.bans.none");
+            table.add("@server.bans.none");
         }
 
         for(PlayerInfo info : netServer.admins.getBanned()){
@@ -40,7 +40,7 @@ public class BansDialog extends BaseDialog{
             res.labelWrap("IP: [lightgray]" + info.lastIP + "\n[]Name: [lightgray]" + info.lastName).width(w - h - 24f);
             res.add().growX();
             res.button(Icon.cancel, () -> {
-                ui.showConfirm("$confirm", "$confirmunban", () -> {
+                ui.showConfirm("@confirm", "@confirmunban", () -> {
                     netServer.admins.unbanPlayerID(info.id);
                     setup();
                 });
diff --git a/core/src/mindustry/ui/dialogs/BaseDialog.java b/core/src/mindustry/ui/dialogs/BaseDialog.java
index 6cdca94146..b180763f86 100644
--- a/core/src/mindustry/ui/dialogs/BaseDialog.java
+++ b/core/src/mindustry/ui/dialogs/BaseDialog.java
@@ -56,7 +56,7 @@ public class BaseDialog extends Dialog{
     @Override
     public void addCloseButton(){
         buttons.defaults().size(210f, 64f);
-        buttons.button("$back", Icon.left, this::hide).size(210f, 64f);
+        buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
 
         keyDown(key -> {
             if(key == KeyCode.escape || key == KeyCode.back){
diff --git a/core/src/mindustry/ui/dialogs/ColorPicker.java b/core/src/mindustry/ui/dialogs/ColorPicker.java
index ebdcb7e819..80c042e1eb 100644
--- a/core/src/mindustry/ui/dialogs/ColorPicker.java
+++ b/core/src/mindustry/ui/dialogs/ColorPicker.java
@@ -8,10 +8,10 @@ import mindustry.graphics.*;
 
 public class ColorPicker extends BaseDialog{
     private Cons<Color> cons = c -> {};
-    private Color current = new Color();
+    Color current = new Color();
 
     public ColorPicker(){
-        super("$pickcolor");
+        super("@pickcolor");
     }
 
     public void show(Color color, Cons<Color> consumer){
@@ -55,7 +55,7 @@ public class ColorPicker extends BaseDialog{
 
         buttons.clear();
         addCloseButton();
-        buttons.button("$ok", Icon.ok, () -> {
+        buttons.button("@ok", Icon.ok, () -> {
             cons.get(current);
             hide();
         });
diff --git a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
index 88a7e24dba..947afa0141 100644
--- a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
+++ b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
@@ -7,7 +7,7 @@ import mindustry.ctype.UnlockableContent;
 public class ContentInfoDialog extends BaseDialog{
 
     public ContentInfoDialog(){
-        super("$info.title");
+        super("@info.title");
 
         addCloseButton();
     }
diff --git a/core/src/mindustry/ui/dialogs/ControlsDialog.java b/core/src/mindustry/ui/dialogs/ControlsDialog.java
index 022338b7a2..746470526a 100644
--- a/core/src/mindustry/ui/dialogs/ControlsDialog.java
+++ b/core/src/mindustry/ui/dialogs/ControlsDialog.java
@@ -17,7 +17,7 @@ public class ControlsDialog extends KeybindDialog{
 
     @Override
     public void addCloseButton(){
-        buttons.button("$back", Icon.left, this::hide).size(230f, 64f);
+        buttons.button("@back", Icon.left, this::hide).size(230f, 64f);
 
         keyDown(key -> {
             if(key == KeyCode.escape || key == KeyCode.back) hide();
diff --git a/core/src/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/mindustry/ui/dialogs/CustomGameDialog.java
index f3f4e6b029..e23d8cca38 100644
--- a/core/src/mindustry/ui/dialogs/CustomGameDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomGameDialog.java
@@ -17,7 +17,7 @@ public class CustomGameDialog extends BaseDialog{
     private MapPlayDialog dialog = new MapPlayDialog();
 
     public CustomGameDialog(){
-        super("$customgame");
+        super("@customgame");
         addCloseButton();
         shown(this::setup);
         onResize(this::setup);
@@ -84,7 +84,7 @@ public class CustomGameDialog extends BaseDialog{
         }
 
         if(Vars.maps.all().size == 0){
-            maps.add("$maps.none").pad(50);
+            maps.add("@maps.none").pad(50);
         }
 
         cont.add(pane).uniformX();
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index 70d0b9a704..e14629b594 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -3,42 +3,47 @@ package mindustry.ui.dialogs;
 import arc.*;
 import arc.func.*;
 import arc.graphics.*;
+import arc.math.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
+import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
+import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.type.Weather.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 
+import static arc.util.Time.*;
 import static mindustry.Vars.*;
 
 public class CustomRulesDialog extends BaseDialog{
     private Table main;
-    private Rules rules;
+    Rules rules;
     private Prov<Rules> resetter;
     private LoadoutDialog loadoutDialog;
     private BaseDialog banDialog;
 
     public CustomRulesDialog(){
-        super("$mode.custom");
+        super("@mode.custom");
 
         loadoutDialog = new LoadoutDialog();
-        banDialog = new BaseDialog("$bannedblocks");
+        banDialog = new BaseDialog("@bannedblocks");
         banDialog.addCloseButton();
 
         banDialog.shown(this::rebuildBanned);
-        banDialog.buttons.button("$addall", Icon.add, () -> {
+        banDialog.buttons.button("@addall", Icon.add, () -> {
             rules.bannedBlocks.addAll(content.blocks().select(Block::canBeBuilt));
             rebuildBanned();
         }).size(180, 64f);
 
-        banDialog.buttons.button("$clear", Icon.trash, () -> {
+        banDialog.buttons.button("@clear", Icon.trash, () -> {
             rules.bannedBlocks.clear();
             rebuildBanned();
         }).size(180, 64f);
@@ -55,7 +60,7 @@ public class CustomRulesDialog extends BaseDialog{
             t.margin(10f);
 
             if(rules.bannedBlocks.isEmpty()){
-                t.add("$empty");
+                t.add("@empty");
             }
 
             Seq<Block> array = Seq.with(rules.bannedBlocks);
@@ -82,8 +87,8 @@ public class CustomRulesDialog extends BaseDialog{
             }
         }).get().setScrollYForce(previousScroll);
         banDialog.cont.row();
-        banDialog.cont.button("$add", Icon.add, () -> {
-            BaseDialog dialog = new BaseDialog("$add");
+        banDialog.cont.button("@add", Icon.add, () -> {
+            BaseDialog dialog = new BaseDialog("@add");
             dialog.cont.pane(t -> {
                 t.left().margin(14f);
                 int[] i = {0};
@@ -116,7 +121,7 @@ public class CustomRulesDialog extends BaseDialog{
         cont.clear();
         cont.pane(m -> main = m).get().setScrollingDisabled(true, false);
         main.margin(10f);
-        main.button("$settings.reset", () -> {
+        main.button("@settings.reset", () -> {
             rules = resetter.get();
             setup();
             requestKeyboard();
@@ -125,45 +130,50 @@ public class CustomRulesDialog extends BaseDialog{
         main.left().defaults().fillX().left().pad(5);
         main.row();
 
-        title("$rules.title.waves");
-        check("$rules.waves", b -> rules.waves = b, () -> rules.waves);
-        check("$rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer);
-        check("$rules.waitForWaveToEnd", b -> rules.waitEnemies = b, () -> rules.waitEnemies);
-        number("$rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> true);
-        number("$rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> true);
+        title("@rules.title.waves");
+        check("@rules.waves", b -> rules.waves = b, () -> rules.waves);
+        check("@rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer);
+        check("@rules.waitForWaveToEnd", b -> rules.waitEnemies = b, () -> rules.waitEnemies);
+        number("@rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> true);
+        number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> true);
 
-        title("$rules.title.resourcesbuilding");
-        check("$rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources);
-        check("$rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
-        number("$rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources);
-        number("$rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier);
-        number("$rules.deconstructrefundmultiplier", false, f -> rules.deconstructRefundMultiplier = f, () -> rules.deconstructRefundMultiplier, () -> !rules.infiniteResources);
-        number("$rules.blockhealthmultiplier", f -> rules.blockHealthMultiplier = f, () -> rules.blockHealthMultiplier);
-        number("$rules.blockdamagemultiplier", f -> rules.blockDamageMultiplier = f, () -> rules.blockDamageMultiplier);
+        title("@rules.title.resourcesbuilding");
+        check("@rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources);
+        check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
+        check("@rules.schematic", b-> rules.schematicsAllowed = b, () -> rules.schematicsAllowed);
+        number("@rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources);
+        number("@rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier);
+        number("@rules.deconstructrefundmultiplier", false, f -> rules.deconstructRefundMultiplier = f, () -> rules.deconstructRefundMultiplier, () -> !rules.infiniteResources);
+        number("@rules.blockhealthmultiplier", f -> rules.blockHealthMultiplier = f, () -> rules.blockHealthMultiplier);
+        number("@rules.blockdamagemultiplier", f -> rules.blockDamageMultiplier = f, () -> rules.blockDamageMultiplier);
 
-        main.button("$configure",
+        main.button("@configure",
             () -> loadoutDialog.show(Blocks.coreShard.itemCapacity, rules.loadout,
+                i -> true,
                 () -> rules.loadout.clear().add(new ItemStack(Items.copper, 100)),
                 () -> {}, () -> {}
         )).left().width(300f);
         main.row();
 
-        main.button("$bannedblocks", banDialog::show).left().width(300f);
+        main.button("@bannedblocks", banDialog::show).left().width(300f);
         main.row();
 
-        title("$rules.title.unit");
-        check("$rules.unitammo", b -> rules.unitAmmo = b, () -> rules.unitAmmo);
-        number("$rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
-        number("$rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
-        number("$rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier);
+        title("@rules.title.unit");
+        check("@rules.unitammo", b -> rules.unitAmmo = b, () -> rules.unitAmmo);
+        number("@rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
+        number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
+        number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier);
 
-        title("$rules.title.enemy");
-        check("$rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);
-        number("$rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
+        title("@rules.title.enemy");
+        check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);
+        check("@rules.buildai", b -> rules.waveTeam.rules().ai = b, () -> rules.waveTeam.rules().ai);
+        number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
 
-        title("$rules.title.environment");
-        number("$rules.solarpowermultiplier", f -> rules.solarPowerMultiplier = f, () -> rules.solarPowerMultiplier);
-        check("$rules.lighting", b -> rules.lighting = b, () -> rules.lighting);
+        title("@rules.title.environment");
+        check("@rules.explosions", b -> rules.damageExplosions = b, () -> rules.damageExplosions);
+        check("@rules.fire", b -> rules.fire = b, () -> rules.fire);
+        check("@rules.lighting", b -> rules.lighting = b, () -> rules.lighting);
+        check("@rules.enemyLights", b -> rules.enemyLights = b, () -> rules.enemyLights);
 
         main.button(b -> {
             b.left();
@@ -172,11 +182,10 @@ public class CustomRulesDialog extends BaseDialog{
                     update(() -> setColor(rules.ambientLight));
                 }}).grow();
             }).margin(4).size(50f).padRight(10);
-            b.add("$rules.ambientlight");
-        }, () -> ui.picker.show(rules.ambientLight, rules.ambientLight::set)).left().width(250f);
-        main.row();
+            b.add("@rules.ambientlight");
+        }, () -> ui.picker.show(rules.ambientLight, rules.ambientLight::set)).left().width(250f).row();
 
-        //TODO add weather patterns
+        main.button("@rules.weather", this::weatherDialog).width(250f).left().row();
     }
 
     void number(String text, Floatc cons, Floatp prov){
@@ -211,4 +220,120 @@ public class CustomRulesDialog extends BaseDialog{
         main.image().color(Pal.accent).height(3f).padRight(100f).padBottom(20);
         main.row();
     }
+
+    Cell<TextField> field(Table table, float value, Floatc setter){
+        return table.field(Strings.autoFixed(value, 2), v -> setter.get(Strings.parseFloat(v)))
+            .valid(Strings::canParsePositiveFloat)
+            .size(90f, 40f).pad(2f).addInputDialog();
+    }
+
+    void weatherDialog(){
+        BaseDialog dialog = new BaseDialog("@rules.weather");
+        Runnable[] rebuild = {null};
+
+        dialog.cont.pane(base -> {
+
+            rebuild[0] = () -> {
+                base.clearChildren();
+                int cols = Math.max(1, Core.graphics.getWidth() / 460);
+                int idx = 0;
+
+                for(WeatherEntry entry : rules.weather){
+                    base.top();
+                    //main container
+                    base.table(Tex.pane, c -> {
+                        c.margin(0);
+
+                        //icons to perform actions
+                        c.table(Tex.whiteui, t -> {
+                            t.setColor(Pal.gray);
+
+                            t.top().left();
+                            t.add(entry.weather.localizedName).left().padLeft(6);
+
+                            t.add().growX();
+
+                            ImageButtonStyle style = Styles.geni;
+                            t.defaults().size(42f);
+
+                            t.button(Icon.cancel, style, () -> {
+                                rules.weather.remove(entry);
+                                rebuild[0].run();
+                            });
+                        }).growX();
+
+                        c.row();
+
+                        //all the options
+                        c.table(f -> {
+                            f.marginLeft(4);
+                            f.left().top();
+
+                            f.defaults().padRight(4).left();
+
+                            f.add("@rules.weather.duration");
+                            field(f, entry.minDuration / toMinutes, v -> entry.minDuration = v * toMinutes);
+                            f.add("@waves.to");
+                            field(f, entry.maxDuration / toMinutes, v -> entry.maxDuration = v * toMinutes);
+                            f.add("@unit.minutes");
+
+                            f.row();
+
+                            f.add("@rules.weather.frequency");
+                            field(f, entry.minFrequency / toMinutes, v -> entry.minFrequency = v * toMinutes);
+                            f.add("@waves.to");
+                            field(f, entry.maxFrequency / toMinutes, v -> entry.maxFrequency = v * toMinutes);
+                            f.add("@unit.minutes");
+
+                            //intensity can't currently be customized
+
+                        }).grow().left().pad(6).top();
+                    }).width(410f).pad(3).top().left().fillY();
+
+                    if(++idx % cols == 0){
+                        base.row();
+                    }
+                }
+            };
+
+            rebuild[0].run();
+        }).grow();
+
+        dialog.addCloseButton();
+
+        dialog.buttons.button("@add", Icon.add, () -> {
+            BaseDialog addd = new BaseDialog("@add");
+            addd.cont.pane(t -> {
+                t.background(Tex.button);
+                int i = 0;
+                for(Weather weather : content.<Weather>getBy(ContentType.weather)){
+
+                    t.button(weather.localizedName, Styles.cleart, () -> {
+                        rules.weather.add(new WeatherEntry(weather));
+                        rebuild[0].run();
+
+                        addd.hide();
+                    }).size(140f, 50f);
+                    if(++i % 2 == 0) t.row();
+                }
+            });
+            addd.addCloseButton();
+            addd.show();
+        }).width(170f);
+
+        //reset cooldown to random number
+        dialog.hidden(() -> {
+            float sum = 0;
+            Seq<WeatherEntry> sh = rules.weather.copy();
+            sh.shuffle();
+
+            for(WeatherEntry w : sh){
+                //add the previous cooldowns to the sum so weather events are staggered and don't happen all at once.
+                w.cooldown = sum + Mathf.random(w.minFrequency, w.maxFrequency);
+                sum += w.cooldown;
+            }
+        });
+
+        dialog.show();
+    }
 }
diff --git a/core/src/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java
index fa15d4aba8..1a718e318a 100644
--- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java
+++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java
@@ -1,12 +1,13 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
-import arc.input.*;
-import arc.struct.*;
 import arc.graphics.*;
+import arc.input.*;
+import arc.math.*;
 import arc.scene.event.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.ctype.*;
@@ -14,12 +15,12 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;
 
-import static mindustry.Vars.ui;
+import static mindustry.Vars.*;
 
 public class DatabaseDialog extends BaseDialog{
 
     public DatabaseDialog(){
-        super("$database");
+        super("@database");
 
         shouldPause = true;
         addCloseButton();
@@ -42,34 +43,33 @@ public class DatabaseDialog extends BaseDialog{
             Seq<Content> array = allContent[j].select(c -> c instanceof UnlockableContent && !((UnlockableContent)c).isHidden());
             if(array.size == 0) continue;
 
-            table.add("$content." + type.name() + ".name").growX().left().color(Pal.accent);
+            table.add("@content." + type.name() + ".name").growX().left().color(Pal.accent);
             table.row();
             table.image().growX().pad(5).padLeft(0).padRight(0).height(3).color(Pal.accent);
             table.row();
             table.table(list -> {
                 list.left();
 
-                int maxWidth = Core.graphics.isPortrait() ? 7 : 13;
-
+                int cols = Mathf.clamp((Core.graphics.getWidth() - 30) / (32 + 10), 1, 18);
                 int count = 0;
 
                 for(int i = 0; i < array.size; i++){
                     UnlockableContent unlock = (UnlockableContent)array.get(i);
 
-                    Image image = unlocked(unlock) ? new Image(unlock.icon(Cicon.medium)) : new Image(Icon.lockOpen, Pal.gray);
+                    Image image = unlocked(unlock) ? new Image(unlock.icon(Cicon.medium)).setScaling(Scaling.fit) : new Image(Icon.lock, Pal.gray);
                     list.add(image).size(8*4).pad(3);
                     ClickListener listener = new ClickListener();
                     image.addListener(listener);
                     if(!Vars.mobile && unlocked(unlock)){
                         image.addListener(new HandCursorListener());
-                        image.update(() -> image.getColor().lerp(!listener.isOver() ? Color.lightGray : Color.white, 0.4f * Time.delta));
+                        image.update(() -> image.color.lerp(!listener.isOver() ? Color.lightGray : Color.white, 0.4f * Time.delta));
                     }
 
                     if(unlocked(unlock)){
                         image.clicked(() -> {
                             if(Core.input.keyDown(KeyCode.shiftLeft) && Fonts.getUnicode(unlock.name) != 0){
                                 Core.app.setClipboardText((char)Fonts.getUnicode(unlock.name) + "");
-                                ui.showInfoFade("$copied");
+                                ui.showInfoFade("@copied");
                             }else{
                                 Vars.ui.content.show(unlock);
                             }
@@ -77,7 +77,7 @@ public class DatabaseDialog extends BaseDialog{
                         image.addListener(new Tooltip(t -> t.background(Tex.button).add(unlock.localizedName)));
                     }
 
-                    if((++count) % maxWidth == 0){
+                    if((++count) % cols == 0){
                         list.row();
                     }
                 }
diff --git a/core/src/mindustry/ui/dialogs/DiscordDialog.java b/core/src/mindustry/ui/dialogs/DiscordDialog.java
index 96aedccadf..3413a4a67b 100644
--- a/core/src/mindustry/ui/dialogs/DiscordDialog.java
+++ b/core/src/mindustry/ui/dialogs/DiscordDialog.java
@@ -33,18 +33,18 @@ public class DiscordDialog extends Dialog{
                 i.image(Icon.discord);
             }).size(h).left();
 
-            t.add("$discord").color(Pal.accent).growX().padLeft(10f);
+            t.add("@discord").color(Pal.accent).growX().padLeft(10f);
         }).size(440f, h).pad(10f);
 
         buttons.defaults().size(150f, 50);
 
-        buttons.button("$back", this::hide);
-        buttons.button("$copylink", () -> {
+        buttons.button("@back", this::hide);
+        buttons.button("@copylink", () -> {
             Core.app.setClipboardText(discordURL);
         });
-        buttons.button("$openlink", () -> {
+        buttons.button("@openlink", () -> {
             if(!Core.app.openURI(discordURL)){
-                ui.showErrorMessage("$linkfail");
+                ui.showErrorMessage("@linkfail");
                 Core.app.setClipboardText(discordURL);
             }
         });
diff --git a/core/src/mindustry/ui/dialogs/FileChooser.java b/core/src/mindustry/ui/dialogs/FileChooser.java
index 57efc91636..2c8f2954b9 100644
--- a/core/src/mindustry/ui/dialogs/FileChooser.java
+++ b/core/src/mindustry/ui/dialogs/FileChooser.java
@@ -17,10 +17,10 @@ import java.util.*;
 
 public class FileChooser extends BaseDialog{
     private static final Fi homeDirectory = Core.files.absolute(Core.files.getExternalStoragePath());
-    private static Fi lastDirectory = homeDirectory;
+    static Fi lastDirectory = Core.files.absolute(Core.settings.getString("lastDirectory", homeDirectory.absolutePath()));
 
     private Table files;
-    private Fi directory = lastDirectory;
+    Fi directory = lastDirectory;
     private ScrollPane pane;
     private TextField navigation, filefield;
     private TextButton ok;
@@ -57,7 +57,7 @@ public class FileChooser extends BaseDialog{
         if(!open) filefield.addInputDialog();
         filefield.setDisabled(open);
 
-        ok = new TextButton(open ? "$load" : "$save");
+        ok = new TextButton(open ? "@load" : "@save");
 
         ok.clicked(() -> {
             if(ok.isDisabled()) return;
@@ -72,11 +72,11 @@ public class FileChooser extends BaseDialog{
 
         filefield.change();
 
-        TextButton cancel = new TextButton("$cancel");
+        TextButton cancel = new TextButton("@cancel");
         cancel.clicked(this::hide);
 
         navigation = new TextField("");
-        navigation.touchable(Touchable.disabled);
+        navigation.touchable = Touchable.disabled;
 
         files = new Table();
         files.marginRight(10);
@@ -108,7 +108,7 @@ public class FileChooser extends BaseDialog{
         ImageButton home = new ImageButton(Icon.home);
         home.clicked(() -> {
             directory = homeDirectory;
-            lastDirectory = directory;
+            setLastDirectory(directory);
             updateFiles(true);
         });
 
@@ -119,7 +119,7 @@ public class FileChooser extends BaseDialog{
         icontable.add(up);
 
         Table fieldcontent = new Table();
-        fieldcontent.bottom().left().add(new Label("$filename"));
+        fieldcontent.bottom().left().add(new Label("@filename"));
         fieldcontent.add(filefield).height(40f).fillX().expandX().padLeft(10f);
 
         Table buttons = new Table();
@@ -163,7 +163,7 @@ public class FileChooser extends BaseDialog{
         return handles;
     }
 
-    private void updateFiles(boolean push){
+    void updateFiles(boolean push){
         if(push) stack.push(directory);
         navigation.setText(directory.toString());
 
@@ -187,7 +187,7 @@ public class FileChooser extends BaseDialog{
         TextButton upbutton = new TextButton(".." + directory.toString(), Styles.clearTogglet);
         upbutton.clicked(() -> {
             directory = directory.parent();
-            lastDirectory = directory;
+            setLastDirectory(directory);
             updateFiles(true);
         });
 
@@ -217,7 +217,7 @@ public class FileChooser extends BaseDialog{
                     updateFileFieldStatus();
                 }else{
                     directory = directory.child(filename);
-                    lastDirectory = directory;
+                    setLastDirectory(directory);
                     updateFiles(true);
                 }
             });
@@ -242,6 +242,11 @@ public class FileChooser extends BaseDialog{
         if(open) filefield.clearText();
     }
 
+    public static void setLastDirectory(Fi directory){
+        lastDirectory = directory;
+        Core.settings.put("lastDirectory", directory.absolutePath());
+    }
+
     private String shorten(String string){
         int max = 30;
         if(string.length() <= max){
@@ -269,14 +274,14 @@ public class FileChooser extends BaseDialog{
             if(!canBack()) return;
             index--;
             directory = history.get(index - 1);
-            lastDirectory = directory;
+            setLastDirectory(directory);
             updateFiles(false);
         }
 
         public void forward(){
             if(!canForward()) return;
             directory = history.get(index);
-            lastDirectory = directory;
+            setLastDirectory(directory);
             index++;
             updateFiles(false);
         }
diff --git a/core/src/mindustry/ui/dialogs/GameOverDialog.java b/core/src/mindustry/ui/dialogs/GameOverDialog.java
index ee96567c1d..b9967e6564 100644
--- a/core/src/mindustry/ui/dialogs/GameOverDialog.java
+++ b/core/src/mindustry/ui/dialogs/GameOverDialog.java
@@ -13,7 +13,7 @@ public class GameOverDialog extends BaseDialog{
     private Team winner;
 
     public GameOverDialog(){
-        super("$gameover");
+        super("@gameover");
         setFillParent(true);
         shown(this::rebuild);
     }
@@ -29,7 +29,7 @@ public class GameOverDialog extends BaseDialog{
     }
 
     void rebuild(){
-        title.setText(state.launched ? "$launch.title" : "$gameover");
+        title.setText("@gameover");
         buttons.clear();
         cont.clear();
 
@@ -37,13 +37,13 @@ public class GameOverDialog extends BaseDialog{
 
         if(state.rules.pvp){
             cont.add(Core.bundle.format("gameover.pvp", winner.localized())).pad(6);
-            buttons.button("$menu", () -> {
+            buttons.button("@menu", () -> {
                 hide();
                 logic.reset();
             }).size(130f, 60f);
         }else{
             if(control.isHighScore()){
-                cont.add("$highscore").pad(6);
+                cont.add("@highscore").pad(6);
                 cont.row();
             }
 
@@ -65,7 +65,7 @@ public class GameOverDialog extends BaseDialog{
                     t.row();
                 }
                 if(state.isCampaign() && !state.stats.itemsDelivered.isEmpty()){
-                    t.add("$stat.delivered");
+                    t.add("@stat.delivered");
                     t.row();
                     for(Item item : content.items()){
                         if(state.stats.itemsDelivered.get(item, 0) > 0){
@@ -79,20 +79,20 @@ public class GameOverDialog extends BaseDialog{
                 }
 
                 if(state.hasSector()){
-                    RankResult result = state.stats.calculateRank(state.getSector(), state.launched);
+                    RankResult result = state.stats.calculateRank(state.getSector(), true);
                     t.add(Core.bundle.format("stat.rank", result.rank + result.modifier));
                     t.row();
                 }
             }).pad(12);
 
             if(state.isCampaign()){
-                buttons.button("$continue", () -> {
+                buttons.button("@continue", () -> {
                     hide();
                     logic.reset();
                     ui.planet.show();
                 }).size(130f, 60f);
             }else{
-                buttons.button("$menu", () -> {
+                buttons.button("@menu", () -> {
                     hide();
                     logic.reset();
                 }).size(130f, 60f);
diff --git a/core/src/mindustry/ui/dialogs/HostDialog.java b/core/src/mindustry/ui/dialogs/HostDialog.java
index 3f14f52822..25300fc0b1 100644
--- a/core/src/mindustry/ui/dialogs/HostDialog.java
+++ b/core/src/mindustry/ui/dialogs/HostDialog.java
@@ -16,12 +16,12 @@ public class HostDialog extends BaseDialog{
     float w = 300;
 
     public HostDialog(){
-        super("$hostserver");
+        super("@hostserver");
 
         addCloseButton();
 
         cont.table(t -> {
-            t.add("$name").padRight(10);
+            t.add("@name").padRight(10);
             t.field(Core.settings.getString("name"), text -> {
                 player.name(text);
                 Core.settings.put("name", text);
@@ -41,26 +41,26 @@ public class HostDialog extends BaseDialog{
 
         cont.add().width(65f);
 
-        cont.button("$host", () -> {
+        cont.button("@host", () -> {
             if(Core.settings.getString("name").trim().isEmpty()){
-                ui.showInfo("$noname");
+                ui.showInfo("@noname");
                 return;
             }
 
             runHost();
         }).width(w).height(70f);
 
-        cont.button("?", () -> ui.showInfo("$host.info")).size(65f, 70f).padLeft(6f);
+        cont.button("?", () -> ui.showInfo("@host.info")).size(65f, 70f).padLeft(6f);
 
         shown(() -> {
             if(!steam){
-                Core.app.post(() -> Core.settings.getBoolOnce("hostinfo", () -> ui.showInfo("$host.info")));
+                Core.app.post(() -> Core.settings.getBoolOnce("hostinfo", () -> ui.showInfo("@host.info")));
             }
         });
     }
 
     public void runHost(){
-        ui.loadfrag.show("$hosting");
+        ui.loadfrag.show("@hosting");
         Time.runTask(5f, () -> {
             try{
                 net.host(Vars.port);
@@ -68,7 +68,7 @@ public class HostDialog extends BaseDialog{
 
                 if(steam){
                     Core.app.post(() -> Core.settings.getBoolOnce("steampublic2", () -> {
-                        ui.showCustomConfirm("$setting.publichost.name", "$public.confirm", "$yes", "$no", () -> {
+                        ui.showCustomConfirm("@setting.publichost.name", "@public.confirm", "@yes", "@no", () -> {
                             Core.settings.put("publichost", true);
                             platform.updateLobby();
                         }, () -> {
@@ -81,10 +81,10 @@ public class HostDialog extends BaseDialog{
                 if(Version.modifier.contains("beta")){
                     Core.settings.put("publichost", false);
                     platform.updateLobby();
-                    Core.settings.getBoolOnce("betapublic", () -> ui.showInfo("$public.beta"));
+                    Core.settings.getBoolOnce("betapublic", () -> ui.showInfo("@public.beta"));
                 }
             }catch(IOException e){
-                ui.showException("$server.error", e);
+                ui.showException("@server.error", e);
             }
             ui.loadfrag.hide();
             hide();
diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index f6a2cbc503..1c80418708 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -1,6 +1,7 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
+import arc.graphics.*;
 import arc.input.*;
 import arc.math.*;
 import arc.scene.ui.*;
@@ -10,6 +11,7 @@ import arc.util.*;
 import arc.util.serialization.*;
 import mindustry.*;
 import mindustry.core.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.io.legacy.*;
@@ -28,9 +30,10 @@ public class JoinDialog extends BaseDialog{
     Table global = new Table();
     Table hosts = new Table();
     int totalHosts;
+    int refreshes;
 
     public JoinDialog(){
-        super("$joingame");
+        super("@joingame");
 
         loadServers();
 
@@ -41,11 +44,11 @@ public class JoinDialog extends BaseDialog{
 
         buttons.add().growX().width(-1);
         if(!steam){
-            buttons.button("?", () -> ui.showInfo("$join.info")).size(60f, 64f).width(-1);
+            buttons.button("?", () -> ui.showInfo("@join.info")).size(60f, 64f).width(-1);
         }
 
-        add = new BaseDialog("$joingame.title");
-        add.cont.add("$joingame.ip").padRight(5f).left();
+        add = new BaseDialog("@joingame.title");
+        add.cont.add("@joingame.ip").padRight(5f).left();
 
         TextField field = add.cont.field(Core.settings.getString("ip"), text -> {
             Core.settings.put("ip", text);
@@ -53,8 +56,8 @@ public class JoinDialog extends BaseDialog{
 
         add.cont.row();
         add.buttons.defaults().size(140f, 60f).pad(4f);
-        add.buttons.button("$cancel", add::hide);
-        add.buttons.button("$ok", () -> {
+        add.buttons.button("@cancel", add::hide);
+        add.buttons.button("@ok", () -> {
             if(renaming == null){
                 Server server = new Server();
                 server.setIP(Core.settings.getString("ip"));
@@ -69,7 +72,7 @@ public class JoinDialog extends BaseDialog{
         }).disabled(b -> Core.settings.getString("ip").isEmpty() || net.active());
 
         add.shown(() -> {
-            add.title.setText(renaming != null ? "$server.edit" : "$server.add");
+            add.title.setText(renaming != null ? "@server.edit" : "@server.add");
             if(renaming != null){
                 field.setText(renaming.displayIP());
             }
@@ -82,7 +85,7 @@ public class JoinDialog extends BaseDialog{
             refreshAll();
 
             if(!steam){
-                Core.app.post(() -> Core.settings.getBoolOnce("joininfo", () -> ui.showInfo("$join.info")));
+                Core.app.post(() -> Core.settings.getBoolOnce("joininfo", () -> ui.showInfo("@join.info")));
             }
         });
 
@@ -93,6 +96,8 @@ public class JoinDialog extends BaseDialog{
     }
 
     void refreshAll(){
+        refreshes ++;
+
         refreshLocal();
         refreshRemote();
         refreshGlobal();
@@ -108,6 +113,7 @@ public class JoinDialog extends BaseDialog{
             TextButton button = buttons[0] = remote.button("[accent]" + server.displayIP(), Styles.cleart, () -> {
                 if(!buttons[0].childrenPressed()){
                     if(server.lastHost != null){
+                        Events.fire(new ClientPreConnectEvent(server.lastHost));
                         safeConnect(server.ip, server.port, server.lastHost.version);
                     }else{
                         connect(server.ip, server.port);
@@ -143,7 +149,7 @@ public class JoinDialog extends BaseDialog{
             }).margin(3f).pad(2).padTop(6f).top().right();
 
             inner.button(Icon.trash, Styles.emptyi, () -> {
-                ui.showConfirm("$confirm", "$server.delete", () -> {
+                ui.showConfirm("@confirm", "@server.delete", () -> {
                     servers.remove(server, true);
                     saveServers();
                     setupRemote();
@@ -191,7 +197,7 @@ public class JoinDialog extends BaseDialog{
 
         net.pingHost(server.ip, server.port, host -> setupServer(server, host), e -> {
             server.content.clear();
-            server.content.add("$host.invalid").padBottom(4);
+            server.content.add("@host.invalid").padBottom(4);
         });
     }
 
@@ -230,7 +236,11 @@ public class JoinDialog extends BaseDialog{
             }
             t.add("[lightgray]" + (Core.bundle.format("players" + (host.players == 1 && host.playerLimit <= 0 ? ".single" : ""), (host.players == 0 ? "[lightgray]" : "[accent]") + host.players + (host.playerLimit > 0 ? "[lightgray]/[accent]" + host.playerLimit : "")+ "[lightgray]"))).left();
             t.row();
-            t.add("[lightgray]" + Core.bundle.format("save.map", host.mapname) + "[lightgray] / " + host.mode.toString()).width(targetWidth() - 10f).left().get().setEllipsis(true);
+            t.add("[lightgray]" + Core.bundle.format("save.map", host.mapname) + "[lightgray] / " + (host.modeName == null ? host.mode.toString() : host.modeName)).width(targetWidth() - 10f).left().get().setEllipsis(true);
+            if(host.ping > 0){
+                t.row();
+                t.add(Iconc.chartBar + " " + host.ping + "ms").color(Color.gray).left();
+            }
         }).expand().left().bottom().padLeft(12f).padBottom(8);
     }
 
@@ -242,9 +252,9 @@ public class JoinDialog extends BaseDialog{
 
         hosts.clear();
 
-        section("$servers.local", local);
-        section("$servers.remote", remote);
-        section("$servers.global", global);
+        section("@servers.local", local);
+        section("@servers.remote", remote);
+        section("@servers.global", global);
 
         ScrollPane pane = new ScrollPane(hosts);
         pane.setFadeScrollBars(false);
@@ -254,15 +264,11 @@ public class JoinDialog extends BaseDialog{
 
         cont.clear();
         cont.table(t -> {
-            t.add("$name").padRight(10);
-            if(!steam){
-                t.field(Core.settings.getString("name"), text -> {
-                    player.name(text);
-                    Core.settings.put("name", text);
-                }).grow().pad(8).addInputDialog(maxNameLength);
-            }else{
-                t.add(player.name).update(l -> l.setColor(player.color())).grow().pad(8);
-            }
+            t.add("@name").padRight(10);
+            t.field(Core.settings.getString("name"), text -> {
+                player.name(text);
+                Core.settings.put("name", text);
+            }).grow().pad(8).addInputDialog(maxNameLength);
 
             ImageButton button = t.button(Tex.whiteui, Styles.clearFulli, 40, () -> {
                 new PaletteDialog().show(color -> {
@@ -275,7 +281,7 @@ public class JoinDialog extends BaseDialog{
         cont.row();
         cont.add(pane).width(w + 38).pad(0);
         cont.row();
-        cont.buttonCenter("$server.add", Icon.add, () -> {
+        cont.buttonCenter("@server.add", Icon.add, () -> {
             renaming = null;
             add.show();
         }).marginLeft(10).width(w).height(80f).update(button -> {
@@ -286,12 +292,12 @@ public class JoinDialog extends BaseDialog{
                 pad = 6;
             }
 
-            Cell cell = ((Table)pane.getParent()).getCell(button);
+            Cell cell = ((Table)pane.parent).getCell(button);
 
             if(!Mathf.equal(cell.minWidth(), pw)){
                 cell.width(pw);
                 cell.padLeft(pad);
-                pane.getParent().invalidateHierarchy();
+                pane.parent.invalidateHierarchy();
             }
         });
     }
@@ -324,12 +330,15 @@ public class JoinDialog extends BaseDialog{
     }
 
     void refreshGlobal(){
+        int cur = refreshes;
+
         global.clear();
         global.background(null);
         for(String host : defaultServers){
             String resaddress = host.contains(":") ? host.split(":")[0] : host;
             int resport = host.contains(":") ? Strings.parseInt(host.split(":")[1]) : port;
             net.pingHost(resaddress, resport, res -> {
+                if(refreshes != cur) return;
                 res.port = resport;
                 addGlobalHost(res);
             }, e -> {});
@@ -340,7 +349,7 @@ public class JoinDialog extends BaseDialog{
         if(totalHosts == 0){
             local.clear();
             local.background(Tex.button);
-            local.add("$hosts.none").pad(10f);
+            local.add("@hosts.none").pad(10f);
             local.add().growX();
             local.button(Icon.refresh, this::refreshLocal).pad(-12f).padLeft(0).size(70f);
         }else{
@@ -378,11 +387,11 @@ public class JoinDialog extends BaseDialog{
 
     public void connect(String ip, int port){
         if(player.name.trim().isEmpty()){
-            ui.showInfo("$noname");
+            ui.showInfo("@noname");
             return;
         }
 
-        ui.loadfrag.show("$connecting");
+        ui.loadfrag.show("@connecting");
 
         ui.loadfrag.setButton(() -> {
             ui.loadfrag.hide();
@@ -403,7 +412,7 @@ public class JoinDialog extends BaseDialog{
     void safeConnect(String ip, int port, int version){
         if(version != Version.build && Version.build != -1 && version != -1){
             ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" +
-            Core.bundle.format("server.versions", Version.build, version));
+                Core.bundle.format("server.versions", Version.build, version));
         }else{
             connect(ip, port);
         }
@@ -424,7 +433,7 @@ public class JoinDialog extends BaseDialog{
         }
 
         //get servers
-        Core.net.httpGet(becontrol.active() ? serverJsonBeURL : serverJsonURL, result -> {
+        Core.net.httpGet(becontrol.active() ? serverJsonBeURL : serverJsonV6URL, result -> {
             try{
                 Jval val = Jval.read(result.getResultAsString());
                 Core.app.post(() -> {
@@ -432,9 +441,13 @@ public class JoinDialog extends BaseDialog{
                         defaultServers.clear();
                         val.asArray().each(child -> defaultServers.add(child.getString("address", "<invalid>")));
                         Log.info("Fetched @ global servers.", defaultServers.size);
-                    }catch(Throwable ignored){}
+                    }catch(Throwable ignored){
+                        Log.err("Failed to parse community servers.");
+                    }
                 });
-            }catch(Throwable ignored){}
+            }catch(Throwable e){
+                Log.err("Failed to fetch community servers.");
+            }
         }, t -> {});
     }
 
diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java
index db51900b54..979f35a7a9 100644
--- a/core/src/mindustry/ui/dialogs/LanguageDialog.java
+++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java
@@ -21,7 +21,7 @@ public class LanguageDialog extends BaseDialog{
     );
 
     public LanguageDialog(){
-        super("$settings.language");
+        super("@settings.language");
         addCloseButton();
         setup();
     }
@@ -40,7 +40,7 @@ public class LanguageDialog extends BaseDialog{
                 if(getLocale().equals(loc)) return;
                 Core.settings.put("locale", loc.toString());
                 Log.info("Setting locale: @", loc.toString());
-                ui.showInfo("$language.restart");
+                ui.showInfo("@language.restart");
             });
             langs.add(button).group(group).update(t -> t.setChecked(loc.equals(getLocale()))).size(400f, 50f).row();
         }
diff --git a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
index 3042aba33d..acb240d7c9 100644
--- a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
+++ b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
@@ -5,6 +5,7 @@ import arc.func.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
+import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -17,37 +18,28 @@ import static mindustry.Vars.*;
 /** Dialog for selecting loadout at sector launch. */
 public class LaunchLoadoutDialog extends BaseDialog{
     LoadoutDialog loadout = new LoadoutDialog();
-    //total as a map
-    ObjectIntMap<Item> totalMap = new ObjectIntMap<>();
     //total required items
-    Seq<ItemStack> total = new Seq<>();
+    ItemSeq total = new ItemSeq();
     //currently selected schematic
     Schematic selected;
     //validity of loadout items
     boolean valid;
 
     public LaunchLoadoutDialog(){
-        super("$configure");
+        super("@configure");
     }
 
     public void show(CoreBlock core, Building build, Runnable confirm){
         cont.clear();
         buttons.clear();
-        totalMap.clear();
-
-        Seq<ItemStack> stacks = universe.getLaunchResources();
 
         addCloseButton();
 
         //updates sum requirements
         Runnable update = () -> {
-            totalMap.clear();
             total.clear();
-            selected.requirements().each(i -> totalMap.increment(i.item, i.amount));
-            universe.getLaunchResources().each(i -> totalMap.increment(i.item, i.amount));
-            for(Item item : content.items()){
-                if(totalMap.containsKey(item)) total.add(new ItemStack(item, totalMap.get(item)));
-            }
+            selected.requirements().each(total::add);
+            universe.getLaunchResources().each(total::add);
             valid = build.items.has(total);
         };
 
@@ -55,10 +47,18 @@ public class LaunchLoadoutDialog extends BaseDialog{
             table.clearChildren();
             int i = 0;
 
+            ItemSeq schems = selected.requirements();
+            ItemSeq launches = universe.getLaunchResources();
+
             for(ItemStack s : total){
                 table.image(s.item.icon(Cicon.small)).left();
-                table.add((build.items.has(s.item, s.amount)) ? "[lightgray]" + s.amount + "" :
-                "[scarlet]" + (Math.min(build.items.get(s.item), s.amount) + "[lightgray]/" + s.amount)).padLeft(2).left().padRight(4);
+                int as = schems.get(s.item), al = launches.get(s.item);
+
+                String amountStr = "[lightgray]" + (al + " + [accent]" + as + "[lightgray]");
+
+                table.add(
+                    build.items.has(s.item, s.amount) ? amountStr :
+                    "[scarlet]" + (Math.min(build.items.get(s.item), s.amount) + "[lightgray]/" + amountStr)).padLeft(2).left().padRight(4);
 
                 if(++i % 4 == 0){
                     table.row();
@@ -70,15 +70,18 @@ public class LaunchLoadoutDialog extends BaseDialog{
 
         Runnable rebuildItems = () -> rebuild.get(items);
 
-        buttons.button("$resources", Icon.terrain, () -> {
-            loadout.show(core.itemCapacity, stacks, stacks::clear, () -> {}, () -> {
-                universe.updateLaunchResources(stacks);
+        buttons.button("@resources", Icon.terrain, () -> {
+            ItemSeq stacks = universe.getLaunchResources();
+            Seq<ItemStack> out = stacks.toSeq();
+
+            loadout.show(core.itemCapacity, out, UnlockableContent::unlocked, out::clear, () -> {}, () -> {
+                universe.updateLaunchResources(new ItemSeq(out));
                 update.run();
                 rebuildItems.run();
             });
         });
 
-        buttons.button("$launch.text", Icon.ok, () -> {
+        buttons.button("@launch.text", Icon.ok, () -> {
             universe.updateLoadout(core, selected);
             confirm.run();
             hide();
diff --git a/core/src/mindustry/ui/dialogs/LoadDialog.java b/core/src/mindustry/ui/dialogs/LoadDialog.java
index e341a1b224..6e2e56e2d8 100644
--- a/core/src/mindustry/ui/dialogs/LoadDialog.java
+++ b/core/src/mindustry/ui/dialogs/LoadDialog.java
@@ -24,7 +24,7 @@ public class LoadDialog extends BaseDialog{
     Table slots;
 
     public LoadDialog(){
-        this("$loadgame");
+        this("@loadgame");
     }
 
     public LoadDialog(String title){
@@ -80,14 +80,14 @@ public class LoadDialog extends BaseDialog{
                     }).checked(slot.isAutosave()).right();
 
                     t.button(Icon.trash, Styles.emptyi, () -> {
-                        ui.showConfirm("$confirm", "$save.delete.confirm", () -> {
+                        ui.showConfirm("@confirm", "@save.delete.confirm", () -> {
                             slot.delete();
                             setup();
                         });
                     }).right();
 
                     t.button(Icon.pencil, Styles.emptyi, () -> {
-                        ui.showTextInput("$save.rename", "$save.rename.text", slot.getName(), text -> {
+                        ui.showTextInput("@save.rename", "@save.rename.text", slot.getName(), text -> {
                             slot.setName(text);
                             setup();
                         });
@@ -104,7 +104,7 @@ public class LoadDialog extends BaseDialog{
 
             button.left().add(new BorderImage(def, 4f)).update(im -> {
                 TextureRegionDrawable draw = (TextureRegionDrawable)im.getDrawable();
-                if(draw.getRegion().getTexture().isDisposed()){
+                if(draw.getRegion().texture.isDisposed()){
                     draw.setRegion(def);
                 }
 
@@ -141,7 +141,7 @@ public class LoadDialog extends BaseDialog{
         }
 
         if(!any){
-            slots.button("$save.none", () -> {}).disabled(true).fillX().margin(20f).minWidth(340f).height(80f).pad(4f);
+            slots.button("@save.none", () -> {}).disabled(true).fillX().margin(20f).minWidth(340f).height(80f).pad(4f);
         }
 
         cont.add(pane);
@@ -149,7 +149,7 @@ public class LoadDialog extends BaseDialog{
 
     public void addSetup(){
 
-        buttons.button("$save.import", Icon.add, () -> {
+        buttons.button("@save.import", Icon.add, () -> {
             platform.showFileChooser(true, saveExtension, file -> {
                 if(SaveIO.isSaveValid(file)){
                     try{
@@ -157,10 +157,10 @@ public class LoadDialog extends BaseDialog{
                         setup();
                     }catch(IOException e){
                         e.printStackTrace();
-                        ui.showException("$save.import.fail", e);
+                        ui.showException("@save.import.fail", e);
                     }
                 }else{
-                    ui.showErrorMessage("$save.import.invalid");
+                    ui.showErrorMessage("@save.import.invalid");
                 }
             });
         }).fillX().margin(10f);
@@ -180,7 +180,7 @@ public class LoadDialog extends BaseDialog{
                 }catch(SaveException e){
                     Log.err(e);
                     logic.reset();
-                    ui.showErrorMessage("$save.corrupted");
+                    ui.showErrorMessage("@save.corrupted");
                 }
             });
         });
diff --git a/core/src/mindustry/ui/dialogs/LoadoutDialog.java b/core/src/mindustry/ui/dialogs/LoadoutDialog.java
index 079b5b5245..d818f5ecda 100644
--- a/core/src/mindustry/ui/dialogs/LoadoutDialog.java
+++ b/core/src/mindustry/ui/dialogs/LoadoutDialog.java
@@ -1,9 +1,10 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
-import arc.struct.*;
+import arc.func.*;
 import arc.input.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -15,13 +16,15 @@ public class LoadoutDialog extends BaseDialog{
     private Runnable hider;
     private Runnable resetter;
     private Runnable updater;
+    //TODO use itemseqs
     private Seq<ItemStack> stacks = new Seq<>();
     private Seq<ItemStack> originalStacks = new Seq<>();
+    private Boolf<Item> validator = i -> true;
     private Table items;
     private int capacity;
 
     public LoadoutDialog(){
-        super("$configure");
+        super("@configure");
         setFillParent(true);
 
         keyDown(key -> {
@@ -41,9 +44,9 @@ public class LoadoutDialog extends BaseDialog{
             }
         });
 
-        buttons.button("$back", Icon.left, this::hide).size(210f, 64f);
+        buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
 
-        buttons.button("$settings.reset", Icon.refresh, () -> {
+        buttons.button("@settings.reset", Icon.refresh, () -> {
             resetter.run();
             reseed();
             updater.run();
@@ -51,13 +54,14 @@ public class LoadoutDialog extends BaseDialog{
         }).size(210f, 64f);
     }
 
-    public void show(int capacity, Seq<ItemStack> stacks, Runnable reseter, Runnable updater, Runnable hider){
+    public void show(int capacity, Seq<ItemStack> stacks, Boolf<Item> validator, Runnable reseter, Runnable updater, Runnable hider){
         this.originalStacks = stacks;
-        reseed();
+        this.validator = validator;
         this.resetter = reseter;
         this.updater = updater;
         this.capacity = capacity;
         this.hider = hider;
+        reseed();
         show();
     }
 
@@ -81,7 +85,7 @@ public class LoadoutDialog extends BaseDialog{
                     updater.run();
                 }).size(bsize);
 
-                t.button(Icon.pencil, Styles.cleari, () -> ui.showTextInput("$configure", stack.item.localizedName, 10, stack.amount + "", true, str -> {
+                t.button(Icon.pencil, Styles.cleari, () -> ui.showTextInput("@configure", stack.item.localizedName, 10, stack.amount + "", true, str -> {
                     if(Strings.canParsePositiveInt(str)){
                         int amount = Strings.parseInt(str);
                         if(amount >= 0 && amount <= capacity){
@@ -106,7 +110,7 @@ public class LoadoutDialog extends BaseDialog{
 
     private void reseed(){
         this.stacks = originalStacks.map(ItemStack::copy);
-        this.stacks.addAll(content.items().select(i -> !stacks.contains(stack -> stack.item == i)).map(i -> new ItemStack(i, 0)));
+        this.stacks.addAll(content.items().select(i -> validator.get(i) && !stacks.contains(stack -> stack.item == i)).map(i -> new ItemStack(i, 0)));
         this.stacks.sort(Structs.comparingInt(s -> s.item.id));
     }
 
diff --git a/core/src/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/mindustry/ui/dialogs/MapPlayDialog.java
index a321d8d7c9..942983a401 100644
--- a/core/src/mindustry/ui/dialogs/MapPlayDialog.java
+++ b/core/src/mindustry/ui/dialogs/MapPlayDialog.java
@@ -15,7 +15,7 @@ import static mindustry.Vars.*;
 public class MapPlayDialog extends BaseDialog{
     CustomRulesDialog dialog = new CustomRulesDialog();
     Rules rules;
-    @NonNull Gamemode selectedGamemode = Gamemode.survival;
+    Gamemode selectedGamemode = Gamemode.survival;
     Map lastMap;
 
     public MapPlayDialog(){
@@ -47,7 +47,7 @@ public class MapPlayDialog extends BaseDialog{
         rules = map.applyRules(selectedGamemode);
 
         Table selmode = new Table();
-        selmode.add("$level.mode").colspan(4);
+        selmode.add("@level.mode").colspan(4);
         selmode.row();
         int i = 0;
 
@@ -67,7 +67,7 @@ public class MapPlayDialog extends BaseDialog{
 
         cont.add(selmode);
         cont.row();
-        cont.button("$customize", Icon.settings, () -> dialog.show(rules, () -> rules = map.applyRules(selectedGamemode))).width(230);
+        cont.button("@customize", Icon.settings, () -> dialog.show(rules, () -> rules = map.applyRules(selectedGamemode))).width(230);
         cont.row();
         cont.add(new BorderImage(map.safeTexture(), 3f)).size(mobile && !Core.graphics.isPortrait() ? 150f : 250f).get().setScaling(Scaling.fit);
         //only maps with survival are valid for high scores
@@ -79,7 +79,7 @@ public class MapPlayDialog extends BaseDialog{
         buttons.clearChildren();
         addCloseButton();
 
-        buttons.button("$play", Icon.play, () -> {
+        buttons.button("@play", Icon.play, () -> {
             control.playMap(map, rules);
             hide();
             ui.custom.hide();
@@ -103,7 +103,7 @@ public class MapPlayDialog extends BaseDialog{
         }
 
         d.cont.add(pane);
-        d.buttons.button("$ok", d::hide).size(110, 50).pad(10f);
+        d.buttons.button("@ok", d::hide).size(110, 50).pad(10f);
         d.show();
     }
 }
diff --git a/core/src/mindustry/ui/dialogs/MapsDialog.java b/core/src/mindustry/ui/dialogs/MapsDialog.java
index 66d502c8c7..c03c01e799 100644
--- a/core/src/mindustry/ui/dialogs/MapsDialog.java
+++ b/core/src/mindustry/ui/dialogs/MapsDialog.java
@@ -20,7 +20,7 @@ public class MapsDialog extends BaseDialog{
     private BaseDialog dialog;
 
     public MapsDialog(){
-        super("$maps");
+        super("@maps");
 
         buttons.remove();
 
@@ -43,35 +43,35 @@ public class MapsDialog extends BaseDialog{
         buttons.clearChildren();
 
         if(Core.graphics.isPortrait()){
-            buttons.button("$back", Icon.left, this::hide).size(210f*2f, 64f).colspan(2);
+            buttons.button("@back", Icon.left, this::hide).size(210f*2f, 64f).colspan(2);
             buttons.row();
         }else{
-            buttons.button("$back", Icon.left, this::hide).size(210f, 64f);
+            buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
         }
 
-        buttons.button("$editor.newmap", Icon.add, () -> {
-            ui.showTextInput("$editor.newmap", "$editor.mapname", "", text -> {
+        buttons.button("@editor.newmap", Icon.add, () -> {
+            ui.showTextInput("@editor.newmap", "@editor.mapname", "", text -> {
                 Runnable show = () -> ui.loadAnd(() -> {
                     hide();
                     ui.editor.show();
-                    ui.editor.editor.getTags().put("name", text);
+                    ui.editor.editor.tags.put("name", text);
                     Events.fire(new MapMakeEvent());
                 });
 
                 if(maps.byName(text) != null){
-                    ui.showErrorMessage("$editor.exists");
+                    ui.showErrorMessage("@editor.exists");
                 }else{
                     show.run();
                 }
             });
         }).size(210f, 64f);
 
-        buttons.button("$editor.importmap", Icon.upload, () -> {
+        buttons.button("@editor.importmap", Icon.upload, () -> {
             platform.showFileChooser(true, mapExtension, file -> {
                 ui.loadAnd(() -> {
                     maps.tryCatchMapError(() -> {
                         if(MapIO.isImage(file)){
-                            ui.showErrorMessage("$editor.errorimage");
+                            ui.showErrorMessage("@editor.errorimage");
                             return;
                         }
 
@@ -88,7 +88,7 @@ public class MapsDialog extends BaseDialog{
 
                         //this will never actually get called, but it remains just in case
                         if(name == null){
-                            ui.showErrorMessage("$editor.errorname");
+                            ui.showErrorMessage("@editor.errorname");
                             return;
                         }
 
@@ -97,7 +97,7 @@ public class MapsDialog extends BaseDialog{
                         if(conflict != null && !conflict.custom){
                             ui.showInfo(Core.bundle.format("editor.import.exists", name));
                         }else if(conflict != null){
-                            ui.showConfirm("$confirm", Core.bundle.format("editor.overwrite.confirm", map.name()), () -> {
+                            ui.showConfirm("@confirm", Core.bundle.format("editor.overwrite.confirm", map.name()), () -> {
                                 maps.tryCatchMapError(() -> {
                                     maps.removeMap(conflict);
                                     maps.importMap(map.file);
@@ -142,13 +142,13 @@ public class MapsDialog extends BaseDialog{
             button.row();
             button.stack(new Image(map.safeTexture()).setScaling(Scaling.fit), new BorderImage(map.safeTexture()).setScaling(Scaling.fit)).size(mapsize - 20f);
             button.row();
-            button.add(map.custom ? "$custom" : map.workshop ? "$workshop" : map.mod != null ? "[lightgray]" + map.mod.meta.displayName() : "$builtin").color(Color.gray).padTop(3);
+            button.add(map.custom ? "@custom" : map.workshop ? "@workshop" : map.mod != null ? "[lightgray]" + map.mod.meta.displayName() : "@builtin").color(Color.gray).padTop(3);
 
             i++;
         }
 
         if(Vars.maps.all().size == 0){
-            maps.add("$maps.none");
+            maps.add("@maps.none");
         }
 
         cont.add(buttons).growX();
@@ -157,7 +157,7 @@ public class MapsDialog extends BaseDialog{
     }
 
     void showMapInfo(Map map){
-        dialog = new BaseDialog("$editor.mapinfo");
+        dialog = new BaseDialog("@editor.mapinfo");
         dialog.addCloseButton();
 
         float mapsize = Core.graphics.isPortrait() ? 160f : 300f;
@@ -176,37 +176,37 @@ public class MapsDialog extends BaseDialog{
             t.top();
             t.defaults().padTop(10).left();
 
-            t.add("$editor.mapname").padRight(10).color(Color.gray).padTop(0);
+            t.add("@editor.mapname").padRight(10).color(Color.gray).padTop(0);
             t.row();
             t.add(map.name()).growX().wrap().padTop(2);
             t.row();
-            t.add("$editor.author").padRight(10).color(Color.gray);
+            t.add("@editor.author").padRight(10).color(Color.gray);
             t.row();
             t.add(!map.custom && map.author().isEmpty() ? "Anuke" : map.author()).growX().wrap().padTop(2);
             t.row();
-            t.add("$editor.description").padRight(10).color(Color.gray).top();
+            t.add("@editor.description").padRight(10).color(Color.gray).top();
             t.row();
             t.add(map.description()).growX().wrap().padTop(2);
         }).height(mapsize).width(mapsize);
 
         table.row();
 
-        table.button("$editor.openin", Icon.export, () -> {
+        table.button("@editor.openin", Icon.export, () -> {
             try{
                 Vars.ui.editor.beginEditMap(map.file);
                 dialog.hide();
                 hide();
             }catch(Exception e){
                 e.printStackTrace();
-                ui.showErrorMessage("$error.mapnotfound");
+                ui.showErrorMessage("@error.mapnotfound");
             }
         }).fillX().height(54f).marginLeft(10);
 
-        table.button(map.workshop && steam ? "$view.workshop" : "$delete", map.workshop && steam ? Icon.link : Icon.trash, () -> {
+        table.button(map.workshop && steam ? "@view.workshop" : "@delete", map.workshop && steam ? Icon.link : Icon.trash, () -> {
             if(map.workshop && steam){
                 platform.viewListing(map);
             }else{
-                ui.showConfirm("$confirm", Core.bundle.format("map.delete", map.name()), () -> {
+                ui.showConfirm("@confirm", Core.bundle.format("map.delete", map.name()), () -> {
                     maps.removeMap(map);
                     dialog.hide();
                     setup();
diff --git a/core/src/mindustry/ui/dialogs/MinimapDialog.java b/core/src/mindustry/ui/dialogs/MinimapDialog.java
index a045895354..d19dd5a1dd 100644
--- a/core/src/mindustry/ui/dialogs/MinimapDialog.java
+++ b/core/src/mindustry/ui/dialogs/MinimapDialog.java
@@ -13,7 +13,7 @@ import static mindustry.Vars.renderer;
 public class MinimapDialog extends BaseDialog{
 
     public MinimapDialog(){
-        super("$minimap");
+        super("@minimap");
         setFillParent(true);
 
         shown(this::setup);
diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java
index ddb72815b4..4695091886 100644
--- a/core/src/mindustry/ui/dialogs/ModsDialog.java
+++ b/core/src/mindustry/ui/dialogs/ModsDialog.java
@@ -3,6 +3,7 @@ package mindustry.ui.dialogs;
 import arc.*;
 import arc.Net.*;
 import arc.files.*;
+import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.scene.ui.TextButton.*;
@@ -20,10 +21,10 @@ import static mindustry.Vars.*;
 public class ModsDialog extends BaseDialog{
 
     public ModsDialog(){
-        super("$mods");
+        super("@mods");
         addCloseButton();
 
-        buttons.button("$mods.guide", Icon.link, () -> Core.app.openURI(modGuideURL)).size(210, 64f);
+        buttons.button("@mods.guide", Icon.link, () -> Core.app.openURI(modGuideURL)).size(210, 64f);
 
         shown(this::setup);
 
@@ -35,7 +36,7 @@ public class ModsDialog extends BaseDialog{
 
         shown(() -> Core.app.post(() -> {
             Core.settings.getBoolOnce("modsalpha", () -> {
-                ui.showText("$mods", "$mods.alphainfo");
+                ui.showText("@mods", "@mods.alphainfo");
             });
         }));
     }
@@ -44,7 +45,7 @@ public class ModsDialog extends BaseDialog{
         ui.loadfrag.hide();
 
         if(Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){
-            ui.showErrorMessage("$feature.unsupported");
+            ui.showErrorMessage("@feature.unsupported");
         }else{
             ui.showException(error);
         }
@@ -52,11 +53,11 @@ public class ModsDialog extends BaseDialog{
 
     void setup(){
         float h = 110f;
-        float w = mobile ? 430f : 524f;
+        float w = mobile ? 440f : 524f;
 
         cont.clear();
         cont.defaults().width(mobile ? 500 : 560f).pad(4);
-        cont.add("$mod.reloadrequired").visible(mods::requiresReload).center().get().setAlignment(Align.center);
+        cont.add("@mod.reloadrequired").visible(mods::requiresReload).center().get().setAlignment(Align.center);
         cont.row();
 
         cont.table(buttons -> {
@@ -65,8 +66,8 @@ public class ModsDialog extends BaseDialog{
             TextButtonStyle style = Styles.clearPartialt;
             float margin = 12f;
 
-            buttons.button("$mod.import", Icon.add, style, () -> {
-                BaseDialog dialog = new BaseDialog("$mod.import");
+            buttons.button("@mod.import", Icon.add, style, () -> {
+                BaseDialog dialog = new BaseDialog("@mod.import");
 
                 TextButtonStyle bstyle = Styles.cleart;
 
@@ -74,7 +75,7 @@ public class ModsDialog extends BaseDialog{
                     t.defaults().size(300f, 70f);
                     t.margin(12f);
 
-                    t.button("$mod.import.file", Icon.file, bstyle, () -> {
+                    t.button("@mod.import.file", Icon.file, bstyle, () -> {
                         dialog.hide();
 
                         platform.showMultiFileChooser(file -> {
@@ -90,7 +91,7 @@ public class ModsDialog extends BaseDialog{
 
                             //show unsafe jar file warning
                             if(file.extEquals("jar")){
-                                ui.showConfirm("$warning", "$mod.jarwarn", go);
+                                ui.showConfirm("@warning", "@mod.jarwarn", go);
                             }else{
                                 go.run();
                             }
@@ -99,38 +100,20 @@ public class ModsDialog extends BaseDialog{
 
                     t.row();
 
-                    t.button("$mod.import.github", Icon.github, bstyle, () -> {
+                    t.button("@mod.import.github", Icon.github, bstyle, () -> {
                         dialog.hide();
 
-                        ui.showTextInput("$mod.import.github", "", 64, Core.settings.getString("lastmod", "Anuken/ExampleMod"), text -> {
+                        ui.showTextInput("@mod.import.github", "", 64, Core.settings.getString("lastmod", "Anuken/ExampleMod"), text -> {
                             Core.settings.put("lastmod", text);
 
                             ui.loadfrag.show();
-                            Core.net.httpGet("http://api.github.com/repos/" + text + "/zipball/master", loc -> {
-                                Core.net.httpGet(loc.getHeader("Location"), result -> {
-                                    if(result.getStatus() != HttpStatus.OK){
-                                        ui.showErrorMessage(Core.bundle.format("connectfail", result.getStatus()));
-                                        ui.loadfrag.hide();
-                                    }else{
-                                        try{
-                                            Fi file = tmpDirectory.child(text.replace("/", "") + ".zip");
-                                            Streams.copy(result.getResultAsStream(), file.write(false));
-                                            mods.importMod(file);
-                                            file.delete();
-                                            Core.app.post(() -> {
-                                                try{
-                                                    setup();
-                                                    ui.loadfrag.hide();
-                                                }catch(Throwable e){
-                                                    ui.showException(e);
-                                                }
-                                            });
-                                        }catch(Throwable e){
-                                            modError(e);
-                                        }
-                                    }
-                                }, t2 -> Core.app.post(() -> modError(t2)));
-                            }, t2 -> Core.app.post(() -> modError(t2)));
+                            // Try to download the 6.0 branch first, but if it doesnt exist try master.
+                            githubImport("6.0", text, e1 -> {
+                                githubImport("master", text, e2 -> {
+                                    ui.showErrorMessage(Core.bundle.format("connectfail", e2));
+                                    ui.loadfrag.hide();
+                                });
+                            });
                         });
                     }).margin(12f);
                 });
@@ -141,7 +124,7 @@ public class ModsDialog extends BaseDialog{
             }).margin(margin);
 
             if(!mobile){
-                buttons.button("$mods.openfolder", Icon.link, style, () -> Core.app.openFolder(modDirectory.absolutePath())).margin(margin);
+                buttons.button("@mods.openfolder", Icon.link, style, () -> Core.app.openFolder(modDirectory.absolutePath())).margin(margin);
             }
         }).width(w);
 
@@ -153,7 +136,6 @@ public class ModsDialog extends BaseDialog{
 
                 boolean anyDisabled = false;
                 for(LoadedMod mod : mods.list()){
-                    String letter = (Strings.stripColors(mod.name).charAt(0) + "").toUpperCase();
 
                     if(!mod.enabled() && !anyDisabled && mods.list().size > 0){
                         anyDisabled = true;
@@ -166,45 +148,55 @@ public class ModsDialog extends BaseDialog{
                         t.top().left();
                         t.margin(12f);
 
-                        t.add(new BorderImage(){
-                            {
-                                if(mod.iconTexture != null){
-                                    setDrawable(new TextureRegion(mod.iconTexture));
-                                }else{
-                                    setDrawable(Tex.clear);
-                                }
-                            }
-
-                            @Override
-                            public void draw(){
-                                super.draw();
-
-                                if(mod.iconTexture == null){
-                                    Fonts.def.draw(letter, x + width/2f, y + height/2f, Align.center);
-                                }
-                            }
-                        }.border(Pal.accent)).size(h - 8f).padTop(-8f).padLeft(-8f).padRight(2f);
-
                         t.defaults().left().top();
                         t.table(title -> {
                             title.left();
-                            title.add("" + mod.meta.displayName() + "\n[lightgray]v" + mod.meta.version + (mod.enabled() ? "" : "\n" + Core.bundle.get("mod.disabled") + "")).wrap().width(170f).growX();
-                            title.add().growX();
 
-                            title.button(mod.enabled() ? "$mod.disable" : "$mod.enable", mod.enabled() ? Icon.downOpen : Icon.upOpen, Styles.transt, () -> {
+                            title.add(new BorderImage(){{
+                                if(mod.iconTexture != null){
+                                    setDrawable(new TextureRegion(mod.iconTexture));
+                                }else{
+                                    setDrawable(Tex.nomap);
+                                }
+                                border(Pal.accent);
+                            }}).size(h - 8f).padTop(-8f).padLeft(-8f).padRight(8f);
+
+                            title.table(text -> {
+                                boolean hideDisabled = !mod.isSupported() || mod.hasUnmetDependencies() || mod.hasContentErrors();
+
+                                text.add("" + mod.meta.displayName() + "\n[lightgray]v" + mod.meta.version + (mod.enabled() || hideDisabled ? "" : "\n" + Core.bundle.get("mod.disabled") + ""))
+                                    .wrap().top().width(300f).growX().left();
+
+                                text.row();
+
+                                if(mod.isOutdated()){
+                                    text.labelWrap("@mod.outdated").growX();
+                                    text.row();
+                                }else if(!mod.isSupported()){
+                                    text.labelWrap(Core.bundle.format("mod.requiresversion", mod.meta.minGameVersion)).growX();
+                                    text.row();
+                                }else if(mod.hasUnmetDependencies()){
+                                    text.labelWrap(Core.bundle.format("mod.missingdependencies", mod.missingDependencies.toString(", "))).growX();
+                                    t.row();
+                                }else if(mod.hasContentErrors()){
+                                    text.labelWrap("@mod.erroredcontent").growX();
+                                    text.row();
+                                }
+                            }).top().growX();
+
+                            title.add().growX();
+                        }).growX().growY().left();
+
+                        t.table(right -> {
+                            right.right();
+                            right.button(mod.enabled() ? Icon.downOpen : Icon.upOpen, Styles.clearPartiali, () -> {
                                 mods.setEnabled(mod, !mod.enabled());
                                 setup();
-                            }).height(50f).margin(8f).width(130f).disabled(!mod.isSupported());
+                            }).size(50f).disabled(!mod.isSupported());
 
-                            if(steam && !mod.hasSteamID()){
-                                title.button(Icon.download, Styles.clearTransi, () -> {
-                                    platform.publish(mod);
-                                }).size(50f);
-                            }
-
-                            title.button(mod.hasSteamID() ? Icon.link : Icon.trash, Styles.clearPartiali, () -> {
+                            right.button(mod.hasSteamID() ? Icon.link : Icon.trash, Styles.clearPartiali, () -> {
                                 if(!mod.hasSteamID()){
-                                    ui.showConfirm("$confirm", "$mod.remove.confirm", () -> {
+                                    ui.showConfirm("@confirm", "@mod.remove.confirm", () -> {
                                         mods.removeMod(mod);
                                         setup();
                                     });
@@ -212,26 +204,23 @@ public class ModsDialog extends BaseDialog{
                                     platform.viewListing(mod);
                                 }
                             }).size(50f);
-                        }).growX().left();
 
-                        t.row();
-                        if(!mod.isSupported()){
-                            t.labelWrap(Core.bundle.format("mod.requiresversion", mod.meta.minGameVersion)).growX();
-                            t.row();
-                        }else if(mod.hasUnmetDependencies()){
-                            t.labelWrap(Core.bundle.format("mod.missingdependencies", mod.missingDependencies.toString(", "))).growX();
-                            t.row();
-                        }else if(mod.hasContentErrors()){
-                            t.labelWrap("$mod.erroredcontent").growX();
-                            t.row();
-                        }
-                    }, Styles.clearPartialt, () -> showMod(mod)).size(w, h);
+                            if(steam && !mod.hasSteamID()){
+                                right.row();
+                                right.button(Icon.download, Styles.clearTransi, () -> {
+                                    platform.publish(mod);
+                                }).size(50f);
+                            }
+                        }).growX().right().padRight(-8f).padTop(-8f);
+
+
+                    }, Styles.clearPartialt, () -> showMod(mod)).size(w, h).growX().pad(4f);
                     table.row();
                 }
             });
 
         }else{
-            cont.table(Styles.black6, t -> t.add("$mods.none")).height(80f);
+            cont.table(Styles.black6, t -> t.add("@mods.none")).height(80f);
         }
 
         cont.row();
@@ -240,7 +229,7 @@ public class ModsDialog extends BaseDialog{
     }
 
     private void reload(){
-        ui.showInfo("$mods.reloadexit", () -> Core.app.exit());
+        ui.showInfo("@mods.reloadexit", () -> Core.app.exit());
     }
 
     private void showMod(LoadedMod mod){
@@ -249,7 +238,7 @@ public class ModsDialog extends BaseDialog{
         dialog.addCloseButton();
 
         if(!mobile){
-            dialog.buttons.button("$mods.openfolder", Icon.link, () -> Core.app.openFolder(mod.file.absolutePath()));
+            dialog.buttons.button("@mods.openfolder", Icon.link, () -> Core.app.openFolder(mod.file.absolutePath()));
         }
 
         //TODO improve this menu later
@@ -257,18 +246,18 @@ public class ModsDialog extends BaseDialog{
             desc.center();
             desc.defaults().padTop(10).left();
 
-            desc.add("$editor.name").padRight(10).color(Color.gray).padTop(0);
+            desc.add("@editor.name").padRight(10).color(Color.gray).padTop(0);
             desc.row();
             desc.add(mod.meta.displayName()).growX().wrap().padTop(2);
             desc.row();
             if(mod.meta.author != null){
-                desc.add("$editor.author").padRight(10).color(Color.gray);
+                desc.add("@editor.author").padRight(10).color(Color.gray);
                 desc.row();
                 desc.add(mod.meta.author).growX().wrap().padTop(2);
                 desc.row();
             }
             if(mod.meta.description != null){
-                desc.add("$editor.description").padRight(10).color(Color.gray).top();
+                desc.add("@editor.description").padRight(10).color(Color.gray).top();
                 desc.row();
                 desc.add(mod.meta.description).growX().wrap().padTop(2);
             }
@@ -277,7 +266,7 @@ public class ModsDialog extends BaseDialog{
             /*
             Array<UnlockableContent> all = Array.with(content.getContentMap()).<Content>flatten().select(c -> c.minfo.mod == mod && c instanceof UnlockableContent).as(UnlockableContent.class);
             if(all.any()){
-                desc.add("$mod.content").padRight(10).color(Color.gray).top();
+                desc.add("@mod.content").padRight(10).color(Color.gray).top();
                 desc.row();
                 desc.pane(cs -> {
                     int i = 0;
@@ -292,8 +281,33 @@ public class ModsDialog extends BaseDialog{
             }*/
         }).width(400f);
 
-
-
         dialog.show();
     }
+
+    private void githubImport(String branch, String repo, Cons<HttpStatus> err){
+        Core.net.httpGet("http://api.github.com/repos/" + repo + "/zipball/" + branch, loc -> {
+            Core.net.httpGet(loc.getHeader("Location"), result -> {
+                if(result.getStatus() != HttpStatus.OK){
+                    err.get(result.getStatus());
+                }else{
+                    try{
+                        Fi file = tmpDirectory.child(repo.replace("/", "") + ".zip");
+                        Streams.copy(result.getResultAsStream(), file.write(false));
+                        mods.importMod(file);
+                        file.delete();
+                        Core.app.post(() -> {
+                            try{
+                                setup();
+                                ui.loadfrag.hide();
+                            }catch(Throwable e){
+                                ui.showException(e);
+                            }
+                        });
+                    }catch(Throwable e){
+                        modError(e);
+                    }
+                }
+             }, t2 -> Core.app.post(() -> modError(t2)));
+         }, t2 -> Core.app.post(() -> modError(t2)));
+    }
 }
diff --git a/core/src/mindustry/ui/dialogs/PausedDialog.java b/core/src/mindustry/ui/dialogs/PausedDialog.java
index f37b1b8b4a..559450a591 100644
--- a/core/src/mindustry/ui/dialogs/PausedDialog.java
+++ b/core/src/mindustry/ui/dialogs/PausedDialog.java
@@ -12,7 +12,7 @@ public class PausedDialog extends BaseDialog{
     private boolean wasClient = false;
 
     public PausedDialog(){
-        super("$menu");
+        super("@menu");
         shouldPause = true;
 
         shown(this::rebuild);
@@ -36,35 +36,27 @@ public class PausedDialog extends BaseDialog{
         if(!mobile){
             //TODO localize
             cont.label(() -> state.getSector() == null ? "" :
-            "[lightgray]Next turn in [accent]" + state.getSector().displayTimeRemaining())
+            ("[lightgray]Next turn in [accent]" + state.getSector().displayTimeRemaining() +
+                (state.rules.winWave > 0 && !state.getSector().isCaptured() ? "\n[lightgray]Reach wave[accent] " + state.rules.winWave + "[] to capture" : "")))
             .visible(() -> state.getSector() != null).colspan(2);
             cont.row();
 
             float dw = 220f;
             cont.defaults().width(dw).height(55).pad(5f);
 
-            cont.button("$back", Icon.left, this::hide).colspan(2).width(dw * 2 + 20f);
-
-            cont.row();
-            //if(state.isCampaign()){
-            //    cont.button("$techtree", Icon.tree, ui.tech::show);
-            //}else{
-            //    cont.button("$database", Icon.book, ui.database::show);
-            //}
-            //TODO remove
-            cont.button("nothing", Icon.warning, () -> ui.showInfo("no"));
-            cont.button("$settings", Icon.settings, ui.settings::show);
+            cont.button("@back", Icon.left, this::hide);
+            cont.button("@settings", Icon.settings, ui.settings::show);
 
             if(!state.rules.tutorial){
                 if(!state.isCampaign() && !state.isEditor()){
                     cont.row();
-                    cont.button("$savegame", Icon.save, save::show);
-                    cont.button("$loadgame", Icon.upload, load::show).disabled(b -> net.active());
+                    cont.button("@savegame", Icon.save, save::show);
+                    cont.button("@loadgame", Icon.upload, load::show).disabled(b -> net.active());
                 }
 
                 cont.row();
 
-                cont.button("$hostserver", Icon.host, () -> {
+                cont.button("@hostserver", Icon.host, () -> {
                     if(net.server() && steam){
                         platform.inviteFriends();
                     }else{
@@ -74,39 +66,51 @@ public class PausedDialog extends BaseDialog{
                             ui.host.show();
                         }
                     }
-                }).disabled(b -> !((steam && net.server()) || !net.active())).colspan(2).width(dw * 2 + 20f).update(e -> e.setText(net.server() && steam ? "$invitefriends" : "$hostserver"));
+                }).disabled(b -> !((steam && net.server()) || !net.active())).colspan(2).width(dw * 2 + 20f).update(e -> e.setText(net.server() && steam ? "@invitefriends" : "@hostserver"));
             }
 
             cont.row();
 
-            cont.button("$quit", Icon.exit, this::showQuitConfirm).colspan(2).width(dw + 20f).update(s -> s.setText(control.saves.getCurrent() != null && control.saves.getCurrent().isAutosave() ? "$save.quit" : "$quit"));
+            cont.button("@quit", Icon.exit, this::showQuitConfirm).colspan(2).width(dw + 20f).update(s -> s.setText(control.saves.getCurrent() != null && control.saves.getCurrent().isAutosave() ? "@save.quit" : "@quit"));
 
         }else{
             cont.defaults().size(130f).pad(5);
-            cont.buttonRow("$back", Icon.play, this::hide);
-            cont.buttonRow("$settings", Icon.settings, ui.settings::show);
+            cont.buttonRow("@back", Icon.play, this::hide);
+            cont.buttonRow("@settings", Icon.settings, ui.settings::show);
 
             if(!state.isCampaign() && !state.isEditor()){
-                cont.buttonRow("$save", Icon.save, save::show);
+                cont.buttonRow("@save", Icon.save, save::show);
 
                 cont.row();
 
-                cont.buttonRow("$load", Icon.download, load::show).disabled(b -> net.active());
+                cont.buttonRow("@load", Icon.download, load::show).disabled(b -> net.active());
+            }else if(state.isCampaign()){
+                cont.buttonRow("@launchcore", Icon.up, () -> {
+                    hide();
+                    ui.planet.showLaunch(state.getSector(), player.team().core());
+                }).disabled(b -> player.team().core() == null);
+
+                cont.row();
+
+                cont.buttonRow("@planetmap", Icon.map, () -> {
+                    hide();
+                    ui.planet.show();
+                });
             }else{
                 cont.row();
             }
 
-            cont.buttonRow("$hostserver.mobile", Icon.host, ui.host::show).disabled(b -> net.active());
+            cont.buttonRow("@hostserver.mobile", Icon.host, ui.host::show).disabled(b -> net.active());
 
-            cont.buttonRow("$quit", Icon.exit, this::showQuitConfirm).update(s -> {
-                s.setText(control.saves.getCurrent() != null && control.saves.getCurrent().isAutosave() ? "$save.quit" : "$quit");
+            cont.buttonRow("@quit", Icon.exit, this::showQuitConfirm).update(s -> {
+                s.setText(control.saves.getCurrent() != null && control.saves.getCurrent().isAutosave() ? "@save.quit" : "@quit");
                 s.getLabelCell().growX().wrap();
             });
         }
     }
 
     void showQuitConfirm(){
-        ui.showConfirm("$confirm", state.rules.tutorial ? "$quit.confirm.tutorial" : "$quit.confirm", () -> {
+        ui.showConfirm("@confirm", state.rules.tutorial ? "@quit.confirm.tutorial" : "@quit.confirm", () -> {
             if(state.rules.tutorial){
                 Core.settings.put("playedtutorial", true);
             }
@@ -128,7 +132,7 @@ public class PausedDialog extends BaseDialog{
             return;
         }
 
-        ui.loadAnd("$saving", () -> {
+        ui.loadAnd("@saving", () -> {
             try{
                 control.saves.getCurrent().save();
             }catch(Throwable e){
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index 4d008d96e4..849a1cf34f 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -1,6 +1,7 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
+import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
@@ -11,17 +12,15 @@ import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
-import arc.struct.*;
 import arc.util.*;
 import arc.util.ArcAnnotate.*;
-import mindustry.content.*;
+import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
 import mindustry.type.*;
-import mindustry.type.Sector.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.storage.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
@@ -31,21 +30,24 @@ import static mindustry.graphics.g3d.PlanetRenderer.*;
 import static mindustry.ui.dialogs.PlanetDialog.Mode.*;
 
 public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
-    private final FrameBuffer buffer = new FrameBuffer(2, 2, true);
-    private final PlanetRenderer planets = renderer.planets;
-    private final LaunchLoadoutDialog loadouts = new LaunchLoadoutDialog();
-    private final Table stable  = new Table().background(Styles.black3);
+    final FrameBuffer buffer = new FrameBuffer(2, 2, true);
+    final PlanetRenderer planets = renderer.planets;
+    final LaunchLoadoutDialog loadouts = new LaunchLoadoutDialog();
+    final Table stable  = new Table().background(Styles.black3);
 
-    private int launchRange;
-    private float zoom = 1f, selectAlpha = 1f;
-    private @Nullable Sector selected, hovered, launchSector;
-    private CoreEntity launcher;
-    private Mode mode = look;
-    private boolean launching;
+    int launchRange;
+    float zoom = 1f, selectAlpha = 1f;
+    @Nullable Sector selected, hovered, launchSector;
+    CoreBuild launcher;
+    Mode mode = look;
+    boolean launching;
+    Cons<Sector> listener = s -> {};
 
     public PlanetDialog(){
         super("", Styles.fullDialog);
 
+        shouldPause = true;
+
         getCell(buttons).padBottom(-4);
         buttons.background(Styles.black).defaults().growX().height(64f).pad(0);
 
@@ -86,18 +88,41 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
     public Dialog show(){
         mode = look;
         selected = hovered = launchSector = null;
-        launching= false;
+        launching = false;
+        if(planets.planet.getLastSector() != null){
+            lookAt(planets.planet.getLastSector());
+        }
         return super.show();
     }
 
-    public void show(Sector sector, CoreEntity launcher){
+    public void showSelect(Sector sector, Cons<Sector> listener){
+        selected = null;
+        hovered = null;
+        launching = false;
+        this.listener = listener;
+
+        //update view to sector
+        lookAt(sector);
+        zoom = 1f;
+        planets.zoom = 2f;
+        selectAlpha = 0f;
+        launchSector = sector;
+
+        mode = select;
+
+        super.show();
+    }
+
+    public void showLaunch(Sector sector, CoreBuild launcher){
+        if(launcher == null) return;
+
         this.launcher = launcher;
         selected = null;
         hovered = null;
         launching = false;
 
         //update view to sector
-        planets.camPos.set(Tmp.v33.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()));
+        lookAt(sector);
         zoom = 1f;
         planets.zoom = 2f;
         selectAlpha = 0f;
@@ -109,11 +134,16 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         super.show();
     }
 
-    boolean canLaunch(Sector sector){
+    private void lookAt(Sector sector){
+        planets.camPos.set(Tmp.v33.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()));
+    }
+
+    boolean canSelect(Sector sector){
+        if(mode == select) return sector.hasBase();
+
         return mode == launch &&
             (sector.tile.v.within(launchSector.tile.v, (launchRange + 0.5f) * planets.planet.sectorApproxRadius*2) //within range
-            //TODO completely untested
-            || (sector.preset != null && sector.preset.unlocked() && sector.preset.requirements.contains(r -> r.zone() != null && r.zone() == sector.preset))); //is an unlocked preset
+            || (sector.preset != null && sector.preset.unlocked())); //is an unlocked preset
     }
 
     @Override
@@ -121,10 +151,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
         //draw all sector stuff
         for(Sector sec : planet.sectors){
+
             if(selectAlpha > 0.01f){
-                if(canLaunch(sec) || sec.unlocked()){
+                if(canSelect(sec) || sec.unlocked()){
                     if(sec.baseCoverage > 0){
-                        planets.fill(sec, Tmp.c1.set(Team.crux.color).a(0.1f * sec.baseCoverage * selectAlpha), -0.002f);
+                        planets.fill(sec, Tmp.c1.set(Team.crux.color).a(0.5f * sec.baseCoverage * selectAlpha), -0.002f);
                     }
 
                     Color color =
@@ -160,8 +191,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
         planets.batch.flush(Gl.triangles);
 
-        if(mode == launch){
-            if(hovered != launchSector && hovered != null && canLaunch(hovered)){
+        if(mode == launch || mode == select){
+            if(hovered != launchSector && hovered != null && canSelect(hovered)){
                 planets.drawArc(planet, launchSector.tile.v, hovered.tile.v);
             }
         }
@@ -184,7 +215,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             planets.drawPlane(hovered, () -> {
                 Draw.color(Color.white, Pal.accent, Mathf.absin(5f, 1f));
 
-                TextureRegion icon = hovered.locked() && !canLaunch(hovered) ? Icon.lock.getRegion() : hovered.is(SectorAttribute.naval) ? Liquids.water.icon(Cicon.large) : null;
+                TextureRegion icon = hovered.locked() && !canSelect(hovered) ? Icon.lock.getRegion() : null;
 
                 if(icon != null){
                     Draw.rect(icon, 0, 0);
@@ -210,7 +241,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                 addListener(new ElementGestureListener(){
                     @Override
                     public void tap(InputEvent event, float x, float y, int count, KeyCode button){
-                        if(hovered != null && (mode == launch ? canLaunch(hovered) && hovered != launchSector : hovered.unlocked())){
+                        if(hovered != null && (mode == launch ? canSelect(hovered) && hovered != launchSector : hovered.unlocked())){
                             selected = hovered;
                         }
 
@@ -230,7 +261,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         new Table(t -> {
             //TODO localize
             t.top();
-            t.label(() -> mode == launch ? "Select Launch Sector" : "Turn " + universe.turn()).style(Styles.outlineLabel).color(Pal.accent);
+            t.label(() -> mode == select ? "@sectors.select" : mode == launch ? "Select Launch Sector" : "Turn " + universe.turn()).style(Styles.outlineLabel).color(Pal.accent);
         })).grow();
 
     }
@@ -284,8 +315,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         selectAlpha = Mathf.lerpDelta(selectAlpha, Mathf.num(planets.zoom < 1.9f), 0.1f);
     }
 
-    //TODO localize
-    private void updateSelected(){
+    void updateSelected(){
         Sector sector = selected;
 
         if(sector == null){
@@ -299,29 +329,43 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
         stable.add("[accent]" + (sector.preset == null ? sector.id : sector.preset.localizedName)).row();
         stable.image().color(Pal.accent).fillX().height(3f).pad(3f).row();
-        stable.add(sector.save != null ? sector.save.getPlayTime() : "[lightgray]Unexplored").row();
+        stable.add(sector.save != null ? sector.save.getPlayTime() : "@sectors.unexplored").row();
+        if(sector.hasWaves() || sector.hasEnemyBase()){
+            stable.add("[accent]Difficulty: " + (int)(sector.baseCoverage * 10)).row();
+        }
 
         if(sector.hasBase() && sector.hasWaves()){
+            //TODO localize when finalized
+            //these mechanics are likely to change and as such are not added to the bundle
             stable.add("[scarlet]Under attack!");
             stable.row();
             stable.add("[accent]" + Mathf.ceil(sectorDestructionTurns - (sector.getSecondsPassed() * 60) / turnDuration) + " turn(s)\nuntil destruction");
             stable.row();
         }
 
-        stable.add("Resources:").row();
-        stable.table(t -> {
-            t.left();
-            int idx = 0;
-            int max = 5;
-            for(UnlockableContent c : sector.data.resources){
-                t.image(c.icon(Cicon.small)).padRight(3);
-                if(++idx % max == 0) t.row();
-            }
-        }).fillX().row();
+        if(sector.save != null){
+            stable.add("@sectors.resources").row();
+            stable.table(t -> {
+
+                if(sector.save != null && sector.save.meta.secinfo != null && sector.save.meta.secinfo.resources.any()){
+                    t.left();
+                    int idx = 0;
+                    int max = 5;
+                    for(UnlockableContent c : sector.save.meta.secinfo.resources){
+                        t.image(c.icon(Cicon.small)).padRight(3);
+                        if(++idx % max == 0) t.row();
+                    }
+                }else{
+                    t.add("@unknown").color(Color.lightGray);
+                }
+
+
+            }).fillX().row();
+        }
 
         //production
         if(sector.hasBase() && sector.save.meta.hasProduction){
-            stable.add("Production:").row();
+            stable.add("@sectors.production").row();
             stable.table(t -> {
                 t.left();
 
@@ -329,7 +373,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                     int total = (int)(stat.mean * 60);
                     if(total > 1){
                         t.image(item.icon(Cicon.small)).padRight(3);
-                        t.add(ui.formatAmount(total) + " /min").color(Color.lightGray);
+                        t.add(UI.formatAmount(total) + " " + Core.bundle.get("unit.perminute")).color(Color.lightGray);
                         t.row();
                     }
                 });
@@ -337,23 +381,20 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }
 
         //stored resources
-        if(sector.hasBase() && sector.save.meta.secinfo.coreItems.size > 0){
-            stable.add("Stored:").row();
+        if(sector.hasBase() && sector.save.meta.secinfo.coreItems.total > 0){
+            stable.add("@sectors.stored").row();
             stable.table(t -> {
                 t.left();
 
                 t.table(res -> {
-                    ObjectIntMap<Item> map = sector.save.meta.secinfo.getCurrentItems(sector);
+                    ItemSeq items = sector.calculateItems();
 
                     int i = 0;
-                    for(Item item : content.items()){
-                        int amount = Math.min(map.get(item), sector.save.meta.secinfo.storageCapacity);
-                        if(amount > 0){
-                            res.image(item.icon(Cicon.small)).padRight(3);
-                            res.add(ui.formatAmount(amount)).color(Color.lightGray);
-                            if(++i % 2 == 0){
-                                res.row();
-                            }
+                    for(ItemStack stack : items){
+                        res.image(stack.item.icon(Cicon.small)).padRight(3);
+                        res.add(UI.formatAmount(stack.amount)).color(Color.lightGray);
+                        if(++i % 2 == 0){
+                            res.row();
                         }
                     }
                 });
@@ -361,28 +402,15 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             }).row();
         }
 
-        //display how many turns this sector has been attacked
-        //TODO implement properly
-        /*
-        if(sector.getTurnsPassed() > 0 && sector.hasBase()){
-            stable.row();
-
-            stable.add("[scarlet]" + Iconc.warning + " " + sector.getTurnsPassed() + "x attacks");
-        }*/
-
         stable.row();
 
-        if((sector.hasBase() && mode == look) || canLaunch(sector) || sector.preset.alwaysUnlocked){
-            stable.button(sector.hasBase() ? "Resume" : "Launch", Styles.transt, () -> {
-                if(sector.is(SectorAttribute.naval)){
-                    ui.showInfo("You need a naval loadout to launch here.");
-                    return;
-                }
+        if((sector.hasBase() && mode == look) || canSelect(sector) || (sector.preset != null && sector.preset.alwaysUnlocked)){
+            stable.button(mode == select ? "@sectors.select" : sector.hasBase() ? "@sectors.resume" : "@sectors.launch", Styles.transt, () -> {
 
                 boolean shouldHide = true;
 
                 //save before launch.
-                if(control.saves.getCurrent() != null && state.isGame()){
+                if(control.saves.getCurrent() != null && state.isGame() && mode != select){
                     try{
                         control.saves.getCurrent().save();
                     }catch(Throwable e){
@@ -402,12 +430,14 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                         ui.hudfrag.showLaunchDirect();
                         Time.runTask(launchDuration, () -> control.playSector(current, sector));
                     });
+                }else if(mode == select){
+                    listener.get(sector);
                 }else{
                     control.playSector(sector);
                 }
 
                 if(shouldHide) hide();
-            }).growX().padTop(2f).height(50f).minWidth(170f);
+            }).growX().padTop(2f).height(50f).minWidth(170f).disabled(b -> state.rules.sector == sector && !state.isMenu());
         }
 
         stable.pack();
@@ -416,12 +446,12 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         stable.update(() -> {
             if(selected != null){
                 if(launching){
-                    stable.getColor().sub(0, 0, 0, 0.05f * Time.delta);
+                    stable.color.sub(0, 0, 0, 0.05f * Time.delta);
                 }else{
                     //fade out UI when not facing selected sector
                     Tmp.v31.set(selected.tile.v).rotate(Vec3.Y, -planets.planet.getRotation()).scl(-1f).nor();
                     float dot = planets.cam.direction.dot(Tmp.v31);
-                    stable.getColor().a = Math.max(dot, 0f)*2f;
+                    stable.color.a = Math.max(dot, 0f)*2f;
                     if(dot*2f <= -0.1f){
                         stable.remove();
                         selected = null;
@@ -438,6 +468,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         /** Look around for existing sectors. Can only deploy. */
         look,
         /** Launch to a new location. */
-        launch
+        launch,
+        /** Select a sector for some purpose. */
+        select
     }
 }
diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java
index f9e7e15392..155b6db9c4 100644
--- a/core/src/mindustry/ui/dialogs/ResearchDialog.java
+++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java
@@ -14,8 +14,10 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import arc.util.ArcAnnotate.*;
 import mindustry.content.*;
 import mindustry.content.TechTree.*;
+import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.game.Objectives.*;
 import mindustry.gen.*;
@@ -24,38 +26,93 @@ import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.ui.layout.*;
 import mindustry.ui.layout.TreeLayout.*;
-import mindustry.world.modules.*;
 
 import java.util.*;
 
 import static mindustry.Vars.*;
 
 public class ResearchDialog extends BaseDialog{
-    private final float nodeSize = Scl.scl(60f);
-    private ObjectSet<TechTreeNode> nodes = new ObjectSet<>();
-    private TechTreeNode root = new TechTreeNode(TechTree.root, null);
-    private Rect bounds = new Rect();
-    private View view;
+    final float nodeSize = Scl.scl(60f);
+    ObjectSet<TechTreeNode> nodes = new ObjectSet<>();
+    TechTreeNode root = new TechTreeNode(TechTree.root, null);
+    Rect bounds = new Rect();
+    ItemsDisplay itemDisplay;
+    View view;
+
+    ItemSeq items;
 
     public ResearchDialog(){
         super("");
 
         titleTable.remove();
         margin(0f).marginBottom(8);
-        cont.add(view = new View()).grow().get();
+        cont.stack(view = new View(), itemDisplay = new ItemsDisplay()).grow();
 
         shouldPause = true;
 
         shown(() -> {
+
+            items = new ItemSeq(){
+                //store sector item amounts for modifications
+                ObjectMap<Sector, ItemSeq> cache = new ObjectMap<>();
+
+                {
+                    //add global counts of each sector
+                    for(Planet planet : content.planets()){
+                        for(Sector sector : planet.sectors){
+                            if(sector.hasSave()){
+                                ItemSeq cached = sector.calculateItems();
+                                add(cached);
+                                cache.put(sector, cached);
+                            }
+                        }
+                    }
+                }
+
+                //this is the only method that actually modifies the sequence itself.
+                @Override
+                public void add(Item item, int amount){
+                    //only have custom removal logic for when the sequence gets items taken out of it (e.g. research)
+                    if(amount < 0){
+                        //remove items from each sector's storage, one by one
+
+                        //negate amount since it's being *removed* - this makes it positive
+                        amount = -amount;
+
+                        //% that gets removed from each sector
+                        double percentage = (double)amount / get(item);
+                        int[] counter = {amount};
+                        cache.each((sector, seq) -> {
+                            if(counter[0] == 0) return;
+
+                            //amount that will be removed
+                            int toRemove = Math.min((int)Math.ceil(percentage * seq.get(item)), counter[0]);
+
+                            //actually remove it from the sector
+                            sector.removeItem(item, toRemove);
+                            seq.remove(item, toRemove);
+
+                            counter[0] -= toRemove;
+                        });
+
+                        //negate again to display correct number
+                        amount = -amount;
+                    }
+
+                    super.add(item, amount);
+                }
+            };
+
             checkNodes(root);
             treeLayout();
+
         });
 
         hidden(ui.planet::setup);
 
         addCloseButton();
 
-        buttons.button("$database", Icon.book, () -> {
+        buttons.button("@database", Icon.book, () -> {
             hide();
             ui.database.show();
         }).size(210f, 64f);
@@ -64,7 +121,7 @@ public class ResearchDialog extends BaseDialog{
         addListener(new InputListener(){
             @Override
             public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY){
-                view.setScale(Mathf.clamp(view.getScaleX() - amountY / 10f * view.getScaleX(), 0.25f, 1f));
+                view.setScale(Mathf.clamp(view.scaleX - amountY / 10f * view.scaleX, 0.25f, 1f));
                 view.setOrigin(Align.center);
                 view.setTransform(true);
                 return true;
@@ -77,11 +134,13 @@ public class ResearchDialog extends BaseDialog{
             }
         });
 
-        addListener(new ElementGestureListener(){
+        touchable = Touchable.enabled;
+
+        addCaptureListener(new ElementGestureListener(){
             @Override
             public void zoom(InputEvent event, float initialDistance, float distance){
                 if(view.lastZoom < 0){
-                    view.lastZoom = view.getScaleX();
+                    view.lastZoom = view.scaleX;
                 }
 
                 view.setScale(Mathf.clamp(distance / initialDistance * view.lastZoom, 0.25f, 1f));
@@ -91,21 +150,30 @@ public class ResearchDialog extends BaseDialog{
 
             @Override
             public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
-                view.lastZoom = view.getScaleX();
+                view.lastZoom = view.scaleX;
             }
 
             @Override
             public void pan(InputEvent event, float x, float y, float deltaX, float deltaY){
-                view.panX += deltaX / view.getScaleX();
-                view.panY += deltaY / view.getScaleY();
+                view.panX += deltaX / view.scaleX;
+                view.panY += deltaY / view.scaleY;
                 view.moved = true;
                 view.clamp();
             }
         });
     }
 
-    ItemModule items(){
-        return state.rules.defaultTeam.items();
+    @Override
+    public Dialog show(){
+        Core.app.post(() -> {
+            if(net.client()){
+                //TODO make this not display every time
+                //TODO rework this in the future
+                ui.showInfo("@campaign.multiplayer");
+            }
+        });
+
+        return super.show();
     }
 
     void treeLayout(){
@@ -170,17 +238,24 @@ public class ResearchDialog extends BaseDialog{
     void checkNodes(TechTreeNode node){
         boolean locked = locked(node.node);
         if(!locked) node.visible = true;
+        node.selectable = selectable(node.node);
         for(TechTreeNode l : node.children){
             l.visible = !locked;
             checkNodes(l);
         }
+
+        itemDisplay.rebuild(items);
+    }
+
+    boolean selectable(TechNode node){
+        return node.content.unlocked() || !node.objectives.contains(i -> !i.complete());
     }
 
     void showToast(String info){
         Table table = new Table();
         table.actions(Actions.fadeOut(0.5f, Interp.fade), Actions.remove());
         table.top().add(info);
-        table.setName("toast");
+        table.name = "toast";
         table.update(() -> {
             table.toFront();
             table.setPosition(Core.graphics.getWidth() / 2f, Core.graphics.getHeight() - 21, Align.top);
@@ -207,7 +282,7 @@ public class ResearchDialog extends BaseDialog{
 
     class TechTreeNode extends TreeNode<TechTreeNode>{
         final TechNode node;
-        boolean visible = true;
+        boolean visible = true, selectable = true;
 
         TechTreeNode(TechNode node, TechTreeNode parent){
             this.node = node;
@@ -230,7 +305,7 @@ public class ResearchDialog extends BaseDialog{
         Table infoTable = new Table();
 
         {
-            infoTable.touchable(Touchable.enabled);
+            infoTable.touchable = Touchable.enabled;
 
             for(TechTreeNode node : nodes){
                 ImageButton button = new ImageButton(node.node.content.icon(Cicon.medium), Styles.nodei);
@@ -256,8 +331,8 @@ public class ResearchDialog extends BaseDialog{
                                 }
                             });
                         }
-                    }else if(items().has(node.node.requirements) && locked(node.node)){
-                        unlock(node.node);
+                    }else if(canSpend(node.node) && locked(node.node)){
+                        spend(node.node);
                     }
                 });
                 button.hovered(() -> {
@@ -273,15 +348,16 @@ public class ResearchDialog extends BaseDialog{
                     }
                 });
                 button.touchable(() -> !node.visible ? Touchable.disabled : Touchable.enabled);
-                button.setUserObject(node.node);
+                button.userObject = node.node;
                 button.setSize(nodeSize);
                 button.update(() -> {
                     float offset = (Core.graphics.getHeight() % 2) / 2f;
                     button.setPosition(node.x + panX + width / 2f, node.y + panY + height / 2f + offset, Align.center);
-                    button.getStyle().up = !locked(node.node) ? Tex.buttonOver : !items().has(node.node.requirements) ? Tex.buttonRed : Tex.button;
-                    ((TextureRegionDrawable)button.getStyle().imageUp)
-                    .setRegion(node.visible ? node.node.content.icon(Cicon.medium) : Icon.lock.getRegion());
-                    button.getImage().setColor(!locked(node.node) ? Color.white : Color.gray);
+                    button.getStyle().up = !locked(node.node) ? Tex.buttonOver : !selectable(node.node) || !canSpend(node.node) ? Tex.buttonRed : Tex.button;
+
+                    ((TextureRegionDrawable)button.getStyle().imageUp).setRegion(node.selectable ? node.node.content.icon(Cicon.medium) : Icon.lock.getRegion());
+                    button.getImage().setColor(!locked(node.node) ? Color.white : node.selectable ? Color.gray : Pal.gray);
+                    button.getImage().setScaling(Scaling.bounded);
                 });
                 addChild(button);
             }
@@ -313,9 +389,61 @@ public class ResearchDialog extends BaseDialog{
             panY = ry - bounds.y - oy;
         }
 
+        boolean canSpend(TechNode node){
+            if(!selectable(node)) return false;
+
+            if(node.requirements.length == 0) return true;
+
+            //can spend when there's at least 1 item that can be spent (non complete)
+            for(int i = 0; i < node.requirements.length; i++){
+                if(node.finishedRequirements[i].amount < node.requirements[i].amount && items.has(node.requirements[i].item)){
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void spend(TechNode node){
+            boolean complete = true;
+
+            boolean[] shine = new boolean[node.requirements.length];
+            boolean[] usedShine = new boolean[content.items().size];
+
+            for(int i = 0; i < node.requirements.length; i++){
+                ItemStack req = node.requirements[i];
+                ItemStack completed = node.finishedRequirements[i];
+
+                //amount actually taken from inventory
+                int used = Math.min(req.amount - completed.amount, items.get(req.item));
+                items.remove(req.item, used);
+                completed.amount += used;
+
+                if(used > 0){
+                    shine[i] = true;
+                    usedShine[req.item.id] = true;
+                }
+
+                //disable completion if the completed amount has not reached requirements
+                if(completed.amount < req.amount){
+                    complete = false;
+                }
+            }
+
+            if(complete){
+                unlock(node);
+            }
+
+            node.save();
+
+            //??????
+            Core.scene.act();
+            rebuild(shine);
+            itemDisplay.rebuild(items, usedShine);
+        }
+
         void unlock(TechNode node){
             node.content.unlock();
-            items().remove(node.requirements);
             showToast(Core.bundle.format("researched", node.content.localizedName));
             checkNodes(root);
             hoverNode = null;
@@ -327,6 +455,11 @@ public class ResearchDialog extends BaseDialog{
         }
 
         void rebuild(){
+            rebuild(null);
+        }
+
+        //pass an array of stack indexes that should shine here
+        void rebuild(@Nullable boolean[] shine){
             ImageButton button = hoverNode;
 
             infoTable.remove();
@@ -335,7 +468,7 @@ public class ResearchDialog extends BaseDialog{
 
             if(button == null) return;
 
-            TechNode node = (TechNode)button.getUserObject();
+            TechNode node = (TechNode)button.userObject;
 
             infoTable.exited(() -> {
                 if(hoverNode == button && !infoTable.hasMouse() && !hoverNode.hasMouse()){
@@ -344,42 +477,92 @@ public class ResearchDialog extends BaseDialog{
                 }
             });
 
-            infoTable.update(() -> infoTable.setPosition(button.getX() + button.getWidth(), button.getY() + button.getHeight(), Align.topLeft));
+            infoTable.update(() -> infoTable.setPosition(button.x + button.getWidth(), button.y + button.getHeight(), Align.topLeft));
 
             infoTable.left();
             infoTable.background(Tex.button).margin(8f);
 
+            boolean selectable = selectable(node);
+
             infoTable.table(b -> {
                 b.margin(0).left().defaults().left();
 
-                b.button(Icon.info, Styles.cleari, () -> ui.content.show(node.content)).growY().width(50f);
+                if(selectable){
+                    b.button(Icon.info, Styles.cleari, () -> ui.content.show(node.content)).growY().width(50f);
+                }
                 b.add().grow();
                 b.table(desc -> {
                     desc.left().defaults().left();
-                    desc.add(node.content.localizedName);
+                    desc.add(selectable ? node.content.localizedName : "[accent]???");
                     desc.row();
                     if(locked(node)){
+
                         desc.table(t -> {
                             t.left();
-                            for(ItemStack req : node.requirements){
-                                t.table(list -> {
-                                    list.left();
-                                    list.image(req.item.icon(Cicon.small)).size(8 * 3).padRight(3);
-                                    list.add(req.item.localizedName).color(Color.lightGray);
-                                    list.label(() -> " " + (player.team().core() != null ? Math.min(player.team().core().items.get(req.item), req.amount) + " / " : "") + req.amount)
-                                    .update(l -> l.setColor(items().has(req.item, req.amount) ? Color.lightGray : Color.scarlet));//TODO
-                                }).fillX().left();
-                                t.row();
-                            }
+                            if(selectable){
 
-                            //TODO test if this works
-                            if(node.objectives.length > 0){
+                                //check if there is any progress, add research progress text
+                                if(Structs.contains(node.finishedRequirements, s -> s.amount > 0)){
+                                    float sum = 0f, used = 0f;
+                                    boolean shiny = false;
+
+                                    for(int i = 0; i < node.requirements.length; i++){
+                                        sum += node.requirements[i].item.cost * node.requirements[i].amount;
+                                        used += node.finishedRequirements[i].item.cost * node.finishedRequirements[i].amount;
+                                        if(shine != null) shiny |= shine[i];
+                                    }
+
+                                    int percent = (int)(used / sum * 100);
+                                    Label label = t.add(Core.bundle.format("research.progress", percent)).left().get();
+
+                                    if(shiny){
+                                        label.setColor(Pal.accent);
+                                        label.actions(Actions.color(Color.lightGray, 0.75f, Interp.fade));
+                                    }else{
+                                        label.setColor(Color.lightGray);
+                                    }
+
+                                    t.row();
+                                }
+
+                                for(int i = 0; i < node.requirements.length; i++){
+                                    ItemStack req = node.requirements[i];
+                                    ItemStack completed = node.finishedRequirements[i];
+
+                                    //skip finished stacks
+                                    if(req.amount <= completed.amount) continue;
+                                    boolean shiny = shine != null && shine[i];
+
+                                    t.table(list -> {
+                                        int reqAmount = req.amount - completed.amount;
+
+                                        list.left();
+                                        list.image(req.item.icon(Cicon.small)).size(8 * 3).padRight(3);
+                                        list.add(req.item.localizedName).color(Color.lightGray);
+                                        Label label = list.label(() -> " " +
+                                                UI.formatAmount(Math.min(items.get(req.item), reqAmount)) + " / "
+                                            + UI.formatAmount(reqAmount)).get();
+
+                                        Color targetColor = items.has(req.item) ? Color.lightGray : Color.scarlet;
+
+                                        if(shiny){
+                                            label.setColor(Pal.accent);
+                                            label.actions(Actions.color(targetColor, 0.75f, Interp.fade));
+                                        }else{
+                                            label.setColor(targetColor);
+                                        }
+
+                                    }).fillX().left();
+                                    t.row();
+                                }
+                            }else if(node.objectives.size > 0){
                                 t.table(r -> {
-                                    r.add("$complete").colspan(2).left();
+                                    r.add("@complete").colspan(2).left();
                                     r.row();
                                     for(Objective o : node.objectives){
-                                        r.image(Icon.right).padRight(4);
-                                        r.add(o.display()).color(Color.lightGray);
+                                        if(o.complete()) continue;
+
+                                        r.add("> " + o.display()).color(Color.lightGray).left();
                                         r.image(o.complete() ? Icon.ok : Icon.cancel, o.complete() ? Color.lightGray : Color.scarlet).padLeft(3);
                                         r.row();
                                     }
@@ -388,19 +571,19 @@ public class ResearchDialog extends BaseDialog{
                             }
                         });
                     }else{
-                        desc.add("$completed");
+                        desc.add("@completed");
                     }
                 }).pad(9);
 
                 if(mobile && locked(node)){
                     b.row();
-                    b.button("$research", Icon.ok, Styles.nodet, () -> unlock(node))
-                    .disabled(i -> !items().has(node.requirements)).growX().height(44f).colspan(3);
+                    b.button("@research", Icon.ok, Styles.nodet, () -> spend(node))
+                    .disabled(i -> !canSpend(node)).growX().height(44f).colspan(3);
                 }
             });
 
             infoTable.row();
-            if(node.content.description != null){
+            if(node.content.description != null && selectable){
                 infoTable.table(t -> t.margin(3f).left().labelWrap(node.content.displayDescription()).color(Color.lightGray).growX()).fillX();
             }
 
@@ -413,13 +596,16 @@ public class ResearchDialog extends BaseDialog{
         public void drawChildren(){
             clamp();
             float offsetX = panX + width / 2f, offsetY = panY + height / 2f;
+            Draw.sort(true);
 
             for(TechTreeNode node : nodes){
                 if(!node.visible) continue;
                 for(TechTreeNode child : node.children){
                     if(!child.visible) continue;
+                    boolean lock = locked(node.node) || locked(child.node);
+                    Draw.z(lock ? 1f : 2f);
 
-                    Lines.stroke(Scl.scl(4f), locked(node.node) || locked(child.node) ? Pal.gray : Pal.accent);
+                    Lines.stroke(Scl.scl(4f), lock ? Pal.gray : Pal.accent);
                     Draw.alpha(parentAlpha);
                     if(Mathf.equal(Math.abs(node.y - child.y), Math.abs(node.x - child.x), 1f) && Mathf.dstm(node.x, node.y, child.x, child.y) <= node.width*3){
                         Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY);
@@ -430,6 +616,7 @@ public class ResearchDialog extends BaseDialog{
                 }
             }
 
+            Draw.sort(false);
             Draw.reset();
             super.drawChildren();
         }
diff --git a/core/src/mindustry/ui/dialogs/SaveDialog.java b/core/src/mindustry/ui/dialogs/SaveDialog.java
index 143206eecf..909dd113d1 100644
--- a/core/src/mindustry/ui/dialogs/SaveDialog.java
+++ b/core/src/mindustry/ui/dialogs/SaveDialog.java
@@ -11,7 +11,7 @@ import static mindustry.Vars.*;
 public class SaveDialog extends LoadDialog{
 
     public SaveDialog(){
-        super("$savegame");
+        super("@savegame");
 
         update(() -> {
             if(state.isMenu() && isShown()){
@@ -23,9 +23,9 @@ public class SaveDialog extends LoadDialog{
     @Override
     public void addSetup(){
 
-        buttons.button("$save.new", Icon.add, () ->
-            ui.showTextInput("$save", "$save.newslot", 30, "",
-            text -> ui.loadAnd("$saving", () -> {
+        buttons.button("@save.new", Icon.add, () ->
+            ui.showTextInput("@save", "@save.newslot", 30, "",
+            text -> ui.loadAnd("@saving", () -> {
             control.saves.addSave(text);
             Core.app.post(() -> Core.app.post(this::setup));
         }))).fillX().margin(10f);
@@ -36,13 +36,13 @@ public class SaveDialog extends LoadDialog{
         button.clicked(() -> {
             if(button.childrenPressed()) return;
 
-            ui.showConfirm("$overwrite", "$save.overwrite", () -> save(slot));
+            ui.showConfirm("@overwrite", "@save.overwrite", () -> save(slot));
         });
     }
 
     void save(SaveSlot slot){
 
-        ui.loadfrag.show("$saving");
+        ui.loadfrag.show("@saving");
 
         Time.runTask(5f, () -> {
             hide();
diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
index e26ab13a93..7a2afbbd1e 100644
--- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java
+++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
@@ -10,8 +10,8 @@ import arc.scene.ui.*;
 import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
-import arc.struct.*;
 import arc.util.*;
+import mindustry.Vars;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -28,14 +28,14 @@ public class SchematicsDialog extends BaseDialog{
     private TextField searchField;
 
     public SchematicsDialog(){
-        super("$schematics");
+        super("@schematics");
         Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> {
             ((Texture)t).setWrap(TextureWrap.repeat);
         };
 
         shouldPause = true;
         addCloseButton();
-        buttons.button("$schematic.import", Icon.download, this::showImport);
+        buttons.button("@schematic.import", Icon.download, this::showImport);
         shown(this::setup);
         onResize(this::setup);
     }
@@ -64,8 +64,12 @@ public class SchematicsDialog extends BaseDialog{
 
             t.update(() -> {
                 if(Core.input.keyTap(Binding.chat) && Core.scene.getKeyboardFocus() == searchField && firstSchematic != null){
-                    control.input.useSchematic(firstSchematic);
-                    hide();
+                    if(!Vars.state.rules.schematicsAllowed){
+                        ui.showInfo("@schematic.disabled");
+                    }else{
+                        control.input.useSchematic(firstSchematic);
+                        hide();
+                    }
                 }
             });
 
@@ -74,7 +78,7 @@ public class SchematicsDialog extends BaseDialog{
 
                 t.clear();
                 int i = 0;
-                String regex = "[`~!@#$%^&*()-_=+[{]}|;:'\",<.>/?]";
+                String regex = "[`~!@#$%^&*()-_=+{}|;:'\",<.>/?]";
                 String searchString = search.toLowerCase().replaceAll(regex, " ");
 
                 firstSchematic = null;
@@ -102,11 +106,11 @@ public class SchematicsDialog extends BaseDialog{
                             });
 
                             buttons.button(Icon.pencil, style, () -> {
-                                ui.showTextInput("$schematic.rename", "$name", s.name(), res -> {
+                                ui.showTextInput("@schematic.rename", "@name", s.name(), res -> {
                                     Schematic replacement = schematics.all().find(other -> other.name().equals(res) && other != s);
                                     if(replacement != null){
                                         //renaming to an existing schematic is not allowed, as it is not clear how the tags would be merged, and which one should be removed
-                                        ui.showErrorMessage("$schematic.exists");
+                                        ui.showErrorMessage("@schematic.exists");
                                         return;
                                     }
 
@@ -123,7 +127,7 @@ public class SchematicsDialog extends BaseDialog{
                                     if(s.mod != null){
                                         ui.showInfo(Core.bundle.format("mod.item.remove", s.mod.meta.displayName()));
                                     }else{
-                                        ui.showConfirm("$confirm", "$schematic.delete.confirm", () -> {
+                                        ui.showConfirm("@confirm", "@schematic.delete.confirm", () -> {
                                             schematics.remove(s);
                                             rebuildPane[0].run();
                                         });
@@ -146,8 +150,12 @@ public class SchematicsDialog extends BaseDialog{
                         if(state.isMenu()){
                             showInfo(s);
                         }else{
-                            control.input.useSchematic(s);
-                            hide();
+                            if(!Vars.state.rules.schematicsAllowed){
+                                ui.showInfo("@schematic.disabled");
+                            }else{
+                                control.input.useSchematic(s);
+                                hide();
+                            }
                         }
                     }).pad(4).style(Styles.cleari).get();
 
@@ -159,7 +167,7 @@ public class SchematicsDialog extends BaseDialog{
                 }
 
                 if(firstSchematic == null){
-                    t.add("$none");
+                    t.add("@none");
                 }
             };
 
@@ -172,28 +180,28 @@ public class SchematicsDialog extends BaseDialog{
     }
 
     public void showImport(){
-        BaseDialog dialog = new BaseDialog("$editor.export");
+        BaseDialog dialog = new BaseDialog("@editor.export");
         dialog.cont.pane(p -> {
             p.margin(10f);
             p.table(Tex.button, t -> {
                 TextButtonStyle style = Styles.cleart;
                 t.defaults().size(280f, 60f).left();
                 t.row();
-                t.button("$schematic.copy.import", Icon.copy, style, () -> {
+                t.button("@schematic.copy.import", Icon.copy, style, () -> {
                     dialog.hide();
                     try{
                         Schematic s = Schematics.readBase64(Core.app.getClipboardText());
                         s.removeSteamID();
                         schematics.add(s);
                         setup();
-                        ui.showInfoFade("$schematic.saved");
+                        ui.showInfoFade("@schematic.saved");
                         showInfo(s);
                     }catch(Throwable e){
                         ui.showException(e);
                     }
                 }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith(schematicBaseStart));
                 t.row();
-                t.button("$schematic.importfile", Icon.download, style, () -> platform.showFileChooser(true, schematicExtension, file -> {
+                t.button("@schematic.importfile", Icon.download, style, () -> platform.showFileChooser(true, schematicExtension, file -> {
                     dialog.hide();
 
                     try{
@@ -208,7 +216,7 @@ public class SchematicsDialog extends BaseDialog{
                 })).marginLeft(12f);
                 t.row();
                 if(steam){
-                    t.button("$schematic.browseworkshop", Icon.book, style, () -> {
+                    t.button("@schematic.browseworkshop", Icon.book, style, () -> {
                         dialog.hide();
                         platform.openWorkshop();
                     }).marginLeft(12f);
@@ -221,25 +229,25 @@ public class SchematicsDialog extends BaseDialog{
     }
 
     public void showExport(Schematic s){
-        BaseDialog dialog = new BaseDialog("$editor.export");
+        BaseDialog dialog = new BaseDialog("@editor.export");
         dialog.cont.pane(p -> {
            p.margin(10f);
            p.table(Tex.button, t -> {
                TextButtonStyle style = Styles.cleart;
                 t.defaults().size(280f, 60f).left();
                 if(steam && !s.hasSteamID()){
-                    t.button("$schematic.shareworkshop", Icon.book, style,
+                    t.button("@schematic.shareworkshop", Icon.book, style,
                         () -> platform.publish(s)).marginLeft(12f);
                     t.row();
                     dialog.hide();
                 }
-                t.button("$schematic.copy", Icon.copy, style, () -> {
+                t.button("@schematic.copy", Icon.copy, style, () -> {
                     dialog.hide();
-                    ui.showInfoFade("$copied");
+                    ui.showInfoFade("@copied");
                     Core.app.setClipboardText(schematics.writeBase64(s));
                 }).marginLeft(12f);
                 t.row();
-                t.button("$schematic.exportfile", Icon.export, style, () -> {
+                t.button("@schematic.exportfile", Icon.export, style, () -> {
                     dialog.hide();
                     platform.export(s.name(), schematicExtension, file -> Schematics.write(s, file));
                 }).marginLeft(12f);
@@ -277,8 +285,8 @@ public class SchematicsDialog extends BaseDialog{
 
         @Override
         public void draw(){
-            boolean checked = getParent().getParent() instanceof Button
-                && ((Button)getParent().getParent()).isOver();
+            boolean checked = parent.parent instanceof Button
+                && ((Button)parent.parent).isOver();
 
             boolean wasSet = set;
             if(!set){
@@ -333,7 +341,7 @@ public class SchematicsDialog extends BaseDialog{
             cont.add(new SchematicImage(schem)).maxSize(800f);
             cont.row();
 
-            Seq<ItemStack> arr = schem.requirements();
+            ItemSeq arr = schem.requirements();
             cont.table(r -> {
                 int i = 0;
                 for(ItemStack s : arr){
diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index ce843d1b67..8dd9753fda 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -82,18 +82,18 @@ public class SettingsMenuDialog extends SettingsDialog{
         prefs.clearChildren();
         prefs.add(menu);
 
-        dataDialog = new BaseDialog("$settings.data");
+        dataDialog = new BaseDialog("@settings.data");
         dataDialog.addCloseButton();
 
         dataDialog.cont.table(Tex.button, t -> {
-            t.defaults().size(270f, 60f).left();
+            t.defaults().size(280f, 60f).left();
             TextButtonStyle style = Styles.cleart;
 
-            t.button("$settings.cleardata", Icon.trash, style, () -> ui.showConfirm("$confirm", "$settings.clearall.confirm", () -> {
+            t.button("@settings.cleardata", Icon.trash, style, () -> ui.showConfirm("@confirm", "@settings.clearall.confirm", () -> {
                 ObjectMap<String, Object> map = new ObjectMap<>();
                 for(String value : Core.settings.keys()){
                     if(value.contains("usid") || value.contains("uuid")){
-                        map.put(value, Core.settings.getString(value));
+                        map.put(value, Core.settings.get(value, null));
                     }
                 }
                 Core.settings.clear();
@@ -104,11 +104,19 @@ public class SettingsMenuDialog extends SettingsDialog{
                 }
 
                 Core.app.exit();
-            }));
+            })).marginLeft(4);
 
             t.row();
 
-            t.button("$data.export", Icon.upload, style, () -> {
+            t.button("@settings.clearsaves", Icon.trash, style, () -> {
+                ui.showConfirm("@confirm", "@settings.clearsaves.confirm", () -> {
+                    control.saves.deleteAll();
+                });
+            }).marginLeft(4);
+
+            t.row();
+
+            t.button("@data.export", Icon.upload, style, () -> {
                 if(ios){
                     Fi file = Core.files.local("mindustry-data-export.zip");
                     try{
@@ -121,36 +129,36 @@ public class SettingsMenuDialog extends SettingsDialog{
                     platform.showFileChooser(false, "zip", file -> {
                         try{
                             exportData(file);
-                            ui.showInfo("$data.exported");
+                            ui.showInfo("@data.exported");
                         }catch(Exception e){
                             e.printStackTrace();
                             ui.showException(e);
                         }
                     });
                 }
-            });
+            }).marginLeft(4);
 
             t.row();
 
-            t.button("$data.import", Icon.download, style, () -> ui.showConfirm("$confirm", "$data.import.confirm", () -> platform.showFileChooser(true, "zip", file -> {
+            t.button("@data.import", Icon.download, style, () -> ui.showConfirm("@confirm", "@data.import.confirm", () -> platform.showFileChooser(true, "zip", file -> {
                 try{
                     importData(file);
                     Core.app.exit();
                 }catch(IllegalArgumentException e){
-                    ui.showErrorMessage("$data.invalid");
+                    ui.showErrorMessage("@data.invalid");
                 }catch(Exception e){
                     e.printStackTrace();
                     if(e.getMessage() == null || !e.getMessage().contains("too short")){
                         ui.showException(e);
                     }else{
-                        ui.showErrorMessage("$data.invalid");
+                        ui.showErrorMessage("@data.invalid");
                     }
                 }
-            })));
+            }))).marginLeft(4);
 
             if(!mobile){
                 t.row();
-                t.button("$data.openfolder", Icon.folder, style, () -> Core.app.openFolder(Core.settings.getDataDirectory().absolutePath()));
+                t.button("@data.openfolder", Icon.folder, style, () -> Core.app.openFolder(Core.settings.getDataDirectory().absolutePath())).marginLeft(4);
             }
         });
 
@@ -189,20 +197,20 @@ public class SettingsMenuDialog extends SettingsDialog{
         TextButtonStyle style = Styles.cleart;
 
         menu.defaults().size(300f, 60f);
-        menu.button("$settings.game", style, () -> visible(0));
+        menu.button("@settings.game", style, () -> visible(0));
         menu.row();
-        menu.button("$settings.graphics", style, () -> visible(1));
+        menu.button("@settings.graphics", style, () -> visible(1));
         menu.row();
-        menu.button("$settings.sound", style, () -> visible(2));
+        menu.button("@settings.sound", style, () -> visible(2));
         menu.row();
-        menu.button("$settings.language", style, ui.language::show);
+        menu.button("@settings.language", style, ui.language::show);
         if(!mobile || Core.settings.getBool("keyboard")){
             menu.row();
-            menu.button("$settings.controls", style, ui.controls::show);
+            menu.button("@settings.controls", style, ui.controls::show);
         }
 
         menu.row();
-        menu.button("$settings.data", style, () -> dataDialog.show());
+        menu.button("@settings.data", style, () -> dataDialog.show());
     }
 
     void addSettings(){
@@ -260,7 +268,7 @@ public class SettingsMenuDialog extends SettingsDialog{
         game.pref(new Setting(){
             @Override
             public void add(SettingsTable table){
-                table.button("$tutorial.retake", () -> {
+                table.button("@tutorial.retake", () -> {
                     hide();
                     control.playTutorial();
                 }).size(220f, 60f).pad(6).left();
@@ -355,7 +363,7 @@ public class SettingsMenuDialog extends SettingsDialog{
             }
         });
 
-        graphics.checkPref("linear", true, b -> {
+        graphics.checkPref("linear", !mobile, b -> {
             for(Texture tex : Core.atlas.getTextures()){
                 TextureFilter filter = b ? TextureFilter.linear : TextureFilter.nearest;
                 tex.setFilter(filter, filter);
@@ -411,6 +419,9 @@ public class SettingsMenuDialog extends SettingsDialog{
 
         zipped.walk(f -> f.copyTo(base.child(f.path())));
         dest.delete();
+
+        //load data so it's saved on exit
+        settings.load();
     }
 
     private void back(){
@@ -426,7 +437,7 @@ public class SettingsMenuDialog extends SettingsDialog{
 
     @Override
     public void addCloseButton(){
-        buttons.button("$back", Icon.leftOpen, () -> {
+        buttons.button("@back", Icon.leftOpen, () -> {
             if(prefs.getChildren().first() != menu){
                 back();
             }else{
diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java
index f6d1a6a5f6..4bc0945020 100644
--- a/core/src/mindustry/ui/dialogs/TraceDialog.java
+++ b/core/src/mindustry/ui/dialogs/TraceDialog.java
@@ -8,7 +8,7 @@ import mindustry.net.Administration.TraceInfo;
 public class TraceDialog extends BaseDialog{
 
     public TraceDialog(){
-        super("$trace");
+        super("@trace");
 
         addCloseButton();
         setFillParent(false);
diff --git a/core/src/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/mindustry/ui/fragments/BlockConfigFragment.java
index b111a9c551..1523508aa4 100644
--- a/core/src/mindustry/ui/fragments/BlockConfigFragment.java
+++ b/core/src/mindustry/ui/fragments/BlockConfigFragment.java
@@ -7,17 +7,18 @@ import arc.scene.actions.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 
 import static mindustry.Vars.*;
 
 public class BlockConfigFragment extends Fragment{
-    private Table table = new Table();
-    private Building configTile;
+    Table table = new Table();
+    Building configTile;
 
     @Override
     public void build(Group parent){
-        table.visible(false);
+        table.visible = false;
         parent.addChild(table);
 
         //hacky way to hide block config when in menu
@@ -27,15 +28,20 @@ public class BlockConfigFragment extends Fragment{
             public void act(float delta){
                 super.act(delta);
                 if(state.isMenu()){
-                    table.visible(false);
+                    table.visible = false;
                     configTile = null;
                 }
             }
         });
+
+        Events.on(ResetEvent.class, e -> {
+            table.visible = false;
+            configTile = null;
+        });
     }
 
     public boolean isShown(){
-        return table.isVisible() && configTile != null;
+        return table.visible && configTile != null;
     }
 
     public Building getSelectedTile(){
@@ -46,7 +52,7 @@ public class BlockConfigFragment extends Fragment{
         if(tile.configTapped()){
             configTile = tile;
 
-            table.visible(true);
+            table.visible = true;
             table.clear();
             tile.buildConfiguration(table);
             table.pack();
@@ -61,7 +67,7 @@ public class BlockConfigFragment extends Fragment{
                 }
 
                 table.setOrigin(Align.center);
-                if(configTile == null || configTile.block() == Blocks.air || !configTile.isValid()){
+                if(configTile == null || configTile.block == Blocks.air || !configTile.isValid()){
                     hideConfig();
                 }else{
                     configTile.updateTableAlign(table);
diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
index 4ec5a83e5f..515a7ef05c 100644
--- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
+++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
@@ -31,12 +31,12 @@ public class BlockInventoryFragment extends Fragment{
     private static final float holdWithdraw = 20f;
     private static final float holdShrink = 120f;
 
-    private Table table = new Table();
-    private Building tile;
-    private float holdTime = 0f, emptyTime;
-    private boolean holding;
-    private float[] shrinkHoldTimes = new float[content.items().size];
-    private Item lastItem;
+    Table table = new Table();
+    Building tile;
+    float holdTime = 0f, emptyTime;
+    boolean holding;
+    float[] shrinkHoldTimes = new float[content.items().size];
+    Item lastItem;
 
     {
         Events.on(WorldLoadEvent.class, e -> hide());
@@ -44,10 +44,12 @@ public class BlockInventoryFragment extends Fragment{
 
     @Remote(called = Loc.server, targets = Loc.both, forward = true)
     public static void requestItem(Player player, Building tile, Item item, int amount){
-        if(player == null || tile == null || !tile.interactable(player.team())) return;
-        amount = Mathf.clamp(amount, 0, player.unit().itemCapacity());
+        if(player == null || tile == null || !tile.interactable(player.team()) || !player.within(tile, buildingRange)) return;
+        amount = Math.min(player.unit().maxAccepted(item), amount);
         int fa = amount;
 
+        if(amount == 0) return;
+
         if(net.server() && (!Units.canInteract(player, tile) ||
             !netServer.admins.allowAction(player, ActionType.withdrawItem, tile.tile(), action -> {
                 action.item = item;
@@ -65,7 +67,7 @@ public class BlockInventoryFragment extends Fragment{
 
     @Override
     public void build(Group parent){
-        table.setName("inventory");
+        table.name = "inventory";
         table.setTransform(true);
         parent.setTransform(true);
         parent.addChild(table);
@@ -77,7 +79,7 @@ public class BlockInventoryFragment extends Fragment{
             return;
         }
         this.tile = t;
-        if(tile == null || !tile.block().isAccessible() || tile.items.total() == 0)
+        if(tile == null || !tile.block.isAccessible() || tile.items.total() == 0)
             return;
         rebuild(true);
     }
@@ -90,7 +92,7 @@ public class BlockInventoryFragment extends Fragment{
             table.clearListeners();
             table.update(null);
         }), Actions.visible(false));
-        table.touchable(Touchable.disabled);
+        table.touchable = Touchable.disabled;
         tile = null;
     }
 
@@ -103,10 +105,10 @@ public class BlockInventoryFragment extends Fragment{
         table.clearChildren();
         table.clearActions();
         table.background(Tex.inventory);
-        table.touchable(Touchable.enabled);
+        table.touchable = Touchable.enabled;
         table.update(() -> {
 
-            if(state.isMenu() || tile == null || !tile.isValid() || !tile.block().isAccessible() || emptyTime >= holdShrink){
+            if(state.isMenu() || tile == null || !tile.isValid() || !tile.block.isAccessible() || emptyTime >= holdShrink){
                 hide();
             }else{
                 if(tile.items.total() == 0){
@@ -129,7 +131,7 @@ public class BlockInventoryFragment extends Fragment{
                 }
 
                 updateTablePosition();
-                if(tile.block().hasItems){
+                if(tile.block.hasItems){
                     boolean dirty = false;
                     if(shrinkHoldTimes.length != content.items().size) shrinkHoldTimes = new float[content.items().size];
 
@@ -155,7 +157,7 @@ public class BlockInventoryFragment extends Fragment{
         table.margin(4f);
         table.defaults().size(8 * 5).pad(4f);
 
-        if(tile.block().hasItems){
+        if(tile.block.hasItems){
 
             for(int i = 0; i < content.items().size; i++){
                 Item item = content.item(i);
@@ -163,7 +165,7 @@ public class BlockInventoryFragment extends Fragment{
 
                 container.add(i);
 
-                Boolp canPick = () -> player.unit().acceptsItem(item) && !state.isPaused();
+                Boolp canPick = () -> player.unit().acceptsItem(item) && !state.isPaused() && player.within(tile, itemTransferRange);
 
                 HandCursorListener l = new HandCursorListener();
                 l.setEnabled(canPick);
@@ -209,7 +211,7 @@ public class BlockInventoryFragment extends Fragment{
 
         updateTablePosition();
 
-        table.visible(true);
+        table.visible = true;
 
         if(actions){
             table.setScale(0f, 1f);
@@ -231,7 +233,7 @@ public class BlockInventoryFragment extends Fragment{
     }
 
     private void updateTablePosition(){
-        Vec2 v = Core.input.mouseScreen(tile.x + tile.block().size * tilesize / 2f, tile.y + tile.block().size * tilesize / 2f);
+        Vec2 v = Core.input.mouseScreen(tile.x + tile.block.size * tilesize / 2f, tile.y + tile.block.size * tilesize / 2f);
         table.pack();
         table.setPosition(v.x, v.y, Align.topLeft);
     }
diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java
index c1e780e144..f0f83b8be2 100644
--- a/core/src/mindustry/ui/fragments/ChatFragment.java
+++ b/core/src/mindustry/ui/fragments/ChatFragment.java
@@ -27,7 +27,7 @@ public class ChatFragment extends Table{
     private boolean shown = false;
     private TextField chatfield;
     private Label fieldlabel = new Label(">");
-    private BitmapFont font;
+    private Font font;
     private GlyphLayout layout = new GlyphLayout();
     private float offsetx = Scl.scl(4), offsety = Scl.scl(4), fontoffsetx = Scl.scl(2), chatspace = Scl.scl(50);
     private Color shadowColor = new Color(0, 0, 0, 0.4f);
@@ -57,12 +57,12 @@ public class ChatFragment extends Table{
                 }
             }
 
-            return net.active();
+            return net.active() && ui.hudfrag.shown();
         });
 
         update(() -> {
 
-            if(net.active() && input.keyTap(Binding.chat) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null || ui.minimapfrag.shown())){
+            if(net.active() && input.keyTap(Binding.chat) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null || ui.minimapfrag.shown()) && !ui.scriptfrag.shown()){
                 toggle();
             }
 
@@ -124,15 +124,15 @@ public class ChatFragment extends Table{
         Draw.color(shadowColor);
 
         if(shown){
-            Fill.crect(offsetx, chatfield.getY(), chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
+            Fill.crect(offsetx, chatfield.y, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
         }
 
         super.draw();
 
         float spacing = chatspace;
 
-        chatfield.visible(shown);
-        fieldlabel.visible(shown);
+        chatfield.visible = shown;
+        fieldlabel.visible = shown;
 
         Draw.color(shadowColor);
         Draw.alpha(shadowColor.a * opacity);
@@ -171,7 +171,7 @@ public class ChatFragment extends Table{
         String message = chatfield.getText();
         clearChatInput();
 
-        if(message.replaceAll(" ", "").isEmpty()) return;
+        if(message.replace(" ", "").isEmpty()) return;
 
         history.insert(1, message);
 
@@ -227,6 +227,7 @@ public class ChatFragment extends Table{
     }
 
     public void addMessage(String message, String sender){
+        if(sender == null && message == null) return;
         messages.insert(0, new ChatMessage(message, sender));
 
         fadetime += 1f;
@@ -244,7 +245,7 @@ public class ChatFragment extends Table{
             this.message = message;
             this.sender = sender;
             if(sender == null){ //no sender, this is a server message?
-                formattedMessage = message;
+                formattedMessage = message == null ? "" : message;
             }else{
                 formattedMessage = "[coral][[" + sender + "[coral]]:[white] " + message;
             }
diff --git a/core/src/mindustry/ui/fragments/FadeInFragment.java b/core/src/mindustry/ui/fragments/FadeInFragment.java
index e34f234c46..e82bc75c68 100644
--- a/core/src/mindustry/ui/fragments/FadeInFragment.java
+++ b/core/src/mindustry/ui/fragments/FadeInFragment.java
@@ -16,7 +16,7 @@ public class FadeInFragment extends Fragment{
         parent.addChild(new Element(){
             {
                 setFillParent(true);
-                touchable(Touchable.disabled);
+                this.touchable = Touchable.disabled;
             }
 
              @Override
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index eb5f94dbae..f843156b3e 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -1,8 +1,9 @@
 package mindustry.ui.fragments;
 
 import arc.*;
+import arc.func.*;
 import arc.graphics.*;
-import arc.input.*;
+import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.scene.*;
 import arc.scene.actions.*;
@@ -24,12 +25,11 @@ import mindustry.input.*;
 import mindustry.net.Packets.*;
 import mindustry.type.*;
 import mindustry.ui.*;
-import mindustry.ui.dialogs.*;
 
 import static mindustry.Vars.*;
 
 public class HudFragment extends Fragment{
-    private static final float dsize = 47.2f;
+    private static final float dsize = 65f;
 
     public final PlacementFragment blockfrag = new PlacementFragment();
 
@@ -61,22 +61,46 @@ public class HudFragment extends Fragment{
         //TODO full implementation
         Events.on(ResetEvent.class, e -> {
             coreItems.resetUsed();
+            coreItems.clear();
         });
 
         Events.on(TurnEvent.class, e -> {
-            ui.announce("[accent][[ Turn " + universe.turn() + " ]");
+            Seq<Sector> attacked = universe.getAttacked(state.getSector().planet);
+
+            if(attacked.any()){
+
+                //TODO localize
+                String text = attacked.size > 1 ? attacked.size + " sectors attacked." : "Sector " + attacked.first().id + " under attack.";
+
+                showToast(Icon.warning, text);
+            }
+
+            //ui.announce("[accent][[ Turn " + universe.turn() + " ]\n[scarlet]" + attackedSectors.size + "[lightgray] sector(s) attacked.");
         });
 
         //paused table
         parent.fill(t -> {
-            t.top().visible(() -> state.isPaused() && !state.isOutOfTime()).touchable(Touchable.disabled);
-            t.table(Styles.black5, top -> top.add("$paused").style(Styles.outlineLabel).pad(8f)).growX();
+            t.top().visible(() -> state.isPaused()).touchable = Touchable.disabled;
+            t.table(Styles.black5, top -> top.add("@paused").style(Styles.outlineLabel).pad(8f)).growX();
+        });
+
+        //minimap + position
+        parent.fill(t -> {
+            t.visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial && shown);
+            //minimap
+            t.add(new Minimap());
+            t.row();
+            //position
+            t.label(() -> player.tileX() + "," + player.tileY())
+            .visible(() -> Core.settings.getBool("position") && !state.rules.tutorial)
+            .touchable(Touchable.disabled);
+            t.top().right();
         });
 
         //TODO tear this all down
         //menu at top left
         parent.fill(cont -> {
-            cont.setName("overlaymarker");
+            cont.name = "overlaymarker";
             cont.top().left();
 
             if(mobile){
@@ -121,6 +145,8 @@ public class HudFragment extends Fragment{
                     }).update(i -> {
                         if(net.active() && mobile){
                             i.getStyle().imageUp = Icon.chat;
+                        }else if(state.isCampaign()){
+                            i.getStyle().imageUp = Icon.tree;
                         }else{
                             i.getStyle().imageUp = Icon.book;
                         }
@@ -144,52 +170,56 @@ public class HudFragment extends Fragment{
 
             cont.stack(wavesMain = new Table(), editorMain = new Table()).height(wavesMain.getPrefHeight());
 
-            {
-                wavesMain.visible(() -> shown && !state.isEditor());
-                wavesMain.top().left();
-                Stack stack = new Stack();
-                Button waves = new Button(Styles.waveb);
-                Table btable = new Table().margin(0);
+            wavesMain.visible(() -> shown && !state.isEditor());
+            wavesMain.top().left();
 
-                stack.add(waves);
-                stack.add(btable);
+            wavesMain.table(s -> {
+                //wave info button with text
+                s.add(makeStatusTable()).grow();
 
-                addWaveTable(waves);
-                addPlayButton(btable);
-                wavesMain.add(stack).width(dsize * 5 + 4f);
-                wavesMain.row();
-                wavesMain.table(Tex.button, t -> t.margin(10f).add(new Bar("boss.health", Pal.health, () -> state.boss() == null ? 0f : state.boss().healthf()).blink(Color.white))
-                .grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get();
-                wavesMain.row();
-            }
+                //table with button to skip wave
+                s.button(Icon.play, Styles.righti, 30f, () -> {
+                    if(net.client() && player.admin){
+                        Call.adminRequest(player, AdminAction.wave);
+                    }else{
+                        logic.skipWave();
+                    }
+                }).growY().fillX().right().width(40f).disabled(b -> !canSkipWave()).visible(() -> state.rules.waves);
+            }).width(dsize * 5 + 4f);
 
-            {
-                editorMain.table(Tex.buttonEdge4, t -> {
-                    //t.margin(0f);
-                    t.add("$editor.teams").growX().left();
-                    t.row();
-                    t.table(teams -> {
-                        teams.left();
-                        int i = 0;
-                        for(Team team : Team.baseTeams){
-                            ImageButton button = teams.button(Tex.whiteui, Styles.clearTogglePartiali, 40f, () -> Call.setPlayerTeamEditor(player, team))
-                                .size(50f).margin(6f).get();
-                            button.getImageCell().grow();
-                            button.getStyle().imageUpColor = team.color;
-                            button.update(() -> button.setChecked(player.team() == team));
+            wavesMain.row();
 
-                            if(++i % 3 == 0){
-                                teams.row();
-                            }
+            wavesMain.table(Tex.button, t -> t.margin(10f).add(new Bar("boss.health", Pal.health, () -> state.boss() == null ? 0f : state.boss().healthf()).blink(Color.white))
+            .grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get();
+
+            wavesMain.row();
+
+            editorMain.table(Tex.buttonEdge4, t -> {
+                //t.margin(0f);
+                t.add("@editor.teams").growX().left();
+                t.row();
+                t.table(teams -> {
+                    teams.left();
+                    int i = 0;
+                    for(Team team : Team.baseTeams){
+                        ImageButton button = teams.button(Tex.whiteui, Styles.clearTogglePartiali, 40f, () -> Call.setPlayerTeamEditor(player, team))
+                            .size(50f).margin(6f).get();
+                        button.getImageCell().grow();
+                        button.getStyle().imageUpColor = team.color;
+                        button.update(() -> button.setChecked(player.team() == team));
+
+                        if(++i % 3 == 0){
+                            teams.row();
                         }
-                    }).left();
-                }).width(dsize * 5 + 4f);
-                editorMain.visible(() -> shown && state.isEditor());
-            }
+                    }
+                }).left();
+            }).width(dsize * 5 + 4f);
+            editorMain.visible(() -> shown && state.isEditor());
+
 
             //fps display
             cont.table(info -> {
-                info.touchable(Touchable.disabled);
+                info.touchable = Touchable.disabled;
                 info.top().left().margin(4).visible(() -> Core.settings.getBool("fps") && shown);
                 info.update(() -> info.setTranslation(state.rules.waves || state.isEditor() ? 0f : -Scl.scl(dsize * 4 + 3), 0));
                 IntFormat fps = new IntFormat("fps");
@@ -201,28 +231,16 @@ public class HudFragment extends Fragment{
             }).top().left();
         });
 
-        parent.fill(t -> {
-            t.visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial && shown);
-            //minimap
-            t.add(new Minimap());
-            t.row();
-            //position
-            t.label(() -> player.tileX() + "," + player.tileY())
-                .visible(() -> Core.settings.getBool("position") && !state.rules.tutorial)
-                .touchable(Touchable.disabled);
-            t.top().right();
-        });
-
         //core items
         parent.fill(t -> {
             t.top().add(coreItems);
-            t.visible(() -> Core.settings.getBool("coreitems") && !mobile);
+            t.visible(() -> Core.settings.getBool("coreitems") && !mobile && !state.isPaused() && shown);
         });
 
         //spawner warning
         parent.fill(t -> {
-            t.touchable(Touchable.disabled);
-            t.table(Styles.black, c -> c.add("$nearpoint")
+            t.touchable = Touchable.disabled;
+            t.table(Styles.black, c -> c.add("@nearpoint")
             .update(l -> l.setColor(Tmp.c1.set(Color.white).lerp(Color.scarlet, Mathf.absin(Time.time(), 10f, 1f))))
             .get().setAlignment(Align.center, Align.center))
             .margin(6).update(u -> u.color.a = Mathf.lerpDelta(u.color.a, Mathf.num(spawner.playerNear()), 0.1f)).get().color.a = 0f;
@@ -230,17 +248,17 @@ public class HudFragment extends Fragment{
 
         parent.fill(t -> {
             t.visible(() -> netServer.isWaitingForPlayers());
-            t.table(Tex.button, c -> c.add("$waiting.players"));
+            t.table(Tex.button, c -> c.add("@waiting.players"));
         });
 
         //'core is under attack' table
         parent.fill(t -> {
-            t.touchable(Touchable.disabled);
+            t.touchable = Touchable.disabled;
             float notifDuration = 240f;
             float[] coreAttackTime = {0};
             float[] coreAttackOpacity = {0};
 
-            Events.on(Trigger.teamCoreDamage, () -> {
+            Events.run(Trigger.teamCoreDamage, () -> {
                 coreAttackTime[0] = notifDuration;
             });
 
@@ -250,7 +268,7 @@ public class HudFragment extends Fragment{
                     return false;
                 }
 
-                t.getColor().a = coreAttackOpacity[0];
+                t.color.a = coreAttackOpacity[0];
                 if(coreAttackTime[0] > 0){
                     coreAttackOpacity[0] = Mathf.lerpDelta(coreAttackOpacity[0], 1f, 0.1f);
                 }else{
@@ -261,29 +279,8 @@ public class HudFragment extends Fragment{
 
                 return coreAttackOpacity[0] > 0;
             });
-            t.table(Tex.button, top -> top.add("$coreattack").pad(2)
-            .update(label -> label.getColor().set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time(), 2f, 1f)))).touchable(Touchable.disabled);
-        });
-
-        //paused table for when the player is out of time
-        parent.fill(t -> {
-            t.top().visible(() -> state.isOutOfTime());
-            t.table(Styles.black5, top -> {
-                //TODO localize when done
-                top.add("Out of sector time.").style(Styles.outlineLabel).color(Pal.accent).update(l -> l.color.a = Mathf.absin(Time.globalTime(), 7f, 1f)).colspan(2);
-                top.row();
-
-                top.defaults().pad(2).size(150f, 54f);
-                top.button("Next Turn", () -> {
-                    universe.runTurn();
-                    state.set(State.playing);
-                });
-
-                top.button("Back to Planet", () -> {
-                    ui.paused.runExitSave();
-                    ui.planet.show();
-                });
-            }).margin(8).growX();
+            t.table(Tex.button, top -> top.add("@coreattack").pad(2)
+            .update(label -> label.color.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time(), 2f, 1f)))).touchable(Touchable.disabled);
         });
 
         //tutorial text
@@ -311,7 +308,7 @@ public class HudFragment extends Fragment{
         //'saving' indicator
         parent.fill(t -> {
             t.bottom().visible(() -> control.saves.isSaving());
-            t.add("$saving").style(Styles.outlineLabel);
+            t.add("@saving").style(Styles.outlineLabel);
         });
 
         parent.fill(p -> {
@@ -324,10 +321,11 @@ public class HudFragment extends Fragment{
                     showHudText = false;
                 }
             });
-            p.touchable(Touchable.disabled);
+            p.touchable = Touchable.disabled;
         });
 
         //TODO DEBUG: rate table
+        if(false)
         parent.fill(t -> {
             t.bottom().left();
             t.table(Styles.black6, c -> {
@@ -458,7 +456,7 @@ public class HudFragment extends Fragment{
 
                 //add to table
                 table.add(in).padRight(8);
-                table.add("$unlocked");
+                table.add("@unlocked");
                 table.pack();
 
                 //create container table which will align and move
@@ -519,7 +517,7 @@ public class HudFragment extends Fragment{
 
     public void showLaunchDirect(){
         Image image = new Image();
-        image.getColor().a = 0f;
+        image.color.a = 0f;
         image.setFillParent(true);
         image.actions(Actions.fadeIn(launchDuration / 60f, Interp.pow2In), Actions.delay(8f / 60f), Actions.remove());
         Core.scene.add(image);
@@ -527,7 +525,7 @@ public class HudFragment extends Fragment{
 
     public void showLaunch(){
         Image image = new Image();
-        image.getColor().a = 0f;
+        image.color.a = 0f;
         image.setFillParent(true);
         image.actions(Actions.fadeIn(40f / 60f));
         image.update(() -> {
@@ -540,8 +538,8 @@ public class HudFragment extends Fragment{
 
     public void showLand(){
         Image image = new Image();
-        image.getColor().a = 1f;
-        image.touchable(Touchable.disabled);
+        image.color.a = 1f;
+        image.touchable = Touchable.disabled;
         image.setFillParent(true);
         image.actions(Actions.fadeOut(0.8f), Actions.remove());
         image.update(() -> {
@@ -553,37 +551,6 @@ public class HudFragment extends Fragment{
         Core.scene.add(image);
     }
 
-    private void showLaunchConfirm(){
-        BaseDialog dialog = new BaseDialog("$launch");
-        dialog.update(() -> {
-            if(!inLaunchWave()){
-                dialog.hide();
-            }
-        });
-        dialog.cont.add("$launch.confirm").width(500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center);
-        dialog.buttons.defaults().size(200f, 54f).pad(2f);
-        dialog.setFillParent(false);
-        dialog.buttons.button("$cancel", dialog::hide);
-        dialog.buttons.button("$ok", () -> {
-            dialog.hide();
-            Call.launchZone();
-        });
-        dialog.keyDown(KeyCode.escape, dialog::hide);
-        dialog.keyDown(KeyCode.back, dialog::hide);
-        dialog.show();
-    }
-
-    private boolean inLaunchWave(){
-        return state.hasSector() &&
-            state.getSector().metCondition() &&
-            !net.client() &&
-            state.wave % state.getSector().launchPeriod == 0 && !spawner.isSpawning();
-    }
-
-    private boolean canLaunch(){
-        return inLaunchWave() && state.enemies <= 0;
-    }
-
     private void toggleMenus(){
         if(flip != null){
             flip.getStyle().imageUp = shown ? Icon.downOpen : Icon.upOpen;
@@ -592,7 +559,9 @@ public class HudFragment extends Fragment{
         shown = !shown;
     }
 
-    private void addWaveTable(Button table){
+    private Table makeStatusTable(){
+        Button table = new Button(Styles.waveb);
+
         StringBuilder ibuild = new StringBuilder();
 
         IntFormat wavef = new IntFormat("wave");
@@ -614,32 +583,116 @@ public class HudFragment extends Fragment{
         });
 
         table.clearChildren();
-        table.touchable(Touchable.enabled);
+        table.touchable = Touchable.enabled;
 
         StringBuilder builder = new StringBuilder();
 
-        table.setName("waves");
+        table.name = "waves";
+
+        table.marginTop(0).marginBottom(4).marginLeft(4);
+
+        class SideBar extends Element{
+            public final Floatp amount;
+            public final boolean flip;
+            public final Boolp flash;
+
+            float last, blink, value;
+
+            public SideBar(Floatp amount, Boolp flash, boolean flip){
+                this.amount = amount;
+                this.flip = flip;
+                this.flash = flash;
+
+                setColor(Pal.health);
+            }
+
+            @Override
+            public void draw(){
+                float next = amount.get();
+
+                if(next < last && flash.get()){
+                    blink = 1f;
+                }
+
+                blink = Mathf.lerpDelta(blink, 0f, 0.2f);
+                value = Mathf.lerpDelta(value, next, 0.15f);
+                last = next;
+
+                drawInner(Pal.darkishGray);
+
+                Draw.beginStencil();
+
+                Fill.crect(x, y, width, height * value);
+
+                Draw.beginStenciled();
+
+                drawInner(Tmp.c1.set(color).lerp(Color.white, blink));
+
+                Draw.endStencil();
+            }
+
+            void drawInner(Color color){
+                if(flip){
+                    x += width;
+                    width = -width;
+                }
+
+                float stroke = width * 0.35f;
+                float bh = height/2f;
+                Draw.color(color);
+
+                Fill.quad(
+                x, y,
+                x + stroke, y,
+                x + width, y + bh,
+                x + width - stroke, y + bh
+                );
+
+                Fill.quad(
+                x + width, y + bh,
+                x + width - stroke, y + bh,
+                x, y + height,
+                x + stroke, y + height
+                );
+
+                Draw.reset();
+
+                if(flip){
+                    width = -width;
+                    x -= width;
+                }
+            }
+        }
+
+        table.stack(
+        new Element(){
+            @Override
+            public void draw(){
+                Draw.color(Pal.darkerGray);
+                Fill.poly(x + width/2f, y + height/2f, 6, height / Mathf.sqrt3);
+                Draw.reset();
+                Drawf.shadow(x + width/2f, y + height/2f, height * 1.13f);
+            }
+        },
+        new Table(t -> {
+            float bw = 40f;
+            float pad = -20;
+            t.margin(0);
+
+            t.add(new SideBar(() -> player.unit().healthf(), () -> true, true)).width(bw).growY().padRight(pad);
+            t.image(() -> player.icon()).scaling(Scaling.bounded).grow().maxWidth(54f);
+            t.add(new SideBar(() -> player.dead() ? 0f : player.displayAmmo() ? player.unit().ammof() : player.unit().healthf(), () -> !player.displayAmmo(), false)).width(bw).growY().padLeft(pad).update(b -> {
+                b.color.set(player.displayAmmo() ? player.dead() || player.unit() instanceof BlockUnitc ? Pal.ammo : player.unit().type().ammoType.color : Pal.health);
+            });
+
+            t.getChildren().get(1).toFront();
+        })).size(120f, 80).padRight(4);
+
         table.labelWrap(() -> {
             builder.setLength(0);
             builder.append(wavef.get(state.wave));
             builder.append("\n");
 
-            if(inLaunchWave()){
-                builder.append("[#");
-                Tmp.c1.set(Color.white).lerp(state.enemies > 0 ? Color.white : Color.scarlet, Mathf.absin(Time.time(), 2f, 1f)).toString(builder);
-                builder.append("]");
-
-                if(!canLaunch()){
-                    builder.append(Core.bundle.get("launch.unable2"));
-                }else{
-                    builder.append(Core.bundle.get("launch"));
-                    builder.append("\n");
-                    builder.append(Core.bundle.format("launch.next", state.wave + state.getSector().launchPeriod));
-                    builder.append("\n");
-                }
-                builder.append("[]\n");
-            }
-
             if(state.enemies > 0){
                 if(state.enemies == 1){
                     builder.append(enemyf.get(state.enemies));
@@ -658,29 +711,14 @@ public class HudFragment extends Fragment{
             return builder;
         }).growX().pad(8f);
 
-        table.setDisabled(() -> !canLaunch());
+        table.setDisabled(true);
         table.visible(() -> state.rules.waves);
-        table.clicked(() -> {
-            if(canLaunch()){
-                showLaunchConfirm();
-            }
-        });
+
+        return table;
     }
 
     private boolean canSkipWave(){
         return state.rules.waves && ((net.server() || player.admin) || !net.active()) && state.enemies == 0 && !spawner.isSpawning() && !state.rules.tutorial;
     }
 
-    private void addPlayButton(Table table){
-        table.right().button(Icon.play, Styles.righti, 30f, () -> {
-            if(net.client() && player.admin){
-                Call.adminRequest(player, AdminAction.wave);
-            }else if(inLaunchWave()){
-                ui.showConfirm("$confirm", "$launch.skip.confirm", () -> !canSkipWave(), () -> logic.skipWave());
-            }else{
-                logic.skipWave();
-            }
-        }).growY().fillX().right().width(40f)
-        .visible(this::canSkipWave);
-    }
 }
diff --git a/core/src/mindustry/ui/fragments/LoadingFragment.java b/core/src/mindustry/ui/fragments/LoadingFragment.java
index 8af45aa79c..3914f48a71 100644
--- a/core/src/mindustry/ui/fragments/LoadingFragment.java
+++ b/core/src/mindustry/ui/fragments/LoadingFragment.java
@@ -14,63 +14,82 @@ public class LoadingFragment extends Fragment{
     private Table table;
     private TextButton button;
     private Bar bar;
+    private Label nameLabel;
 
     @Override
     public void build(Group parent){
         parent.fill(Styles.black8, t -> {
-            t.visible(false);
-            t.touchable(Touchable.enabled);
+            t.visible = false;
+            t.touchable = Touchable.enabled;
             t.add().height(133f).row();
             t.add(new WarningBar()).growX().height(24f);
             t.row();
-            t.add("$loading").name("namelabel").pad(10f).style(Styles.techLabel);
+            nameLabel = t.add("@loading").pad(10f).style(Styles.techLabel).get();
             t.row();
             t.add(new WarningBar()).growX().height(24f);
             t.row();
 
+            text("@loading");
+
             bar = t.add(new Bar()).pad(3).size(500f, 40f).visible(false).get();
             t.row();
-            button = t.button("$cancel", () -> {}).pad(20).size(250f, 70f).visible(false).get();
+            button = t.button("@cancel", () -> {}).pad(20).size(250f, 70f).visible(false).get();
             table = t;
         });
     }
 
     public void setProgress(Floatp progress){
         bar.reset(0f);
-        bar.visible(true);
+        bar.visible = true;
         bar.set(() -> ((int)(progress.get() * 100) + "%"), progress, Pal.accent);
     }
 
     public void setButton(Runnable listener){
-        button.visible(true);
+        button.visible = true;
         button.getListeners().remove(button.getListeners().size - 1);
         button.clicked(listener);
     }
 
     public void setText(String text){
-        table.<Label>find("namelabel").setText(text);
-        table.<Label>find("namelabel").setColor(Pal.accent);
+        text(text);
+        nameLabel.setColor(Pal.accent);
     }
 
     public void show(){
-        show("$loading");
+        show("@loading");
     }
 
     public void show(String text){
-        table.<Label>find("namelabel").setColor(Color.white);
-        bar.visible(false);
+        nameLabel.setColor(Color.white);
+        bar.visible = false;
         table.clearActions();
-        table.touchable(Touchable.enabled);
-        table.<Label>find("namelabel").setText(text);
-        table.visible(true);
-        table.getColor().a = 1f;
+        table.touchable = Touchable.enabled;
+        text(text);
+        table.visible = true;
+        table.color.a = 1f;
         table.toFront();
     }
 
     public void hide(){
         table.clearActions();
         table.toFront();
-        table.touchable(Touchable.disabled);
+        table.touchable = Touchable.disabled;
         table.actions(Actions.fadeOut(0.5f), Actions.visible(false));
     }
+
+    private void text(String text){
+        nameLabel.setText(text);
+
+        CharSequence realText = nameLabel.getText();
+
+        //fallback to the default font if characters are missing
+        //TODO this should happen everywhere
+        for(int i = 0; i < realText.length(); i++){
+            if(Fonts.tech.getData().getGlyph(realText.charAt(i)) == null){
+                nameLabel.setStyle(Styles.defaultLabel);
+                return;
+            }
+        }
+        nameLabel.setStyle(Styles.techLabel);
+    }
 }
diff --git a/core/src/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java
index bf4b19207f..45faa9bf10 100644
--- a/core/src/mindustry/ui/fragments/MenuFragment.java
+++ b/core/src/mindustry/ui/fragments/MenuFragment.java
@@ -60,12 +60,12 @@ public class MenuFragment extends Fragment{
             parent.fill(c -> c.bottom().left().button("", Styles.infot, ui.about::show).size(84, 45));
             parent.fill(c -> c.bottom().right().button("", Styles.discordt, ui.discord::show).size(84, 45));
         }else if(becontrol.active()){
-            parent.fill(c -> c.bottom().right().button("$be.check", Icon.refresh, () -> {
+            parent.fill(c -> c.bottom().right().button("@be.check", Icon.refresh, () -> {
                 ui.loadfrag.show();
                 becontrol.checkUpdate(result -> {
                     ui.loadfrag.hide();
                     if(!result){
-                        ui.showInfo("$be.noupdates");
+                        ui.showInfo("@be.noupdates");
                     }
                 });
             }).size(200, 60).update(t -> {
@@ -73,13 +73,12 @@ public class MenuFragment extends Fragment{
             }));
         }
 
-        String versionText = "[#ffffffba]" + ((Version.build == -1) ? "[#fc8140aa]custom build" : (Version.type.equals("official") ? Version.modifier : Version.type) + " build " + Version.build + (Version.revision == 0 ? "" : "." + Version.revision));
-
+        String versionText = ((Version.build == -1) ? "[#fc8140aa]" : "[#ffffffba]") + Version.combined();
         parent.fill((x, y, w, h) -> {
             TextureRegion logo = Core.atlas.find("logo");
             float logoscl = Scl.scl(1);
-            float logow = Math.min(logo.getWidth() * logoscl, Core.graphics.getWidth() - Scl.scl(20));
-            float logoh = logow * (float)logo.getHeight() / logo.getWidth();
+            float logow = Math.min(logo.width * logoscl, Core.graphics.getWidth() - Scl.scl(20));
+            float logoh = logow * (float)logo.height / logo.width;
 
             float fx = (int)(Core.graphics.getWidth() / 2f);
             float fy = (int)(Core.graphics.getHeight() - 6 - logoh) + logoh / 2 - (Core.graphics.isPortrait() ? Scl.scl(30f) : 0f);
@@ -89,7 +88,7 @@ public class MenuFragment extends Fragment{
 
             Fonts.def.setColor(Color.white);
             Fonts.def.draw(versionText, fx, fy - logoh/2f, Align.center);
-        }).touchable(Touchable.disabled);
+        }).touchable = Touchable.disabled;
     }
 
     private void buildMobile(){
@@ -100,15 +99,15 @@ public class MenuFragment extends Fragment{
         container.defaults().size(size).pad(5).padTop(4f);
 
         MobileButton
-            play = new MobileButton(Icon.play, "$campaign", () -> checkPlay(ui.planet::show)),
-            custom = new MobileButton(Icon.rightOpenOut, "$customgame", () -> checkPlay(ui.custom::show)),
-            maps = new MobileButton(Icon.download, "$loadgame", () -> checkPlay(ui.load::show)),
-            join = new MobileButton(Icon.add, "$joingame", () -> checkPlay(ui.join::show)),
-            editor = new MobileButton(Icon.terrain, "$editor", () -> checkPlay(ui.maps::show)),
-            tools = new MobileButton(Icon.settings, "$settings", ui.settings::show),
-            mods = new MobileButton(Icon.book, "$mods", ui.mods::show),
-            donate = new MobileButton(Icon.link, "$website", () -> Core.app.openURI("https://anuke.itch.io/mindustry")),
-            exit = new MobileButton(Icon.exit, "$quit", () -> Core.app.exit());
+            play = new MobileButton(Icon.play, "@campaign", () -> checkPlay(ui.planet::show)),
+            custom = new MobileButton(Icon.rightOpenOut, "@customgame", () -> checkPlay(ui.custom::show)),
+            maps = new MobileButton(Icon.download, "@loadgame", () -> checkPlay(ui.load::show)),
+            join = new MobileButton(Icon.add, "@joingame", () -> checkPlay(ui.join::show)),
+            editor = new MobileButton(Icon.terrain, "@editor", () -> checkPlay(ui.maps::show)),
+            tools = new MobileButton(Icon.settings, "@settings", ui.settings::show),
+            mods = new MobileButton(Icon.book, "@mods", ui.mods::show),
+            donate = new MobileButton(Icon.link, "@website", () -> Core.app.openURI("https://anuke.itch.io/mindustry")),
+            exit = new MobileButton(Icon.exit, "@quit", () -> Core.app.exit());
 
         if(!Core.graphics.isPortrait()){
             container.marginTop(60f);
@@ -164,27 +163,27 @@ public class MenuFragment extends Fragment{
             t.defaults().width(width).height(70f);
 
             buttons(t,
-                new Buttoni("$play", Icon.play,
-                    new Buttoni("$campaign", Icon.play, () -> checkPlay(ui.planet::show)),
-                    new Buttoni("$joingame", Icon.add, () -> checkPlay(ui.join::show)),
-                    new Buttoni("$customgame", Icon.terrain, () -> checkPlay(ui.custom::show)),
-                    new Buttoni("$loadgame", Icon.download, () -> checkPlay(ui.load::show)),
-                    new Buttoni("$tutorial", Icon.info, () -> checkPlay(control::playTutorial))
+                new Buttoni("@play", Icon.play,
+                    new Buttoni("@campaign", Icon.play, () -> checkPlay(ui.planet::show)),
+                    new Buttoni("@joingame", Icon.add, () -> checkPlay(ui.join::show)),
+                    new Buttoni("@customgame", Icon.terrain, () -> checkPlay(ui.custom::show)),
+                    new Buttoni("@loadgame", Icon.download, () -> checkPlay(ui.load::show)),
+                    new Buttoni("@tutorial", Icon.info, () -> checkPlay(control::playTutorial))
                 ),
-                new Buttoni("$editor", Icon.terrain, () -> checkPlay(ui.maps::show)), steam ? new Buttoni("$workshop", Icon.book, platform::openWorkshop) : null,
+                new Buttoni("@editor", Icon.terrain, () -> checkPlay(ui.maps::show)), steam ? new Buttoni("@workshop", Icon.book, platform::openWorkshop) : null,
                 new Buttoni(Core.bundle.get("mods"), Icon.bookOpen, ui.mods::show),
                 //not enough space for this button
-                //new Buttoni("$schematics", Icon.paste, ui.schematics::show),
-                new Buttoni("$settings", Icon.settings, ui.settings::show),
-                new Buttoni("$about.button", Icon.info, ui.about::show),
-                new Buttoni("$quit", Icon.exit, Core.app::exit)
+                //new Buttoni("@schematics", Icon.paste, ui.schematics::show),
+                new Buttoni("@settings", Icon.settings, ui.settings::show),
+                new Buttoni("@about.button", Icon.info, ui.about::show),
+                new Buttoni("@quit", Icon.exit, Core.app::exit)
             );
 
         }).width(width).growY();
 
         container.table(background, t -> {
             submenu = t;
-            t.getColor().a = 0f;
+            t.color.a = 0f;
             t.top();
             t.defaults().width(width).height(70f);
             t.visible(() -> !t.getChildren().isEmpty());
@@ -196,7 +195,7 @@ public class MenuFragment extends Fragment{
         if(!mods.hasContentErrors()){
             run.run();
         }else{
-            ui.showInfo("$mod.noerrorplay");
+            ui.showInfo("@mod.noerrorplay");
         }
     }
 
diff --git a/core/src/mindustry/ui/fragments/MinimapFragment.java b/core/src/mindustry/ui/fragments/MinimapFragment.java
index a8ca154342..7c9d3b5994 100644
--- a/core/src/mindustry/ui/fragments/MinimapFragment.java
+++ b/core/src/mindustry/ui/fragments/MinimapFragment.java
@@ -16,7 +16,7 @@ import static mindustry.Vars.*;
 
 public class MinimapFragment extends Fragment{
     private boolean shown;
-    private float panx, pany, zoom = 1f, lastZoom = -1;
+    float panx, pany, zoom = 1f, lastZoom = -1;
     private float baseSize = Scl.scl(5f);
     private Element elem;
 
@@ -32,7 +32,7 @@ public class MinimapFragment extends Fragment{
 
             if(renderer.minimap.getTexture() != null){
                 Draw.color();
-                float ratio = (float)renderer.minimap.getTexture().getHeight() / renderer.minimap.getTexture().getWidth();
+                float ratio = (float)renderer.minimap.getTexture().height / renderer.minimap.getTexture().width;
                 TextureRegion reg = Draw.wrap(renderer.minimap.getTexture());
                 Draw.rect(reg, w/2f + panx*zoom, h/2f + pany*zoom, size, size * ratio);
                 renderer.minimap.drawEntities(w/2f + panx*zoom - size/2f, h/2f + pany*zoom - size/2f * ratio, size, size * ratio, zoom, true);
@@ -54,7 +54,7 @@ public class MinimapFragment extends Fragment{
                 shown = false;
             }
         });
-        elem.touchable(Touchable.enabled);
+        elem.touchable = Touchable.enabled;
 
         elem.addListener(new ElementGestureListener(){
 
@@ -98,11 +98,11 @@ public class MinimapFragment extends Fragment{
             t.visible(() -> shown);
             t.update(() -> t.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight()));
 
-            t.add("$minimap").style(Styles.outlineLabel).pad(10f);
+            t.add("@minimap").style(Styles.outlineLabel).pad(10f);
             t.row();
             t.add().growY();
             t.row();
-            t.button("$back", Icon.leftOpen, () -> shown = false).size(220f, 60f).pad(10f);
+            t.button("@back", Icon.leftOpen, () -> shown = false).size(220f, 60f).pad(10f);
         });
     }
 
@@ -113,7 +113,7 @@ public class MinimapFragment extends Fragment{
     public void toggle(){
         if(Core.settings.getBool("mapcenter")){
             float size = baseSize * zoom * world.width();
-            float ratio = (float)renderer.minimap.getTexture().getHeight() / renderer.minimap.getTexture().getWidth();
+            float ratio = (float)renderer.minimap.getTexture().height / renderer.minimap.getTexture().width;
             panx = (size/2f - player.x() / (world.width() * tilesize) * size) / zoom;
             pany = (size*ratio/2f - player.y() / (world.height() * tilesize) * size*ratio) / zoom;
         }
diff --git a/core/src/mindustry/ui/fragments/OverlayFragment.java b/core/src/mindustry/ui/fragments/OverlayFragment.java
index b3116b20b9..72dd3c223d 100644
--- a/core/src/mindustry/ui/fragments/OverlayFragment.java
+++ b/core/src/mindustry/ui/fragments/OverlayFragment.java
@@ -13,7 +13,7 @@ public class OverlayFragment{
     private WidgetGroup group = new WidgetGroup();
 
     public OverlayFragment(){
-        group.touchable(Touchable.childrenOnly);
+        group.touchable = Touchable.childrenOnly;
         inv = new BlockInventoryFragment();
         config = new BlockConfigFragment();
     }
diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java
index 393e7f6272..f854826322 100644
--- a/core/src/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/mindustry/ui/fragments/PlacementFragment.java
@@ -12,6 +12,7 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
+import mindustry.core.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
@@ -21,6 +22,8 @@ import mindustry.input.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.ConstructBlock.*;
 
 import static mindustry.Vars.*;
 
@@ -28,7 +31,7 @@ public class PlacementFragment extends Fragment{
     final int rowWidth = 4;
 
     public Category currentCategory = Category.distribution;
-    Seq<Block> returnArray = new Seq<>();
+    Seq<Block> returnArray = new Seq<>(), returnArray2 = new Seq<>();
     Seq<Category> returnCatArray = new Seq<>();
     boolean[] categoryEmpty = new boolean[Category.all.length];
     ObjectMap<Category,Block> selectedBlocks = new ObjectMap<>();
@@ -80,7 +83,7 @@ public class PlacementFragment extends Fragment{
 
     void rebuild(){
         currentCategory = Category.turret;
-        Group group = toggler.getParent();
+        Group group = toggler.parent;
         int index = toggler.getZIndex();
         toggler.remove();
         build(group);
@@ -92,7 +95,7 @@ public class PlacementFragment extends Fragment{
 
         if(Core.input.keyDown(Binding.pick) && player.isBuilder()){ //mouse eyedropper select
             Building tile = world.buildWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
-            Block tryRecipe = tile == null ? null : tile.block();
+            Block tryRecipe = tile == null ? null : tile.block instanceof ConstructBlock ? ((ConstructBuild)tile).cblock : tile.block;
             Object tryConfig = tile == null ? null : tile.config();
 
             for(BuildPlan req : player.builder().plans()){
@@ -121,18 +124,17 @@ public class PlacementFragment extends Fragment{
                     for(int j = 0; j < blocks.size; j++){
                         if(blocks.get(j) == currentBlock){
                             switch(i){
-                                case 10: //left
-                                    j = (j - 1 + blocks.size) % blocks.size;
-                                    break;
-                                case 11: //right
-                                    j = (j + 1) % blocks.size;
-                                    break;
-                                case 12: //up
+                                //left
+                                case 10 -> j = (j - 1 + blocks.size) % blocks.size;
+                                //right
+                                case 11 -> j = (j + 1) % blocks.size;
+                                //up
+                                case 12 -> {
                                     j = (j > 3 ? j - 4 : blocks.size - blocks.size % 4 + j);
                                     j -= (j < blocks.size ? 0 : 4);
-                                    break;
-                                case 13: //down
-                                    j = (j < blocks.size - 4 ? j + 4 : j % 4);
+                                }
+                                //down
+                                case 13 -> j = (j < blocks.size - 4 ? j + 4 : j % 4);
                             }
                             input.block = blocks.get(j);
                             selectedBlocks.put(currentCategory, input.block);
@@ -159,7 +161,7 @@ public class PlacementFragment extends Fragment{
                         blockSelectEnd = true;
                     }
                     Seq<Block> blocks = getByCategory(currentCategory);
-                    if(!unlocked(blocks.get(i))) return true;
+                    if(i >= blocks.size || !unlocked(blocks.get(i))) return true;
                     input.block = (i < blocks.size) ? blocks.get(i) : null;
                     selectedBlocks.put(currentCategory, input.block);
                     blockSelectSeqMillis = Time.millis();
@@ -215,7 +217,7 @@ public class PlacementFragment extends Fragment{
                             if(unlocked(block)){
                                 if(Core.input.keyDown(KeyCode.shiftLeft) && Fonts.getUnicode(block.name) != 0){
                                     Core.app.setClipboardText((char)Fonts.getUnicode(block.name) + "");
-                                    ui.showInfoFade("$copied");
+                                    ui.showInfoFade("@copied");
                                 }else{
                                     control.input.block = control.input.block == block ? null : block;
                                     selectedBlocks.put(currentCategory, control.input.block);
@@ -325,7 +327,7 @@ public class PlacementFragment extends Fragment{
                                             int stackamount = Math.round(stack.amount * state.rules.buildCostMultiplier);
                                             String color = (amount < stackamount / 2f ? "[red]" : amount < stackamount ? "[accent]" : "[white]");
 
-                                            return color + ui.formatAmount(amount) + "[white]/" + stackamount;
+                                            return color + UI.formatAmount(amount) + "[white]/" + stackamount;
                                         }).padLeft(5);
                                     }).left();
                                     req.row();
@@ -336,7 +338,7 @@ public class PlacementFragment extends Fragment{
                                 topTable.row();
                                 topTable.table(b -> {
                                     b.image(Icon.cancel).padRight(2).color(Color.scarlet);
-                                    b.add(!player.isBuilder() ? "$unit.nobuild" : displayBlock.unplaceableMessage()).width(190f).wrap();
+                                    b.add(!player.isBuilder() ? "@unit.nobuild" : displayBlock.unplaceableMessage()).width(190f).wrap();
                                     b.left();
                                 }).padTop(2).left();
                             }
@@ -419,7 +421,7 @@ public class PlacementFragment extends Fragment{
     }
 
     Seq<Block> getUnlockedByCategory(Category cat){
-        return returnArray.selectFrom(content.blocks(), block -> block.category == cat && block.isVisible() && unlocked(block)).sort((b1, b2) -> Boolean.compare(!b1.isPlaceable(), !b2.isPlaceable()));
+        return returnArray2.selectFrom(content.blocks(), block -> block.category == cat && block.isVisible() && unlocked(block)).sort((b1, b2) -> Boolean.compare(!b1.isPlaceable(), !b2.isPlaceable()));
     }
 
     Block getSelectedBlock(Category cat){
diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java
index 151b5f51b2..87ac5d068d 100644
--- a/core/src/mindustry/ui/fragments/PlayerListFragment.java
+++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java
@@ -16,8 +16,8 @@ import mindustry.ui.*;
 import static mindustry.Vars.*;
 
 public class PlayerListFragment extends Fragment{
+    public Table content = new Table().marginRight(13f).marginLeft(13f);
     private boolean visible = false;
-    private Table content = new Table().marginRight(13f).marginLeft(13f);
     private Interval timer = new Interval();
     private TextField sField;
     private boolean found = false;
@@ -57,9 +57,9 @@ public class PlayerListFragment extends Fragment{
                 pane.table(menu -> {
                     menu.defaults().growX().height(50f).fillY();
 
-                    menu.button("$server.bans", ui.bans::show).disabled(b -> net.client());
-                    menu.button("$server.admins", ui.admins::show).disabled(b -> net.client());
-                    menu.button("$close", this::toggle);
+                    menu.button("@server.bans", ui.bans::show).disabled(b -> net.client());
+                    menu.button("@server.admins", ui.admins::show).disabled(b -> net.client());
+                    menu.button("@close", this::toggle);
                 }).margin(0f).pad(10f).growX();
 
             }).touchable(Touchable.enabled).margin(14f);
@@ -116,11 +116,11 @@ public class PlayerListFragment extends Fragment{
 
                     t.button(Icon.hammer, Styles.clearPartiali,
                     () -> {
-                        ui.showConfirm("$confirm", Core.bundle.format("confirmban",  user.name()), () -> Call.adminRequest(user, AdminAction.ban));
+                        ui.showConfirm("@confirm", Core.bundle.format("confirmban",  user.name()), () -> Call.adminRequest(user, AdminAction.ban));
                     });
                     t.button(Icon.cancel, Styles.clearPartiali,
                     () -> {
-                        ui.showConfirm("$confirm", Core.bundle.format("confirmkick",  user.name()), () -> Call.adminRequest(user, AdminAction.kick));
+                        ui.showConfirm("@confirm", Core.bundle.format("confirmkick",  user.name()), () -> Call.adminRequest(user, AdminAction.kick));
                     });
 
                     t.row();
@@ -131,9 +131,9 @@ public class PlayerListFragment extends Fragment{
                         String id = user.uuid();
 
                         if(netServer.admins.isAdmin(id, connection.address)){
-                            ui.showConfirm("$confirm", Core.bundle.format("confirmunadmin",  user.name()), () -> netServer.admins.unAdminPlayer(id));
+                            ui.showConfirm("@confirm", Core.bundle.format("confirmunadmin",  user.name()), () -> netServer.admins.unAdminPlayer(id));
                         }else{
-                            ui.showConfirm("$confirm", Core.bundle.format("confirmadmin",  user.name()), () -> netServer.admins.adminPlayer(id, user.usid()));
+                            ui.showConfirm("@confirm", Core.bundle.format("confirmadmin",  user.name()), () -> netServer.admins.adminPlayer(id, user.usid()));
                         }
                     }).update(b -> b.setChecked(user.admin))
                         .disabled(b -> net.client())
@@ -148,7 +148,7 @@ public class PlayerListFragment extends Fragment{
 
                 button.button(Icon.hammer, Styles.clearPartiali,
                 () -> {
-                    ui.showConfirm("$confirm", Core.bundle.format("confirmvotekick",  user.name()), () -> {
+                    ui.showConfirm("@confirm", Core.bundle.format("confirmvotekick",  user.name()), () -> {
                         Call.sendChatMessage("/votekick " + user.name());
                     });
                 }).size(h);
diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
index d19a278a29..73861538e3 100644
--- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
+++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
@@ -2,7 +2,6 @@ package mindustry.ui.fragments;
 
 import arc.*;
 import arc.Input.*;
-import arc.struct.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -10,8 +9,8 @@ import arc.scene.*;
 import arc.scene.ui.*;
 import arc.scene.ui.Label.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
-import mindustry.*;
 import mindustry.input.*;
 import mindustry.ui.*;
 
@@ -24,7 +23,7 @@ public class ScriptConsoleFragment extends Table{
     private boolean open = false, shown;
     private TextField chatfield;
     private Label fieldlabel = new Label(">");
-    private BitmapFont font;
+    private Font font;
     private GlyphLayout layout = new GlyphLayout();
     private float offsetx = Scl.scl(4), offsety = Scl.scl(4), fontoffsetx = Scl.scl(2), chatspace = Scl.scl(50);
     private Color shadowColor = new Color(0, 0, 0, 0.4f);
@@ -45,7 +44,7 @@ public class ScriptConsoleFragment extends Table{
         font = Fonts.def;
 
         visible(() -> {
-            if(input.keyTap(Binding.console)  && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null)){
+            if(input.keyTap(Binding.console)  && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null) && !ui.chatfrag.shown()){
                 shown = !shown;
                 if(shown && !open && enableConsole){
                     toggle();
@@ -53,7 +52,7 @@ public class ScriptConsoleFragment extends Table{
                 clearChatInput();
             }
 
-            return shown && !Vars.net.active();
+            return shown;
         });
 
         update(() -> {
@@ -96,7 +95,6 @@ public class ScriptConsoleFragment extends Table{
         fieldlabel.setStyle(fieldlabel.getStyle());
 
         chatfield = new TextField("", new TextField.TextFieldStyle(scene.getStyle(TextField.TextFieldStyle.class)));
-        chatfield.setMaxLength(Vars.maxTextLength);
         chatfield.getStyle().background = null;
         chatfield.getStyle().font = Fonts.chat;
         chatfield.getStyle().fontColor = Color.white;
@@ -115,15 +113,15 @@ public class ScriptConsoleFragment extends Table{
         Draw.color(shadowColor);
 
         if(open){
-            Fill.crect(offsetx, chatfield.getY(), chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
+            Fill.crect(offsetx, chatfield.y, chatfield.getWidth() + 15f, chatfield.getHeight() - 1);
         }
 
         super.draw();
 
         float spacing = chatspace;
 
-        chatfield.visible(open);
-        fieldlabel.visible(open);
+        chatfield.visible = open;
+        fieldlabel.visible = open;
 
         Draw.color(shadowColor);
         Draw.alpha(shadowColor.a * opacity);
@@ -159,7 +157,7 @@ public class ScriptConsoleFragment extends Table{
         String message = chatfield.getText();
         clearChatInput();
 
-        if(message.replaceAll(" ", "").isEmpty()) return;
+        if(message.replace(" ", "").isEmpty()) return;
 
         //special case for 'clear' command
         if(message.equals("clear")){
@@ -180,7 +178,6 @@ public class ScriptConsoleFragment extends Table{
             open = !open;
             if(mobile){
                 TextInput input = new TextInput();
-                input.maxLength = maxTextLength;
                 input.accepted = text -> {
                     chatfield.setText(text);
                     sendMessage();
@@ -221,6 +218,10 @@ public class ScriptConsoleFragment extends Table{
         return open;
     }
 
+    public boolean shown(){
+        return shown;
+    }
+
     public void addMessage(String message){
         messages.insert(0, message);
     }
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index ee08bb03ed..7fe708ce7d 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -15,6 +15,7 @@ import arc.util.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.pooling.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
@@ -56,6 +57,8 @@ public class Block extends UnlockableContent{
     public final BlockBars bars = new BlockBars();
     public final Consumers consumes = new Consumers();
 
+    /** whether to display flow rate */
+    public boolean displayFlow = true;
     /** whether this block is visible in the editor */
     public boolean inEditor = true;
     /** the last configuration value applied to this block. */
@@ -74,12 +77,16 @@ public class Block extends UnlockableContent{
     public boolean solidifes;
     /** whether this is rotateable */
     public boolean rotate;
+    /** for static blocks only: if true, tile data() is saved in world data. */
+    public boolean saveData;
     /** whether you can break this with rightclick */
     public boolean breakable;
     /** whether to add this block to brokenblocks */
     public boolean rebuildable = true;
     /** whether this water can only be placed on water */
     public boolean requiresWater = false;
+    /** whether this water can be placed on any liquids, anywhere */
+    public boolean placeableLiquid = false;
     /** whether this floor can be placed on. */
     public boolean placeableOn = true;
     /** whether this block has insulating properties. */
@@ -88,6 +95,14 @@ public class Block extends UnlockableContent{
     public boolean squareSprite = true;
     /** whether this block absorbs laser attacks. */
     public boolean absorbLasers = false;
+    /** if false, the status is never drawn */
+    public boolean enableDrawStatus = true;
+    /** whether to draw disabled status */
+    public boolean drawDisabled = true;
+    /** whether to automatically reset enabled status after a logic block has not interacted for a while. */
+    public boolean autoResetEnabled = true;
+    /** if true, the block stops updating when disabled */
+    public boolean noUpdateDisabled = false;
     /** tile entity health */
     public int health = -1;
     /** base block explosiveness */
@@ -181,8 +196,12 @@ public class Block extends UnlockableContent{
     public float buildCostMultiplier = 1f;
     /** Whether this block has instant transfer.*/
     public boolean instantTransfer = false;
+    /** Whether you can rotate this block with Keybind rotateplaced + Scroll Wheel. */
+    public boolean quickRotate = true;
+    /** Main subclass. Non-anonymous. */
+    public @Nullable Class<?> subclass;
 
-    protected Prov<Building> entityType = null; //initialized later
+    public Prov<Building> buildType = null; //initialized later
     public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>();
 
     protected TextureRegion[] generatedIcons;
@@ -192,6 +211,7 @@ public class Block extends UnlockableContent{
     public @Load("@-team") TextureRegion teamRegion;
     public TextureRegion[] teamRegions;
 
+    //TODO make this not static
     public static TextureRegion[][] cracks;
     protected static final Seq<Tile> tempTiles = new Seq<>();
     protected static final Seq<Building> tempTileEnts = new Seq<>();
@@ -203,7 +223,7 @@ public class Block extends UnlockableContent{
 
     public Block(String name){
         super(name);
-        initEntity();
+        initBuilding();
     }
 
     public void drawBase(Tile tile){
@@ -211,7 +231,7 @@ public class Block extends UnlockableContent{
         if(tile.build != null){
             tile.build.draw();
         }else{
-            Draw.rect(region, tile.drawx(), tile.drawy(), rotate ? tile.rotation * 90 : 0);
+            Draw.rect(region, tile.drawx(), tile.drawy());
         }
     }
 
@@ -234,7 +254,7 @@ public class Block extends UnlockableContent{
         if(renderer.pixelator.enabled()) return 0;
 
         Color color = valid ? Pal.accent : Pal.remove;
-        BitmapFont font = Fonts.outline;
+        Font font = Fonts.outline;
         GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
         boolean ints = font.usesIntegerPositions();
         font.setUseIntegerPositions(false);
@@ -261,7 +281,8 @@ public class Block extends UnlockableContent{
         return width;
     }
 
-    public float sumAttribute(Attribute attr, int x, int y){
+    public float sumAttribute(@Nullable Attribute attr, int x, int y){
+        if(attr == null) return 0;
         Tile tile = world.tile(x, y);
         if(tile == null) return 0;
         return tile.getLinkedTilesAs(this, tempTiles)
@@ -310,6 +331,10 @@ public class Block extends UnlockableContent{
             stats.add(BlockStat.buildCost, new ItemListValue(false, requirements));
         }
 
+        if(instantTransfer){
+            stats.add(BlockStat.maxConsecutive, 2, StatUnit.none);
+        }
+
         consumes.display(stats);
 
         // Note: Power stats are added by the consumers.
@@ -347,7 +372,8 @@ public class Block extends UnlockableContent{
     }
 
     public boolean canReplace(Block other){
-        return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group && size == other.size;
+        if(other.alwaysReplace) return true;
+        return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group && (size == other.size || (size >= other.size && subclass != null && subclass == other.subclass));
     }
 
     /** @return a possible replacement for this block when placed in a line by the player. */
@@ -355,6 +381,13 @@ public class Block extends UnlockableContent{
         return this;
     }
 
+    public Object nextConfig(){
+        if(saveConfig && lastConfig != null){
+            return lastConfig;
+        }
+        return null;
+    }
+
     public void drawRequest(BuildPlan req, Eachable<BuildPlan> list, boolean valid){
         Draw.reset();
         Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime(), 6f, 0.28f));
@@ -370,7 +403,7 @@ public class Block extends UnlockableContent{
         TextureRegion reg = getRequestRegion(req, list);
         Draw.rect(reg, req.drawx(), req.drawy(), !rotate ? 0 : req.rotation * 90);
 
-        if(req.hasConfig){
+        if(req.config != null){
             drawRequestConfig(req, list);
         }
     }
@@ -396,6 +429,11 @@ public class Block extends UnlockableContent{
 
     }
 
+    /** Transforms the internal position of this config using the specified function, and return the result. */
+    public Object pointConfig(Object config, Cons<Point2> transformer){
+        return config;
+    }
+
     /** Configure when a null value is passed.*/
     public <E extends Building> void configClear(Cons<E> cons){
         configurations.put(void.class, (tile, value) -> cons.get((E)tile));
@@ -464,12 +502,12 @@ public class Block extends UnlockableContent{
         return variantRegions;
     }
 
-    public boolean hasEntity(){
+    public boolean hasBuilding(){
         return destructible || update;
     }
 
-    public final Building newEntity(){
-        return entityType.get();
+    public final Building newBuilding(){
+        return buildType.get();
     }
 
     public Rect bounds(int x, int y, Rect rect){
@@ -545,7 +583,7 @@ public class Block extends UnlockableContent{
         Arrays.sort(requirements, Structs.comparingInt(i -> i.item.id));
     }
 
-    protected void initEntity(){
+    protected void initBuilding(){
         //attempt to find the first declared class and use it as the entity type
         try{
             Class<?> current = getClass();
@@ -554,13 +592,15 @@ public class Block extends UnlockableContent{
                 current = current.getSuperclass();
             }
 
-            while(entityType == null && Block.class.isAssignableFrom(current)){
+            subclass = current;
+
+            while(buildType == null && Block.class.isAssignableFrom(current)){
                 //first class that is subclass of Building
                 Class<?> type = Structs.find(current.getDeclaredClasses(), t -> Building.class.isAssignableFrom(t) && !t.isInterface());
                 if(type != null){
                     //these are inner classes, so they have an implicit parameter generated
                     Constructor<? extends Building> cons = (Constructor<? extends Building>)type.getDeclaredConstructor(type.getDeclaringClass());
-                    entityType = () -> {
+                    buildType = () -> {
                         try{
                             return cons.newInstance(this);
                         }catch(Exception e){
@@ -576,9 +616,29 @@ public class Block extends UnlockableContent{
         }catch(Throwable ignored){
         }
 
-        if(entityType == null){
+        if(buildType == null){
             //assign default value
-            entityType = Building::create;
+            buildType = Building::create;
+        }
+    }
+
+    @Override
+    public ItemStack[] researchRequirements(){
+        ItemStack[] out = new ItemStack[requirements.length];
+        for(int i = 0; i < out.length; i++){
+            int quantity = 40 + Mathf.round(Mathf.pow(requirements[i].amount, 1.25f) * 20, 10);
+
+            out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity));
+        }
+
+        return out;
+    }
+
+    @Override
+    public void getDependencies(Cons<UnlockableContent> cons){
+        //just requires items
+        for(ItemStack stack : requirements){
+            cons.get(stack.item);
         }
     }
 
@@ -601,6 +661,10 @@ public class Block extends UnlockableContent{
             health = size * size * 40;
         }
 
+        if(group == BlockGroup.transportation || consumes.has(ConsumeType.item) || category == Category.distribution){
+            acceptsItems = true;
+        }
+
         offset = ((size + 1) % 2) * tilesize / 2f;
 
         buildCost = 0f;
@@ -628,7 +692,7 @@ public class Block extends UnlockableContent{
     public void load(){
         region = Core.atlas.find(name);
 
-        if(cracks == null || (cracks[0][0].getTexture() != null && cracks[0][0].getTexture().isDisposed())){
+        if(cracks == null || (cracks[0][0].texture != null && cracks[0][0].texture.isDisposed())){
             cracks = new TextureRegion[maxCrackSize][crackRegions];
             for(int size = 1; size <= maxCrackSize; size++){
                 for(int i = 0; i < crackRegions; i++){
diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index 5ea1ef3aae..070ddab553 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -3,18 +3,21 @@ package mindustry.world;
 import arc.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
+import mindustry.gen.*;
 import mindustry.world.blocks.*;
-import mindustry.world.blocks.BuildBlock.*;
+import mindustry.world.blocks.ConstructBlock.*;
 
 import static mindustry.Vars.*;
 
 public class Build{
+    private static final IntSet tmp = new IntSet();
 
     @Remote(called = Loc.server)
     public static void beginBreak(Team team, int x, int y){
@@ -22,7 +25,7 @@ public class Build{
             return;
         }
 
-        Tile tile = world.Building(x, y);
+        Tile tile = world.tileBuilding(x, y);
         //this should never happen, but it doesn't hurt to check for links
         float prevPercent = 1f;
 
@@ -30,13 +33,14 @@ public class Build{
             prevPercent = tile.build.healthf();
         }
 
-        int rotation = tile.rotation();
+        int rotation = tile.build != null ? tile.build.rotation : 0;
         Block previous = tile.block();
-        Block sub = BuildBlock.get(previous.size);
+        Block sub = ConstructBlock.get(previous.size);
 
         tile.setBlock(sub, team, rotation);
-        tile.<BuildEntity>bc().setDeconstruct(previous);
-        tile.build.health(tile.build.maxHealth() * prevPercent);
+        tile.<ConstructBuild>bc().setDeconstruct(previous);
+        tile.build.health = tile.build.maxHealth * prevPercent;
+
 
         Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, true)));
     }
@@ -54,12 +58,24 @@ public class Build{
         if(tile == null) return;
 
         Block previous = tile.block();
-        Block sub = BuildBlock.get(result.size);
+        Block sub = ConstructBlock.get(result.size);
+        Seq<Building> prevBuild = new Seq<>(9);
 
         result.beforePlaceBegan(tile, previous);
+        tmp.clear();
+
+        tile.getLinkedTilesAs(result, t -> {
+            if(t.build != null && t.build.team == team && tmp.add(t.build.id)){
+                prevBuild.add(t.build);
+            }
+        });
 
         tile.setBlock(sub, team, rotation);
-        tile.<BuildEntity>bc().setConstruct(previous, result);
+
+        ConstructBuild build = tile.bc();
+
+        build.setConstruct(previous.size == sub.size ? previous : Blocks.air, result);
+        build.prevBuild = prevBuild;
 
         result.placeBegan(tile, previous);
 
@@ -68,8 +84,13 @@ public class Build{
 
     /** Returns whether a tile can be placed at this location by this team. */
     public static boolean validPlace(Block type, Team team, int x, int y, int rotation){
+        return validPlace(type, team, x, y, rotation, true);
+    }
+
+    /** Returns whether a tile can be placed at this location by this team. */
+    public static boolean validPlace(Block type, Team team, int x, int y, int rotation, boolean checkVisible){
         //the wave team can build whatever they want as long as it's visible - banned blocks are not applicable
-        if(type == null || (!type.isPlaceable() && !(state.rules.waves && team == state.rules.waveTeam && type.isVisible()))){
+        if(type == null || (checkVisible && (!type.isPlaceable() && !(state.rules.waves && team == state.rules.waveTeam && type.isVisible())))){
             return false;
         }
 
@@ -90,65 +111,39 @@ public class Build{
             return false;
         }
 
-        if(type.isMultiblock()){
-            if((type.canReplace(tile.block()) || (tile.block instanceof BuildBlock && tile.<BuildEntity>bc().cblock == type)) &&
-                type.canPlaceOn(tile, team) && tile.interactable(team)){
-
-                //if the block can be replaced but the sizes differ, check all the spaces around the block to make sure it can fit
-                if(type.size != tile.block().size){
-                    int offsetx = -(type.size - 1) / 2;
-                    int offsety = -(type.size - 1) / 2;
-
-                    //this does not check *all* the conditions for placeability yet
-                    for(int dx = 0; dx < type.size; dx++){
-                        for(int dy = 0; dy < type.size; dy++){
-                            int wx = dx + offsetx + x, wy = dy + offsety + y;
-
-                            Tile check = world.tile(wx, wy);
-                            if(check == null || (!check.block.alwaysReplace && check.block != tile.block)) return false;
-                        }
-                    }
-                }
-
-                //make sure that the new block can fit the old one
-                return type.bounds(x, y, Tmp.r1).grow(0.01f).contains(tile.block.bounds(tile.centerX(), tile.centerY(), Tmp.r2));
-            }
-
-            if(!type.requiresWater && !contactsShallows(tile.x, tile.y, type)){
-                return false;
-            }
-
-            if(!type.canPlaceOn(tile, team)){
-                return false;
-            }
-
-            int offsetx = -(type.size - 1) / 2;
-            int offsety = -(type.size - 1) / 2;
-            for(int dx = 0; dx < type.size; dx++){
-                for(int dy = 0; dy < type.size; dy++){
-                    Tile other = world.tile(x + dx + offsetx, y + dy + offsety);
-                    if(
-                        other == null ||
-                        !other.block().alwaysReplace ||
-                        !other.floor().placeableOn ||
-                        (other.floor().isDeep() && !type.floating && !type.requiresWater) ||
-                        (type.requiresWater && tile.floor().liquidDrop != Liquids.water)
-                    ){
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }else{
-            return tile.interactable(team)
-                && (contactsShallows(tile.x, tile.y, type) || type.requiresWater)
-                && (!tile.floor().isDeep() || type.floating || type.requiresWater)
-                && tile.floor().placeableOn
-                && (!type.requiresWater || tile.floor().liquidDrop == Liquids.water)
-                && (((type.canReplace(tile.block()) || (tile.block instanceof BuildBlock && tile.<BuildEntity>bc().cblock == type))
-                && !(type == tile.block() && rotation == tile.rotation() && type.rotate)) || tile.block().alwaysReplace || tile.block() == Blocks.air)
-                && tile.block().isMultiblock() == type.isMultiblock() && type.canPlaceOn(tile, team);
+        if(!type.requiresWater && !contactsShallows(tile.x, tile.y, type) && !type.placeableLiquid){
+            return false;
         }
+
+        if(!type.canPlaceOn(tile, team)){
+            return false;
+        }
+
+        int offsetx = -(type.size - 1) / 2;
+        int offsety = -(type.size - 1) / 2;
+
+        for(int dx = 0; dx < type.size; dx++){
+            for(int dy = 0; dy < type.size; dy++){
+                int wx = dx + offsetx + tile.x, wy = dy + offsety + tile.y;
+
+
+                Tile check = world.tile(wx, wy);
+
+                if(
+                check == null || //nothing there
+                (check.floor().isDeep() && !type.floating && !type.requiresWater && !type.placeableLiquid) || //deep water
+                (type == check.block() && check.build != null && rotation == check.build.rotation && type.rotate) || //same block, same rotation
+                !check.interactable(team) || //cannot interact
+                !check.floor().placeableOn || //solid wall
+                    !((type.canReplace(check.block()) || //can replace type
+                        (check.block instanceof ConstructBlock && check.<ConstructBuild>bc().cblock == type && check.centerX() == tile.x && check.centerY() == tile.y)) && //same type in construction
+                    type.bounds(tile.x, tile.y, Tmp.r1).grow(0.01f).contains(check.block.bounds(check.centerX(), check.centerY(), Tmp.r2))) || //no replacement
+                (type.requiresWater && check.floor().liquidDrop != Liquids.water) //requires water but none found
+                ) return false;
+            }
+        }
+
+        return true;
     }
 
     public static boolean contactsGround(int x, int y, Block block){
diff --git a/core/src/mindustry/world/CachedTile.java b/core/src/mindustry/world/CachedTile.java
index 5a04f6a83e..3c14ade132 100644
--- a/core/src/mindustry/world/CachedTile.java
+++ b/core/src/mindustry/world/CachedTile.java
@@ -21,12 +21,12 @@ public class CachedTile extends Tile{
     }
 
     @Override
-    protected void changeEntity(Team team, Prov<Building> entityprov){
+    protected void changeEntity(Team team, Prov<Building> entityprov, int rotation){
         build = null;
 
         Block block = block();
 
-        if(block.hasEntity()){
+        if(block.hasBuilding()){
             Building n = entityprov.get();
             n.cons(new ConsumeModule(build));
             n.tile(this);
diff --git a/core/src/mindustry/world/Edges.java b/core/src/mindustry/world/Edges.java
index 4b45ca3a32..097c016541 100644
--- a/core/src/mindustry/world/Edges.java
+++ b/core/src/mindustry/world/Edges.java
@@ -51,7 +51,7 @@ public class Edges{
     }
 
     public static Tile getFacingEdge(Building tile, Building other){
-        return getFacingEdge(tile.block(), tile.tileX(), tile.tileY(), other.tile());
+        return getFacingEdge(tile.block, tile.tileX(), tile.tileY(), other.tile());
     }
 
     public static Tile getFacingEdge(Tile tile, Tile other){
diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java
index 93aab9bcc9..978d91fe58 100644
--- a/core/src/mindustry/world/Tile.java
+++ b/core/src/mindustry/world/Tile.java
@@ -21,16 +21,14 @@ import static mindustry.Vars.*;
 public class Tile implements Position, QuadTreeObject, Displayable{
     static final ObjectSet<Building> tileSet = new ObjectSet<>();
 
-    /** Tile traversal cost. */
-    public short cost = 1;
+    /** Extra data for very specific blocks. */
+    public byte data;
     /** Tile entity, usually null. */
     public @Nullable Building build;
     public short x, y;
-    protected @NonNull Block block;
-    protected @NonNull Floor floor;
-    protected @NonNull Floor overlay;
-    /** Rotation, 0-3. Not guaranteed to be in any specific range. */
-    protected byte rotation;
+    protected Block block;
+    protected Floor floor;
+    protected Floor overlay;
     protected boolean changing = false;
 
     public Tile(int x, int y){
@@ -47,7 +45,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         this.block = wall;
 
         //update entity and create it if needed
-        changeEntity(Team.derelict, wall::newEntity);
+        changeEntity(Team.derelict, wall::newBuilding, 0);
         changed();
     }
 
@@ -132,15 +130,15 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return block.solid && !block.synthetic() && block.fillsTile;
     }
 
-    public @NonNull Floor floor(){
+    public Floor floor(){
         return floor;
     }
 
-    public @NonNull Block block(){
+    public Block block(){
         return block;
     }
 
-    public @NonNull Floor overlay(){
+    public Floor overlay(){
         return overlay;
     }
 
@@ -150,7 +148,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
     }
 
     public Team team(){
-        return build == null ? Team.derelict : build.team();
+        return build == null ? Team.derelict : build.team;
     }
 
     public void setTeam(Team team){
@@ -175,17 +173,20 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return team().id;
     }
 
-    public void setBlock(@NonNull Block type, Team team, int rotation){
-        setBlock(type, team, rotation, type::newEntity);
+    public void setBlock(Block type, Team team, int rotation){
+        setBlock(type, team, rotation, type::newBuilding);
     }
 
-    public void setBlock(@NonNull Block type, Team team, int rotation, Prov<Building> entityprov){
+    public void setBlock(Block type, Team team, int rotation, Prov<Building> entityprov){
         changing = true;
 
+        if(type.isStatic() || this.block.isStatic()){
+            recache();
+        }
+
         this.block = type;
-        this.rotation = rotation == 0 ? 0 : (byte)Mathf.mod(rotation, 4);
         preChanged();
-        changeEntity(team, entityprov);
+        changeEntity(team, entityprov, (byte)Mathf.mod(rotation, 4));
 
         if(build != null){
             build.team(team);
@@ -231,16 +232,16 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         changing = false;
     }
 
-    public void setBlock(@NonNull Block type, Team team){
+    public void setBlock(Block type, Team team){
         setBlock(type, team, 0);
     }
 
-    public void setBlock(@NonNull Block type){
+    public void setBlock(Block type){
         setBlock(type, Team.derelict, 0);
     }
 
     /** This resets the overlay! */
-    public void setFloor(@NonNull Floor type){
+    public void setFloor(Floor type){
         this.floor = type;
         this.overlay = (Floor)Blocks.air;
 
@@ -251,7 +252,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
     }
 
     /** Sets the floor, preserving overlay.*/
-    public void setFloorUnder(@NonNull Floor floor){
+    public void setFloorUnder(Floor floor){
         Block overlay = this.overlay;
         setFloor(floor);
         setOverlay(overlay);
@@ -289,6 +290,11 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         Call.removeTile(this);
     }
 
+    /** set()-s this tile, except it's synced across the network */
+    public void setNet(Block block){
+        Call.setTile(this, block, Team.derelict, 0);
+    }
+
     /** set()-s this tile, except it's synced across the network */
     public void setNet(Block block, Team team, int rotation){
         Call.setTile(this, block, team, rotation);
@@ -304,18 +310,6 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         setFloorNet(floor, Blocks.air);
     }
 
-    public byte rotation(){
-        return rotation;
-    }
-
-    public int rotdeg(){
-        return rotation * 90;
-    }
-
-    public void rotation(int rotation){
-        this.rotation = (byte)rotation;
-    }
-
     public short overlayID(){
         return overlay.id;
     }
@@ -395,19 +389,27 @@ public class Tile implements Position, QuadTreeObject, Displayable{
      */
     public Seq<Tile> getLinkedTilesAs(Block block, Seq<Tile> tmpArray){
         tmpArray.clear();
+        getLinkedTilesAs(block, tmpArray::add);
+        return tmpArray;
+    }
+
+    /**
+     * Returns the list of all tiles linked to this multiblock if it were this block.
+     * The result contains all linked tiles, including this tile itself.
+     */
+    public void getLinkedTilesAs(Block block, Cons<Tile> tmpArray){
         if(block.isMultiblock()){
             int offsetx = -(block.size - 1) / 2;
             int offsety = -(block.size - 1) / 2;
             for(int dx = 0; dx < block.size; dx++){
                 for(int dy = 0; dy < block.size; dy++){
                     Tile other = world.tile(x + dx + offsetx, y + dy + offsety);
-                    if(other != null) tmpArray.add(other);
+                    if(other != null) tmpArray.get(other);
                 }
             }
         }else{
-            tmpArray.add(this);
+            tmpArray.get(this);
         }
-        return tmpArray;
     }
 
     public Rect getHitbox(Rect rect){
@@ -443,23 +445,6 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return null;
     }
 
-    // ▲ ▲ ▼ ▼ ◀ ▶ ◀ ▶ B A
-    public @Nullable Building front(){
-        return getNearbyEntity((rotation + 4) % 4);
-    }
-
-    public @Nullable Building right(){
-        return getNearbyEntity((rotation + 3) % 4);
-    }
-
-    public @Nullable Building back(){
-        return getNearbyEntity((rotation + 2) % 4);
-    }
-
-    public @Nullable Building left(){
-        return getNearbyEntity((rotation + 1) % 4);
-    }
-
     public boolean interactable(Team team){
         return state.teams.canInteract(team, team());
     }
@@ -469,45 +454,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
     }
 
     public int staticDarkness(){
-        return block.solid && block.fillsTile && !block.synthetic() ? rotation : 0;
-    }
-
-    public void updateOcclusion(){
-        cost = 1;
-        boolean occluded = false;
-
-        //check for occlusion
-        for(int i = 0; i < 8; i++){
-            Point2 point = Geometry.d8[i];
-            Tile tile = world.tile(x + point.x, y + point.y);
-            if(tile != null && tile.floor.isLiquid){
-                cost += 4;
-            }
-            if(tile != null && tile.solid()){
-                occluded = true;
-                break;
-            }
-        }
-
-        if(occluded){
-            cost += 2;
-        }
-
-        if(block.synthetic() && solid()){
-            cost += Mathf.clamp(block.health / 6f, 0, 1000);
-        }
-
-        if(floor.isLiquid){
-            cost += 10;
-        }
-
-        if(floor.drownTime > 0){
-            cost += 70;
-        }
-
-        if(cost < 0){
-            cost = Byte.MAX_VALUE;
-        }
+        return block.solid && block.fillsTile && !block.synthetic() ? data : 0;
     }
 
     protected void preChanged(){
@@ -517,7 +464,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
             build.removeFromProximity();
 
             //remove this tile's dangling entities
-            if(build.block().isMultiblock()){
+            if(build.block.isMultiblock()){
                 int cx = build.tileX(), cy = build.tileY();
                 int size = build.block.size;
                 int offsetx = -(size - 1) / 2;
@@ -532,8 +479,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
                                 other.block = Blocks.air;
 
                                 //manually call changed event
-                                other.updateOcclusion();
-                                world.notifyChanged(other);
+                                other.fireChanged();
                             }
                         }
                     }
@@ -548,7 +494,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         }
     }
 
-    protected void changeEntity(Team team, Prov<Building> entityprov){
+    protected void changeEntity(Team team, Prov<Building> entityprov, int rotation){
         if(build != null){
             int size = build.block.size;
             build.remove();
@@ -570,8 +516,8 @@ public class Tile implements Position, QuadTreeObject, Displayable{
             }
         }
 
-        if(block.hasEntity()){
-            build = entityprov.get().init(this, team, block.update);
+        if(block.hasBuilding()){
+            build = entityprov.get().init(this, team, block.update && !state.isEditor(), rotation);
         }
     }
 
@@ -583,16 +529,14 @@ public class Tile implements Position, QuadTreeObject, Displayable{
                 //since the entity won't update proximity for us, update proximity for all nearby tiles manually
                 for(Point2 p : Geometry.d4){
                     Building tile = world.build(x + p.x, y + p.y);
-                    if(tile != null && !tile.tile().changing){
+                    if(tile != null && !tile.tile.changing){
                         tile.onProximityUpdate();
                     }
                 }
             }
         }
 
-        updateOcclusion();
-
-        world.notifyChanged(this);
+        fireChanged();
 
         //recache when static block is added
         if(block.isStatic()){
@@ -600,6 +544,10 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         }
     }
 
+    protected void fireChanged(){
+        world.notifyChanged(this);
+    }
+
     @Override
     public void display(Table table){
         Block toDisplay = overlay.itemDrop != null ? overlay : floor;
diff --git a/core/src/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java
index 74c784a850..173f3bf0b1 100644
--- a/core/src/mindustry/world/Tiles.java
+++ b/core/src/mindustry/world/Tiles.java
@@ -11,7 +11,7 @@ import java.util.*;
 public class Tiles implements Iterable<Tile>{
     public final int width, height;
 
-    private final Tile[] array;
+    final Tile[] array;
 
     public Tiles(int width, int height){
         this.array = new Tile[width * height];
@@ -50,20 +50,20 @@ public class Tiles implements Iterable<Tile>{
     }
 
     /** @return a tile at coordinates; throws an exception if out of bounds */
-    public @NonNull Tile getn(int x, int y){
+    public Tile getn(int x, int y){
         if(x < 0 || x >= width || y < 0 || y >= height) throw new IllegalArgumentException(x + ", " + y + " out of bounds: width=" + width + ", height=" + height);
         return array[y*width + x];
     }
 
     /** @return a tile at coordinates, clamped. */
-    public @NonNull Tile getc(int x, int y){
+    public Tile getc(int x, int y){
         x = Mathf.clamp(x, 0, width - 1);
         y = Mathf.clamp(y, 0, height - 1);
         return array[y*width + x];
     }
 
     /** @return a tile at an iteration index [0, width * height] */
-    public @NonNull Tile geti(int idx){
+    public Tile geti(int idx){
         return array[idx];
     }
 
@@ -72,7 +72,7 @@ public class Tiles implements Iterable<Tile>{
         return get(Point2.x(pos), Point2.y(pos));
     }
 
-    public void each(Cons<Tile> cons){
+    public void eachTile(Cons<Tile> cons){
         for(Tile tile : array){
             cons.get(tile);
         }
@@ -87,6 +87,9 @@ public class Tiles implements Iterable<Tile>{
     private class TileIterator implements Iterator<Tile>{
         int index = 0;
 
+        TileIterator(){
+        }
+
         @Override
         public boolean hasNext(){
             return index < array.length;
diff --git a/core/src/mindustry/world/blocks/Attributes.java b/core/src/mindustry/world/blocks/Attributes.java
index 487b093314..50c907e218 100644
--- a/core/src/mindustry/world/blocks/Attributes.java
+++ b/core/src/mindustry/world/blocks/Attributes.java
@@ -1,15 +1,51 @@
 package mindustry.world.blocks;
 
+import arc.util.serialization.*;
+import arc.util.serialization.Json.*;
 import mindustry.world.meta.Attribute;
 
-public class Attributes{
-    private float[] array = new float[Attribute.values().length];
+import java.util.*;
+
+public class Attributes implements Serializable{
+    private final float[] arr = new float[Attribute.all.length];
+
+    public void clear(){
+        Arrays.fill(arr, 0);
+    }
 
     public float get(Attribute attr){
-        return array[attr.ordinal()];
+        return arr[attr.ordinal()];
     }
 
     public void set(Attribute attr, float value){
-        array[attr.ordinal()] = value;
+        arr[attr.ordinal()] = value;
+    }
+
+    public void add(Attributes other){
+        for(int i = 0; i < arr.length; i++){
+            arr[i] += other.arr[i];
+        }
+    }
+
+    public void add(Attributes other, float scl){
+        for(int i = 0; i < arr.length; i++){
+            arr[i] += other.arr[i] * scl;
+        }
+    }
+
+    @Override
+    public void write(Json json){
+        for(Attribute at : Attribute.all){
+            if(arr[at.ordinal()] != 0){
+                json.writeValue(at.name(), arr[at.ordinal()]);
+            }
+        }
+    }
+
+    @Override
+    public void read(Json json, JsonValue data){
+        for(Attribute at : Attribute.all){
+            arr[at.ordinal()] = data.getFloat(at.name(), 0);
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java
index 73ddc75d3d..4e8748db2a 100644
--- a/core/src/mindustry/world/blocks/Autotiler.java
+++ b/core/src/mindustry/world/blocks/Autotiler.java
@@ -14,31 +14,57 @@ import java.util.*;
 //TODO documentation
 public interface Autotiler{
 
-    //holds some static temporary variables, required due to some RoboVM bugs
+    /**
+     * Holds some static temporary variables, required due to some RoboVM bugs
+     */
     class AutotilerHolder{
         static final int[] blendresult = new int[5];
         static final BuildPlan[] directionals = new BuildPlan[4];
     }
 
-    /** slices a texture region:
-     * mode == 0 -> no slice
-     * mode == 1 -> bottom
-     * mode == 2 -> top */
-    default TextureRegion sliced(TextureRegion input, int mode){
-        return mode == 0 ? input : mode == 1 ? botHalf(input) : topHalf(input);
+    /**
+     * The mode to slice a texture at.
+     */
+    enum SliceMode{
+        none,
+        bottom,
+        top
     }
 
+    /**
+     * Slices a texture region depending on the SliceMode paramater
+     *
+     * @param input The TextureRegion to be sliced
+     * @param mode The SliceMode to be applied
+     * @return The sliced texture
+     */
+    default TextureRegion sliced(TextureRegion input, SliceMode mode){
+        return mode == SliceMode.none ? input : mode == SliceMode.bottom ? botHalf(input) : topHalf(input);
+    }
+
+    /**
+     * Get the top half of a texture
+     *
+     * @param input The TextureRegion to slice
+     * @return The top half of the texture
+     */
     default TextureRegion topHalf(TextureRegion input){
         TextureRegion region = Tmp.tr1;
         region.set(input);
-        region.setWidth(region.getWidth() / 2);
+        region.setWidth(region.width / 2);
         return region;
     }
 
+    /**
+     * Get the buttom half of a texture
+     *
+     * @param input The TextureRegion to slice
+     * @return The buttom half of the texture
+     */
     default TextureRegion botHalf(TextureRegion input){
         TextureRegion region = Tmp.tr1;
         region.set(input);
-        int width = region.getWidth();
+        int width = region.width;
         region.setWidth(width / 2);
         region.setX(region.getX() + width);
         return region;
@@ -82,6 +108,8 @@ public interface Autotiler{
         int[] blendresult = AutotilerHolder.blendresult;
         blendresult[0] = 0;
         blendresult[1] = blendresult[2] = 1;
+
+        // TODO code refactoring maybe?
         int num =
         (blends(tile, rotation, directional, 2, world) && blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 0 :
         (blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 1 :
@@ -92,6 +120,8 @@ public interface Autotiler{
         -1;
         transformCase(num, blendresult);
 
+        // Calculate bitmask for direction.
+
         blendresult[3] = 0;
 
         for(int i = 0; i < 4; i++){
@@ -100,11 +130,13 @@ public interface Autotiler{
             }
         }
 
+        // Calculate direction for non-square sprites.
+
         blendresult[4] = 0;
 
         for(int i = 0; i < 4; i++){
             int realDir = Mathf.mod(rotation - i, 4);
-            if(blends(tile, rotation, directional, i, world) && (tile != null && tile.getNearbyEntity(realDir) != null && !tile.getNearbyEntity(realDir).block().squareSprite)){
+            if(blends(tile, rotation, directional, i, world) && (tile != null && tile.getNearbyEntity(realDir) != null && !tile.getNearbyEntity(realDir).block.squareSprite)){
                 blendresult[4] |= (1 << i);
             }
         }
@@ -112,6 +144,12 @@ public interface Autotiler{
         return blendresult;
     }
 
+    /**
+     * Transforms the autotiler setting the connection and the y-scale
+     *
+     * @param num The number to use to transform the array
+     * @param bits The blending value array
+     */
     default void transformCase(int num, int[] bits){
         if(num == 0){
             bits[0] = 3;
@@ -130,6 +168,18 @@ public interface Autotiler{
         }
     }
 
+    /**
+     * Check if a position is facing the secondary position at a rotation
+     *
+     * @param x The x coordinate of position 1
+     * @param y The y coordinate of position 1
+     * @param rotation The rotation of the tile on (x, y)
+     *
+     * @param x2 The x coordinate of position 2
+     * @param y2 The y coordinate of position 2
+     *
+     * @return If position 1 is facing position 2 at a certain angle
+     */
     default boolean facing(int x, int y, int rotation, int x2, int y2){
         return Point2.equals(x + Geometry.d4(rotation).x,y + Geometry.d4(rotation).y, x2, y2);
     }
@@ -145,9 +195,11 @@ public interface Autotiler{
         return checkWorld && blends(tile, rotation, direction);
     }
 
+
+    // TODO docs -- use for direction?
     default boolean blends(Tile tile, int rotation, int direction){
         Building other = tile.getNearbyEntity(Mathf.mod(rotation - direction, 4));
-        return other != null && other.team() == tile.team() && blends(tile, rotation, other.tileX(), other.tileY(), other.rotation(), other.block());
+        return other != null && other.team == tile.team() && blends(tile, rotation, other.tileX(), other.tileY(), other.rotation, other.block);
     }
 
     default boolean blendsArmored(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
@@ -168,7 +220,16 @@ public interface Autotiler{
         || (!otherblock.rotatedOutput(otherx, othery) || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
     }
 
-    /** @return whether this tile is looking at the other tile. */
+    /**
+     * Check if a position is facing the secondary position at a rotation
+     *
+     * @param tile The origin tile that is or is not facing the destinated `otherblock`
+     * @param rotation The rotation of the tile on (x, y)
+     *
+     * @param otherx The x coordinate of position 2
+     * @param othery The y coordinate of position 2
+     * @return whether this tile is looking at the other tile.
+     */
     default boolean lookingAt(Tile tile, int rotation, int otherx, int othery, Block otherblock){
         Tile facing = Edges.getFacingEdge(otherblock, otherx, othery, tile);
         return facing != null &&
diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
similarity index 84%
rename from core/src/mindustry/world/blocks/BuildBlock.java
rename to core/src/mindustry/world/blocks/ConstructBlock.java
index 53fc4bcc54..3cd0b5ec0f 100644
--- a/core/src/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -5,6 +5,7 @@ import arc.Graphics.*;
 import arc.Graphics.Cursor.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import arc.util.io.*;
@@ -23,51 +24,66 @@ import mindustry.world.modules.*;
 
 import static mindustry.Vars.*;
 
-public class BuildBlock extends Block{
+/** A block in the process of construction. */
+public class ConstructBlock extends Block{
     public static final int maxSize = 16;
-    private static final BuildBlock[] buildBlocks = new BuildBlock[maxSize];
+    private static final ConstructBlock[] consBlocks = new ConstructBlock[maxSize];
 
     private static long lastTime = 0;
     private static int pitchSeq = 0;
     private static long lastPlayed;
 
-    public BuildBlock(int size){
+    public ConstructBlock(int size){
         super("build" + size);
         this.size = size;
         update = true;
         health = 20;
         consumesTap = true;
         solidifes = true;
-        buildBlocks[size - 1] = this;
+        consBlocks[size - 1] = this;
     }
 
     /** Returns a BuildBlock by size. */
-    public static BuildBlock get(int size){
-        if(size > maxSize) throw new IllegalArgumentException("No. Don't place BuildBlocks of size greater than " + maxSize);
-        return buildBlocks[size - 1];
+    public static ConstructBlock get(int size){
+        if(size > maxSize) throw new IllegalArgumentException("No. Don't place ConstructBlock of size greater than " + maxSize);
+        return consBlocks[size - 1];
     }
 
     @Remote(called = Loc.server)
-    public static void deconstructFinish(Tile tile, Block block, int builderID){
+    public static void deconstructFinish(Tile tile, Block block, Unit builder){
         Team team = tile.team();
         Fx.breakBlock.at(tile.drawx(), tile.drawy(), block.size);
-        Events.fire(new BlockBuildEndEvent(tile, Groups.unit.getByID(builderID), team, true));
+        Events.fire(new BlockBuildEndEvent(tile, builder, team, true, null));
         tile.remove();
         if(shouldPlay()) Sounds.breaks.at(tile, calcPitch(false));
     }
 
     @Remote(called = Loc.server)
-    public static void constructFinish(Tile tile, Block block, int builderID, byte rotation, Team team, boolean skipConfig){
+    public static void constructFinish(Tile tile, Block block, Unit builder, byte rotation, Team team, Object config){
         if(tile == null) return;
+
         float healthf = tile.build == null ? 1f : tile.build.healthf();
+        Seq<Building> prev = tile.build instanceof ConstructBuild ? ((ConstructBuild)tile.build).prevBuild : null;
+
         tile.setBlock(block, team, rotation);
-        tile.build.health = block.health * healthf;
-        //last builder was this local client player, call placed()
-        if(!headless && builderID == player.unit().id()){
-            if(!skipConfig){
-                tile.build.playerPlaced();
+
+        if(tile.build != null){
+            tile.build.health = block.health * healthf;
+
+            if(config != null){
+                tile.build.configured(builder, config);
+            }
+
+            if(prev != null && prev.size > 0){
+                tile.build.overwrote(prev);
             }
         }
+
+        //last builder was this local client player, call placed()
+        if(tile.build != null && !headless && builder == player.unit()){
+            tile.build.playerPlaced(config);
+        }
+
         Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size);
     }
 
@@ -95,11 +111,13 @@ public class BuildBlock extends Block{
         }
     }
 
-    public static void constructed(Tile tile, Block block, int builderID, byte rotation, Team team, boolean skipConfig){
-        Call.constructFinish(tile, block, builderID, rotation, team, skipConfig);
-        tile.build.placed();
+    public static void constructed(Tile tile, Block block, Unit builder, byte rotation, Team team, Object config){
+        Call.constructFinish(tile, block, builder, rotation, team, config);
+        if(tile.build != null){
+            tile.build.placed();
+        }
 
-        Events.fire(new BlockBuildEndEvent(tile, Groups.unit.getByID(builderID), team, false));
+        Events.fire(new BlockBuildEndEvent(tile, builder, team, false, config));
         if(shouldPlay()) Sounds.place.at(tile, calcPitch(true));
     }
 
@@ -108,12 +126,13 @@ public class BuildBlock extends Block{
         return true;
     }
 
-    public class BuildEntity extends Building{
+    public class ConstructBuild extends Building{
         /**
          * The recipe of the block that is being constructed.
          * If there is no recipe for this block, as is the case with rocks, 'previous' is used.
          */
         public @Nullable Block cblock;
+        public @Nullable Seq<Building> prevBuild;
 
         public float progress = 0;
         public float buildCost;
@@ -122,7 +141,7 @@ public class BuildBlock extends Block{
          * If a non-recipe block is being deconstructed, this is the block that is being deconstructed.
          */
         public Block previous;
-        public int builderID = -1;
+        public Object lastConfig;
 
         private float[] accumulator;
         private float[] totalAccumulator;
@@ -148,13 +167,13 @@ public class BuildBlock extends Block{
         }
 
         @Override
-        public void tapped(Player player){
+        public void tapped(){
             //if the target is constructible, begin constructing
-            if(!headless && cblock != null){
+            if(cblock != null){
                 if(control.input.buildWasAutoPaused && !control.input.isBuilding && player.isBuilder()){
                     control.input.isBuilding = true;
                 }
-                player.builder().addBuild(new BuildPlan(tile.x, tile.y, tile.rotation(), cblock), false);
+                player.builder().addBuild(new BuildPlan(tile.x, tile.y, rotation, cblock, lastConfig), false);
             }
         }
 
@@ -163,14 +182,14 @@ public class BuildBlock extends Block{
             Fx.blockExplosionSmoke.at(tile);
 
             if(!tile.floor().solid && !tile.floor().isLiquid){
-                Effects.rubble(x, y, size);
+                Effect.rubble(x, y, size);
             }
         }
 
         @Override
         public void draw(){
             if(!(previous == null || cblock == null || previous == cblock) && Core.atlas.isFound(previous.icon(Cicon.full))){
-                Draw.rect(previous.icon(Cicon.full), x, y, previous.rotate ? tile.rotdeg() : 0);
+                Draw.rect(previous.icon(Cicon.full), x, y, previous.rotate ? rotdeg() : 0);
             }
 
             Draw.draw(Layer.blockBuilding, () -> {
@@ -183,19 +202,21 @@ public class BuildBlock extends Block{
                         Shaders.blockbuild.region = region;
                         Shaders.blockbuild.progress = progress;
 
-                        Draw.rect(region, x, y, target.rotate ? tile.rotdeg() : 0);
+                        Draw.rect(region, x, y, target.rotate ? rotdeg() : 0);
                         Draw.flush();
                     }
                 }
             });
         }
 
-        public boolean construct(Unitc builder, @Nullable Building core, float amount, boolean configured){
+        public void construct(Unit builder, @Nullable Building core, float amount, Object config){
             if(cblock == null){
                 kill();
-                return false;
+                return;
             }
 
+            lastConfig = config;
+
             if(cblock.requirements.length != accumulator.length || totalAccumulator.length != cblock.requirements.length){
                 setConstruct(previous, cblock);
             }
@@ -211,16 +232,13 @@ public class BuildBlock extends Block{
             maxProgress = core == null || team.rules().infiniteResources ? maxProgress : checkRequired(core.items, maxProgress, true);
 
             progress = Mathf.clamp(progress + maxProgress);
-            builderID = builder.id();
 
             if(progress >= 1f || state.rules.infiniteResources){
-                constructed(tile, cblock, builderID, tile.rotation(), builder.team(), configured);
-                return true;
+                constructed(tile, cblock, builder, (byte)rotation, builder.team, config);
             }
-            return false;
         }
 
-        public void deconstruct(Unitc builder, @Nullable Building core, float amount){
+        public void deconstruct(Unit builder, @Nullable Building core, float amount){
             float deconstructMultiplier = state.rules.deconstructRefundMultiplier;
 
             if(cblock != null){
@@ -253,10 +271,8 @@ public class BuildBlock extends Block{
 
             progress = Mathf.clamp(progress - amount);
 
-            builderID = builder.id();
-
             if(progress <= 0 || state.rules.infiniteResources){
-                Call.deconstructFinish(tile, this.cblock == null ? previous : this.cblock, builderID);
+                Call.deconstructFinish(tile, this.cblock == null ? previous : this.cblock, builder);
             }
         }
 
diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java
index b67589769e..093fff4f70 100644
--- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java
+++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java
@@ -5,6 +5,7 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
@@ -34,6 +35,7 @@ public class LaunchPad extends Block{
         hasItems = true;
         solid = true;
         update = true;
+        configurable = true;
     }
 
     @Override
@@ -50,7 +52,8 @@ public class LaunchPad extends Block{
         bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
     }
 
-    public class LaunchPadEntity extends Building{
+    public class LaunchPadBuild extends Building{
+
         @Override
         public void draw(){
             super.draw();
@@ -97,16 +100,45 @@ public class LaunchPad extends Block{
             //launch when full and base conditions are met
             if(items.total() >= itemCapacity && efficiency() >= 1f && timer(timerLaunch, launchTime / timeScale)){
                 LaunchPayload entity = LaunchPayload.create();
-                items.each((item, amount) -> entity.stacks().add(new ItemStack(item, amount)));
+                items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount)));
                 entity.set(this);
                 entity.lifetime(120f);
                 entity.team(team);
                 entity.add();
                 Fx.launchPod.at(this);
                 items.clear();
-                Effects.shake(3f, 3f, this);
+                Effect.shake(3f, 3f, this);
             }
         }
+
+        @Override
+        public void display(Table table){
+            super.display(table);
+
+            table.row();
+            table.label(() -> {
+                Sector dest = state.secinfo.getRealDestination();
+
+                return Core.bundle.format("launch.destination",
+                    dest == null ? Core.bundle.get("sectors.nonelaunch") :
+                    dest.preset == null ?
+                        "[accent]Sector " + dest.id :
+                        "[accent]" + dest.preset.localizedName);
+            }).pad(4);
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            if(!state.isCampaign()){
+                deselect();
+                return;
+            }
+
+            table.button(Icon.upOpen, Styles.clearTransi, () -> {
+                ui.planet.showSelect(state.rules.sector, other -> state.secinfo.destination = other);
+                deselect();
+            }).size(40f);
+        }
     }
 
     @EntityDef(LaunchPayloadc.class)
@@ -142,7 +174,7 @@ public class LaunchPad extends Block{
             Draw.z(Layer.weather - 1);
 
             TextureRegion region = Core.atlas.find("launchpod");
-            float rw = region.getWidth() * Draw.scl * scale, rh = region.getHeight() * Draw.scl * scale;
+            float rw = region.width * Draw.scl * scale, rh = region.height * Draw.scl * scale;
 
             Draw.alpha(alpha);
             Draw.rect(region, cx, cy, rw, rh, rotation);
@@ -174,25 +206,25 @@ public class LaunchPad extends Block{
 
         @Override
         public void remove(){
+            if(!state.isCampaign()) return;
+
+            Sector destsec = state.secinfo.getRealDestination();
 
             //actually launch the items upon removal
-            if(team() == state.rules.defaultTeam && state.secinfo.origin != null){
-                Seq<ItemStack> dest = state.secinfo.origin.getReceivedItems();
+            if(team() == state.rules.defaultTeam){
+                if(destsec != null && (destsec != state.rules.sector || net.client())){
+                    ItemSeq dest = destsec.getExtraItems();
 
-                for(ItemStack stack : stacks){
-                    ItemStack sto = dest.find(i -> i.item == stack.item);
-                    if(sto != null){
-                        sto.amount += stack.amount;
-                    }else{
+                    for(ItemStack stack : stacks){
                         dest.add(stack);
+
+                        //update export
+                        state.secinfo.handleItemExport(stack);
+                        Events.fire(new LaunchItemEvent(stack));
                     }
 
-                    //update export
-                    state.secinfo.handleItemExport(stack);
-                    Events.fire(new LaunchItemEvent(stack));
+                    destsec.setExtraItems(dest);
                 }
-
-                state.secinfo.origin.setReceivedItems(dest);
             }
         }
     }
diff --git a/core/src/mindustry/world/blocks/campaign/ResearchBlock.java b/core/src/mindustry/world/blocks/campaign/ResearchBlock.java
deleted file mode 100644
index 4a29cb3e03..0000000000
--- a/core/src/mindustry/world/blocks/campaign/ResearchBlock.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package mindustry.world.blocks.campaign;
-
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.math.*;
-import arc.scene.style.*;
-import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
-import arc.util.*;
-import arc.util.io.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
-import mindustry.content.TechTree.*;
-import mindustry.ctype.*;
-import mindustry.gen.*;
-import mindustry.graphics.*;
-import mindustry.type.*;
-import mindustry.ui.*;
-import mindustry.world.*;
-import mindustry.world.consumers.*;
-
-import static mindustry.Vars.*;
-
-public class ResearchBlock extends Block{
-    public float researchSpeed = 1f;
-    public @Load("@-top") TextureRegion topRegion;
-
-    public ResearchBlock(String name){
-        super(name);
-
-        update = true;
-        solid = true;
-        hasPower = true;
-        hasItems = true;
-        configurable = true;
-        itemCapacity = 100;
-
-        //TODO requirements shrink as time goes on
-        consumes.add(new ConsumeItemDynamic((ResearchBlockEntity entity) -> entity.researching != null ? entity.researching.requirements : ItemStack.empty));
-        config(TechNode.class, ResearchBlockEntity::setTo);
-    }
-
-    @Override
-    public boolean outputsItems(){
-        return false;
-    }
-
-    @Override
-    public void setBars(){
-        super.setBars();
-
-        bars.add("progress", (ResearchBlockEntity e) -> new Bar("bar.progress", Pal.ammo, () -> e.researching == null ? 0f : e.researching.progress / e.researching.time));
-    }
-
-    public class ResearchBlockEntity extends Building{
-        public @Nullable TechNode researching;
-
-        public double[] accumulator;
-        public double[] totalAccumulator;
-
-        @Override
-        public void updateTile(){
-            if(researching != null){
-                //don't research something that is already researched
-                if(researching.content.unlocked()){
-                    setTo(null);
-                }else{
-                    double totalTicks = researching.time * 60.0;
-                    double amount = researchSpeed * edelta() / totalTicks;
-
-                    double maxProgress = checkRequired(amount, false);
-
-                    for(int i = 0; i < researching.requirements.length; i++){
-                        int reqamount = Math.round(state.rules.buildCostMultiplier * researching.requirements[i].amount);
-                        accumulator[i] += Math.min(reqamount * maxProgress, reqamount - totalAccumulator[i] + 0.00001); //add min amount progressed to the accumulator
-                        totalAccumulator[i] = Math.min(totalAccumulator[i] + reqamount * maxProgress, reqamount);
-                    }
-
-                    maxProgress = checkRequired(maxProgress, true);
-
-                    float increment = (float)(maxProgress * researching.time);
-                    researching.progress += increment;
-
-                    //check if it has been researched
-                    if(researching.progress >= researching.time){
-                        researching.content.unlock();
-
-                        setTo(null);
-                    }
-                }
-            }
-        }
-
-        private double checkRequired(double amount, boolean remove){
-            double maxProgress = amount;
-
-            for(int i = 0; i < researching.requirements.length; i++){
-                int ramount = researching.requirements[i].amount;
-                int required = (int)(accumulator[i]); //calculate items that are required now
-
-                if(!items.has(researching.requirements[i].item) && ramount > 0){
-                    maxProgress = 0f;
-                }else if(required > 0){ //if this amount is positive...
-                    //calculate how many items it can actually use
-                    int maxUse = Math.min(required, items.get(researching.requirements[i].item));
-                    //get this as a fraction
-                    double fraction = maxUse / (double)required;
-
-                    //move max progress down if this fraction is less than 1
-                    maxProgress = Math.min(maxProgress, maxProgress * fraction);
-
-                    accumulator[i] -= maxUse;
-
-                    //remove stuff that is actually used
-                    if(remove){
-                        items.remove(researching.requirements[i].item, maxUse);
-                    }
-                }
-                //else, no items are required yet, so just keep going
-            }
-
-            return maxProgress;
-        }
-
-        private void setTo(@Nullable TechNode value){
-            researching = value;
-            if(value != null){
-                accumulator = new double[researching.requirements.length];
-                totalAccumulator = new double[researching.requirements.length];
-            }
-        }
-
-        @Override
-        public void display(Table table){
-            super.display(table);
-
-            TextureRegionDrawable reg = new TextureRegionDrawable();
-
-            table.row();
-            table.table(t -> {
-                t.image().update(i -> {
-                    i.setDrawable(researching == null ? Icon.cancel : reg.set(researching.content.icon(Cicon.medium)));
-                    i.setScaling(Scaling.fit);
-                    i.setColor(researching == null ? Color.lightGray : Color.white);
-                }).size(32).pad(3);
-                t.label(() -> researching == null ? "$none" : researching.content.localizedName).color(Color.lightGray);
-            }).left().padTop(4);
-        }
-
-        @Override
-        public void buildConfiguration(Table table){
-
-        }
-
-        @Override
-        public void draw(){
-            super.draw();
-
-            Draw.mixcol(Color.white, Mathf.absin(10f, 0.2f));
-            Draw.rect(topRegion, x, y);
-            Draw.reset();
-        }
-
-        @Override
-        public boolean acceptItem(Building source, Item item){
-            return items.get(item) < getMaximumAccepted(item);
-        }
-
-        @Override
-        public int getMaximumAccepted(Item item){
-            if(researching == null) return 0;
-            for(int i = 0; i < researching.requirements.length; i++){
-                if(researching.requirements[i].item == item) return researching.requirements[i].amount;
-            }
-            return 0;
-        }
-
-        @Override
-        public boolean configTapped(){
-            //configure with tech node
-            ui.showInfo("this does nothing");
-            //ui.research.show(node -> {
-            //    configure(node);
-            //    ui.research.hide();
-            //});
-
-            return false;
-        }
-
-        @Override
-        public void write(Writes write){
-            super.write(write);
-
-            if(researching != null){
-                write.b(researching.content.getContentType().ordinal());
-                write.s(researching.content.id);
-            }else{
-                write.b(-1);
-            }
-        }
-
-        @Override
-        public void read(Reads read, byte revision){
-            super.read(read, revision);
-
-            byte type = read.b();
-            if(type != -1){
-                setTo(TechTree.get(content.getByID(ContentType.all[type], read.s())));
-            }else{
-                researching = null;
-            }
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java
index 705cd1c9aa..c745f3a63f 100644
--- a/core/src/mindustry/world/blocks/defense/Door.java
+++ b/core/src/mindustry/world/blocks/defense/Door.java
@@ -1,9 +1,12 @@
 package mindustry.world.blocks.defense;
 
+import arc.audio.*;
 import arc.Graphics.*;
 import arc.Graphics.Cursor.*;
 import arc.graphics.g2d.*;
+import arc.math.*;
 import arc.math.geom.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
@@ -11,8 +14,9 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
+import mindustry.logic.*;
 
-import static mindustry.Vars.pathfinder;
+import static mindustry.Vars.*;
 
 public class Door extends Wall{
     protected final static Rect rect = new Rect();
@@ -20,6 +24,7 @@ public class Door extends Wall{
     public final int timerToggle = timers++;
     public Effect openfx = Fx.dooropen;
     public Effect closefx = Fx.doorclose;
+    public Sound doorSound = Sounds.door;
     public @Load("@-open") TextureRegion openRegion;
 
     public Door(String name){
@@ -28,11 +33,19 @@ public class Door extends Wall{
         solidifes = true;
         consumesTap = true;
 
-        config(Boolean.class, (DoorEntity entity, Boolean open) -> {
-            entity.open = open;
-            pathfinder.updateTile(entity.tile());
-            (open ? closefx : openfx).at(entity);
-            Sounds.door.at(entity);
+        config(Boolean.class, (DoorBuild base, Boolean open) -> {
+            doorSound.at(base);
+
+            for(DoorBuild entity : base.chained){
+                //skip doors with things in them
+                if((Units.anyEntities(entity.tile) && !open) || entity.open == open){
+                    continue;
+                }
+
+                entity.open = open;
+                pathfinder.updateTile(entity.tile());
+                entity.effect();
+            }
         });
     }
 
@@ -41,8 +54,70 @@ public class Door extends Wall{
         return req.config == Boolean.TRUE ? openRegion : region;
     }
 
-    public class DoorEntity extends Building{
+    public class DoorBuild extends Building{
         public boolean open = false;
+        public ObjectSet<DoorBuild> chained = new ObjectSet<>();
+
+        @Override
+        public void onProximityAdded(){
+            super.onProximityAdded();
+            updateChained();
+        }
+
+        @Override
+        public void onProximityRemoved(){
+            super.onProximityRemoved();
+
+            for(Building b : proximity){
+                if(b instanceof DoorBuild){
+                    ((DoorBuild)b).updateChained();
+                }
+            }
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.enabled) return open ? 1 : 0;
+            return super.sense(sensor);
+        }
+
+        @Override
+        public void control(LAccess type, double p1, double p2, double p3, double p4){
+            if(type == LAccess.enabled){
+                boolean shouldOpen = !Mathf.zero(p1);
+
+                if(net.client() || open == shouldOpen || (Units.anyEntities(tile) && !shouldOpen) || !origin().timer(timerToggle, 80f)){
+                    return;
+                }
+
+                configureAny(shouldOpen);
+            }
+        }
+
+        public DoorBuild origin(){
+            return chained.isEmpty() ? this : chained.first();
+        }
+
+        public void effect(){
+            (open ? closefx : openfx).at(this);
+        }
+
+        public void updateChained(){
+            chained = new ObjectSet<>();
+            flow(chained);
+        }
+
+        public void flow(ObjectSet<DoorBuild> set){
+            if(!set.add(this)) return;
+
+            this.chained = set;
+
+            for(Building b : proximity){
+                if(b instanceof DoorBuild){
+                    ((DoorBuild)b).flow(set);
+                }
+            }
+        }
 
         @Override
         public void draw(){
@@ -60,8 +135,8 @@ public class Door extends Wall{
         }
 
         @Override
-        public void tapped(Player player){
-            if((Units.anyEntities(tile) && open) || !timer(timerToggle, 30f)){
+        public void tapped(){
+            if((Units.anyEntities(tile) && open) || !origin().timer(timerToggle, 60f)){
                 return;
             }
 
diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java
index 44243f9fb6..b508e90965 100644
--- a/core/src/mindustry/world/blocks/defense/ForceProjector.java
+++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java
@@ -23,6 +23,7 @@ public class ForceProjector extends Block{
     public float phaseUseTime = 350f;
 
     public float phaseRadiusBoost = 80f;
+    public float phaseShieldBoost = 400f;
     public float radius = 101.7f;
     public float breakage = 550f;
     public float cooldownNormal = 1.75f;
@@ -31,9 +32,9 @@ public class ForceProjector extends Block{
     public float basePowerDraw = 0.2f;
     public @Load("@-top") TextureRegion topRegion;
 
-    private static ForceProjectorEntity paramEntity;
-    private static final Cons<Shielderc> shieldConsumer = trait -> {
-        if(trait.team() != paramEntity.team() && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){
+    static ForceBuild paramEntity;
+    static final Cons<Bullet> shieldConsumer = trait -> {
+        if(trait.team != paramEntity.team && trait.type.absorbable && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){
             trait.absorb();
             Fx.absorb.at(trait);
             paramEntity.hit = 1f;
@@ -48,7 +49,6 @@ public class ForceProjector extends Block{
         hasPower = true;
         hasLiquids = true;
         hasItems = true;
-        expanded = true;
         consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.1f)).boost().update(false);
     }
 
@@ -60,9 +60,11 @@ public class ForceProjector extends Block{
     @Override
     public void setStats(){
         super.setStats();
-
+        stats.add(BlockStat.shieldHealth, breakage, StatUnit.none);
+        stats.add(BlockStat.cooldownTime, (int) (breakage / cooldownBrokenBase / 60f), StatUnit.seconds);
         stats.add(BlockStat.powerUse, basePowerDraw * 60f, StatUnit.powerSecond);
         stats.add(BlockStat.boostEffect, phaseRadiusBoost / tilesize, StatUnit.blocks);
+        stats.add(BlockStat.boostEffect, phaseShieldBoost, StatUnit.shieldHealth);
     }
 
     @Override
@@ -71,20 +73,32 @@ public class ForceProjector extends Block{
 
         Draw.color(Pal.gray);
         Lines.stroke(3f);
-        Lines.poly(x * tilesize, y * tilesize, 6, radius);
+        Lines.poly(x * tilesize + offset, y * tilesize + offset, 6, radius);
         Draw.color(player.team().color);
         Lines.stroke(1f);
-        Lines.poly(x * tilesize, y * tilesize, 6, radius);
+        Lines.poly(x * tilesize + offset, y * tilesize + offset, 6, radius);
         Draw.color();
     }
 
-    public class ForceProjectorEntity extends Building{
-        boolean broken = true;
-        float buildup = 0f;
-        float radscl = 0f;
-        float hit;
-        float warmup;
-        float phaseHeat;
+    public class ForceBuild extends Building{
+        public boolean broken = true;
+        public float buildup, radscl, hit, warmup, phaseHeat;
+        public ForceDraw drawer;
+
+        @Override
+        public void created(){
+            super.created();
+            drawer = ForceDraw.create();
+            drawer.build = this;
+            drawer.set(x, y);
+            drawer.add();
+        }
+
+        @Override
+        public void onRemoved(){
+            super.onRemoved();
+            drawer.remove();
+        }
 
         @Override
         public void updateTile(){
@@ -119,10 +133,10 @@ public class ForceProjector extends Block{
                 broken = false;
             }
 
-            if(buildup >= breakage && !broken){
+            if(buildup >= breakage + phaseShieldBoost && !broken){
                 broken = true;
                 buildup = breakage;
-                Fx.shieldBreak.at(x, y, radius, team.color);
+                Fx.shieldBreak.at(x, y, realRadius(), team.color);
             }
 
             if(hit > 0f){
@@ -137,7 +151,7 @@ public class ForceProjector extends Block{
             }
         }
 
-        float realRadius(){
+        public float realRadius(){
             return (radius + phaseHeat * phaseRadiusBoost) * radscl;
         }
 
@@ -145,6 +159,10 @@ public class ForceProjector extends Block{
         public void draw(){
             super.draw();
 
+            if(drawer != null){
+                drawer.set(x, y);
+            }
+
             if(buildup > 0f){
                 Draw.alpha(buildup / breakage * 0.75f);
                 Draw.blend(Blending.additive);
@@ -152,7 +170,9 @@ public class ForceProjector extends Block{
                 Draw.blend();
                 Draw.reset();
             }
+        }
 
+        public void drawShield(){
             if(!broken){
                 float radius = realRadius();
 
@@ -195,4 +215,21 @@ public class ForceProjector extends Block{
             phaseHeat = read.f();
         }
     }
+
+    @EntityDef(value = {ForceDrawc.class}, serialize = false)
+    @Component(base = true)
+    abstract class ForceDrawComp implements Drawc{
+        transient ForceBuild build;
+
+        @Override
+        public void draw(){
+            build.drawShield();
+        }
+
+        @Replace
+        @Override
+        public float clipSize(){
+            return build.realRadius() * 3f;
+        }
+    }
 }
diff --git a/core/src/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java
index dfa10b9383..f9fc7b0ac8 100644
--- a/core/src/mindustry/world/blocks/defense/MendProjector.java
+++ b/core/src/mindustry/world/blocks/defense/MendProjector.java
@@ -55,7 +55,7 @@ public class MendProjector extends Block{
         Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, Pal.accent);
     }
 
-    public class MendEntity extends Building{
+    public class MendBuild extends Building{
         float heat;
         float charge = Mathf.random(reload);
         float phaseHeat;
@@ -65,9 +65,9 @@ public class MendProjector extends Block{
             heat = Mathf.lerpDelta(heat, consValid() || cheating() ? 1f : 0f, 0.08f);
             charge += heat * delta();
 
-            phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(cons().optionalValid()), 0.1f);
+            phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(cons.optionalValid()), 0.1f);
 
-            if(cons().optionalValid() && timer(timerUse, useTime) && efficiency() > 0){
+            if(cons.optionalValid() && timer(timerUse, useTime) && efficiency() > 0){
                 consume();
             }
 
@@ -77,7 +77,7 @@ public class MendProjector extends Block{
 
                 indexer.eachBlock(this, realRange, other -> other.damaged(), other -> {
                     other.heal(other.maxHealth() * (healPercent + phaseHeat * phaseBoost) / 100f * efficiency());
-                    Fx.healBlockFull.at(other.x, other.y, other.block().size, Tmp.c1.set(baseColor).lerp(phaseColor, phaseHeat));
+                    Fx.healBlockFull.at(other.x, other.y, other.block.size, Tmp.c1.set(baseColor).lerp(phaseColor, phaseHeat));
                 });
             }
         }
diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java
index 034b7407b7..56010c7c0f 100644
--- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java
+++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java
@@ -60,7 +60,7 @@ public class OverdriveProjector extends Block{
         }
     }
 
-    public class OverdriveEntity extends Building{
+    public class OverdriveBuild extends Building{
         float heat;
         float charge = Mathf.random(reload);
         float phaseHeat;
@@ -76,10 +76,10 @@ public class OverdriveProjector extends Block{
             charge += heat * Time.delta;
 
             if(hasBoost){
-                phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(cons().optionalValid()), 0.1f);
+                phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(cons.optionalValid()), 0.1f);
             }
 
-            if(timer(timerUse, useTime) && efficiency() > 0){
+            if(timer(timerUse, useTime) && efficiency() > 0 && consValid()){
                 consume();
             }
 
@@ -96,7 +96,7 @@ public class OverdriveProjector extends Block{
         public void drawSelect(){
             float realRange = range + phaseHeat * phaseRangeBoost;
 
-            indexer.eachBlock(this, realRange, other -> other.block().canOverdrive, other -> Drawf.selected(other, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f))));
+            indexer.eachBlock(this, realRange, other -> other.block.canOverdrive, other -> Drawf.selected(other, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f))));
 
             Drawf.dashCircle(x, y, realRange, baseColor);
         }
diff --git a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java
index 51df62d6fe..9adafd1e54 100644
--- a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java
+++ b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java
@@ -21,7 +21,7 @@ public class PointDefenseTurret extends Block{
     public final int timerTarget = timers++;
     public float retargetTime = 5f;
 
-    public @Load("block-$size") TextureRegion baseRegion;
+    public @Load("block-@size") TextureRegion baseRegion;
 
     public Color color = Color.white;
     public Effect beamEffect = Fx.pointBeam;
@@ -60,7 +60,7 @@ public class PointDefenseTurret extends Block{
         stats.add(BlockStat.reload, 60f / reloadTime, StatUnit.none);
     }
 
-    public class PointDefenseEntity extends Building{
+    public class PointDefenseBuild extends Building{
         public float rotation = 90, reload;
         public @Nullable Bullet target;
 
@@ -72,8 +72,13 @@ public class PointDefenseTurret extends Block{
                 target = Groups.bullet.intersect(x - range, y - range, range*2, range*2).min(b -> b.team == team || !b.type().hittable ? Float.MAX_VALUE : b.dst2(this));
             }
 
+            //pooled bullets
+            if(target != null && !target.isAdded()){
+                target = null;
+            }
+
             //look at target
-            if(target != null && target.within(this, range) && target.team != team && target.type().hittable){
+            if(target != null && target.within(this, range) && target.team != team && target.type() != null && target.type().hittable){
                 float dest = angleTo(target);
                 rotation = Angles.moveToward(rotation, dest, rotateSpeed * edelta());
                 reload -= edelta();
@@ -106,6 +111,7 @@ public class PointDefenseTurret extends Block{
         @Override
         public void draw(){
             Draw.rect(baseRegion, x, y);
+            Drawf.shadow(region, x - (size / 2f), y - (size / 2f), rotation - 90);
             Draw.rect(region, x, y, rotation - 90);
         }
 
diff --git a/core/src/mindustry/world/blocks/defense/ShockMine.java b/core/src/mindustry/world/blocks/defense/ShockMine.java
index 8421fb4257..00c805ac48 100644
--- a/core/src/mindustry/world/blocks/defense/ShockMine.java
+++ b/core/src/mindustry/world/blocks/defense/ShockMine.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.defense;
 
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import mindustry.entities.*;
@@ -15,6 +16,7 @@ public class ShockMine extends Block{
     public float damage = 13;
     public int length = 10;
     public int tendrils = 6;
+    public Color lightningColor = Pal.lancerLaser;
 
     public ShockMine(String name){
         super(name);
@@ -25,7 +27,7 @@ public class ShockMine extends Block{
         rebuildable = false;
     }
 
-    public class ShockMineEntity extends Building{
+    public class ShockMineBuild extends Building{
 
         @Override
         public void drawTeam(){
@@ -43,9 +45,9 @@ public class ShockMine extends Block{
 
         @Override
         public void unitOn(Unit unit){
-            if(unit.team() != team && timer(timerDamage, cooldown)){
+            if(enabled && unit.team != team && timer(timerDamage, cooldown)){
                 for(int i = 0; i < tendrils; i++){
-                    Lightning.create(team, Pal.lancerLaser, damage, x, y, Mathf.random(360f), length);
+                    Lightning.create(team, lightningColor, damage, x, y, Mathf.random(360f), length);
                 }
                 damage(tileDamage);
             }
diff --git a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java
index 5bffb5c032..33dc39d631 100644
--- a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java
+++ b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java
@@ -19,7 +19,7 @@ public class TractorBeamTurret extends Block{
     public final int timerTarget = timers++;
     public float retargetTime = 5f;
 
-    public @Load("block-$size") TextureRegion baseRegion;
+    public @Load("block-@size") TextureRegion baseRegion;
     public @Load("@-laser") TextureRegion laser;
     public @Load("@-laser-end") TextureRegion laserEnd;
 
@@ -31,6 +31,7 @@ public class TractorBeamTurret extends Block{
     public float scaledForce = 0f;
     public float damage = 0f;
     public boolean targetAir = true, targetGround = false;
+    public Color laserColor = Color.white;
 
     public TractorBeamTurret(String name){
         super(name);
@@ -60,7 +61,7 @@ public class TractorBeamTurret extends Block{
         stats.add(BlockStat.damage, damage * 60f, StatUnit.perSecond);
     }
 
-    public class TractorBeamEntity extends Building{
+    public class TractorBeamBuild extends Building{
         public float rotation = 90;
         public @Nullable Unit target;
         public float lastX, lastY, strength;
@@ -75,16 +76,16 @@ public class TractorBeamTurret extends Block{
             }
 
             //look at target
-            if(target != null && target.within(this, range) && target.team() != team && target.type().flying){
+            if(target != null && target.within(this, range) && target.team() != team && target.type().flying && efficiency() > 0.01f){
                 any = true;
                 float dest = angleTo(target);
-                rotation = Angles.moveToward(rotation,dest, rotateSpeed * edelta());
+                rotation = Angles.moveToward(rotation, dest, rotateSpeed * edelta());
                 lastX = target.x;
                 lastY = target.y;
                 strength = Mathf.lerpDelta(strength, 1f, 0.1f);
 
                 if(damage > 0){
-                    target.damageContinuous(damage);
+                    target.damageContinuous(damage * efficiency());
                 }
 
                 //shoot when possible
@@ -105,6 +106,7 @@ public class TractorBeamTurret extends Block{
         @Override
         public void draw(){
             Draw.rect(baseRegion, x, y);
+            Drawf.shadow(region, x - (size / 2f), y - (size / 2f), rotation - 90);
             Draw.rect(region, x, y, rotation - 90);
 
             //draw laser if applicable
@@ -113,7 +115,7 @@ public class TractorBeamTurret extends Block{
                 float ang = angleTo(lastX, lastY);
                 float len = 5f;
 
-                Draw.mixcol(Color.white, Mathf.absin(4f, 0.6f));
+                Draw.mixcol(laserColor, Mathf.absin(4f, 0.6f));
 
                 Drawf.laser(team, laser, laserEnd,
                 x + Angles.trnsx(ang, len), y + Angles.trnsy(ang, len),
diff --git a/core/src/mindustry/world/blocks/defense/Wall.java b/core/src/mindustry/world/blocks/defense/Wall.java
index 0a4cae8de7..873cbaea78 100644
--- a/core/src/mindustry/world/blocks/defense/Wall.java
+++ b/core/src/mindustry/world/blocks/defense/Wall.java
@@ -1,6 +1,7 @@
 package mindustry.world.blocks.defense;
 
 import arc.*;
+import arc.audio.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -19,10 +20,14 @@ public class Wall extends Block{
     public float lightningChance = -0.001f;
     public float lightningDamage = 20f;
     public int lightningLength = 17;
+    public Color lightningColor = Pal.surge;
+    public Sound lightningSound = Sounds.spark;
 
-    public float maxDamageDeflect = 10f;
-    public boolean flashWhite;
+    public float chanceDeflect = 10f;
+    public boolean flashHit;
+    public Color flashColor = Color.white;
     public boolean deflect;
+    public Sound deflectSound = Sounds.none;
 
     public Wall(String name){
         super(name);
@@ -30,6 +35,7 @@ public class Wall extends Block{
         destructible = true;
         group = BlockGroup.walls;
         buildCostMultiplier = 5f;
+        canOverdrive = false;
     }
 
     @Override
@@ -53,10 +59,11 @@ public class Wall extends Block{
 
     @Override
     public boolean canReplace(Block other){
-        return super.canReplace(other) && health > other.health && size == other.size;
+        if(other.alwaysReplace) return true;
+        return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group && other != this && size >= other.size;
     }
 
-    public class WallEntity extends Building{
+    public class WallBuild extends Building{
         public float hit;
 
         @Override
@@ -68,10 +75,10 @@ public class Wall extends Block{
             }
 
             //draw flashing white overlay if enabled
-            if(flashWhite){
+            if(flashHit){
                 if(hit < 0.0001f) return;
 
-                Draw.color(Color.white);
+                Draw.color(flashColor);
                 Draw.alpha(hit * 0.5f);
                 Draw.blend(Blending.additive);
                 Fill.rect(x, y, tilesize * size, tilesize * size);
@@ -91,14 +98,21 @@ public class Wall extends Block{
             //create lightning if necessary
             if(lightningChance > 0){
                 if(Mathf.chance(lightningChance)){
-                    Lightning.create(team(), Pal.surge, lightningDamage, x, y, bullet.rotation() + 180f, lightningLength);
+                    Lightning.create(team, lightningColor, lightningDamage, x, y, bullet.rotation() + 180f, lightningLength);
+                    lightningSound.at(tile, Mathf.random(0.9f, 1.1f));
                 }
             }
 
             //deflect bullets if necessary
             if(deflect){
-                //doesn't reflect powerful bullets
-                if(bullet.damage() > maxDamageDeflect) return true;
+                //slow bullets are not deflected
+                if(bullet.vel().len() <= 0.1f || !bullet.type.reflectable) return true;
+
+                //bullet reflection chance depends on bullet damage
+                if(!Mathf.chance(chanceDeflect / bullet.damage())) return true;
+
+                //make sound
+                deflectSound.at(tile, Mathf.random(0.9f, 1.1f));
 
                 //translate bullet back to where it was upon collision
                 bullet.trns(-bullet.vel.x, -bullet.vel.y);
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java
index 031bca9ebf..a63cd15ac1 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java
@@ -19,7 +19,7 @@ public class ChargeTurret extends PowerTurret{
         super(name);
     }
 
-    public class ChargeTurretEntity extends PowerTurretEntity{
+    public class ChargeTurretBuild extends PowerTurretBuild{
         public boolean shooting;
 
         @Override
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
index a21e268621..ea94a670b9 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
@@ -43,7 +43,7 @@ public class ItemTurret extends Turret{
             public void build(Building tile, Table table){
                 MultiReqImage image = new MultiReqImage();
                 content.items().each(i -> filter.get(i) && i.unlockedNow(), item -> image.add(new ReqImage(new ItemImage(item.icon(Cicon.medium)),
-                    () -> tile != null && !((ItemTurretEntity)tile).ammo.isEmpty() && ((ItemEntry)((ItemTurretEntity)tile).ammo.peek()).item == item)));
+                    () -> tile != null && !((ItemTurretBuild)tile).ammo.isEmpty() && ((ItemEntry)((ItemTurretBuild)tile).ammo.peek()).item == item)));
 
                 table.add(image).size(8 * 4);
             }
@@ -51,7 +51,7 @@ public class ItemTurret extends Turret{
             @Override
             public boolean valid(Building entity){
                 //valid when there's any ammo in the turret
-                return !((ItemTurretEntity)entity).ammo.isEmpty();
+                return !((ItemTurretBuild)entity).ammo.isEmpty();
             }
 
             @Override
@@ -61,7 +61,8 @@ public class ItemTurret extends Turret{
         });
     }
 
-    public class ItemTurretEntity extends TurretEntity{
+    public class ItemTurretBuild extends TurretBuild{
+
         @Override
         public void onProximityAdded(){
             super.onProximityAdded();
@@ -72,6 +73,13 @@ public class ItemTurret extends Turret{
             }
         }
 
+        @Override
+        public void updateTile(){
+            unit.ammo((float)unit.type().ammoCapacity * totalAmmo / maxAmmo);
+
+            super.updateTile();
+        }
+
         @Override
         public void displayBars(Table bars){
             super.displayBars(bars);
@@ -138,13 +146,18 @@ public class ItemTurret extends Turret{
             return ammoTypes.get(item) != null && totalAmmo + ammoTypes.get(item).ammoMultiplier <= maxAmmo;
         }
 
+        @Override
+        public byte version(){
+            return 2;
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
             write.b(ammo.size);
             for(AmmoEntry entry : ammo){
                 ItemEntry i = (ItemEntry)entry;
-                write.b(i.item.id);
+                write.s(i.item.id);
                 write.s(i.amount);
             }
         }
@@ -152,12 +165,16 @@ public class ItemTurret extends Turret{
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
-            byte amount = read.b();
+            int amount = read.ub();
             for(int i = 0; i < amount; i++){
-                Item item = Vars.content.item(read.b());
+                Item item = Vars.content.item(revision < 2 ? read.ub() : read.s());
                 short a = read.s();
                 totalAmmo += a;
-                ammo.add(new ItemEntry(item, a));
+
+                //only add ammo if this is a valid ammo type
+                if(ammoTypes.containsKey(item)){
+                    ammo.add(new ItemEntry(item, a));
+                }
             }
         }
     }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
index a7554b49f8..7ac517c51a 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
@@ -25,7 +25,7 @@ public class LaserTurret extends PowerTurret{
 
     @Override
     public void init(){
-        consumes.powerCond(powerUse, entity -> ((LaserTurretEntity)entity).bullet != null || ((LaserTurretEntity)entity).target != null);
+        consumes.powerCond(powerUse, entity -> ((LaserTurretBuild)entity).bullet != null || ((LaserTurretBuild)entity).target != null);
         super.init();
     }
 
@@ -40,7 +40,7 @@ public class LaserTurret extends PowerTurret{
         stats.add(BlockStat.damage, shootType.damage * 60f / 5f, StatUnit.perSecond);
     }
 
-    public class LaserTurretEntity extends PowerTurretEntity{
+    public class LaserTurretBuild extends PowerTurretBuild{
         Bullet bullet;
         float bulletLife;
 
@@ -65,7 +65,7 @@ public class LaserTurret extends PowerTurret{
                     bullet = null;
                 }
             }else if(reload > 0){
-                Liquid liquid = liquids().current();
+                Liquid liquid = liquids.current();
                 float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
 
                 float used = (cheating() ? maxUsed * Time.delta : Math.min(liquids.get(liquid), maxUsed * Time.delta)) * liquid.heatCapacity * coolantMultiplier;
@@ -96,7 +96,7 @@ public class LaserTurret extends PowerTurret{
 
         @Override
         protected void turnToTarget(float targetRot){
-            rotation = Angles.moveToward(rotation, targetRot, efficiency() * rotatespeed * delta() * (bulletLife > 0f ? firingMoveFract : 1f));
+            rotation = Angles.moveToward(rotation, targetRot, efficiency() * rotateSpeed * delta() * (bulletLife > 0f ? firingMoveFract : 1f));
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index 9109937f95..7b3736cc81 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -1,6 +1,5 @@
 package mindustry.world.blocks.defense.turrets;
 
-import arc.*;
 import arc.graphics.g2d.*;
 import arc.struct.*;
 import mindustry.annotations.Annotations.*;
@@ -8,15 +7,17 @@ import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
 import mindustry.type.*;
+import mindustry.graphics.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 import mindustry.world.meta.values.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class LiquidTurret extends Turret{
     public ObjectMap<Liquid, BulletType> ammoTypes = new ObjectMap<>();
     public @Load("@-liquid") TextureRegion liquidRegion;
+    public @Load("@-top") TextureRegion topRegion;
 
     public LiquidTurret(String name){
         super(name);
@@ -53,18 +54,15 @@ public class LiquidTurret extends Turret{
         });
     }
 
-    public class LiquidTurretEntity extends TurretEntity{
-
+    public class LiquidTurretBuild extends TurretBuild{
         @Override
         public void draw(){
             super.draw();
             
-            if(Core.atlas.isFound(liquidRegion)){
-                Draw.color(liquids.current().color);
-                Draw.alpha(liquids.total() / liquidCapacity);
-                Draw.rect(liquidRegion, x + tr2.x, y + tr2.y, rotation - 90);
-                Draw.color();
+            if(liquidRegion.found()){
+                Drawf.liquid(liquidRegion, x + tr2.x, y + tr2.y, liquids.total() / liquidCapacity, liquids.current().color, rotation - 90);
             }
+            if(topRegion.found()) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90);
         }
 
         @Override
@@ -72,6 +70,13 @@ public class LiquidTurret extends Turret{
             return target != null && hasAmmo();
         }
 
+        @Override
+        public void updateTile(){
+            unit.ammo(unit.type().ammoCapacity * liquids.currentAmount() / liquidCapacity);
+
+            super.updateTile();
+        }
+
         @Override
         protected void findTarget(){
             if(liquids.current().canExtinguish()){
@@ -98,7 +103,7 @@ public class LiquidTurret extends Turret{
             shootSound.at(tile);
 
             if(shootShake > 0){
-                Effects.shake(shootShake, shootShake, tile.build);
+                Effect.shake(shootShake, shootShake, tile.build);
             }
 
             recoil = recoilAmount;
@@ -108,7 +113,7 @@ public class LiquidTurret extends Turret{
         public BulletType useAmmo(){
             if(cheating()) return ammoTypes.get(liquids.current());
             BulletType type = ammoTypes.get(liquids.current());
-            liquids.remove(liquids.current(), type.ammoMultiplier);
+            liquids.remove(liquids.current(), 1f / type.ammoMultiplier);
             return type;
         }
 
@@ -119,7 +124,7 @@ public class LiquidTurret extends Turret{
 
         @Override
         public boolean hasAmmo(){
-            return ammoTypes.get(liquids.current()) != null && liquids.total() >= ammoTypes.get(liquids.current()).ammoMultiplier;
+            return ammoTypes.get(liquids.current()) != null && liquids.total() >= 1f / ammoTypes.get(liquids.current()).ammoMultiplier;
         }
 
         @Override
@@ -131,7 +136,7 @@ public class LiquidTurret extends Turret{
         public boolean acceptLiquid(Building source, Liquid liquid, float amount){
             return ammoTypes.get(liquid) != null
                 && (liquids.current() == liquid || (ammoTypes.containsKey(liquids.current())
-                && liquids.get(liquids.current()) <= ammoTypes.get(liquids.current()).ammoMultiplier + 0.001f));
+                && liquids.get(liquids.current()) <= 1f / ammoTypes.get(liquids.current()).ammoMultiplier + 0.001f));
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
index fd62367feb..9647c25bfc 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
@@ -1,11 +1,10 @@
 package mindustry.world.blocks.defense.turrets;
 
-import arc.util.ArcAnnotate.*;
 import mindustry.entities.bullet.*;
 import mindustry.world.meta.*;
 
 public class PowerTurret extends Turret{
-    public @NonNull BulletType shootType;
+    public BulletType shootType;
     public float powerUse = 1f;
 
     public PowerTurret(String name){
@@ -16,17 +15,23 @@ public class PowerTurret extends Turret{
     @Override
     public void setStats(){
         super.setStats();
-
         stats.add(BlockStat.damage, shootType.damage, StatUnit.none);
     }
 
     @Override
     public void init(){
-        consumes.powerCond(powerUse, entity -> ((TurretEntity)entity).target != null);
+        consumes.powerCond(powerUse, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting));
         super.init();
     }
 
-    public class PowerTurretEntity extends TurretEntity{
+    public class PowerTurretBuild extends TurretBuild{
+
+        @Override
+        public void updateTile(){
+            unit.ammo(power.status * unit.type().ammoCapacity);
+
+            super.updateTile();
+        }
 
         @Override
         public BulletType useAmmo(){
@@ -44,10 +49,5 @@ public class PowerTurret extends Turret{
         public BulletType peekAmmo(){
             return shootType;
         }
-
-        @Override
-        protected float baseReloadSpeed(){
-            return cheating() ? 1f : power.status;
-        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 73b478d582..447d490722 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -14,10 +14,12 @@ import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.entities.Units.*;
 import mindustry.entities.bullet.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
@@ -25,9 +27,12 @@ import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 import mindustry.world.meta.values.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public abstract class Turret extends Block{
+    //after being logic-controlled and this amount of time passes, the turret will resume normal AI
+    public final static float logicControlCooldown = 60 * 2;
+
     public final int timerTarget = timers++;
     public int targetInterval = 20;
 
@@ -48,7 +53,7 @@ public abstract class Turret extends Block{
     public float recoilAmount = 1f;
     public float restitution = 0.02f;
     public float cooldown = 0.02f;
-    public float rotatespeed = 5f; //in degrees per tick
+    public float rotateSpeed = 5f; //in degrees per tick
     public float shootCone = 8f;
     public float shootShake = 0f;
     public float xRand = 0f;
@@ -63,16 +68,18 @@ public abstract class Turret extends Block{
     public float coolantMultiplier = 5f;
     /** Effect displayed when coolant is used. */
     public Effect coolEffect = Fx.fuelburn;
+    public Sortf unitSort = Unit::dst2;
 
     protected Vec2 tr = new Vec2();
     protected Vec2 tr2 = new Vec2();
 
-    public @Load("block-$size") TextureRegion baseRegion;
+    public @Load("block-@size") TextureRegion baseRegion;
     public @Load("@-heat") TextureRegion heatRegion;
 
-    public Cons<TurretEntity> drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90);
-    public Cons<TurretEntity> heatDrawer = tile -> {
+    public Cons<TurretBuild> drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90);
+    public Cons<TurretBuild> heatDrawer = tile -> {
         if(tile.heat <= 0.00001f) return;
+
         Draw.color(heatColor, tile.heat);
         Draw.blend(Blending.additive);
         Draw.rect(heatRegion, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90);
@@ -137,14 +144,20 @@ public abstract class Turret extends Block{
         public abstract BulletType type();
     }
 
-    public class TurretEntity extends Building implements ControlBlock{
+    public class TurretBuild extends Building implements ControlBlock, Ranged{
         public Seq<AmmoEntry> ammo = new Seq<>();
         public int totalAmmo;
-        public float reload, rotation = 90, recoil, heat;
+        public float reload, rotation = 90, recoil, heat, logicControlTime = -1;
         public int shotCounter;
+        public boolean logicShooting = false;
         public @Nullable Posc target;
         public Vec2 targetPos = new Vec2();
-        public @NonNull BlockUnitc unit = Nulls.blockUnit;
+        public BlockUnitc unit = Nulls.blockUnit;
+
+        @Override
+        public float range(){
+            return range;
+        }
 
         @Override
         public void created(){
@@ -152,11 +165,36 @@ public abstract class Turret extends Block{
             unit.tile(this);
         }
 
+        @Override
+        public void control(LAccess type, double p1, double p2, double p3, double p4){
+            if(type == LAccess.shoot && !unit.isPlayer()){
+                targetPos.set((float)p1, (float)p2);
+                logicControlTime = logicControlCooldown;
+                logicShooting = !Mathf.zero(p3);
+            }
+
+            super.control(type, p1, p2, p3, p4);
+        }
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.rotation) return rotation;
+            if(sensor == LAccess.shootX) return targetPos.x;
+            if(sensor == LAccess.shootY) return targetPos.y;
+            if(sensor == LAccess.shooting) return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0;
+
+            return super.sense(sensor);
+        }
+
         @Override
         public Unit unit(){
             return (Unit)unit;
         }
 
+        public boolean logicControlled(){
+            return logicControlTime > 0;
+        }
+
         @Override
         public void draw(){
             Draw.rect(baseRegion, x, y);
@@ -166,6 +204,7 @@ public abstract class Turret extends Block{
 
             tr2.trns(rotation, -recoil);
 
+            Drawf.shadow(region, x + tr2.x - (size / 2f), y + tr2.y - (size / 2f), rotation - 90);
             drawer.get(this);
 
             if(heatRegion != Core.atlas.find("error")){
@@ -184,6 +223,10 @@ public abstract class Turret extends Block{
             unit.rotation(rotation);
             unit.team(team);
 
+            if(logicControlTime > 0){
+                logicControlTime -= Time.delta;
+            }
+
             if(hasAmmo()){
 
                 if(timer(timerTarget, targetInterval)){
@@ -193,10 +236,11 @@ public abstract class Turret extends Block{
                 if(validateTarget()){
                     boolean canShoot = true;
 
-                    //player behavior
-                    if(isControlled()){
+                    if(isControlled()){ //player behavior
                         targetPos.set(unit.aimX(), unit.aimY());
                         canShoot = unit.isShooting();
+                    }else if(logicControlled()){ //logic behavior
+                        canShoot = logicShooting;
                     }else{ //default AI behavior
                         BulletType type = peekAmmo();
                         float speed = type.speed;
@@ -259,19 +303,19 @@ public abstract class Turret extends Block{
         }
 
         protected boolean validateTarget(){
-            return !Units.invalidateTarget(target, team, x, y) || isControlled();
+            return !Units.invalidateTarget(target, team, x, y) || isControlled() || logicControlled();
         }
 
         protected void findTarget(){
             if(targetAir && !targetGround){
-                target = Units.closestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded());
+                target = Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded(), unitSort);
             }else{
-                target = Units.closestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround));
+                target = Units.bestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> true, unitSort);
             }
         }
 
         protected void turnToTarget(float targetRot){
-            rotation = Angles.moveToward(rotation, targetRot, rotatespeed * delta() * baseReloadSpeed());
+            rotation = Angles.moveToward(rotation, targetRot, rotateSpeed * delta() * baseReloadSpeed());
         }
 
         public boolean shouldTurn(){
@@ -355,7 +399,7 @@ public abstract class Turret extends Block{
         }
 
         protected void bullet(BulletType type, float angle){
-            float lifeScl = type.scaleVelocity ? Mathf.clamp(Mathf.dst(x, y, targetPos.x, targetPos.y) / type.range(), minRange / type.range(), range / type.range()) : 1f;
+            float lifeScl = type.scaleVelocity ? Mathf.clamp(Mathf.dst(x + tr.x, y + tr.y, targetPos.x, targetPos.y) / type.range(), minRange / type.range(), range / type.range()) : 1f;
 
             type.create(this, team, x + tr.x, y + tr.y, angle, 1f + Mathf.range(velocityInaccuracy), lifeScl);
         }
@@ -369,7 +413,7 @@ public abstract class Turret extends Block{
             shootSound.at(tile, Mathf.random(0.9f, 1.1f));
 
             if(shootShake > 0){
-                Effects.shake(shootShake, shootShake, this);
+                Effect.shake(shootShake, shootShake, this);
             }
 
             recoil = recoilAmount;
@@ -382,7 +426,7 @@ public abstract class Turret extends Block{
         }
 
         protected float baseReloadSpeed(){
-            return 1f;
+            return efficiency();
         }
 
         @Override
@@ -395,7 +439,8 @@ public abstract class Turret extends Block{
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
-            if(revision == 1){
+
+            if(revision >= 1){
                 reload = read.f();
                 rotation = read.f();
             }
diff --git a/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
index 02ca9d0cda..cba1366147 100644
--- a/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
@@ -15,10 +15,10 @@ public class ArmoredConveyor extends Conveyor{
         return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock);
     }
 
-    public class ArmoredConveyorEntity extends ConveyorEntity{
+    public class ArmoredConveyorBuild extends ConveyorBuild{
         @Override
         public boolean acceptItem(Building source, Item item){
-            return super.acceptItem(source, item) && (source.block() instanceof Conveyor || Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == tile.rotation());
+            return super.acceptItem(source, item) && (source.block instanceof Conveyor || Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation);
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
index 2bda6f2aab..a0eddc20c1 100644
--- a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java
@@ -19,7 +19,7 @@ public class BufferedItemBridge extends ExtendingItemBridge{
         canOverdrive = true;
     }
 
-    public class BufferedItemBridgeEntity extends ExtendingItemBridgeEntity{
+    public class BufferedItemBridgeBuild extends ExtendingItemBridgeBuild{
         ItemBuffer buffer = new ItemBuffer(bufferCapacity);
 
         @Override
@@ -29,7 +29,7 @@ public class BufferedItemBridge extends ExtendingItemBridge{
             }
 
             Item item = buffer.poll(speed / timeScale);
-            if(timer(timerAccept, 4) && item != null && other.acceptItem(this, item)){
+            if(timer(timerAccept, 4 / timeScale) && item != null && other.acceptItem(this, item)){
                 cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
                 other.handleItem(this, item);
                 buffer.remove();
diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
index bf960fb881..f6f347aba3 100644
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -25,8 +25,8 @@ public class Conveyor extends Block implements Autotiler{
     private static final float itemSpace = 0.4f;
     private static final int capacity = 4;
 
-    private final Vec2 tr1 = new Vec2();
-    private final Vec2 tr2 = new Vec2();
+    final Vec2 tr1 = new Vec2();
+    final Vec2 tr2 = new Vec2();
 
     public @Load(value = "@-#1-#2", lengths = {7, 4}) TextureRegion[][] regions;
 
@@ -45,6 +45,7 @@ public class Conveyor extends Block implements Autotiler{
         idleSound = Sounds.conveyor;
         idleSoundVolume = 0.004f;
         unloadable = false;
+        noUpdateDisabled = false;
     }
 
     @Override
@@ -62,7 +63,7 @@ public class Conveyor extends Block implements Autotiler{
         if(bits == null) return;
 
         TextureRegion region = regions[bits[0]][0];
-        Draw.rect(region, req.drawx(), req.drawy(), region.getWidth() * bits[1] * Draw.scl, region.getHeight() * bits[2] * Draw.scl, req.rotation * 90);
+        Draw.rect(region, req.drawx(), req.drawy(), region.width * bits[1] * Draw.scl, region.height * bits[2] * Draw.scl, req.rotation * 90);
     }
 
     @Override
@@ -88,34 +89,33 @@ public class Conveyor extends Block implements Autotiler{
             cont.get(Geometry.d4(req.rotation - 2)) &&
             req.tile() != null &&
             req.tile().block() instanceof Conveyor &&
-            Mathf.mod(req.tile().rotation() - req.rotation, 2) == 1 ? Blocks.junction : this;
+            Mathf.mod(req.tile().build.rotation - req.rotation, 2) == 1 ? Blocks.junction : this;
     }
 
-    public class ConveyorEntity extends Building{
+    public class ConveyorBuild extends Building{
         //parallel array data
-        Item[] ids = new Item[capacity];
-        float[] xs = new float[capacity];
-        float[] ys = new float[capacity];
+        public Item[] ids = new Item[capacity];
+        public float[] xs = new float[capacity];
+        public float[] ys = new float[capacity];
         //amount of items, always < capacity
-        int len = 0;
+        public int len = 0;
         //next entity
-        @Nullable Building next;
-        @Nullable ConveyorEntity nextc;
+        public @Nullable Building next;
+        public @Nullable ConveyorBuild nextc;
         //whether the next conveyor's rotation == tile rotation
-        boolean aligned;
+        public boolean aligned;
 
-        int lastInserted, mid;
-        float minitem = 1;
+        public int lastInserted, mid;
+        public float minitem = 1;
 
-        int blendbits, blending;
-        int blendsclx, blendscly;
+        public int blendbits, blending;
+        public int blendsclx, blendscly;
 
-        float clogHeat = 0f;
+        public float clogHeat = 0f;
 
         @Override
         public void draw(){
-            byte rotation = tile.rotation();
-            int frame = clogHeat <= 0.5f ? (int)(((Time.time() * speed * 8f * timeScale())) % 4) : 0;
+            int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time() * speed * 8f * timeScale())) % 4) : 0;
 
             //draw extra conveyors facing this one for non-square tiling purposes
             Draw.z(Layer.blockUnder);
@@ -124,7 +124,7 @@ public class Conveyor extends Block implements Autotiler{
                     int dir = rotation - i;
                     float rot = i == 0 ? rotation * 90 : (dir)*90;
 
-                    Draw.rect(sliced(regions[0][frame], i != 0 ? 1 : 2), x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, rot);
+                    Draw.rect(sliced(regions[0][frame], i != 0 ? SliceMode.bottom : SliceMode.top), x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, rot);
                 }
             }
 
@@ -146,6 +146,20 @@ public class Conveyor extends Block implements Autotiler{
             }
         }
 
+        @Override
+        public void overwrote(Seq<Building> builds){
+            if(builds.first() instanceof ConveyorBuild build){
+                ids = build.ids.clone();
+                xs = build.xs.clone();
+                ys = build.ys.clone();
+                len = build.len;
+                clogHeat = build.clogHeat;
+                lastInserted = build.lastInserted;
+                mid = build.mid;
+                minitem = build.minitem;
+            }
+        }
+
         @Override
         public boolean shouldIdleSound(){
             return clogHeat <= 0.5f ;
@@ -155,31 +169,28 @@ public class Conveyor extends Block implements Autotiler{
         public void onProximityUpdate(){
             super.onProximityUpdate();
 
-            int[] bits = buildBlending(tile, rotation(), null, true);
+            int[] bits = buildBlending(tile, rotation, null, true);
             blendbits = bits[0];
             blendsclx = bits[1];
             blendscly = bits[2];
             blending = bits[4];
 
-            if(tile.front() != null && tile.front() != null){
-                next = tile.front();
-                nextc = next instanceof ConveyorEntity && next.team() == team ? (ConveyorEntity)next : null;
-                aligned = nextc != null && tile.rotation() == next.tile().rotation();
-            }
+            next = front();
+            nextc = next instanceof ConveyorBuild && next.team == team ? (ConveyorBuild)next : null;
+            aligned = nextc != null && rotation == next.rotation;
         }
 
         @Override
         public void unitOn(Unit unit){
-            if(clogHeat > 0.5f){
-                return;
-            }
+
+            if(clogHeat > 0.5f) return;
 
             noSleep();
 
-            float mspeed = speed * tilesize / 2.4f;
+            float mspeed = speed * tilesize * 55f;
             float centerSpeed = 0.1f;
             float centerDstScl = 3f;
-            float tx = Geometry.d4[tile.rotation()].x, ty = Geometry.d4[tile.rotation()].y;
+            float tx = Geometry.d4x(rotation), ty = Geometry.d4y(rotation);
 
             float centerx = 0f, centery = 0f;
 
@@ -209,10 +220,11 @@ public class Conveyor extends Block implements Autotiler{
             }
 
             float nextMax = aligned ? 1f - Math.max(itemSpace - nextc.minitem, 0) : 1f;
+            float moved = speed * edelta();
 
             for(int i = len - 1; i >= 0; i--){
                 float nextpos = (i == len - 1 ? 100f : ys[i + 1]) - itemSpace;
-                float maxmove = Mathf.clamp(nextpos - ys[i], 0, speed * delta());
+                float maxmove = Mathf.clamp(nextpos - ys[i], 0, moved);
 
                 ys[i] += maxmove;
 
@@ -220,7 +232,7 @@ public class Conveyor extends Block implements Autotiler{
                 if(ys[i] > 0.5 && i > 0) mid = i - 1;
                 xs[i] = Mathf.approachDelta(xs[i], 0, speed*2);
 
-                if(ys[i] >= 1f && moveForward(ids[i])){
+                if(ys[i] >= 1f && pass(ids[i])){
                     //align X position if passing forwards
                     if(aligned){
                         nextc.xs[nextc.lastInserted] = xs[i];
@@ -242,6 +254,14 @@ public class Conveyor extends Block implements Autotiler{
             noSleep();
         }
 
+        public boolean pass(Item item) {
+            if(next != null && next.team == team && next.acceptItem(this, item)){
+                next.handleItem(this, item);
+                return true;
+            }
+            return false;
+        }
+
         @Override
         public int removeStack(Item item, int amount){
             noSleep();
@@ -263,7 +283,7 @@ public class Conveyor extends Block implements Autotiler{
 
         @Override
         public void getStackOffset(Item item, Vec2 trns){
-            trns.trns(tile.rotdeg() + 180f, tilesize / 2f);
+            trns.trns(rotdeg() + 180f, tilesize / 2f);
         }
 
         @Override
@@ -289,17 +309,17 @@ public class Conveyor extends Block implements Autotiler{
         @Override
         public boolean acceptItem(Building source, Item item){
             if(len >= capacity) return false;
-            Tile facing = Edges.getFacingEdge(source.tile(), tile);
-            int direction = Math.abs(facing.relativeTo(tile.x, tile.y) - tile.rotation());
-            return (((direction == 0) && minitem >= itemSpace) || ((direction % 2 == 1) && minitem > 0.7f)) && !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation());
+            Tile facing = Edges.getFacingEdge(source.tile, tile);
+            int direction = Math.abs(facing.relativeTo(tile.x, tile.y) - rotation);
+            return (((direction == 0) && minitem >= itemSpace) || ((direction % 2 == 1) && minitem > 0.7f)) && !(source.block.rotate && (source.rotation + 2) % 4 == rotation);
         }
 
         @Override
         public void handleItem(Building source, Item item){
             if(len >= capacity) return;
 
-            byte r = tile.rotation();
-            Tile facing = Edges.getFacingEdge(source.tile(), tile);
+            int r = rotation;
+            Tile facing = Edges.getFacingEdge(source.tile, tile);
             int ang = ((facing.relativeTo(tile.x, tile.y) - r));
             float x = (ang == -1 || ang == 3) ? 1 : (ang == 1 || ang == -3) ? -1 : 0;
 
@@ -346,10 +366,13 @@ public class Conveyor extends Block implements Autotiler{
                     ys[i] = y;
                 }
             }
+
+            //this updates some state
+            updateTile();
         }
 
 
-        final void add(int o){
+        public final void add(int o){
             for(int i = Math.max(o + 1, len); i > o; i--){
                 ids[i] = ids[i - 1];
                 xs[i] = xs[i - 1];
@@ -359,7 +382,7 @@ public class Conveyor extends Block implements Autotiler{
             len++;
         }
 
-        final void remove(int o){
+        public final void remove(int o){
             for(int i = o; i < len - 1; i++){
                 ids[i] = ids[i + 1];
                 xs[i] = xs[i + 1];
diff --git a/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java b/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java
index a4786217b3..18bc444eec 100644
--- a/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/ExtendingItemBridge.java
@@ -15,8 +15,8 @@ public class ExtendingItemBridge extends ItemBridge{
         super(name);
         hasItems = true;
     }
-    
-    public class ExtendingItemBridgeEntity extends ItemBridgeEntity{
+
+    public class ExtendingItemBridgeBuild extends ItemBridgeBuild{
         @Override
         public void draw(){
             Draw.rect(region, x, y);
@@ -28,8 +28,8 @@ public class ExtendingItemBridge extends ItemBridge{
 
             int i = tile.absoluteRelativeTo(other.x, other.y);
 
-            float ex = other.worldx() - x - Geometry.d4[i].x * tilesize / 2f,
-                ey = other.worldy() - y - Geometry.d4[i].y * tilesize / 2f;
+            float ex = other.worldx() - x - Geometry.d4(i).x * tilesize / 2f,
+                ey = other.worldy() - y - Geometry.d4(i).y * tilesize / 2f;
 
             float uptime = state.isEditor() ? 1f : this.uptime;
 
@@ -42,15 +42,15 @@ public class ExtendingItemBridge extends ItemBridge{
 
             Lines.stroke(8f);
             Lines.line(bridgeRegion,
-            x + Geometry.d4[i].x * tilesize / 2f,
-            y + Geometry.d4[i].y * tilesize / 2f,
+            x + Geometry.d4(i).x * tilesize / 2f,
+            y + Geometry.d4(i).y * tilesize / 2f,
             x + ex,
-            y + ey, CapStyle.none, 0f);
+            y + ey, false);
 
             Draw.rect(endRegion, x, y, i * 90 + 90);
             Draw.rect(endRegion,
-            x + ex + Geometry.d4[i].x * tilesize / 2f,
-            y + ey + Geometry.d4[i].y * tilesize / 2f, i * 90 + 270);
+            x + ex + Geometry.d4(i).x * tilesize / 2f,
+            y + ey + Geometry.d4(i).y * tilesize / 2f, i * 90 + 270);
 
             int dist = Math.max(Math.abs(other.x - tile.x), Math.abs(other.y - tile.y));
 
@@ -61,8 +61,8 @@ public class ExtendingItemBridge extends ItemBridge{
             for(int a = 0; a < arrows; a++){
                 Draw.alpha(Mathf.absin(a / (float)arrows - time / 100f, 0.1f, 1f) * uptime * opacity);
                 Draw.rect(arrowRegion,
-                x + Geometry.d4[i].x * (tilesize / 2f + a * 6f + 2) * uptime,
-                y + Geometry.d4[i].y * (tilesize / 2f + a * 6f + 2) * uptime,
+                x + Geometry.d4(i).x * (tilesize / 2f + a * 6f + 2) * uptime,
+                y + Geometry.d4(i).y * (tilesize / 2f + a * 6f + 2) * uptime,
                     i * 90f);
             }
             Draw.reset();
diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
index 5fcd64c674..da162d9398 100644
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
@@ -41,12 +41,12 @@ public class ItemBridge extends Block{
         hasItems = true;
         unloadable = false;
         group = BlockGroup.transportation;
-        canOverdrive = false;
+        noUpdateDisabled = true;
 
         //point2 config is relative
-        config(Point2.class, (ItemBridgeEntity tile, Point2 i) -> tile.link = Point2.pack(i.x + tile.tileX(), i.y + tile.tileY()));
+        config(Point2.class, (ItemBridgeBuild tile, Point2 i) -> tile.link = Point2.pack(i.x + tile.tileX(), i.y + tile.tileY()));
         //integer is not
-        config(Integer.class, (ItemBridgeEntity tile, Integer i) -> tile.link = i);
+        config(Integer.class, (ItemBridgeBuild tile, Integer i) -> tile.link = i);
     }
 
     @Override
@@ -61,11 +61,17 @@ public class ItemBridge extends Block{
         if(otherReq == null) return;
 
         Lines.stroke(8f);
-        Lines.line(bridgeRegion,
-        req.drawx(),
-        req.drawy(),
-        otherReq.drawx(),
-        otherReq.drawy(), CapStyle.none, -tilesize / 2f);
+
+        Tmp.v1.set(otherReq.drawx(), otherReq.drawy()).sub(req.drawx(), req.drawy()).setLength(tilesize/2f);
+
+        Lines.line(
+        bridgeRegion,
+        req.drawx() + Tmp.v1.x,
+        req.drawy() + Tmp.v1.y,
+        otherReq.drawx() - Tmp.v1.x,
+        otherReq.drawy() - Tmp.v1.y, false
+        );
+
         Draw.rect(arrowRegion, (req.drawx() + otherReq.drawx()) / 2f, (req.drawy() + otherReq.drawy()) / 2f,
             Angles.angle(req.drawx(), req.drawy(), otherReq.drawx(), otherReq.drawy()));
     }
@@ -93,7 +99,7 @@ public class ItemBridge extends Block{
             float h = (link.y == y ? tilesize : Math.abs(link.y - y) * tilesize - tilesize);
             Lines.rect((x + link.x) / 2f * tilesize - w / 2f, (y + link.y) / 2f * tilesize - h / 2f, w, h);
 
-            Draw.rect("bridge-arrow", link.x * tilesize + Geometry.d4[rot].x * tilesize, link.y * tilesize + Geometry.d4[rot].y * tilesize, link.absoluteRelativeTo(x, y) * 90);
+            Draw.rect("bridge-arrow", link.x * tilesize + Geometry.d4(rot).x * tilesize, link.y * tilesize + Geometry.d4(rot).y * tilesize, link.absoluteRelativeTo(x, y) * 90);
         }
         Draw.reset();
     }
@@ -114,7 +120,7 @@ public class ItemBridge extends Block{
 
         return ((other.block() == tile.block() && tile.block() == this) || (!(tile.block() instanceof ItemBridge) && other.block() == this))
             && (other.team() == tile.team() || tile.block() != this)
-            && (!checkDouble || other.<ItemBridgeEntity>bc().link != tile.pos());
+            && (!checkDouble || other.<ItemBridgeBuild>bc().link != tile.pos());
     }
 
     public Tile findLink(int x, int y){
@@ -124,7 +130,7 @@ public class ItemBridge extends Block{
         return null;
     }
 
-    public class ItemBridgeEntity extends Building{
+    public class ItemBridgeBuild extends Building{
         public int link = -1;
         public IntSet incoming = new IntSet();
         public float uptime;
@@ -133,7 +139,11 @@ public class ItemBridge extends Block{
         public float cycleSpeed = 1f;
 
         @Override
-        public void playerPlaced(){
+        public void playerPlaced(Object config){
+            super.playerPlaced(config);
+
+            if(config != null) return;
+
             Tile link = findLink(tile.x, tile.y);
             if(linkValid(tile, link)){
                 link.build.configure(tile.pos());
@@ -146,17 +156,16 @@ public class ItemBridge extends Block{
         public void drawSelect(){
             if(linkValid(tile, world.tile(link))){
                 drawInput(world.tile(link));
-            }else{
-                incoming.each(pos -> drawInput(world.tile(pos)));
             }
 
+            incoming.each(pos -> drawInput(world.tile(pos)));
+
             Draw.reset();
         }
 
         private void drawInput(Tile other){
             if(!linkValid(tile, other, false)) return;
             boolean linked = other.pos() == link;
-            if(!linked && !(other.<ItemBridgeEntity>bc().link == tile.pos())) return;
 
             Tmp.v2.trns(tile.angleTo(other), 2f);
             float tx = tile.drawx(), ty = tile.drawy();
@@ -207,13 +216,13 @@ public class ItemBridge extends Block{
         @Override
         public boolean onConfigureTileTapped(Building other){
             //reverse connection
-            if(other instanceof ItemBridgeEntity && ((ItemBridgeEntity)other).link == pos()){
+            if(other instanceof ItemBridgeBuild && ((ItemBridgeBuild)other).link == pos()){
                 configure(other.pos());
                 other.configure(-1);
                 return true;
             }
 
-            if(linkValid(tile, other.tile())){
+            if(linkValid(tile, other.tile)){
                 if(link == other.pos()){
                     configure(-1);
                 }else{
@@ -229,7 +238,7 @@ public class ItemBridge extends Block{
             while(it.hasNext){
                 int i = it.next();
                 Tile other = world.tile(i);
-                if(!linkValid(tile, other, false) || other.<ItemBridgeEntity>bc().link != tile.pos()){
+                if(!linkValid(tile, other, false) || other.<ItemBridgeBuild>bc().link != tile.pos()){
                     it.remove();
                 }
             }
@@ -247,7 +256,7 @@ public class ItemBridge extends Block{
                 dump();
                 uptime = 0f;
             }else{
-                ((ItemBridgeEntity)other.build).incoming.add(tile.pos());
+                ((ItemBridgeBuild)other.build).incoming.add(tile.pos());
 
                 if(consValid() && Mathf.zero(1f - efficiency())){
                     uptime = Mathf.lerpDelta(uptime, 1f, 0.04f);
@@ -264,10 +273,13 @@ public class ItemBridge extends Block{
                 Item item = items.take();
                 if(item != null && other.acceptItem(this, item)){
                     other.handleItem(this, item);
-                    cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
+                    cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f); //TODO this is kinda broken, because lerping only happens on a timer
                 }else{
                     cycleSpeed = Mathf.lerpDelta(cycleSpeed, 1f, 0.01f);
-                    if(item != null) items.add(item, 1);
+                    if(item != null){
+                        items.add(item, 1);
+                        items.undoFlow(item);
+                    }
                 }
             }
         }
@@ -293,11 +305,14 @@ public class ItemBridge extends Block{
             Draw.rect(endRegion, other.drawx(), other.drawy(), i * 90 + 270);
 
             Lines.stroke(8f);
+
+            Tmp.v1.set(x, y).sub(other.worldx(), other.worldy()).setLength(tilesize/2f).scl(-1f);
+
             Lines.line(bridgeRegion,
-            x,
-            y,
-            other.worldx(),
-            other.worldy(), CapStyle.none, -tilesize / 2f);
+            x + Tmp.v1.x,
+            y + Tmp.v1.y,
+            other.worldx() - Tmp.v1.x,
+            other.worldy() - Tmp.v1.y, false);
 
             int dist = Math.max(Math.abs(other.x - tile.x), Math.abs(other.y - tile.y));
 
@@ -309,15 +324,15 @@ public class ItemBridge extends Block{
             for(int a = 0; a < arrows; a++){
                 Draw.alpha(Mathf.absin(a / (float)arrows - time / 100f, 0.1f, 1f) * uptime * opacity);
                 Draw.rect(arrowRegion,
-                x + Geometry.d4[i].x * (tilesize / 2f + a * 4f + time % 4f),
-                y + Geometry.d4[i].y * (tilesize / 2f + a * 4f + time % 4f), i * 90f);
+                x + Geometry.d4(i).x * (tilesize / 2f + a * 4f + time % 4f),
+                y + Geometry.d4(i).y * (tilesize / 2f + a * 4f + time % 4f), i * 90f);
             }
             Draw.reset();
         }
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            if(team != source.team()) return false;
+            if(team != source.team) return false;
 
             Tile other = world.tile(link);
 
@@ -327,7 +342,7 @@ public class ItemBridge extends Block{
 
                 if(rel == rel2) return false;
             }else{
-                return source.block() instanceof ItemBridge && linkValid(source.tile(), tile) && items.total() < itemCapacity;
+                return linked(source) && items.total() < itemCapacity;
             }
 
             return items.total() < itemCapacity;
@@ -340,7 +355,7 @@ public class ItemBridge extends Block{
 
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid, float amount){
-            if(team != source.team() || !hasLiquids) return false;
+            if(team != source.team || !hasLiquids) return false;
 
             Tile other = world.tile(link);
 
@@ -349,13 +364,17 @@ public class ItemBridge extends Block{
                 int rel2 = relativeTo(Edges.getFacingEdge(source, this));
 
                 if(rel == rel2) return false;
-            }else if(!(source.block() instanceof ItemBridge && linkValid(source.tile(), tile))){
+            }else if(!(linked(source))){
                 return false;
             }
 
             return liquids.get(liquid) + amount < liquidCapacity && (liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f);
         }
 
+        protected boolean linked(Building source){
+            return source instanceof ItemBridgeBuild && linkValid(source.tile, tile) && ((ItemBridgeBuild)source).link == pos();
+        }
+
         @Override
         public boolean canDump(Building to, Item item){
             return checkDump(to);
@@ -364,7 +383,7 @@ public class ItemBridge extends Block{
         protected boolean checkDump(Building to){
             Tile other = world.tile(link);
             if(!linkValid(tile, other)){
-                Tile edge = Edges.getFacingEdge(to.tile(), tile);
+                Tile edge = Edges.getFacingEdge(to.tile, tile);
                 int i = relativeTo(edge.x, edge.y);
 
                 IntSetIterator it = incoming.iterator();
@@ -386,7 +405,7 @@ public class ItemBridge extends Block{
 
         @Override
         public boolean shouldConsume(){
-            return linkValid(tile, world.tile(link));
+            return linkValid(tile, world.tile(link)) && enabled;
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java
index 4c497d1634..26801e86c2 100644
--- a/core/src/mindustry/world/blocks/distribution/Junction.java
+++ b/core/src/mindustry/world/blocks/distribution/Junction.java
@@ -19,6 +19,7 @@ public class Junction extends Block{
         solid = true;
         group = BlockGroup.transportation;
         unloadable = false;
+        noUpdateDisabled = true;
     }
 
     @Override
@@ -26,8 +27,8 @@ public class Junction extends Block{
         return true;
     }
 
-    public class JunctionEntity extends Building{
-        DirectionalItemBuffer buffer = new DirectionalItemBuffer(capacity);
+    public class JunctionBuild extends Building{
+        public DirectionalItemBuffer buffer = new DirectionalItemBuffer(capacity);
 
         @Override
         public int acceptStack(Item item, int amount, Teamc source){
@@ -49,7 +50,7 @@ public class Junction extends Block{
                         Building dest = nearby(i);
 
                         //skip blocks that don't want the item, keep waiting until they do
-                        if(dest == null || !dest.acceptItem(this, item) || dest.team() != team){
+                        if(dest == null || !dest.acceptItem(this, item) || dest.team != team){
                             continue;
                         }
 
@@ -73,7 +74,7 @@ public class Junction extends Block{
 
             if(relative == -1 || !buffer.accepts(relative)) return false;
             Building to = nearby(relative);
-            return to != null && to.team() == team;
+            return to != null && to.team == team;
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java
index 6cd1e57d6c..115d365a88 100644
--- a/core/src/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.distribution;
 
+import arc.audio.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
@@ -30,6 +31,7 @@ public class MassDriver extends Block{
     public Effect shootEffect = Fx.shootBig2;
     public Effect smokeEffect = Fx.shootBigSmoke2;
     public Effect receiveEffect = Fx.mineBig;
+    public Sound shootSound = Sounds.shootBig;
     public float shake = 3f;
     public @Load("@-base") TextureRegion baseRegion;
 
@@ -41,9 +43,11 @@ public class MassDriver extends Block{
         hasItems = true;
         hasPower = true;
         outlineIcon = true;
+        sync = true;
+
         //point2 is relative
-        config(Point2.class, (MassDriverEntity tile, Point2 point) -> tile.link = Point2.pack(point.x + tile.tileX(), point.y + tile.tileY()));
-        config(Integer.class, (MassDriverEntity tile, Integer point) -> tile.link = point);
+        config(Point2.class, (MassDriverBuild tile, Point2 point) -> tile.link = Point2.pack(point.x + tile.tileX(), point.y + tile.tileY()));
+        config(Integer.class, (MassDriverBuild tile, Integer point) -> tile.link = point);
     }
 
     @Override
@@ -58,7 +62,7 @@ public class MassDriver extends Block{
         //check if a mass driver is selected while placing this driver
         if(!control.input.frag.config.isShown()) return;
         Building selected = control.input.frag.config.getSelectedTile();
-        if(selected == null || !(selected.block() instanceof MassDriver) || !(selected.within(x * tilesize, y * tilesize, range))) return;
+        if(selected == null || !(selected.block instanceof MassDriver) || !(selected.within(x * tilesize, y * tilesize, range))) return;
 
         //if so, draw a dotted line towards it while it is in range
         float sin = Mathf.absin(Time.time(), 6f, 1f);
@@ -75,7 +79,7 @@ public class MassDriver extends Block{
     }
 
     public class DriverBulletData implements Poolable{
-        public MassDriverEntity from, to;
+        public MassDriverBuild from, to;
         public int[] items = new int[content.items().size];
 
         @Override
@@ -85,14 +89,14 @@ public class MassDriver extends Block{
         }
     }
 
-    public class MassDriverEntity extends Building{
-        int link = -1;
-        float rotation = 90;
-        float reload = 0f;
-        DriverState state = DriverState.idle;
-        OrderedSet<Tile> waitingShooters = new OrderedSet<>();
+    public class MassDriverBuild extends Building{
+        public int link = -1;
+        public float rotation = 90;
+        public float reload = 0f;
+        public DriverState state = DriverState.idle;
+        public OrderedSet<Tile> waitingShooters = new OrderedSet<>();
 
-        Tile currentShooter(){
+        public Tile currentShooter(){
             return waitingShooters.isEmpty() ? null : waitingShooters.first();
         }
 
@@ -151,9 +155,9 @@ public class MassDriver extends Block{
 
                 if(
                 items.total() >= minDistribute && //must shoot minimum amount of items
-                link.block().itemCapacity - link.items.total() >= minDistribute //must have minimum amount of space
+                link.block.itemCapacity - link.items.total() >= minDistribute //must have minimum amount of space
                 ){
-                    MassDriverEntity other = (MassDriverEntity)link;
+                    MassDriverBuild other = (MassDriverBuild)link;
                     other.waitingShooters.add(tile);
 
                     if(reload <= 0.0001f){
@@ -184,6 +188,9 @@ public class MassDriver extends Block{
 
             Draw.z(Layer.turret);
 
+            Drawf.shadow(region,
+            x + Angles.trnsx(rotation + 180f, reload * knockback) - (size / 2),
+            y + Angles.trnsy(rotation + 180f, reload * knockback) - (size / 2), rotation - 90);
             Draw.rect(region,
             x + Angles.trnsx(rotation + 180f, reload * knockback),
             y + Angles.trnsy(rotation + 180f, reload * knockback), rotation - 90);
@@ -221,7 +228,7 @@ public class MassDriver extends Block{
             if(link == other.pos()){
                 configure(-1);
                 return false;
-            }else if(other.block() instanceof MassDriver && other.dst(tile) <= range && other.team() == team){
+            }else if(other.block instanceof MassDriver && other.dst(tile) <= range && other.team == team){
                 configure(other.pos());
                 return false;
             }
@@ -235,7 +242,7 @@ public class MassDriver extends Block{
             return items.total() < itemCapacity && linkValid();
         }
 
-        protected void fire(MassDriverEntity target){
+        protected void fire(MassDriverBuild target){
             //reset reload, use power.
             reload = 1f;
 
@@ -244,7 +251,7 @@ public class MassDriver extends Block{
             data.to = target;
             int totalUsed = 0;
             for(int i = 0; i < content.items().size; i++){
-                int maxTransfer = Math.min(items.get(content.item(i)), ((MassDriver)tile.block()).itemCapacity - totalUsed);
+                int maxTransfer = Math.min(items.get(content.item(i)), tile.block().itemCapacity - totalUsed);
                 data.items[i] = maxTransfer;
                 totalUsed += maxTransfer;
                 items.remove(content.item(i), maxTransfer);
@@ -252,7 +259,7 @@ public class MassDriver extends Block{
 
             float angle = tile.angleTo(target);
 
-            Bullets.driverBolt.create(this, team(),
+            Bullets.driverBolt.create(this, team,
                 x + Angles.trnsx(angle, translation), y + Angles.trnsy(angle, translation),
                 angle, -1f, bulletSpeed, bulletLifetime, data);
 
@@ -262,7 +269,9 @@ public class MassDriver extends Block{
             smokeEffect.at(x + Angles.trnsx(angle, translation),
             y + Angles.trnsy(angle, translation), angle);
 
-            Effects.shake(shake, shake, this);
+            Effect.shake(shake, shake, this);
+            
+            shootSound.at(tile, Mathf.random(0.9f, 1.1f));
         }
 
         public void handlePayload(Bullet bullet, DriverBulletData data){
@@ -280,7 +289,7 @@ public class MassDriver extends Block{
                 }
             }
 
-            Effects.shake(shake, shake, this);
+            Effect.shake(shake, shake, this);
             receiveEffect.at(bullet);
 
             reload = 1f;
@@ -290,7 +299,7 @@ public class MassDriver extends Block{
         protected boolean shooterValid(Tile other){
             if(other == null) return true;
             if(!(other.block() instanceof MassDriver)) return false;
-            MassDriverEntity entity = other.bc();
+            MassDriverBuild entity = other.bc();
             return entity.link == tile.pos() && tile.dst(other) <= range;
         }
 
@@ -318,14 +327,16 @@ public class MassDriver extends Block{
             super.read(read, revision);
             link = read.i();
             rotation = read.f();
-            state = DriverState.values()[read.b()];
+            state = DriverState.all[read.b()];
         }
     }
 
-    enum DriverState{
+    public enum DriverState{
         idle, //nothing is shooting at this mass driver and it does not have any target
         accepting, //currently getting shot at, unload items
         shooting,
-        unloading
+        unloading;
+
+        public static final DriverState[] all = values();
     }
 }
diff --git a/core/src/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/mindustry/world/blocks/distribution/OverflowGate.java
index 2c80b29a1e..981080a95d 100644
--- a/core/src/mindustry/world/blocks/distribution/OverflowGate.java
+++ b/core/src/mindustry/world/blocks/distribution/OverflowGate.java
@@ -21,6 +21,7 @@ public class OverflowGate extends Block{
         solid = true;
         update = true;
         group = BlockGroup.transportation;
+        instantTransfer = true;
         unloadable = false;
         canOverdrive = false;
     }
@@ -30,10 +31,10 @@ public class OverflowGate extends Block{
         return true;
     }
 
-    public class OverflowGateEntity extends Building{
-        Item lastItem;
-        Tile lastInput;
-        float time;
+    public class OverflowGateBuild extends Building{
+        public Item lastItem;
+        public Tile lastInput;
+        public float time;
 
         @Override
         public int acceptStack(Item item, int amount, Teamc source){
@@ -75,7 +76,7 @@ public class OverflowGate extends Block{
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            return team == source.team() && lastItem == null && items.total() == 0;
+            return team == source.team && lastItem == null && items.total() == 0;
         }
 
         @Override
@@ -90,17 +91,17 @@ public class OverflowGate extends Block{
             int from = relativeToEdge(src);
             if(from == -1) return null;
             Building to = nearby((from + 2) % 4);
-            boolean canForward = to != null && to.acceptItem(this, item) && to.team() == team && !(to.block() instanceof OverflowGate);
+            boolean canForward = to != null && to.acceptItem(this, item) && to.team == team && !(to.block instanceof OverflowGate);
+            boolean inv = invert == enabled;
 
-
-            if(!canForward || invert){
+            if(!canForward || inv){
                 Building a = nearby(Mathf.mod(from - 1, 4));
                 Building b = nearby(Mathf.mod(from + 1, 4));
-                boolean ac = a != null && a.acceptItem(this, item) && !(a.block() instanceof OverflowGate) && a.team() == team;
-                boolean bc = b != null && b.acceptItem(this, item) && !(b.block() instanceof OverflowGate) && b.team() == team;
+                boolean ac = a != null && a.acceptItem(this, item) && !(a.block instanceof OverflowGate) && a.team == team;
+                boolean bc = b != null && b.acceptItem(this, item) && !(b.block instanceof OverflowGate) && b.team == team;
 
                 if(!ac && !bc){
-                    return invert && canForward ? to : null;
+                    return inv && canForward ? to : null;
                 }
 
                 if(ac && !bc){
@@ -108,12 +109,12 @@ public class OverflowGate extends Block{
                 }else if(bc && !ac){
                     to = b;
                 }else{
-                    if(tile.rotation() == 0){
+                    if(rotation == 0){
                         to = a;
-                        if(flip) tile.rotation((byte) 1);
+                        if(flip) rotation =1;
                     }else{
                         to = b;
-                        if(flip) tile.rotation((byte) 0);
+                        if(flip) rotation = 0;
                     }
                 }
             }
@@ -128,12 +129,15 @@ public class OverflowGate extends Block{
 
         @Override
         public void write(Writes write){
+            super.write(write);
+
             write.i(lastInput == null ? -1 : lastInput.pos());
         }
 
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
+
             if(revision == 1){
                 new DirectionalItemBuffer(25).read(read);
             }else if(revision == 3){
diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
index d4a56458ff..656315446f 100644
--- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
@@ -17,7 +17,7 @@ import mindustry.world.blocks.production.*;
 import static mindustry.Vars.*;
 
 public class PayloadConveyor extends Block{
-    public float moveTime = 70f;
+    public float moveTime = 40f, moveForce = 201f;
     public @Load("@-top") TextureRegion topRegion;
     public @Load("@-edge") TextureRegion edgeRegion;
     public Interp interp = Interp.pow5;
@@ -29,6 +29,8 @@ public class PayloadConveyor extends Block{
         rotate = true;
         update = true;
         outputsPayload = true;
+        noUpdateDisabled = true;
+        sync = true;
     }
 
     @Override
@@ -42,15 +44,16 @@ public class PayloadConveyor extends Block{
 
         for(int i = 0; i < 4; i++){
             Building other = world.build(x + Geometry.d4x[i] * size, y + Geometry.d4y[i] * size);
-            if(other != null && other.block().outputsPayload && other.block().size == size){
-                Drawf.selected(other.tileX(), other.tileY(), other.block(), Pal.accent);
+            if(other != null && other.block.outputsPayload && other.block.size == size){
+                Drawf.selected(other.tileX(), other.tileY(), other.block, Pal.accent);
             }
         }
     }
 
-    public class PayloadConveyorEntity extends Building{
+    public class PayloadConveyorBuild extends Building{
         public @Nullable Payload item;
         public float progress, itemRotation, animation;
+        public float curInterp, lastInterp;
         public @Nullable Building next;
         public boolean blocked;
         public int step = -1, stepAccepted = -1;
@@ -66,17 +69,17 @@ public class PayloadConveyor extends Block{
         public void onProximityUpdate(){
             super.onProximityUpdate();
 
-            Building accept = nearby(Geometry.d4(rotation()).x * size, Geometry.d4(rotation()).y * size);
+            Building accept = nearby(Geometry.d4(rotation).x * size, Geometry.d4(rotation).y * size);
             //next block must be aligned and of the same size
             if(accept != null && (
                 //same size
-                (accept.block().size == size && tileX() + Geometry.d4(rotation()).x * size == accept.tileX() && tileY() + Geometry.d4(rotation()).y * size == accept.tileY()) ||
+                (accept.block.size == size && tileX() + Geometry.d4(rotation).x * size == accept.tileX() && tileY() + Geometry.d4(rotation).y * size == accept.tileY()) ||
 
                 //differing sizes
-                (accept.block().size > size &&
-                    (rotation() % 2 == 0 ? //check orientation
-                    Math.abs(accept.y - y) <= (accept.block().size * tilesize - size * tilesize)/2f : //check Y alignment
-                    Math.abs(accept.x - x) <= (accept.block().size * tilesize - size * tilesize)/2f   //check X alignment
+                (accept.block.size > size &&
+                    (rotation % 2 == 0 ? //check orientation
+                    Math.abs(accept.y - y) <= (accept.block.size * tilesize - size * tilesize)/2f : //check Y alignment
+                    Math.abs(accept.x - x) <= (accept.block.size * tilesize - size * tilesize)/2f   //check X alignment
                 )))){
                 next = accept;
             }else{
@@ -84,8 +87,8 @@ public class PayloadConveyor extends Block{
             }
 
             int ntrns = 1 + size/2;
-            Tile next = tile.getNearby(Geometry.d4(rotation()).x * ntrns, Geometry.d4(rotation()).y * ntrns);
-            blocked = (next != null && next.solid()) || (this.next != null && (this.next.rotation() + 2)%4 == rotation());
+            Tile next = tile.getNearby(Geometry.d4(rotation).x * ntrns, Geometry.d4(rotation).y * ntrns);
+            blocked = (next != null && next.solid() && !next.block().outputsPayload) || (this.next != null && (this.next.rotation + 2)%4 == rotation);
         }
 
         @Override
@@ -95,7 +98,13 @@ public class PayloadConveyor extends Block{
 
         @Override
         public void updateTile(){
-            progress = Time.time() % moveTime;
+            if(!enabled) return;
+
+            lastInterp = curInterp;
+            curInterp = fract();
+            //rollover skip
+            if(lastInterp > curInterp) lastInterp = 0f;
+            progress = time() % moveTime;
 
             updatePayload();
 
@@ -104,6 +113,7 @@ public class PayloadConveyor extends Block{
             if(curStep > step){
                 boolean valid = step != -1;
                 step = curStep;
+                boolean had = item != null;
 
                 if(valid && stepAccepted != curStep && item != null){
                     if(next != null){
@@ -125,9 +135,17 @@ public class PayloadConveyor extends Block{
                         }
                     }
                 }
+
+                if(had && item != null){
+                    moveFailed();
+                }
             }
         }
 
+        public void moveFailed(){
+
+        }
+
         public void moved(){
 
         }
@@ -136,7 +154,7 @@ public class PayloadConveyor extends Block{
             super.draw();
         }
 
-        @Override 
+        @Override
         public void draw(){
             super.draw();
 
@@ -151,20 +169,20 @@ public class PayloadConveyor extends Block{
             float s = tilesize * size;
 
             //next
-            Tmp.v1.set((s-clipped.getWidth()*Draw.scl) + clipped.getWidth()/2f*Draw.scl - s/2f, s-clipped.getHeight()*Draw.scl + clipped.getHeight()/2f*Draw.scl - s/2f).rotate(rot);
+            Tmp.v1.set((s- clipped.width *Draw.scl) + clipped.width /2f*Draw.scl - s/2f, s- clipped.height *Draw.scl + clipped.height /2f*Draw.scl - s/2f).rotate(rot);
             Draw.rect(clipped, x + Tmp.v1.x, y + Tmp.v1.y, rot);
 
             clipped = clipRegion(tile.getHitbox(Tmp.r1), tile.getHitbox(Tmp.r2).move(trprev, 0), topRegion);
 
             //prev
-            Tmp.v1.set(- s/2f + clipped.getWidth()/2f*Draw.scl,  - s/2f + clipped.getHeight()/2f*Draw.scl).rotate(rot);
+            Tmp.v1.set(- s/2f + clipped.width /2f*Draw.scl,  - s/2f + clipped.height /2f*Draw.scl).rotate(rot);
             Draw.rect(clipped, x + Tmp.v1.x, y + Tmp.v1.y, rot);
 
             for(int i = 0; i < 4; i++){
-                if(blends(i) && i != rotation()){
+                if(blends(i) && i != rotation){
                     Draw.alpha(1f - Interp.pow5In.apply(fract()));
                     //prev from back
-                    Tmp.v1.set(- s/2f + clipped.getWidth()/2f*Draw.scl,  - s/2f + clipped.getHeight()/2f*Draw.scl).rotate(i * 90 + 180);
+                    Tmp.v1.set(- s/2f + clipped.width /2f*Draw.scl,  - s/2f + clipped.height /2f*Draw.scl).rotate(i * 90 + 180);
                     Draw.rect(clipped, x + Tmp.v1.x, y + Tmp.v1.y, i * 90 + 180);
                 }
             }
@@ -184,17 +202,32 @@ public class PayloadConveyor extends Block{
             }
         }
 
+        public float time(){
+            return Time.time();
+        }
+
+        @Override
+        public void unitOn(Unit unit){
+            //calculate derivative of units moved last frame
+            float delta = (curInterp - lastInterp) * size * tilesize;
+            Tmp.v1.trns(rotdeg(), delta * moveForce).scl(1f / Math.max(unit.mass(), 201f));
+            unit.move(Tmp.v1.x, Tmp.v1.y);
+        }
+
         @Override
         public boolean acceptPayload(Building source, Payload payload){
+            if(source == this){
+                return this.item == null && payload.fits();
+            }
             //accepting payloads from units isn't supported
-            return this.item == null && progress <= 5f && source != this && payload.fits();
+            return this.item == null && progress <= 5f && payload.fits();
         }
 
         @Override
         public void handlePayload(Building source, Payload payload){
             this.item = payload;
             this.stepAccepted = curStep();
-            this.itemRotation = source.angleTo(this);
+            this.itemRotation = source == this ? rotdeg() : source.angleTo(this);
             this.animation = 0;
 
             updatePayload();
@@ -213,7 +246,7 @@ public class PayloadConveyor extends Block{
         public void read(Reads read, byte revision){
             super.read(read, revision);
 
-            progress = read.f();
+            read.f(); //why is progress written?
             itemRotation = read.f();
             item = Payload.read(read);
         }
@@ -241,26 +274,25 @@ public class PayloadConveyor extends Block{
             }
         }
 
-        boolean blends(int direction){
-            if(direction == rotation()){
+        protected boolean blends(int direction){
+            if(direction == rotation){
                 return !blocked || next != null;
-            }else{
-                return PayloadAcceptor.blends(this, direction);
             }
+            return PayloadAcceptor.blends(this, direction);
         }
 
-        TextureRegion clipRegion(Rect bounds, Rect sprite, TextureRegion region){
+        protected TextureRegion clipRegion(Rect bounds, Rect sprite, TextureRegion region){
             Rect over = Tmp.r3;
 
             boolean overlaps = Intersector.intersectRectangles(bounds, sprite, over);
 
             TextureRegion out = Tmp.tr1;
-            out.set(region.getTexture());
+            out.set(region.texture);
 
             if(overlaps){
-                float w = region.getU2() - region.getU();
-                float h = region.getV2() - region.getV();
-                float x = region.getU(), y = region.getV();
+                float w = region.u2 - region.u;
+                float h = region.v2 - region.v;
+                float x = region.u, y = region.v;
                 float newX = (over.x - sprite.x) / sprite.width * w + x;
                 float newY = (over.y - sprite.y) / sprite.height * h + y;
                 float newW = (over.width / sprite.width) * w, newH = (over.height / sprite.height) * h;
@@ -273,11 +305,11 @@ public class PayloadConveyor extends Block{
             return out;
         }
 
-        int curStep(){
-            return (int)((Time.time()) / moveTime);
+        public int curStep(){
+            return (int)((time()) / moveTime);
         }
 
-        float fract(){
+        public float fract(){
             return interp.apply(progress / moveTime);
         }
     }
diff --git a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java b/core/src/mindustry/world/blocks/distribution/PayloadRouter.java
index 2fea02a283..3f277c82d3 100644
--- a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java
+++ b/core/src/mindustry/world/blocks/distribution/PayloadRouter.java
@@ -5,7 +5,9 @@ import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.entities.units.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.world.blocks.payloads.*;
 
 public class PayloadRouter extends PayloadConveyor{
     public @Load("@-over") TextureRegion overRegion;
@@ -24,7 +26,7 @@ public class PayloadRouter extends PayloadConveyor{
         Draw.rect(overRegion, req.drawx(), req.drawy());
     }
 
-    public class PayloadRouterEntity extends PayloadConveyorEntity{
+    public class PayloadRouterBuild extends PayloadConveyorBuild{
         public float smoothRot;
 
         @Override
@@ -33,13 +35,27 @@ public class PayloadRouter extends PayloadConveyor{
             smoothRot = rotdeg();
         }
 
+        public void pickNext(){
+            if(item != null){
+                int rotations = 0;
+                do{
+                    rotation = (rotation + 1) % 4;
+                    onProximityUpdate();
+                    //this condition intentionally uses "accept from itself" conditions, because payload conveyors only accept during the start
+                    //"accept from self" conditions are for dropped payloads and are less restrictive
+                }while((blocked || next == null || !next.acceptPayload(next, item)) && ++rotations < 4);
+            }
+        }
+
         @Override
-        public void moved(){
-            int rotations = 0;
-            do{
-                tile.rotation((tile.rotation() + 1) % 4);
-                onProximityUpdate();
-            }while((blocked || next == null) && ++rotations < 4);
+        public void handlePayload(Building source, Payload payload){
+            super.handlePayload(source, payload);
+            pickNext();
+        }
+
+        @Override
+        public void moveFailed(){
+            pickNext();
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/distribution/Router.java b/core/src/mindustry/world/blocks/distribution/Router.java
index 2f88c5c9a7..cb0ae9807d 100644
--- a/core/src/mindustry/world/blocks/distribution/Router.java
+++ b/core/src/mindustry/world/blocks/distribution/Router.java
@@ -17,12 +17,13 @@ public class Router extends Block{
         itemCapacity = 1;
         group = BlockGroup.transportation;
         unloadable = false;
+        noUpdateDisabled = true;
     }
 
-    public class RouterEntity extends Building{
-        Item lastItem;
-        Tile lastInput;
-        float time;
+    public class RouterBuild extends Building{
+        public Item lastItem;
+        public Tile lastInput;
+        public float time;
 
         @Override
         public void updateTile(){
@@ -34,7 +35,7 @@ public class Router extends Block{
                 time += 1f / speed * delta();
                 Building target = getTileTarget(lastItem, lastInput, false);
 
-                if(target != null && (time >= 1f || !(target.block() instanceof Router))){
+                if(target != null && (time >= 1f || !(target.block instanceof Router || target.block.instantTransfer))){
                     getTileTarget(lastItem, lastInput, true);
                     target.handleItem(this, lastItem);
                     items.remove(lastItem, 1);
@@ -50,7 +51,7 @@ public class Router extends Block{
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            return team == source.team() && lastItem == null && items.total() == 0;
+            return team == source.team && lastItem == null && items.total() == 0;
         }
 
         @Override
@@ -70,12 +71,12 @@ public class Router extends Block{
             return result;
         }
 
-        Building getTileTarget(Item item, Tile from, boolean set){
-            int counter = tile.rotation();
+        public Building getTileTarget(Item item, Tile from, boolean set){
+            int counter = rotation;
             for(int i = 0; i < proximity.size; i++){
                 Building other = proximity.get((i + counter) % proximity.size);
-                if(set) tile.rotation((byte)((tile.rotation() + 1) % proximity.size));
-                if(other.tile() == from && from.block() == Blocks.overflowGate) continue;
+                if(set) rotation = ((byte)((rotation + 1) % proximity.size));
+                if(other.tile == from && from.block() == Blocks.overflowGate) continue;
                 if(other.acceptItem(this, item)){
                     return other;
                 }
diff --git a/core/src/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java
index 8fa77bb230..6deed76005 100644
--- a/core/src/mindustry/world/blocks/distribution/Sorter.java
+++ b/core/src/mindustry/world/blocks/distribution/Sorter.java
@@ -28,8 +28,8 @@ public class Sorter extends Block{
         unloadable = false;
         saveConfig = true;
 
-        config(Item.class, (SorterEntity tile, Item item) -> tile.sortItem = item);
-        configClear((SorterEntity tile) -> tile.sortItem = null);
+        config(Item.class, (SorterBuild tile, Item item) -> tile.sortItem = item);
+        configClear((SorterBuild tile) -> tile.sortItem = null);
     }
 
     @Override
@@ -44,14 +44,14 @@ public class Sorter extends Block{
 
     @Override
     public int minimapColor(Tile tile){
-        return tile.<SorterEntity>bc().sortItem == null ? 0 : tile.<SorterEntity>bc().sortItem.color.rgba();
+        return tile.<SorterBuild>bc().sortItem == null ? 0 : tile.<SorterBuild>bc().sortItem.color.rgba();
     }
 
-    public class SorterEntity extends Building{
-        @Nullable Item sortItem;
+    public class SorterBuild extends Building{
+        public @Nullable Item sortItem;
 
         @Override
-        public void configured(Player player, Object value){
+        public void configured(Unit player, Object value){
             super.configured(player, value);
 
             if(!headless){
@@ -76,7 +76,7 @@ public class Sorter extends Block{
         public boolean acceptItem(Building source, Item item){
             Building to = getTileTarget(item, source, false);
 
-            return to != null && to.acceptItem(this, item) && to.team() == team;
+            return to != null && to.acceptItem(this, item) && to.team == team;
         }
 
         @Override
@@ -86,17 +86,17 @@ public class Sorter extends Block{
             to.handleItem(this, item);
         }
 
-        boolean isSame(Building other){
-            //uncomment code below to prevent sorter/gate chaining
-            return other != null && (other.block() instanceof Sorter/* || other.block() instanceof OverflowGate */);
+        public boolean isSame(Building other){
+            // comment code below to allow sorter/gate chaining
+            return other != null && other.block.instantTransfer;
         }
 
-        Building getTileTarget(Item item, Building source, boolean flip){
+        public Building getTileTarget(Item item, Building source, boolean flip){
             int dir = source.relativeTo(tile.x, tile.y);
             if(dir == -1) return null;
             Building to;
 
-            if((item == sortItem) != invert){
+            if(((item == sortItem) != invert) == enabled){
                 //prevent 3-chains
                 if(isSame(source) && isSame(nearby(dir))){
                     return null;
@@ -105,9 +105,9 @@ public class Sorter extends Block{
             }else{
                 Building a = nearby(Mathf.mod(dir - 1, 4));
                 Building b = nearby(Mathf.mod(dir + 1, 4));
-                boolean ac = a != null && !(a.block().instantTransfer && source.block().instantTransfer) &&
+                boolean ac = a != null && !(a.block.instantTransfer && source.block.instantTransfer) &&
                 a.acceptItem(this, item);
-                boolean bc = b != null && !(b.block().instantTransfer && source.block().instantTransfer) &&
+                boolean bc = b != null && !(b.block.instantTransfer && source.block.instantTransfer) &&
                 b.acceptItem(this, item);
 
                 if(ac && !bc){
@@ -117,12 +117,12 @@ public class Sorter extends Block{
                 }else if(!bc){
                     return null;
                 }else{
-                    if(rotation() == 0){
+                    if(rotation == 0){
                         to = a;
-                        if(flip) rotation((byte)1);
+                        if(flip) this.rotation = (byte)1;
                     }else{
                         to = b;
-                        if(flip) rotation((byte)0);
+                        if(flip) this.rotation = (byte)0;
                     }
                 }
             }
@@ -132,7 +132,7 @@ public class Sorter extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> sortItem, item -> configure(item));
+            ItemSelection.buildTable(table, content.items(), () -> sortItem, this::configure);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index 1868e02662..ce77b978df 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
@@ -2,10 +2,12 @@ package mindustry.world.blocks.distribution;
 
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -13,6 +15,7 @@ import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
+import mindustry.world.blocks.distribution.Conveyor.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -25,8 +28,11 @@ public class StackConveyor extends Block implements Autotiler{
     public @Load("@-stack") TextureRegion stackRegion;
 
     public float speed = 0f;
-    public float recharge = 4f;
     public boolean splitOut = true;
+    /** (minimum) amount of loading docks needed to fill a line */
+    public float recharge = 2f;
+    public Effect loadEffect = Fx.plasticburn;
+    public Effect unloadEffect = Fx.plasticburn;
 
     public StackConveyor(String name){
         super(name);
@@ -52,15 +58,17 @@ public class StackConveyor extends Block implements Autotiler{
 
     @Override
     public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        if(tile.build instanceof StackConveyorEntity){
-            int state = ((StackConveyorEntity)tile.build).state;
+        if(tile.build instanceof StackConveyorBuild){
+            int state = ((StackConveyorBuild)tile.build).state;
             if(state == stateLoad){ //standard conveyor mode
                 return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
             }else if(state == stateUnload){ //router mode
-                return (otherblock.hasItems || otherblock.outputsItems() || otherblock.acceptsItems) &&
+                return otherblock.acceptsItems &&
                     (notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) ||
                     (otherblock instanceof StackConveyor && facing(otherx, othery, otherrot, tile.x, tile.y))) &&
-                    !(world.build(otherx, othery) instanceof StackConveyorEntity && ((StackConveyorEntity)world.build(otherx, othery)).state == stateUnload);
+                    !(world.build(otherx, othery) instanceof StackConveyorBuild && ((StackConveyorBuild)world.build(otherx, othery)).state == stateUnload) &&
+                    !(world.build(otherx, othery) instanceof StackConveyorBuild && ((StackConveyorBuild)world.build(otherx, othery)).state == stateMove &&
+                        !facing(otherx, othery, otherrot, tile.x, tile.y));
             }
         }
         return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock) && otherblock instanceof StackConveyor;
@@ -85,13 +93,13 @@ public class StackConveyor extends Block implements Autotiler{
     @Override
     public boolean rotatedOutput(int x, int y){
         Building tile = world.build(x, y);
-        if(tile instanceof StackConveyorEntity){
-            return ((StackConveyorEntity)tile).state != stateUnload;
+        if(tile instanceof StackConveyorBuild){
+            return ((StackConveyorBuild)tile).state != stateUnload;
         }
         return super.rotatedOutput(x, y);
     }
 
-    public class StackConveyorEntity extends Building{
+    public class StackConveyorBuild extends Building{
         public int state, blendprox;
 
         public int link = -1;
@@ -104,25 +112,28 @@ public class StackConveyor extends Block implements Autotiler{
 
             for(int i = 0; i < 4; i++){
                 if((blendprox & (1 << i)) == 0){
-                    Draw.rect(edgeRegion, x, y, (rotation() - i) * 90);
+                    Draw.rect(edgeRegion, x, y, (rotation - i) * 90);
                 }
             }
 
             Draw.z(Layer.blockOver);
 
-            if(link == -1) return;
+            Tile from = world.tile(link);
+
+            if(link == -1 || from == null || lastItem == null) return;
+
+            int fromRot = from.build == null ? rotation : from.build.rotation;
 
             //offset
-            Tile from = world.tile(link);
-            Tmp.v1.set(from);
-            Tmp.v2.set(tile);
+            Tmp.v1.set(from.worldx(), from.worldy());
+            Tmp.v2.set(x, y);
             Tmp.v1.interpolate(Tmp.v2, 1f - cooldown, Interp.linear);
 
             //rotation
-            float a = (from.rotation()%4) * 90;
-            float b = (tile.rotation()%4) * 90;
-            if((from.rotation()%4) == 3 && (tile.rotation()%4) == 0) a = -1 * 90;
-            if((from.rotation()%4) == 0 && (tile.rotation()%4) == 3) a =  4 * 90;
+            float a = (fromRot%4) * 90;
+            float b = (rotation%4) * 90;
+            if((fromRot%4) == 3 && (rotation%4) == 0) a = -1 * 90;
+            if((fromRot%4) == 0 && (rotation%4) == 3) a =  4 * 90;
 
             //stack
             Draw.rect(stackRegion, Tmp.v1.x, Tmp.v1.y, Mathf.lerp(a, b, Interp.smooth.apply(1f - Mathf.clamp(cooldown * 2, 0f, 1f))));
@@ -130,7 +141,7 @@ public class StackConveyor extends Block implements Autotiler{
             //item
             float size = itemSize * Mathf.lerp(Math.min((float)items.total() / itemCapacity, 1), 1f, 0.4f);
             Drawf.shadow(Tmp.v1.x, Tmp.v1.y, size * 1.2f);
-            Draw.rect(items.first().icon(Cicon.medium), Tmp.v1.x, Tmp.v1.y, size, size, 0);
+            Draw.rect(lastItem.icon(Cicon.medium), Tmp.v1.x, Tmp.v1.y, size, size, 0);
         }
 
         @Override
@@ -141,14 +152,14 @@ public class StackConveyor extends Block implements Autotiler{
 
             state = stateMove;
 
-            int[] bits = buildBlending(tile, tile.rotation(), null, true);
-            if(bits[0] == 0 &&  blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) state = stateLoad;  // a 0 that faces into a conveyor with none behind it
-            if(bits[0] == 0 && !blends(tile, tile.rotation(), 0) && blends(tile, tile.rotation(), 2)) state = stateUnload; // a 0 that faces into none with a conveyor behind it
-            
+            int[] bits = buildBlending(tile, rotation, null, true);
+            if(bits[0] == 0 &&  blends(tile, rotation, 0) && !blends(tile, rotation, 2)) state = stateLoad;  // a 0 that faces into a conveyor with none behind it
+            if(bits[0] == 0 && !blends(tile, rotation, 0) && blends(tile, rotation, 2)) state = stateUnload; // a 0 that faces into none with a conveyor behind it
+
             blendprox = 0;
 
             for(int i = 0; i < 4; i++){
-                if(blends(tile, rotation(), i)){
+                if(blends(tile, rotation, i)){
                     blendprox |= (1 << i);
                 }
             }
@@ -156,8 +167,11 @@ public class StackConveyor extends Block implements Autotiler{
             //update other conveyor state when this conveyor's state changes
             if(state != lastState){
                 for(Building near : proximity){
-                    if(near instanceof StackConveyorEntity){
+                    if(near instanceof StackConveyorBuild){
                         near.onProximityUpdate();
+                        for(Building other : near.proximity){
+                            if(!(other instanceof StackConveyorBuild)) other.onProximityUpdate();
+                        }
                     }
                 }
             }
@@ -187,9 +201,9 @@ public class StackConveyor extends Block implements Autotiler{
             }else{ //transfer
                 if(state != stateLoad || (items.total() >= getMaximumAccepted(lastItem))){
                     if(front() != null
-                    && front().team() == team()
-                    && front().block() instanceof StackConveyor){
-                        StackConveyorEntity e = (StackConveyorEntity)front();
+                    && front().team == team
+                    && front().block instanceof StackConveyor){
+                        StackConveyorBuild e = (StackConveyorBuild)front();
 
                         // sleep if its occupied
                         if(e.link == -1){
@@ -208,18 +222,28 @@ public class StackConveyor extends Block implements Autotiler{
             }
         }
 
+        @Override
+        public void overwrote(Seq<Building> builds){
+            if(builds.first() instanceof ConveyorBuild build){
+                Item item = build.items.first();
+                if(item != null){
+                    handleStack(item, build.items.get(itemCapacity), null);
+                }
+            }
+        }
+
         @Override
         public boolean shouldIdleSound(){
             return false; // has no moving parts;
         }
 
-        private void poofIn(){
+        protected void poofIn(){
             link = tile.pos();
-            Fx.plasticburn.at(this);
+            loadEffect.at(this);
         }
 
-        private void poofOut(){
-            Fx.plasticburn.at(this);
+        protected void poofOut(){
+            unloadEffect.at(this);
             link = -1;
         }
 
@@ -253,7 +277,7 @@ public class StackConveyor extends Block implements Autotiler{
             return !((state != stateLoad)                   // not a loading dock
             ||  (items.total() > 0 && !items.has(item))     // incompatible items
             ||  (items.total() >= getMaximumAccepted(item)) // filled to capacity
-            ||  (tile.front()  == source));
+            ||  (front()  == source));
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/environment/Rock.java b/core/src/mindustry/world/blocks/environment/Boulder.java
similarity index 94%
rename from core/src/mindustry/world/blocks/environment/Rock.java
rename to core/src/mindustry/world/blocks/environment/Boulder.java
index 1c3abc1a15..4c90d8204f 100644
--- a/core/src/mindustry/world/blocks/environment/Rock.java
+++ b/core/src/mindustry/world/blocks/environment/Boulder.java
@@ -7,10 +7,10 @@ import arc.math.Mathf;
 import mindustry.world.Block;
 import mindustry.world.Tile;
 
-public class Rock extends Block{
+public class Boulder extends Block{
     protected int variants;
 
-    public Rock(String name){
+    public Boulder(String name){
         super(name);
         breakable = true;
         alwaysReplace = true;
diff --git a/core/src/mindustry/world/blocks/environment/Cliff.java b/core/src/mindustry/world/blocks/environment/Cliff.java
index a9a800f126..d4347a7c97 100644
--- a/core/src/mindustry/world/blocks/environment/Cliff.java
+++ b/core/src/mindustry/world/blocks/environment/Cliff.java
@@ -6,6 +6,7 @@ import mindustry.graphics.*;
 import mindustry.world.*;
 
 public class Cliff extends Block{
+    public float size = 11f;
 
     public Cliff(String name){
         super(name);
@@ -18,11 +19,12 @@ public class Cliff extends Block{
 
     @Override
     public void drawBase(Tile tile){
-        int r = tile.rotation();
+
+        int r = tile.data;
         for(int i = 0; i < 8; i++){
             if((r & (1 << i)) != 0){
                 Draw.color(Tmp.c1.set(tile.floor().mapColor).mul(1.3f + (i >= 4 ? -0.4f : 0.3f)));
-                Draw.rect(region, tile.worldx(), tile.worldy(), 11f, 11f, i * 45f);
+                Draw.rect(region, tile.worldx(), tile.worldy(), size, size, i * 45f);
             }
         }
 
diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index bd858602fc..7ada1bbcf7 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -37,11 +37,13 @@ public class Floor extends Block{
     /** Effect displayed when drowning on this floor. */
     public Effect drownUpdateEffect = Fx.bubble;
     /** Status effect applied when walking on. */
-    public @NonNull StatusEffect status = StatusEffects.none;
+    public StatusEffect status = StatusEffects.none;
     /** Intensity of applied status effect. */
     public float statusDuration = 60f;
     /** liquids that drop from this block, used for pumps */
     public @Nullable Liquid liquidDrop = null;
+    /** Multiplier for pumped liquids, used for deep water. */
+    public float liquidMultiplier = 1f;
     /** item that drops from this block, used for drills */
     public @Nullable Item itemDrop = null;
     /** whether this block can be drowned in */
@@ -65,7 +67,7 @@ public class Floor extends Block{
 
     protected TextureRegion[][] edges;
     protected Seq<Block> blenders = new Seq<>();
-    protected IntSet blended = new IntSet();
+    protected Bits blended = new Bits(256);
     protected TextureRegion edgeRegion;
 
     public Floor(String name){
@@ -101,16 +103,15 @@ public class Floor extends Block{
         super.init();
 
         if(wall == Blocks.air){
-            wall = content.block(name + "Rocks");
-            if(wall == null) wall = content.block(name + "rocks");
-            if(wall == null) wall = content.block(name.replace("darksand", "dune") + "rocks");
+            wall = content.block(name + "-wall");
+            if(wall == null) wall = content.block(name.replace("darksand", "dune") + "-wall");
         }
 
         //keep default value if not found...
         if(wall == null) wall = Blocks.air;
 
         if(decoration == Blocks.air){
-            decoration = content.blocks().min(b -> b instanceof Rock && b.breakable ? mapColor.diff(b.mapColor) : Float.POSITIVE_INFINITY);
+            decoration = content.blocks().min(b -> b instanceof Boulder && b.breakable ? mapColor.diff(b.mapColor) : Float.POSITIVE_INFINITY);
         }
     }
 
@@ -148,7 +149,7 @@ public class Floor extends Block{
 
     @Override
     public void drawBase(Tile tile){
-        Mathf.random.setSeed(tile.pos());
+        Mathf.rand.setSeed(tile.pos());
 
         Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
 
@@ -169,30 +170,43 @@ public class Floor extends Block{
         return drownTime > 0;
     }
 
-    public void drawNonLayer(Tile tile){
-        Mathf.random.setSeed(tile.pos());
+    public void drawNonLayer(Tile tile, CacheLayer layer){
+        Mathf.rand.setSeed(tile.pos());
 
-        drawEdges(tile, true);
-    }
-
-    protected void drawEdges(Tile tile){
-        drawEdges(tile, false);
-    }
-
-    protected void drawEdges(Tile tile, boolean sameLayer){
         blenders.clear();
         blended.clear();
 
         for(int i = 0; i < 8; i++){
             Point2 point = Geometry.d8[i];
             Tile other = tile.getNearby(point);
-            if(other != null && doEdge(other.floor(), sameLayer) && other.floor().edges() != null){
-                if(blended.add(other.floor().id)){
+            if(other != null && other.floor().cacheLayer == layer && other.floor().edges() != null){
+                if(!blended.getAndSet(other.floor().id)){
                     blenders.add(other.floor());
                 }
             }
         }
 
+        drawBlended(tile);
+    }
+
+    protected void drawEdges(Tile tile){
+        blenders.clear();
+        blended.clear();
+
+        for(int i = 0; i < 8; i++){
+            Point2 point = Geometry.d8[i];
+            Tile other = tile.getNearby(point);
+            if(other != null && doEdge(other.floor()) && other.floor().cacheLayer == cacheLayer && other.floor().edges() != null){
+                if(!blended.getAndSet(other.floor().id)){
+                    blenders.add(other.floor());
+                }
+            }
+        }
+
+        drawBlended(tile);
+    }
+
+    protected void drawBlended(Tile tile){
         blenders.sort(a -> a.id);
 
         for(Block block : blenders){
@@ -200,23 +214,18 @@ public class Floor extends Block{
                 Point2 point = Geometry.d8[i];
                 Tile other = tile.getNearby(point);
                 if(other != null && other.floor() == block){
-                    TextureRegion region = edge((Floor)block, 2 - (point.x + 1), 2 - (point.y + 1));
+                    TextureRegion region = edge((Floor)block, 1 - point.x, 1 - point.y);
                     Draw.rect(region, tile.worldx(), tile.worldy());
-
-                    if(!sameLayer && block.cacheLayer.ordinal() > cacheLayer.ordinal()){
-                        Draw.rect(block.variantRegions()[0], tile.worldx() + point.x*tilesize, tile.worldy() + point.y*tilesize);
-                    }
                 }
             }
         }
-
     }
 
     //'new' style of edges with shadows instead of colors, not used currently
     protected void drawEdgesFlat(Tile tile, boolean sameLayer){
         for(int i = 0; i < 4; i++){
             Tile other = tile.getNearby(i);
-            if(other != null && doEdge(other.floor(), sameLayer)){
+            if(other != null && doEdge(other.floor())){
                 Color color = other.floor().mapColor;
                 Draw.color(color.r, color.g, color.b, 1f);
                 Draw.rect(edgeRegion, tile.worldx(), tile.worldy(), i*90);
@@ -230,8 +239,8 @@ public class Floor extends Block{
         return ((Floor)blendGroup).edges;
     }
 
-    protected boolean doEdge(Floor other, boolean sameLayer){
-        return (((other.blendGroup.id > blendGroup.id) || edges() == null) && (other.cacheLayer.ordinal() > this.cacheLayer.ordinal() || !sameLayer));
+    protected boolean doEdge(Floor other){
+        return other.blendGroup.id > blendGroup.id || edges() == null;
     }
 
     TextureRegion edge(Floor block, int x, int y){
diff --git a/core/src/mindustry/world/blocks/environment/StaticTree.java b/core/src/mindustry/world/blocks/environment/StaticTree.java
index 3550895b96..5e923f6f5f 100644
--- a/core/src/mindustry/world/blocks/environment/StaticTree.java
+++ b/core/src/mindustry/world/blocks/environment/StaticTree.java
@@ -16,7 +16,7 @@ public class StaticTree extends StaticWall{
     public void drawBase(Tile tile){
         TextureRegion r = Tmp.tr1;
         r.set(region);
-        int crop = (region.getWidth() - tilesize*4) / 2;
+        int crop = (region.width - tilesize*4) / 2;
         float ox = 0;
         float oy = 0;
 
@@ -24,7 +24,7 @@ public class StaticTree extends StaticWall{
             if(tile.getNearby(i) != null && tile.getNearby(i).block() instanceof StaticWall){
 
                 if(i == 0){
-                    r.setWidth(r.getWidth() - crop);
+                    r.setWidth(r.width - crop);
                     ox -= crop /2f;
                 }else if(i == 1){
                     r.setY(r.getY() + crop);
@@ -33,7 +33,7 @@ public class StaticTree extends StaticWall{
                     r.setX(r.getX() + crop);
                     ox += crop /2f;
                 }else{
-                    r.setHeight(r.getHeight() - crop);
+                    r.setHeight(r.height - crop);
                     oy += crop /2f;
                 }
             }
diff --git a/core/src/mindustry/world/blocks/environment/StaticWall.java b/core/src/mindustry/world/blocks/environment/StaticWall.java
index 4142db8700..2b9e41a41e 100644
--- a/core/src/mindustry/world/blocks/environment/StaticWall.java
+++ b/core/src/mindustry/world/blocks/environment/StaticWall.java
@@ -10,7 +10,7 @@ import mindustry.world.*;
 
 import static mindustry.Vars.world;
 
-public class StaticWall extends Rock{
+public class StaticWall extends Boulder{
     public @Load("@-large") TextureRegion large;
     public TextureRegion[][] split;
 
diff --git a/core/src/mindustry/world/blocks/environment/TreeBlock.java b/core/src/mindustry/world/blocks/environment/TreeBlock.java
index afc367270f..b6170b8b85 100644
--- a/core/src/mindustry/world/blocks/environment/TreeBlock.java
+++ b/core/src/mindustry/world/blocks/environment/TreeBlock.java
@@ -1,12 +1,17 @@
 package mindustry.world.blocks.environment;
 
-import arc.graphics.g2d.Draw;
+import arc.graphics.g2d.*;
 import arc.math.Mathf;
+import arc.math.geom.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
 import mindustry.graphics.Layer;
 import mindustry.world.Block;
 import mindustry.world.Tile;
 
 public class TreeBlock extends Block{
+    public @Load("@-shadow") TextureRegion shadow;
+    public float shadowOffset = -4f;
 
     public TreeBlock(String name){
         super(name);
@@ -16,7 +21,27 @@ public class TreeBlock extends Block{
 
     @Override
     public void drawBase(Tile tile){
+
+        float x = tile.worldx(), y = tile.worldy();
+        float rot = Mathf.randomSeed(tile.pos(), 0, 4) * 90 + Mathf.sin(Time.time() + x, 50f, 0.5f) + Mathf.sin(Time.time() - y, 65f, 0.9f) + Mathf.sin(Time.time() + y - x, 85f, 0.9f);
+        float w = region.width * Draw.scl, h = region.height * Draw.scl;
+        float scl = 30f, mag = 0.2f;
+
+        if(shadow.found()){
+            Draw.z(Layer.power - 1);
+            Draw.rect(shadow, tile.worldx() + shadowOffset, tile.worldy() + shadowOffset, rot);
+        }
+
         Draw.z(Layer.power + 1);
-        Draw.rect(region, tile.worldx(), tile.worldy(), Mathf.randomSeed(tile.pos(), 0, 4) * 90);
+        Draw.rectv(region, x, y, w, h, rot, vec -> {
+            vec.add(
+            Mathf.sin(vec.y*3 + Time.time(), scl, mag) + Mathf.sin(vec.x*3 - Time.time(), 70, 0.8f),
+            Mathf.cos(vec.x*3 + Time.time() + 8, scl + 6f, mag * 1.1f) + Mathf.sin(vec.y*3 - Time.time(), 50, 0.2f)
+            );
+        });
+    }
+
+    void tweak(Vec2 vec){
+
     }
 }
diff --git a/core/src/mindustry/world/blocks/experimental/BlockForge.java b/core/src/mindustry/world/blocks/experimental/BlockForge.java
index 2c43a8b514..03052caac3 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockForge.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockForge.java
@@ -33,16 +33,16 @@ public class BlockForge extends PayloadAcceptor{
         hasPower = true;
         rotate = true;
 
-        config(Block.class, (BlockForgeEntity tile, Block block) -> tile.recipe = block);
+        config(Block.class, (BlockForgeBuild tile, Block block) -> tile.recipe = block);
 
-        consumes.add(new ConsumeItemDynamic((BlockForgeEntity e) -> e.recipe != null ? e.recipe.requirements : ItemStack.empty));
+        consumes.add(new ConsumeItemDynamic((BlockForgeBuild e) -> e.recipe != null ? e.recipe.requirements : ItemStack.empty));
     }
 
     @Override
     public void setBars(){
         super.setBars();
 
-        bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, () -> ((BlockForgeEntity)entity).progress));
+        bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, () -> ((BlockForgeBuild)entity).progress));
     }
 
     @Override
@@ -51,7 +51,7 @@ public class BlockForge extends PayloadAcceptor{
         Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
     }
 
-    public class BlockForgeEntity extends PayloadAcceptorEntity<BlockPayload>{
+    public class BlockForgeBuild extends PayloadAcceptorBuild<BlockPayload>{
         public @Nullable Block recipe;
         public float progress, time, heat;
 
diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
index 4b101051ad..0afbeafb78 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
@@ -40,7 +40,7 @@ public class BlockLoader extends PayloadAcceptor{
     public void setBars(){
         super.setBars();
 
-        bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, ((BlockLoaderEntity)entity)::fraction));
+        bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, ((BlockLoaderBuild)entity)::fraction));
     }
 
     @Override
@@ -50,13 +50,13 @@ public class BlockLoader extends PayloadAcceptor{
         Draw.rect(topRegion, req.drawx(), req.drawy());
     }
 
-    public class BlockLoaderEntity extends PayloadAcceptorEntity<BlockPayload>{
+    public class BlockLoaderBuild extends PayloadAcceptorBuild<BlockPayload>{
 
         @Override
         public boolean acceptPayload(Building source, Payload payload){
             return super.acceptPayload(source, payload) &&
                 (payload instanceof BlockPayload) &&
-                ((((BlockPayload)payload).entity.block().hasItems && ((BlockPayload)payload).block().unloadable && ((BlockPayload)payload).block().itemCapacity >= 10)/* ||
+                ((((BlockPayload)payload).entity.block.hasItems && ((BlockPayload)payload).block().unloadable && ((BlockPayload)payload).block().itemCapacity >= 10)/* ||
                 ((BlockPayload)payload).entity.block().hasLiquids && ((BlockPayload)payload).block().liquidCapacity >= 10f)*/);
         }
 
@@ -71,7 +71,7 @@ public class BlockLoader extends PayloadAcceptor{
 
             //draw input
             for(int i = 0; i < 4; i++){
-                if(blends(i) && i != rotation()){
+                if(blends(i) && i != rotation){
                     Draw.rect(inRegion, x, y, i * 90);
                 }
             }
@@ -127,7 +127,7 @@ public class BlockLoader extends PayloadAcceptor{
         }
 
         public float fraction(){
-            return payload == null ? 0f : payload.entity.items.total() / (float)payload.entity.block().itemCapacity;
+            return payload == null ? 0f : payload.entity.items.total() / (float)payload.entity.block.itemCapacity;
         }
 
         public boolean shouldExport(){
diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
index d9630e0ae1..072d64ecea 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
@@ -16,7 +16,7 @@ public class BlockUnloader extends BlockLoader{
         return true;
     }
 
-    public class BlockUnloaderEntity extends BlockLoaderEntity{
+    public class BlockUnloaderBuild extends BlockLoaderBuild{
 
         @Override
         public boolean acceptItem(Building source, Item item){
@@ -56,7 +56,7 @@ public class BlockUnloader extends BlockLoader{
 
         @Override
         public float fraction(){
-            return payload == null ? 0f : 1f - payload.entity.items.total() / (float)payload.entity.block().itemCapacity;
+            return payload == null ? 0f : 1f - payload.entity.items.total() / (float)payload.entity.block.itemCapacity;
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/experimental/ProcessorBlock.java b/core/src/mindustry/world/blocks/experimental/ProcessorBlock.java
deleted file mode 100644
index 4d7d4e7df8..0000000000
--- a/core/src/mindustry/world/blocks/experimental/ProcessorBlock.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package mindustry.world.blocks.experimental;
-
-import arc.scene.ui.layout.*;
-import arc.struct.*;
-import mindustry.gen.*;
-import mindustry.world.*;
-
-public class ProcessorBlock extends Block{
-
-    public ProcessorBlock(String name){
-        super(name);
-        configurable = true;
-    }
-
-    public class ProcessorEntity extends Building{
-        //all tiles in the block network - does not include itself
-        Seq<Building> network = new Seq<>();
-
-        @Override
-        public boolean onConfigureTileTapped(Building other){
-            if(other == this) return true;
-
-            if(!network.contains(other)){
-                network.add(other);
-            }else{
-                network.remove(other);
-            }
-            return false;
-        }
-
-        @Override
-        public void buildConfiguration(Table table){
-            super.buildConfiguration(table);
-        }
-    }
-
-}
diff --git a/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java b/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java
deleted file mode 100644
index 0ee076c083..0000000000
--- a/core/src/mindustry/world/blocks/legacy/LegacyCommandCenter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package mindustry.world.blocks.legacy;
-
-import arc.util.io.*;
-import mindustry.gen.*;
-
-public class LegacyCommandCenter extends LegacyBlock{
-
-    public LegacyCommandCenter(String name){
-        super(name);
-        update = true;
-    }
-
-    public class LegacyCommandCenterEntity extends Building{
-        @Override
-        public void read(Reads read, byte revision){
-            super.read(read, revision);
-            read.b();
-        }
-    }
-}
diff --git a/core/src/mindustry/world/blocks/legacy/LegacyMechPad.java b/core/src/mindustry/world/blocks/legacy/LegacyMechPad.java
index d5f51283ce..68f9ce25b9 100644
--- a/core/src/mindustry/world/blocks/legacy/LegacyMechPad.java
+++ b/core/src/mindustry/world/blocks/legacy/LegacyMechPad.java
@@ -11,7 +11,7 @@ public class LegacyMechPad extends LegacyBlock{
         hasPower = true;
     }
 
-    public class LegacyMechPadEntity extends Building{
+    public class LegacyMechPadBuild extends Building{
 
         @Override
         public void read(Reads read, byte revision){
diff --git a/core/src/mindustry/world/blocks/legacy/LegacyUnitFactory.java b/core/src/mindustry/world/blocks/legacy/LegacyUnitFactory.java
index e9bdb7ddee..c44eec9477 100644
--- a/core/src/mindustry/world/blocks/legacy/LegacyUnitFactory.java
+++ b/core/src/mindustry/world/blocks/legacy/LegacyUnitFactory.java
@@ -13,7 +13,7 @@ public class LegacyUnitFactory extends LegacyBlock{
         solid = false;
     }
 
-    public class LegacyUnitFactoryEntity extends Building{
+    public class LegacyUnitFactoryBuild extends Building{
 
         @Override
         public void read(Reads read, byte revision){
diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
index 202877f486..6b8739b93a 100644
--- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
+++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
@@ -19,21 +19,22 @@ public class ArmoredConduit extends Conduit{
         return otherblock.outputsLiquid && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock);
     }
 
-    public class ArmoredConduitEntity extends ConduitEntity{
+    public class ArmoredConduitBuild extends ConduitBuild{
         @Override
         public void draw(){
             super.draw();
 
             // draw the cap when a conduit would normally leak
-            Building next = tile.front();
-            if(next != null && next.team() == team && next.block().hasLiquids) return;
+            Building next = front();
+            if(next != null && next.team == team && next.block.hasLiquids) return;
 
-            Draw.rect(capRegion, x, y, tile.rotdeg());
+            Draw.rect(capRegion, x, y, rotdeg());
         }
 
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid, float amount){
-            return super.acceptLiquid(source, liquid, amount) && (source.block() instanceof Conduit) || Edges.getFacingEdge(source.tile(), tile).absoluteRelativeTo(tile.x, tile.y) == tile.rotation();
+            return super.acceptLiquid(source, liquid, amount) && (source.block instanceof Conduit ||
+                source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation);
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java
index 01ebd077c7..8824d44d34 100644
--- a/core/src/mindustry/world/blocks/liquid/Conduit.java
+++ b/core/src/mindustry/world/blocks/liquid/Conduit.java
@@ -35,6 +35,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
         solid = false;
         floating = true;
         conveyorPlacement = true;
+        noUpdateDisabled = true;
     }
 
     @Override
@@ -59,12 +60,12 @@ public class Conduit extends LiquidBlock implements Autotiler{
             cont.get(Geometry.d4(req.rotation - 2)) &&
             req.tile() != null &&
             req.tile().block() instanceof Conduit &&
-            Mathf.mod(req.tile().rotation() - req.rotation, 2) == 1 ? Blocks.liquidJunction : this;
+            Mathf.mod(req.build().rotation - req.rotation, 2) == 1 ? Blocks.liquidJunction : this;
     }
 
     @Override
     public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        return otherblock.hasLiquids && otherblock.outputsLiquid && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
+        return otherblock.hasLiquids && (otherblock.outputsLiquid || (lookingAt(tile, rotation, otherx, othery, otherblock))) && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
     }
 
     @Override
@@ -72,14 +73,14 @@ public class Conduit extends LiquidBlock implements Autotiler{
         return new TextureRegion[]{Core.atlas.find("conduit-bottom"), topRegions[0]};
     }
 
-    public class ConduitEntity extends LiquidBlockEntity{
+    public class ConduitBuild extends LiquidBuild{
         public float smoothLiquid;
         public int blendbits, xscl, yscl, blending;
 
         @Override
         public void draw(){
             float rotation = rotdeg();
-            int r = rotation();
+            int r = this.rotation;
 
             //draw extra conduits facing this one for tiling purposes
             Draw.z(Layer.blockUnder);
@@ -87,25 +88,22 @@ public class Conduit extends LiquidBlock implements Autotiler{
                 if((blending & (1 << i)) != 0){
                     int dir = r - i;
                     float rot = i == 0 ? rotation : (dir)*90;
-                    drawAt(x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, 0, rot, i != 0 ? 1 : 2);
+                    drawAt(x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, 0, rot, i != 0 ? SliceMode.bottom : SliceMode.top);
                 }
             }
 
             Draw.z(Layer.block);
 
             Draw.scl(xscl, yscl);
-            drawAt(x, y, blendbits, rotation, 0);
+            drawAt(x, y, blendbits, rotation, SliceMode.none);
             Draw.reset();
         }
 
-        protected void drawAt(float x, float y, int bits, float rotation, int slice){
+        protected void drawAt(float x, float y, int bits, float rotation, SliceMode slice){
             Draw.color(botColor);
             Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
 
-            Draw.color(liquids.current().color);
-            Draw.alpha(smoothLiquid);
-            Draw.rect(sliced(botRegions[bits], slice), x, y, rotation);
-            Draw.color();
+            Drawf.liquid(sliced(botRegions[bits], slice), x, y, smoothLiquid, liquids.current().color, rotation);
 
             Draw.rect(sliced(topRegions[bits], slice), x, y, rotation);
         }
@@ -114,7 +112,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
         public void onProximityUpdate(){
             super.onProximityUpdate();
 
-            int[] bits = buildBlending(tile, rotation(), null, true);
+            int[] bits = buildBlending(tile, rotation, null, true);
             blendbits = bits[0];
             xscl = bits[1];
             yscl = bits[2];
@@ -125,7 +123,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
         public boolean acceptLiquid(Building source, Liquid liquid, float amount){
             noSleep();
             return liquids.get(liquid) + amount < liquidCapacity && (liquids.current() == liquid || liquids.currentAmount() < 0.2f)
-                && ((source.relativeTo(tile.x, tile.y) + 2) % 4 != tile.rotation());
+                && ((source.relativeTo(tile.x, tile.y) + 2) % 4 != rotation);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java
index c1e7f3bd65..eb9a3f16d3 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java
@@ -3,6 +3,7 @@ package mindustry.world.blocks.liquid;
 import arc.graphics.g2d.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
@@ -25,17 +26,14 @@ public class LiquidBlock extends Block{
         return new TextureRegion[]{bottomRegion, topRegion};
     }
 
-    public class LiquidBlockEntity extends Building{
+    public class LiquidBuild extends Building{
         @Override
         public void draw(){
             float rotation = rotate ? rotdeg() : 0;
             Draw.rect(bottomRegion, x, y, rotation);
 
             if(liquids.total() > 0.001f){
-                Draw.color(liquids.current().color);
-                Draw.alpha(liquids.total() / liquidCapacity);
-                Draw.rect(liquidRegion, x, y, rotation);
-                Draw.color();
+                Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
             }
 
             Draw.rect(topRegion, x, y, rotation);
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java
index f8de48a4ff..c658cde66c 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java
@@ -15,10 +15,11 @@ public class LiquidBridge extends ItemBridge{
         hasItems = false;
         hasLiquids = true;
         outputsLiquid = true;
+        canOverdrive = false;
         group = BlockGroup.liquids;
     }
 
-    public class LiquidBridgeEntity extends ItemBridgeEntity{
+    public class LiquidBridgeBuild extends ItemBridgeBuild{
         @Override
         public void updateTile(){
             time += cycleSpeed * delta();
@@ -30,7 +31,7 @@ public class LiquidBridge extends ItemBridge{
             if(other == null || !linkValid(tile, other.tile())){
                 dumpLiquid(liquids.current());
             }else{
-                ((ItemBridgeEntity)other).incoming.add(tile.pos());
+                ((ItemBridgeBuild)other).incoming.add(tile.pos());
 
                 if(consValid()){
                     float alpha = 0.04f;
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
index 8ceef95d12..76e4929b45 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
@@ -6,7 +6,7 @@ import mindustry.type.*;
 import mindustry.world.blocks.distribution.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.world;
+import static mindustry.Vars.*;
 
 public class LiquidExtendingBridge extends ExtendingItemBridge{
 
@@ -18,7 +18,7 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{
         group = BlockGroup.liquids;
     }
 
-    public class LiquidExtendingBridgeEntity extends ExtendingItemBridgeEntity{
+    public class LiquidExtendingBridgeBuild extends ExtendingItemBridgeBuild{
         @Override
         public void updateTile(){
             time += cycleSpeed * delta();
@@ -30,7 +30,7 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{
             if(other == null || !linkValid(tile, other.tile())){
                 dumpLiquid(liquids.current());
             }else{
-                ((ItemBridgeEntity)other).incoming.add(tile.pos());
+                ((ItemBridgeBuild)other).incoming.add(tile.pos());
 
                 if(consValid()){
                     uptime = Mathf.lerpDelta(uptime, 1f, 0.04f);
@@ -42,7 +42,7 @@ public class LiquidExtendingBridge extends ExtendingItemBridge{
                     if(moveLiquid(other, liquids.current()) > 0.1f){
                         cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
                     }else{
-                        cycleSpeed = Mathf.lerpDelta(cycleSpeed, 1f, 0.01f);
+                        cycleSpeed = Mathf.lerpDelta(cycleSpeed, 0f, 0.01f);
                     }
                 }
             }
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidJunction.java b/core/src/mindustry/world/blocks/liquid/LiquidJunction.java
index aa849fd734..2845281d96 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidJunction.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidJunction.java
@@ -28,7 +28,7 @@ public class LiquidJunction extends LiquidBlock{
         return new TextureRegion[]{region};
     }
 
-    public class LiquidJunctionEntity extends Building{
+    public class LiquidJunctionBuild extends Building{
         @Override
         public void draw(){
             Draw.rect(region, x, y);
@@ -36,10 +36,12 @@ public class LiquidJunction extends LiquidBlock{
 
         @Override
         public Building getLiquidDestination(Building source, Liquid liquid){
+            if(!enabled) return this;
+
             int dir = source.relativeTo(tile.x, tile.y);
             dir = (dir + 4) % 4;
             Building next = nearby(dir);
-            if(next == null || (!next.acceptLiquid(this, liquid, 0f) && !(next.block() instanceof LiquidJunction))){
+            if(next == null || (!next.acceptLiquid(this, liquid, 0f) && !(next.block instanceof LiquidJunction))){
                 return this;
             }
             return next.getLiquidDestination(this, liquid);
diff --git a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java
index 4b273369d3..60fab24df1 100644
--- a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java
+++ b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java
@@ -7,9 +7,11 @@ public class LiquidRouter extends LiquidBlock{
 
     public LiquidRouter(String name){
         super(name);
+
+        noUpdateDisabled = true;
     }
 
-    public class LiquidRouterEntity extends LiquidBlockEntity{
+    public class LiquidRouterBuild extends LiquidBuild{
         @Override
         public void updateTile(){
             if(liquids.total() > 0.01f){
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
new file mode 100644
index 0000000000..b5439b3e70
--- /dev/null
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
@@ -0,0 +1,545 @@
+package mindustry.world.blocks.logic;
+
+import arc.func.*;
+import arc.math.geom.*;
+import arc.scene.ui.layout.*;
+import arc.struct.Bits;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.logic.*;
+import mindustry.logic.LAssembler.*;
+import mindustry.logic.LExecutor.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.blocks.ConstructBlock.*;
+import mindustry.world.meta.*;
+
+import java.io.*;
+import java.util.zip.*;
+
+import static mindustry.Vars.*;
+
+public class LogicBlock extends Block{
+    public int maxInstructionScale = 5;
+    public int instructionsPerTick = 1;
+    public float range = 8 * 10;
+
+    public LogicBlock(String name){
+        super(name);
+        update = true;
+        solid = true;
+        configurable = true;
+
+        config(byte[].class, (LogicBuild build, byte[] data) -> build.readCompressed(data, true));
+
+        config(Integer.class, (LogicBuild entity, Integer pos) -> {
+            //if there is no valid link in the first place, nobody cares
+            if(!entity.validLink(world.build(pos))) return;
+            Building lbuild = world.build(pos);
+            int x = lbuild.tileX(), y = lbuild.tileY();
+
+            LogicLink link = entity.links.find(l -> l.x == x && l.y == y);
+            String bname = getLinkName(lbuild.block);
+
+            if(link != null){
+                link.active = !link.active;
+                //find a name when the base name differs (new block type)
+                if(!link.name.startsWith(bname)){
+                    link.name = "";
+                    link.name = entity.findLinkName(lbuild.block);
+                }
+            }else{
+                entity.links.remove(l -> world.build(l.x, l.y) == lbuild);
+                LogicLink out = new LogicLink(x, y, entity.findLinkName(lbuild.block), true);
+                entity.links.add(out);
+            }
+
+            entity.updateCode();
+        });
+    }
+
+    static String getLinkName(Block block){
+        String name = block.name;
+        if(name.contains("-")){
+            String[] split = name.split("-");
+            //filter out 'large' at the end of block names
+            if(split.length >= 2 && (split[split.length - 1].equals("large") || Strings.canParseFloat(split[split.length - 1]))){
+                name = split[split.length - 2];
+            }else{
+                name = split[split.length - 1];
+            }
+        }
+        return name;
+    }
+
+    static byte[] compress(String code, Seq<LogicLink> links){
+        return compress(code.getBytes(charset), links);
+    }
+
+    static byte[] compress(byte[] bytes, Seq<LogicLink> links){
+        try{
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            DataOutputStream stream = new DataOutputStream(new DeflaterOutputStream(baos));
+
+            //current version of config format
+            stream.write(1);
+
+            //write string data
+            stream.writeInt(bytes.length);
+            stream.write(bytes);
+
+            int actives = links.count(l -> l.active);
+
+            stream.writeInt(actives);
+            for(LogicLink link : links){
+                if(!link.active) continue;
+
+                stream.writeUTF(link.name);
+                stream.writeShort(link.x);
+                stream.writeShort(link.y);
+            }
+
+            stream.close();
+
+            return baos.toByteArray();
+        }catch(IOException e){
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(BlockStat.linkRange, range / 8, StatUnit.blocks);
+        stats.add(BlockStat.instructions, instructionsPerTick * 60, StatUnit.perSecond);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        Drawf.circles(x*tilesize + offset, y*tilesize + offset, range);
+    }
+
+    @Override
+    public Object pointConfig(Object config, Cons<Point2> transformer){
+        if(config instanceof byte[]){
+            byte[] data = (byte[])config;
+
+            try(DataInputStream stream = new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(data)))){
+                //discard version for now
+                stream.read();
+
+                int bytelen = stream.readInt();
+                byte[] bytes = new byte[bytelen];
+                stream.readFully(bytes);
+
+                int total = stream.readInt();
+
+                Seq<LogicLink> links = new Seq<>();
+
+                for(int i = 0; i < total; i++){
+                    String name = stream.readUTF();
+                    short x = stream.readShort(), y = stream.readShort();
+
+                    transformer.get(Tmp.p1.set(x, y));
+                    links.add(new LogicLink(Tmp.p1.x, Tmp.p1.y, name, true));
+                }
+
+                return compress(bytes, links);
+            }catch(IOException e){
+                Log.err(e);
+            }
+        }
+        return config;
+    }
+
+    public static class LogicLink{
+        public boolean active = true, valid;
+        public int x, y;
+        public String name;
+
+        public LogicLink(int x, int y, String name, boolean valid){
+            this.x = x;
+            this.y = y;
+            this.name = name;
+            this.valid = valid;
+        }
+
+        public LogicLink copy(){
+            LogicLink out = new LogicLink(x, y, name, valid);
+            out.active = active;
+            return out;
+        }
+    }
+
+    public class LogicBuild extends Building implements Ranged{
+        /** logic "source code" as list of asm statements */
+        public String code = "";
+        public LExecutor executor = new LExecutor();
+        public float accumulator = 0;
+        public Seq<LogicLink> links = new Seq<>();
+
+        public void readCompressed(byte[] data, boolean relative){
+            DataInputStream stream = new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(data)));
+
+            try{
+                int version = stream.read();
+
+                int bytelen = stream.readInt();
+                byte[] bytes = new byte[bytelen];
+                stream.readFully(bytes);
+
+                links.clear();
+
+                int total = stream.readInt();
+
+                if(version == 0){
+                    //old version just had links, ignore those
+
+                    for(int i = 0; i < total; i++){
+                        stream.readInt();
+                    }
+                }else{
+                    for(int i = 0; i < total; i++){
+                        String name = stream.readUTF();
+                        short x = stream.readShort(), y = stream.readShort();
+
+                        if(relative){
+                            x += tileX();
+                            y += tileY();
+                        }
+                        links.add(new LogicLink(x, y, name, validLink(world.build(x, y))));
+                    }
+                }
+
+                updateCode(new String(bytes, charset));
+            }catch(IOException e){
+                Log.err(e);
+            }
+        }
+
+        public String findLinkName(Block block){
+            String bname = getLinkName(block);
+            Bits taken = new Bits(links.size);
+            int max = 1;
+
+            for(LogicLink others : links){
+                if(others.name.startsWith(bname)){
+
+                    String num = others.name.substring(bname.length());
+                    try{
+                        int val = Integer.parseInt(num);
+                        taken.set(val);
+                        max = Math.max(val, max);
+                    }catch(NumberFormatException ignored){
+                        //ignore failed parsing, it isn't relevant
+                    }
+                }
+            }
+
+            int outnum = 0;
+
+            for(int i = 1; i < max + 2; i++){
+                if(!taken.get(i)){
+                    outnum = i;
+                    break;
+                }
+            }
+
+            return bname + outnum;
+        }
+
+        public void updateCode(){
+            updateCode(code);
+        }
+
+        public void updateCode(String str){
+            updateCodeVars(str, null);
+        }
+
+        public void updateCodeVars(String str, Cons<LAssembler> assemble){
+            if(str != null){
+                code = str;
+
+                try{
+                    //create assembler to store extra variables
+                    LAssembler asm = LAssembler.assemble(str, LExecutor.maxInstructions);
+
+                    //store connections
+                    for(LogicLink link : links){
+                        if(link.active && (link.valid = validLink(world.build(link.x, link.y)))){
+                            asm.putConst(link.name, world.build(link.x, link.y));
+                        }
+                    }
+
+                    //store link objects
+                    executor.links = new Building[links.count(l -> l.valid && l.active)];
+                    int index = 0;
+                    for(LogicLink link : links){
+                        if(link.active && link.valid){
+                            executor.links[index ++] = world.build(link.x, link.y);
+                        }
+                    }
+
+                    asm.putConst("@links", executor.links.length);
+                    asm.putConst("@ipt", instructionsPerTick);
+
+                    //store any older variables
+                    for(Var var : executor.vars){
+                        if(!var.constant){
+                            BVar dest = asm.getVar(var.name);
+                            if(dest != null && !dest.constant){
+                                dest.value = var.isobj ? var.objval : var.numval;
+                            }
+                        }
+                    }
+
+                    //inject any extra variables
+                    if(assemble != null){
+                        assemble.get(asm);
+                    }
+
+                    asm.putConst("@this", this);
+                    asm.putConst("@thisx", x);
+                    asm.putConst("@thisy", y);
+
+                    executor.load(asm);
+                }catch(Exception e){
+                    e.printStackTrace();
+
+                    //handle malformed code and replace it with nothing
+                    executor.load("", LExecutor.maxInstructions);
+                }
+            }
+        }
+
+        //logic blocks cause write problems when picked up
+        @Override
+        public boolean canPickup(){
+            return false;
+        }
+
+        @Override
+        public float range(){
+            return range;
+        }
+
+        @Override
+        public void updateTile(){
+
+            //check for previously invalid links to add after configuration
+            boolean changed = false;
+
+            for(int i = 0; i < links.size; i++){
+                LogicLink l = links.get(i);
+
+                if(!l.active) continue;
+
+                boolean valid = validLink(world.build(l.x, l.y));
+                if(valid != l.valid ){
+                    changed = true;
+                    l.valid = valid;
+                    if(valid){
+                        Building lbuild = world.build(l.x, l.y);
+
+                        //this prevents conflicts
+                        l.name = "";
+                        //finds a new matching name after toggling
+                        l.name = findLinkName(lbuild.block);
+
+                        //remove redundant links
+                        links.removeAll(o -> world.build(o.x, o.y) == lbuild && o != l);
+
+                        //break to prevent concurrent modification
+                        break;
+                    }
+                }
+            }
+
+            if(changed){
+                updateCode();
+            }
+
+            if(enabled){
+                accumulator += edelta() * instructionsPerTick * (consValid() ? 1 : 0);
+
+                if(accumulator > maxInstructionScale * instructionsPerTick) accumulator = maxInstructionScale * instructionsPerTick;
+
+                for(int i = 0; i < (int)accumulator; i++){
+                    if(executor.initialized()){
+                        executor.runOnce();
+                    }
+                    accumulator --;
+                }
+            }
+        }
+
+        @Override
+        public byte[] config(){
+            return compress(code, relativeConnections());
+        }
+
+        public Seq<LogicLink> relativeConnections(){
+            Seq<LogicLink> copy = new Seq<>(links.size);
+            for(LogicLink l : links){
+                LogicLink c = l.copy();
+                c.x -= tileX();
+                c.y -= tileY();
+                copy.add(c);
+            }
+            return copy;
+        }
+
+        @Override
+        public void drawConfigure(){
+            super.drawConfigure();
+
+            Drawf.circles(x, y, range);
+
+            for(LogicLink l : links){
+                Building build = world.build(l.x, l.y);
+                if(l.active && validLink(build)){
+                    Drawf.square(build.x, build.y, build.block.size * tilesize / 2f + 1f, Pal.place);
+                }
+            }
+
+            //draw top text on separate layer
+            for(LogicLink l : links){
+                Building build = world.build(l.x, l.y);
+                if(l.active && validLink(build)){
+                    build.block.drawPlaceText(l.name, build.tileX(), build.tileY(), true);
+                }
+            }
+        }
+
+        public boolean validLink(Building other){
+            return other != null && other.isValid() && other.team == team && other.within(this, range + other.block.size*tilesize/2f) && !(other instanceof ConstructBuild);
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+
+            table.button(Icon.pencil, Styles.clearTransi, () -> {
+                Vars.ui.logic.show(code, code -> {
+                    configure(compress(code, relativeConnections()));
+                });
+            }).size(40);
+        }
+
+        @Override
+        public boolean onConfigureTileTapped(Building other){
+            if(this == other){
+                deselect();
+                return false;
+            }
+
+            if(validLink(other)){
+                configure(other.pos());
+                return false;
+            }
+
+            return super.onConfigureTileTapped(other);
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            byte[] compressed = compress(code, links);
+            write.i(compressed.length);
+            write.b(compressed);
+
+            //write only the non-constant variables
+            int count = Structs.count(executor.vars, v -> !v.constant);
+
+            write.i(count);
+            for(int i = 0; i < executor.vars.length; i++){
+                Var v = executor.vars[i];
+
+                if(v.constant) continue;
+
+                //write the name and the object value
+                write.str(v.name);
+
+                Object value = v.isobj ? v.objval : v.numval;
+                if(value instanceof Unit) value = null; //do not save units.
+                TypeIO.writeObject(write, value);
+            }
+
+            //no memory
+            write.i(0);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            if(revision == 1){
+                int compl = read.i();
+                byte[] bytes = new byte[compl];
+                read.b(bytes);
+                readCompressed(bytes, false);
+            }else{
+
+                code = read.str();
+                links.clear();
+                short total = read.s();
+                for(int i = 0; i < total; i++){
+                    read.i();
+                }
+            }
+
+            int varcount = read.i();
+
+            //variables need to be temporarily stored in an array until they can be used
+            String[] names = new String[varcount];
+            Object[] values = new Object[varcount];
+
+            for(int i = 0; i < varcount; i++){
+                String name = read.str();
+                Object value = TypeIO.readObject(read);
+
+                names[i] = name;
+                values[i] = value;
+            }
+
+            int memory = read.i();
+            //skip memory, it isn't used anymore
+            read.skip(memory * 8);
+
+            updateCodeVars(code, asm -> {
+
+                //load up the variables that were stored
+                for(int i = 0; i < varcount; i++){
+                    BVar dest = asm.getVar(names[i]);
+                    if(dest != null && !dest.constant){
+                        dest.value = values[i];
+                    }
+                }
+            });
+        }
+    }
+
+    public static class LogicConfig{
+        public String code;
+        public IntSeq connections;
+
+        public LogicConfig(String code, IntSeq connections){
+            this.code = code;
+            this.connections = connections;
+        }
+
+        public LogicConfig(){
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
new file mode 100644
index 0000000000..9a6592ea36
--- /dev/null
+++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
@@ -0,0 +1,126 @@
+package mindustry.world.blocks.logic;
+
+import arc.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.graphics.gl.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+public class LogicDisplay extends Block{
+    public static final byte
+        commandClear = 0,
+        commandColor = 1,
+        commandStroke = 2,
+        commandLine = 3,
+        commandRect = 4,
+        commandLineRect = 5,
+        commandPoly = 6,
+        commandLinePoly = 7,
+        commandTriangle = 8;
+
+    public int maxSides = 25;
+
+    public int displaySize = 64;
+
+    public LogicDisplay(String name){
+        super(name);
+        update = true;
+        solid = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(BlockStat.displaySize, "@x@", displaySize, displaySize);
+    }
+
+    public class LogicDisplayBuild extends Building{
+        public FrameBuffer buffer;
+        public float color = Color.whiteFloatBits;
+        public float stroke = 1f;
+        public LongQueue commands = new LongQueue(256);
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            Draw.draw(Draw.z(), () -> {
+                if(buffer == null){
+                    buffer = new FrameBuffer(displaySize, displaySize);
+                    //clear the buffer - some OSs leave garbage in it
+                    buffer.begin(Pal.darkerMetal);
+                    buffer.end();
+                }
+            });
+
+            if(!commands.isEmpty()){
+                Draw.draw(Draw.z(), () -> {
+                    Tmp.m1.set(Draw.proj());
+                    Draw.proj(0, 0, displaySize, displaySize);
+                    buffer.begin();
+                    Draw.color(color);
+                    Lines.stroke(stroke);
+
+                    while(!commands.isEmpty()){
+                        long c = commands.removeFirst();
+                        byte type = DisplayCmd.type(c);
+                        int x = DisplayCmd.x(c), y = DisplayCmd.y(c),
+                        p1 = DisplayCmd.p1(c), p2 = DisplayCmd.p2(c), p3 = DisplayCmd.p3(c), p4 = DisplayCmd.p4(c);
+
+                        switch(type){
+                            case commandClear: Core.graphics.clear(x/255f, y/255f, p1/255f, 1f); break;
+                            case commandLine: Lines.line(x, y, p1, p2); break;
+                            case commandRect: Fill.crect(x, y, p1, p2); break;
+                            case commandLineRect: Lines.rect(x, y, p1, p2); break;
+                            case commandPoly: Fill.poly(x, y, Math.min(p1, maxSides), p2, p3); break;
+                            case commandLinePoly: Lines.poly(x, y, Math.min(p1, maxSides), p2, p3); break;
+                            case commandTriangle: Fill.tri(x, y, p1, p2, p3, p4); break;
+                            case commandColor: this.color = Color.toFloatBits(x, y, p1, p2); Draw.color(this.color); break;
+                            case commandStroke: this.stroke = x; Lines.stroke(x); break;
+                        }
+                    }
+
+                    buffer.end();
+                    Draw.proj(Tmp.m1);
+                    Draw.reset();
+                });
+            }
+
+            Draw.draw(Draw.z(), () -> {
+                if(buffer != null){
+                    Draw.rect(Draw.wrap(buffer.getTexture()), x, y, buffer.getWidth() * Draw.scl, -buffer.getHeight() * Draw.scl);
+                }
+            });
+        }
+    }
+
+    public enum GraphicsType{
+        clear,
+        color,
+        stroke,
+        line,
+        rect,
+        lineRect,
+        poly,
+        linePoly,
+        triangle;
+
+        public static final GraphicsType[] all = values();
+    }
+
+    @Struct
+    static class DisplayCmdStruct{
+        public byte type;
+
+        //9 bits are required for full 360 degrees
+        @StructField(9)
+        public int x, y, p1, p2, p3, p4;
+    }
+}
diff --git a/core/src/mindustry/world/blocks/logic/MemoryBlock.java b/core/src/mindustry/world/blocks/logic/MemoryBlock.java
new file mode 100644
index 0000000000..d215238ced
--- /dev/null
+++ b/core/src/mindustry/world/blocks/logic/MemoryBlock.java
@@ -0,0 +1,54 @@
+package mindustry.world.blocks.logic;
+
+import arc.util.io.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+public class MemoryBlock extends Block{
+    public int memoryCapacity = 32;
+
+    public MemoryBlock(String name){
+        super(name);
+        destructible = true;
+        solid = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(BlockStat.memoryCapacity, memoryCapacity, StatUnit.none);
+    }
+
+    public class MemoryBuild extends Building{
+        public double[] memory = new double[memoryCapacity];
+
+        //massive byte size means picking up causes sync issues
+        @Override
+        public boolean canPickup(){
+            return false;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.i(memory.length);
+            for(double v : memory){
+                write.d(v);
+            }
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            int amount = read.i();
+            for(int i = 0; i < amount; i++){
+                double val = read.d();
+                if(i < memory.length) memory[i] = val;
+            }
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/storage/MessageBlock.java b/core/src/mindustry/world/blocks/logic/MessageBlock.java
similarity index 77%
rename from core/src/mindustry/world/blocks/storage/MessageBlock.java
rename to core/src/mindustry/world/blocks/logic/MessageBlock.java
index 61d8fc93fc..26722774c6 100644
--- a/core/src/mindustry/world/blocks/storage/MessageBlock.java
+++ b/core/src/mindustry/world/blocks/logic/MessageBlock.java
@@ -1,4 +1,4 @@
-package mindustry.world.blocks.storage;
+package mindustry.world.blocks.logic;
 
 import arc.*;
 import arc.Input.*;
@@ -11,7 +11,6 @@ import arc.util.*;
 import arc.util.io.*;
 import arc.util.pooling.*;
 import mindustry.gen.*;
-import mindustry.net.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 import mindustry.world.*;
@@ -29,12 +28,14 @@ public class MessageBlock extends Block{
         solid = true;
         destructible = true;
 
-        config(String.class, (MessageBlockEntity tile, String text) -> {
-            if(net.server() && text.length() > maxTextLength){
-                throw new ValidateException(player, "Player has gone above text limit.");
+        config(String.class, (MessageBuild tile, String text) -> {
+            if(text.length() > maxTextLength){
+                return; //no.
             }
 
-            StringBuilder result = new StringBuilder(text.length());
+            tile.message.ensureCapacity(text.length());
+            tile.message.setLength(0);
+
             text = text.trim();
             int count = 0;
             for(int i = 0; i < text.length(); i++){
@@ -42,33 +43,29 @@ public class MessageBlock extends Block{
                 if(c == '\n' || c == '\r'){
                     count ++;
                     if(count <= maxNewlines){
-                        result.append('\n');
+                        tile.message.append('\n');
                     }
                 }else{
-                    result.append(c);
+                    tile.message.append(c);
                 }
             }
-
-            tile.message = result.toString();
-            tile.lines = tile.message.split("\n");
         });
     }
 
-    public class MessageBlockEntity extends Building{
-        public String message = "";
-        public String[] lines = {""};
+    public class MessageBuild extends Building{
+        public StringBuilder message = new StringBuilder();
 
         @Override
         public void drawSelect(){
             if(renderer.pixelator.enabled()) return;
 
-            BitmapFont font = Fonts.outline;
+            Font font = Fonts.outline;
             GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new);
             boolean ints = font.usesIntegerPositions();
             font.getData().setScale(1 / 4f / Scl.scl(1f));
             font.setUseIntegerPositions(false);
 
-            String text = message == null || message.isEmpty() ? "[lightgray]" + Core.bundle.get("empty") : message;
+            CharSequence text = message == null || message.length() == 0 ? "[lightgray]" + Core.bundle.get("empty") : message;
 
             l.setText(font, text, Color.white, 90f, Align.left, true);
             float offset = 1f;
@@ -90,15 +87,15 @@ public class MessageBlock extends Block{
             table.button(Icon.pencil, () -> {
                 if(mobile){
                     Core.input.getTextInput(new TextInput(){{
-                        text = message;
+                        text = message.toString();
                         multiline = true;
                         maxLength = maxTextLength;
                         accepted = str -> configure(str);
                     }});
                 }else{
-                    BaseDialog dialog = new BaseDialog("$editmessage");
+                    BaseDialog dialog = new BaseDialog("@editmessage");
                     dialog.setFillParent(false);
-                    TextArea a = dialog.cont.add(new TextArea(message.replace("\n", "\r"))).size(380f, 160f).get();
+                    TextArea a = dialog.cont.add(new TextArea(message.toString().replace("\n", "\r"))).size(380f, 160f).get();
                     a.setFilter((textField, c) -> {
                         if(c == '\n' || c == '\r'){
                             int count = 0;
@@ -112,7 +109,7 @@ public class MessageBlock extends Block{
                         return true;
                     });
                     a.setMaxLength(maxTextLength);
-                    dialog.buttons.button("$ok", () -> {
+                    dialog.buttons.button("@ok", () -> {
                         configure(a.getText());
                         dialog.hide();
                     }).size(130f, 60f);
@@ -127,6 +124,12 @@ public class MessageBlock extends Block{
             }).size(40f);
         }
 
+        @Override
+        public void handleString(Object value){
+            message.setLength(0);
+            message.append(value);
+        }
+
         @Override
         public void updateTableAlign(Table table){
             Vec2 pos = Core.input.mouseScreen(x, y + size * tilesize / 2f + 1);
@@ -135,19 +138,19 @@ public class MessageBlock extends Block{
 
         @Override
         public String config(){
-            return message;
+            return message.toString();
         }
 
         @Override
         public void write(Writes write){
             super.write(write);
-            write.str(message);
+            write.str(message.toString());
         }
 
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
-            message = read.str();
+            message = new StringBuilder(read.str());
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java
new file mode 100644
index 0000000000..5bb9dbf621
--- /dev/null
+++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java
@@ -0,0 +1,68 @@
+package mindustry.world.blocks.logic;
+
+import arc.graphics.g2d.*;
+import arc.util.io.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.gen.*;
+import mindustry.logic.*;
+import mindustry.world.*;
+
+public class SwitchBlock extends Block{
+    public @Load("@-on") TextureRegion onRegion;
+
+    public SwitchBlock(String name){
+        super(name);
+        configurable = true;
+        update = true;
+        drawDisabled = false;
+        autoResetEnabled = false;
+
+        config(Boolean.class, (SwitchBuild entity, Boolean b) -> entity.enabled = b);
+    }
+
+    public class SwitchBuild extends Building{
+
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.enabled) return enabled ? 1 : 0;
+            return super.sense(sensor);
+        }
+
+        @Override
+        public boolean configTapped(){
+            configure(!enabled);
+            Sounds.click.at(this);
+            return false;
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            if(enabled){
+                Draw.rect(onRegion, x, y);
+            }
+        }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void readAll(Reads read, byte revision){
+            super.readAll(read, revision);
+
+            if(revision == 1){
+                enabled = read.bool();
+            }
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.bool(enabled);
+        }
+    }
+}
diff --git a/core/src/mindustry/world/blocks/payloads/BlockPayload.java b/core/src/mindustry/world/blocks/payloads/BlockPayload.java
index ddc013b4c2..3fc87dbe6b 100644
--- a/core/src/mindustry/world/blocks/payloads/BlockPayload.java
+++ b/core/src/mindustry/world/blocks/payloads/BlockPayload.java
@@ -14,7 +14,7 @@ public class BlockPayload implements Payload{
     public Building entity;
 
     public BlockPayload(Block block, Team team){
-        this.entity = block.newEntity().create(block, team);
+        this.entity = block.newBuilding().create(block, team);
     }
 
     public BlockPayload(Building entity){
@@ -22,7 +22,7 @@ public class BlockPayload implements Payload{
     }
 
     public Block block(){
-        return entity.block();
+        return entity.block;
     }
 
     public void place(Tile tile){
@@ -30,23 +30,19 @@ public class BlockPayload implements Payload{
     }
 
     public void place(Tile tile, int rotation){
-        tile.setBlock(entity.block(), entity.team(), rotation, () -> entity);
+        tile.setBlock(entity.block, entity.team, rotation, () -> entity);
+        entity.dropped();
     }
 
     @Override
-    public boolean canBeTaken(Payloadc picker){
-        return entity.block.size <= 2;
-    }
-
-    @Override
-    public boolean fits(){
-        return entity.block().size < 3;
+    public float size(){
+        return entity.block.size * tilesize;
     }
 
     @Override
     public void write(Writes write){
         write.b(payloadBlock);
-        write.s(entity.block().id);
+        write.s(entity.block.id);
         write.b(entity.version());
         entity.writeAll(write);
     }
@@ -58,7 +54,7 @@ public class BlockPayload implements Payload{
 
     @Override
     public void draw(){
-        Drawf.shadow(entity.x, entity.y, entity.block().size * tilesize * 2f);
-        Draw.rect(entity.block().icon(Cicon.full), entity.x, entity.y);
+        Drawf.shadow(entity.x, entity.y, entity.block.size * tilesize * 2f);
+        Draw.rect(entity.block.icon(Cicon.full), entity.x, entity.y);
     }
 }
diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java
index 3a136474b3..d19d0cda68 100644
--- a/core/src/mindustry/world/blocks/payloads/Payload.java
+++ b/core/src/mindustry/world/blocks/payloads/Payload.java
@@ -6,7 +6,7 @@ import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 
-import static mindustry.Vars.content;
+import static mindustry.Vars.*;
 
 public interface Payload{
     int payloadUnit = 0, payloadBlock = 1;
@@ -17,6 +17,9 @@ public interface Payload{
     /** draws this payload at a position. */
     void draw();
 
+    /** @return hitbox size of the payload. */
+    float size();
+
     /** @return whether this payload was dumped. */
     default boolean dump(){
         return false;
@@ -24,12 +27,7 @@ public interface Payload{
 
     /** @return whether this payload fits on a standard 3x3 conveyor. */
     default boolean fits(){
-        return true;
-    }
-
-    /** @return whether the unit can pick up this payload. */
-    default boolean canBeTaken(Payloadc picker){
-        return true;
+        return size() / tilesize <= 2.5f;
     }
 
     /** writes the payload for saving. */
diff --git a/core/src/mindustry/world/blocks/payloads/UnitPayload.java b/core/src/mindustry/world/blocks/payloads/UnitPayload.java
index ee912480de..751152fb1f 100644
--- a/core/src/mindustry/world/blocks/payloads/UnitPayload.java
+++ b/core/src/mindustry/world/blocks/payloads/UnitPayload.java
@@ -1,30 +1,28 @@
 package mindustry.world.blocks.payloads;
 
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
+import mindustry.entities.*;
+import mindustry.entities.EntityCollisions.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;
 
 public class UnitPayload implements Payload{
+    public static final float deactiveDuration = 40f;
+
     public Unit unit;
+    public float deactiveTime = 0f;
 
     public UnitPayload(Unit unit){
         this.unit = unit;
     }
 
-    @Override
-    public boolean fits(){
-        return unit.hitSize <= 16f;
-    }
-
-    @Override
-    public boolean canBeTaken(Payloadc picker){
-        return unit.hitSize < picker.hitSize();
-    }
-
     @Override
     public void write(Writes write){
         write.b(payloadUnit);
@@ -38,8 +36,31 @@ public class UnitPayload implements Payload{
         unit.rotation(rotation);
     }
 
+    @Override
+    public float size(){
+        return unit.hitSize;
+    }
+
     @Override
     public boolean dump(){
+        if(!Units.canCreate(unit.team, unit.type())){
+            deactiveTime = 1f;
+            return false;
+        }
+
+        //check if unit can be dumped here
+        SolidPred solid = unit.solidity();
+        if(solid != null){
+            int tx = unit.tileX(), ty = unit.tileY();
+            boolean nearEmpty = !solid.solid(tx, ty);
+            for(Point2 p : Geometry.d4){
+                nearEmpty |= !solid.solid(tx + p.x, ty + p.y);
+            }
+
+            //cannot dump on solid blocks
+            if(!nearEmpty) return false;
+        }
+
         //no client dumping
         if(Vars.net.client()) return true;
 
@@ -54,5 +75,18 @@ public class UnitPayload implements Payload{
     public void draw(){
         Drawf.shadow(unit.x, unit.y, 20);
         Draw.rect(unit.type().icon(Cicon.full), unit.x, unit.y, unit.rotation - 90);
+
+        //draw warning
+        if(deactiveTime > 0){
+            Draw.color(Color.scarlet);
+            Draw.alpha(0.8f * Interp.exp5Out.apply(deactiveTime));
+
+            float size = 8f;
+            Draw.rect(Icon.warning.getRegion(), unit.x, unit.y, size, size);
+
+            Draw.reset();
+
+            deactiveTime = Math.max(deactiveTime - Time.delta/deactiveDuration, 0f);
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/power/Battery.java b/core/src/mindustry/world/blocks/power/Battery.java
index 718c5a5ff7..fb70751c18 100644
--- a/core/src/mindustry/world/blocks/power/Battery.java
+++ b/core/src/mindustry/world/blocks/power/Battery.java
@@ -2,8 +2,11 @@ package mindustry.world.blocks.power;
 
 import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.tilesize;
 
@@ -17,9 +20,10 @@ public class Battery extends PowerDistributor{
         super(name);
         outputsPower = true;
         consumesPower = true;
+        flags = EnumSet.of(BlockFlag.powerResupply);
     }
 
-    public class BatteryEntity extends Building{
+    public class BatteryBuild extends Building{
         @Override
         public void draw(){
             Draw.color(emptyLightColor, fullLightColor, power.status);
@@ -28,5 +32,15 @@ public class Battery extends PowerDistributor{
 
             Draw.rect(topRegion, x, y);
         }
+
+        @Override
+        public void overwrote(Seq<Building> previous){
+            for(Building other : previous){
+                if(other.power != null && other.block.consumes.hasPower() && other.block.consumes.getPower().buffered){
+                    float amount = other.block.consumes.getPower().capacity * other.power.status;
+                    power.status = Mathf.clamp(power.status + amount / block.consumes.getPower().capacity);
+                }
+            }
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/power/BurnerGenerator.java b/core/src/mindustry/world/blocks/power/BurnerGenerator.java
index b9f270fcdf..763b92ed20 100644
--- a/core/src/mindustry/world/blocks/power/BurnerGenerator.java
+++ b/core/src/mindustry/world/blocks/power/BurnerGenerator.java
@@ -1,6 +1,7 @@
 package mindustry.world.blocks.power;
 
 import arc.graphics.g2d.*;
+import mindustry.graphics.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.type.*;
 
@@ -28,7 +29,7 @@ public class BurnerGenerator extends ItemLiquidGenerator{
         return turbineRegions[0].found() ? new TextureRegion[]{region, turbineRegions[0], turbineRegions[1], capRegion} : super.icons();
     }
 
-    public class BurnerGeneratorEntity extends ItemLiquidGeneratorEntity{
+    public class BurnerGeneratorBuild extends ItemLiquidGeneratorBuild{
 
         @Override
         public void draw(){
@@ -39,6 +40,10 @@ public class BurnerGenerator extends ItemLiquidGenerator{
                 Draw.rect(turbineRegions[1], x, y, -totalTime * turbineSpeed);
 
                 Draw.rect(capRegion, x, y);
+
+                if(hasLiquids){
+                    Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
+                }
             }
         }
     }
diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java
index 545e07dca0..a24fecf2b4 100644
--- a/core/src/mindustry/world/blocks/power/ImpactReactor.java
+++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java
@@ -43,7 +43,7 @@ public class ImpactReactor extends PowerGenerator{
     public void setBars(){
         super.setBars();
 
-        bars.add("poweroutput", (GeneratorEntity entity) -> new Bar(() ->
+        bars.add("poweroutput", (GeneratorBuild entity) -> new Bar(() ->
         Core.bundle.format("bar.poweroutput",
         Strings.fixed(Math.max(entity.getPowerProduction() - consumes.getPower().usage, 0) * 60 * entity.timeScale(), 1)),
         () -> Pal.powerBar,
@@ -64,10 +64,9 @@ public class ImpactReactor extends PowerGenerator{
         return new TextureRegion[]{bottomRegion, region};
     }
 
-    public class FusionReactorEntity extends GeneratorEntity{
+    public class ImpactReactorBuild extends GeneratorBuild{
         public float warmup;
 
-
         @Override
         public void updateTile(){
             if(consValid() && power.status >= 0.99f){
@@ -126,7 +125,7 @@ public class ImpactReactor extends PowerGenerator{
 
             Sounds.explosionbig.at(tile);
 
-            Effects.shake(6f, 16f, x, y);
+            Effect.shake(6f, 16f, x, y);
             Fx.impactShockwave.at(x, y);
             for(int i = 0; i < 6; i++){
                 Time.run(Mathf.random(80), () -> Fx.impactcloud.at(x, y));
diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
index 4b4d99aac7..2d82bfa4c7 100644
--- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
+++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
@@ -84,7 +84,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
         return 0.0f;
     }
 
-    public class ItemLiquidGeneratorEntity extends GeneratorEntity{
+    public class ItemLiquidGeneratorBuild extends GeneratorBuild{
         public float explosiveness, heat, totalTime;
 
         @Override
@@ -113,7 +113,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
                 }
             }
 
-            totalTime += heat;
+            totalTime += heat * Time.delta;
 
             //liquid takes priority over solids
             if(hasLiquids && liquid != null && liquids.get(liquid) >= 0.001f){
@@ -165,10 +165,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
             }
 
             if(hasLiquids){
-                Draw.color(liquids.current().color);
-                Draw.alpha(liquids.currentAmount() / liquidCapacity);
-                Draw.rect(liquidRegion, x, y);
-                Draw.color();
+                Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
             }
         }
 
diff --git a/core/src/mindustry/world/blocks/power/LightBlock.java b/core/src/mindustry/world/blocks/power/LightBlock.java
index 8c5dbb2237..6d55d0ac09 100644
--- a/core/src/mindustry/world/blocks/power/LightBlock.java
+++ b/core/src/mindustry/world/blocks/power/LightBlock.java
@@ -25,10 +25,10 @@ public class LightBlock extends Block{
         configurable = true;
         saveConfig = true;
 
-        config(Integer.class, (LightEntity tile, Integer value) -> tile.color = value);
+        config(Integer.class, (LightBuild tile, Integer value) -> tile.color = value);
     }
 
-    public class LightEntity extends Building{
+    public class LightBuild extends Building{
         public int color = Pal.accent.rgba();
         public float smoothTime = 1f;
 
diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java
index ec8abc9176..ac449d90db 100644
--- a/core/src/mindustry/world/blocks/power/NuclearReactor.java
+++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java
@@ -13,6 +13,7 @@ import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.consumers.*;
@@ -60,27 +61,29 @@ public class NuclearReactor extends PowerGenerator{
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("heat", (NuclearReactorEntity entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.heat));
+        bars.add("heat", (NuclearReactorBuild entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.heat));
     }
 
-    public class NuclearReactorEntity extends GeneratorEntity{
+    public class NuclearReactorBuild extends GeneratorBuild{
         public float heat;
 
         @Override
         public void updateTile(){
             ConsumeLiquid cliquid = consumes.get(ConsumeType.liquid);
-            Item item = consumes.<ConsumeItems>get(ConsumeType.item).items[0].item;
+            Item item = consumes.getItem().items[0].item;
 
             int fuel = items.get(item);
             float fullness = (float)fuel / itemCapacity;
             productionEfficiency = fullness;
 
-            if(fuel > 0){
+            if(fuel > 0 && enabled){
                 heat += fullness * heating * Math.min(delta(), 4f);
 
                 if(timer(timerFuel, itemDuration / timeScale())){
                     consume();
                 }
+            }else{
+                productionEfficiency = 0f;
             }
 
             Liquid liquid = cliquid.liquid;
@@ -107,6 +110,12 @@ public class NuclearReactor extends PowerGenerator{
             }
         }
 
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.heat) return heat;
+            return super.sense(sensor);
+        }
+
         @Override
         public void onDestroyed(){
             super.onDestroyed();
@@ -117,7 +126,7 @@ public class NuclearReactor extends PowerGenerator{
 
             if((fuel < 5 && heat < 0.5f) || !state.rules.reactorExplosions) return;
 
-            Effects.shake(6f, 16f, x, y);
+            Effect.shake(6f, 16f, x, y);
             Fx.nuclearShockwave.at(x, y);
             for(int i = 0; i < 6; i++){
                 Time.run(Mathf.random(40), () -> Fx.nuclearcloud.at(x, y));
diff --git a/core/src/mindustry/world/blocks/power/PowerDiode.java b/core/src/mindustry/world/blocks/power/PowerDiode.java
index cdbf612745..e93dde18e9 100644
--- a/core/src/mindustry/world/blocks/power/PowerDiode.java
+++ b/core/src/mindustry/world/blocks/power/PowerDiode.java
@@ -21,6 +21,7 @@ public class PowerDiode extends Block{
         solid = true;
         insulated = true;
         group = BlockGroup.power;
+        noUpdateDisabled = true;
     }
 
     @Override
@@ -39,24 +40,24 @@ public class PowerDiode extends Block{
 
     // battery % of the graph on either side, defaults to zero
     public float bar(Building tile){
-        return (tile != null && tile.block().hasPower) ? tile.power.graph.getBatteryStored() / tile.power.graph.getTotalBatteryCapacity() : 0f;
+        return (tile != null && tile.block.hasPower) ? tile.power.graph.getLastPowerStored() / tile.power.graph.getTotalBatteryCapacity() : 0f;
     }
 
-    public class PowerDiodeEntity extends Building{
+    public class PowerDiodeBuild extends Building{
         @Override
         public void draw(){
             Draw.rect(region, x, y, 0);
-            Draw.rect(arrow, x, y, rotate ? tile.rotdeg() : 0);
+            Draw.rect(arrow, x, y, rotate ? rotdeg() : 0);
         }
 
         @Override
         public void updateTile(){
             super.updateTile();
 
-            if(tile.front() == null || tile.back() == null || !tile.back().block().hasPower || !tile.front().block().hasPower || tile.back().team() != tile.front().team()) return;
+            if(front() == null || back() == null || !back().block.hasPower || !front().block.hasPower || back().team != front().team) return;
 
-            PowerGraph backGraph = tile.back().power().graph;
-            PowerGraph frontGraph = tile.front().power().graph;
+            PowerGraph backGraph = back().power.graph;
+            PowerGraph frontGraph = front().power.graph;
             if(backGraph == frontGraph) return;
 
             // 0f - 1f of battery capacity in use
diff --git a/core/src/mindustry/world/blocks/power/PowerGenerator.java b/core/src/mindustry/world/blocks/power/PowerGenerator.java
index 056caa3b7e..2307093f27 100644
--- a/core/src/mindustry/world/blocks/power/PowerGenerator.java
+++ b/core/src/mindustry/world/blocks/power/PowerGenerator.java
@@ -32,7 +32,7 @@ public class PowerGenerator extends PowerDistributor{
         super.setBars();
 
         if(hasPower && outputsPower && !consumes.hasPower()){
-            bars.add("power", (GeneratorEntity entity) -> new Bar(() ->
+            bars.add("power", (GeneratorBuild entity) -> new Bar(() ->
             Core.bundle.format("bar.poweroutput",
             Strings.fixed(entity.getPowerProduction() * 60 * entity.timeScale(), 1)),
             () -> Pal.powerBar,
@@ -45,7 +45,7 @@ public class PowerGenerator extends PowerDistributor{
         return false;
     }
 
-    public class GeneratorEntity extends Building{
+    public class GeneratorBuild extends Building{
         public float generateTime;
         /** The efficiency of the producer. An efficiency of 1.0 means 100% */
         public float productionEfficiency = 0.0f;
diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java
index e0447dbad5..fdb19dc05c 100644
--- a/core/src/mindustry/world/blocks/power/PowerGraph.java
+++ b/core/src/mindustry/world/blocks/power/PowerGraph.java
@@ -19,7 +19,8 @@ public class PowerGraph{
     private final ObjectSet<Building> all = new ObjectSet<>();
 
     private final WindowedMean powerBalance = new WindowedMean(60);
-    private float lastPowerProduced, lastPowerNeeded, lastUsageFraction;
+    private float lastPowerProduced, lastPowerNeeded, lastPowerStored;
+    private float lastScaledPowerIn, lastScaledPowerOut, lastCapacity;
 
     private long lastFrameUpdated = -1;
     private final int graphID;
@@ -33,6 +34,18 @@ public class PowerGraph{
         return graphID;
     }
 
+    public float getLastScaledPowerIn(){
+        return lastScaledPowerIn;
+    }
+
+    public float getLastScaledPowerOut(){
+        return lastScaledPowerOut;
+    }
+
+    public float getLastCapacity(){
+        return lastCapacity;
+    }
+
     public float getPowerBalance(){
         return powerBalance.mean();
     }
@@ -45,6 +58,10 @@ public class PowerGraph{
         return lastPowerProduced;
     }
 
+    public float getLastPowerStored(){
+        return lastPowerStored;
+    }
+
     public float getSatisfaction(){
         if(Mathf.zero(lastPowerProduced)){
             return 0f;
@@ -70,7 +87,7 @@ public class PowerGraph{
     public float getPowerNeeded(){
         float powerNeeded = 0f;
         for(Building consumer : consumers){
-            Consumers consumes = consumer.block().consumes;
+            Consumers consumes = consumer.block.consumes;
             if(consumes.hasPower()){
                 ConsumePower consumePower = consumes.getPower();
                 if(otherConsumersAreValid(consumer, consumePower)){
@@ -84,9 +101,9 @@ public class PowerGraph{
     public float getBatteryStored(){
         float totalAccumulator = 0f;
         for(Building battery : batteries){
-            Consumers consumes = battery.block().consumes;
+            Consumers consumes = battery.block.consumes;
             if(consumes.hasPower()){
-                totalAccumulator += battery.power().status * consumes.getPower().capacity;
+                totalAccumulator += battery.power.status * consumes.getPower().capacity;
             }
         }
         return totalAccumulator;
@@ -95,9 +112,9 @@ public class PowerGraph{
     public float getBatteryCapacity(){
         float totalCapacity = 0f;
         for(Building battery : batteries){
-            if(battery.block().consumes.hasPower()){
-                ConsumePower power = battery.block().consumes.getPower();
-                totalCapacity += (1f - battery.power().status) * power.capacity;
+            if(battery.block.consumes.hasPower()){
+                ConsumePower power = battery.block.consumes.getPower();
+                totalCapacity += (1f - battery.power.status) * power.capacity;
             }
         }
         return totalCapacity;
@@ -106,8 +123,8 @@ public class PowerGraph{
     public float getTotalBatteryCapacity(){
         float totalCapacity = 0f;
         for(Building battery : batteries){
-            if(battery.block().consumes.hasPower()){
-                totalCapacity += battery.block().consumes.getPower().capacity;
+            if(battery.block.consumes.hasPower()){
+                totalCapacity += battery.block.consumes.getPower().capacity;
             }
         }
         return totalCapacity;
@@ -120,9 +137,9 @@ public class PowerGraph{
         float used = Math.min(stored, needed);
         float consumedPowerPercentage = Math.min(1.0f, needed / stored);
         for(Building battery : batteries){
-            Consumers consumes = battery.block().consumes;
+            Consumers consumes = battery.block.consumes;
             if(consumes.hasPower()){
-                battery.power().status *= (1f-consumedPowerPercentage);
+                battery.power.status *= (1f-consumedPowerPercentage);
             }
         }
         return used;
@@ -135,11 +152,11 @@ public class PowerGraph{
         if(Mathf.equal(capacity, 0f)) return 0f;
 
         for(Building battery : batteries){
-            Consumers consumes = battery.block().consumes;
+            Consumers consumes = battery.block.consumes;
             if(consumes.hasPower()){
                 ConsumePower consumePower = consumes.getPower();
                 if(consumePower.capacity > 0f){
-                    battery.power().status += (1f-battery.power().status) * chargedPercent;
+                    battery.power.status += (1f- battery.power.status) * chargedPercent;
                 }
             }
         }
@@ -150,24 +167,24 @@ public class PowerGraph{
         //distribute even if not needed. this is because some might be requiring power but not using it; it updates consumers
         float coverage = Mathf.zero(needed) && Mathf.zero(produced) ? 0f : Mathf.zero(needed) ? 1f : Math.min(1, produced / needed);
         for(Building consumer : consumers){
-            Consumers consumes = consumer.block().consumes;
+            Consumers consumes = consumer.block.consumes;
             if(consumes.hasPower()){
                 ConsumePower consumePower = consumes.getPower();
                 if(consumePower.buffered){
                     if(!Mathf.zero(consumePower.capacity)){
                         // Add an equal percentage of power to all buffers, based on the global power coverage in this graph
                         float maximumRate = consumePower.requestedPower(consumer) * coverage * consumer.delta();
-                        consumer.power().status = Mathf.clamp(consumer.power().status + maximumRate / consumePower.capacity);
+                        consumer.power.status = Mathf.clamp(consumer.power.status + maximumRate / consumePower.capacity);
                     }
                 }else{
                     //valid consumers get power as usual
                     if(otherConsumersAreValid(consumer, consumePower)){
-                        consumer.power().status = coverage;
+                        consumer.power.status = coverage;
                     }else{ //invalid consumers get an estimate, if they were to activate
-                        consumer.power().status = Math.min(1, produced / (needed + consumePower.usage * consumer.delta()));
+                        consumer.power.status = Math.min(1, produced / (needed + consumePower.usage * consumer.delta()));
                         //just in case
-                        if(Float.isNaN(consumer.power().status)){
-                            consumer.power().status = 0f;
+                        if(Float.isNaN(consumer.power.status)){
+                            consumer.power.status = 0f;
                         }
                     }
                 }
@@ -184,7 +201,7 @@ public class PowerGraph{
                 tile.power.status = 1f;
             }
 
-            lastPowerNeeded = lastPowerProduced = lastUsageFraction = 1f;
+            lastPowerNeeded = lastPowerProduced = 1f;
             return;
         }
 
@@ -197,6 +214,12 @@ public class PowerGraph{
         lastPowerNeeded = powerNeeded;
         lastPowerProduced = powerProduced;
 
+        lastScaledPowerIn = powerProduced / Time.delta;
+        lastScaledPowerOut = powerNeeded / Time.delta;
+        lastCapacity = getTotalBatteryCapacity();
+
+        lastPowerStored = getBatteryStored();
+
         powerBalance.add((lastPowerProduced - lastPowerNeeded) / Time.delta);
 
         if(!(consumers.size == 0 && producers.size == 0 && batteries.size == 0)){
@@ -213,12 +236,6 @@ public class PowerGraph{
 
             distributePower(powerNeeded, powerProduced);
         }
-
-        //overproducing: 10 / 20 = 0.5
-        //underproducing: 20 / 10 = 2 -> clamp -> 1.0
-        //nothing being produced: 20 / 0 -> 1.0
-        //nothing being consumed: 0 / 20 -> 0.0
-        lastUsageFraction = Mathf.zero(rawProduced) ? 1f : Mathf.clamp(powerNeeded / rawProduced);
     }
 
     public void addGraph(PowerGraph graph){
@@ -232,14 +249,14 @@ public class PowerGraph{
         tile.power.graph = this;
         all.add(tile);
 
-        if(tile.block().outputsPower && tile.block().consumesPower && !tile.block().consumes.getPower().buffered){
+        if(tile.block.outputsPower && tile.block.consumesPower && !tile.block.consumes.getPower().buffered){
             producers.add(tile);
             consumers.add(tile);
-        }else if(tile.block().outputsPower && tile.block().consumesPower){
+        }else if(tile.block.outputsPower && tile.block.consumesPower){
             batteries.add(tile);
-        }else if(tile.block().outputsPower){
+        }else if(tile.block.outputsPower){
             producers.add(tile);
-        }else if(tile.block().consumesPower){
+        }else if(tile.block.consumesPower){
             consumers.add(tile);
         }
     }
@@ -275,7 +292,7 @@ public class PowerGraph{
         //go through all the connections of this tile
         for(Building other : tile.getPowerConnections(outArray1)){
             //a graph has already been assigned to this tile from a previous call, skip it
-            if(other.power().graph != this) continue;
+            if(other.power.graph != this) continue;
 
             //create graph for this branch
             PowerGraph graph = new PowerGraph();
@@ -294,7 +311,7 @@ public class PowerGraph{
                 for(Building next : child.getPowerConnections(outArray2)){
                     //make sure it hasn't looped back, and that the new graph being assigned hasn't already been assigned
                     //also skip closed tiles
-                    if(next != tile && next.power().graph != graph && !closedSet.contains(next.pos())){
+                    if(next != tile && next.power.graph != graph && !closedSet.contains(next.pos())){
                         queue.addLast(next);
                         closedSet.add(next.pos());
                     }
@@ -306,7 +323,7 @@ public class PowerGraph{
     }
 
     private boolean otherConsumersAreValid(Building tile, Consume consumePower){
-        for(Consume cons : tile.block().consumes.all()){
+        for(Consume cons : tile.block.consumes.all()){
             if(cons != consumePower && !cons.isOptional() && !cons.valid(tile)){
                 return false;
             }
diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java
index ae76588b8b..5d4431afef 100644
--- a/core/src/mindustry/world/blocks/power/PowerNode.java
+++ b/core/src/mindustry/world/blocks/power/PowerNode.java
@@ -10,6 +10,7 @@ import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.core.*;
 import mindustry.entities.units.*;
 import mindustry.game.*;
 import mindustry.gen.*;
@@ -26,35 +27,37 @@ public class PowerNode extends PowerBlock{
     protected static BuildPlan otherReq;
 
     protected final ObjectSet<PowerGraph> graphs = new ObjectSet<>();
-    protected final Vec2 t1 = new Vec2(), t2 = new Vec2();
 
     public @Load("laser") TextureRegion laser;
     public @Load("laser-end") TextureRegion laserEnd;
     public float laserRange = 6;
     public int maxNodes = 3;
+    public Color laserColor1 = Color.white;
+    public Color laserColor2 = Pal.powerLight;
 
     public PowerNode(String name){
         super(name);
-        expanded = true;
         configurable = true;
         consumesPower = false;
         outputsPower = false;
+        canOverdrive = false;
+
         config(Integer.class, (entity, value) -> {
             PowerModule power = entity.power;
             Building other = world.build(value);
-            boolean contains = power.links.contains(value), valid = other != null && other.power() != null;
+            boolean contains = power.links.contains(value), valid = other != null && other.power != null;
 
             if(contains){
                 //unlink
                 power.links.removeValue(value);
-                if(valid) other.power().links.removeValue(entity.pos());
+                if(valid) other.power.links.removeValue(entity.pos());
 
                 PowerGraph newgraph = new PowerGraph();
 
                 //reflow from this point, covering all tiles on this side
                 newgraph.reflow(entity);
 
-                if(valid && other.power().graph != newgraph){
+                if(valid && other.power.graph != newgraph){
                     //create new graph for other end
                     PowerGraph og = new PowerGraph();
                     //reflow from other end
@@ -66,10 +69,10 @@ public class PowerNode extends PowerBlock{
                     power.links.add(other.pos());
                 }
 
-                if(other.team() == entity.team()){
+                if(other.team == entity.team){
 
-                    if(!other.power().links.contains(entity.pos())){
-                        other.power().links.add(entity.pos());
+                    if(!other.power.links.contains(entity.pos())){
+                        other.power.links.add(entity.pos());
                     }
                 }
 
@@ -79,10 +82,19 @@ public class PowerNode extends PowerBlock{
 
         config(Point2[].class, (tile, value) -> {
             tile.power.links.clear();
+
+            IntSeq old = new IntSeq(tile.power.links);
+
+            //clear old
+            for(int i = 0; i < old.size; i++){
+                int cur = old.get(i);
+                configurations.get(Integer.class).get(tile, cur);
+            }
+
+            //set new
             for(Point2 p : value){
-                if(tile.power.links.size < maxNodes){
-                    tile.power.links.add(Point2.pack(p.x + tile.tileX(), p.y + tile.tileY()));
-                }
+                int newPos = Point2.pack(p.x + tile.tileX(), p.y + tile.tileY());
+                configurations.get(Integer.class).get(tile, newPos);
             }
         });
     }
@@ -98,9 +110,9 @@ public class PowerNode extends PowerBlock{
 
         bars.add("batteries", entity -> new Bar(() ->
         Core.bundle.format("bar.powerstored",
-            (ui.formatAmount((int)entity.power.graph.getBatteryStored())), ui.formatAmount((int)entity.power.graph.getTotalBatteryCapacity())),
+            (UI.formatAmount((int)entity.power.graph.getLastPowerStored())), UI.formatAmount((int)entity.power.graph.getLastCapacity())),
             () -> Pal.powerBar,
-            () -> Mathf.clamp(entity.power.graph.getBatteryStored() / entity.power.graph.getTotalBatteryCapacity())));
+            () -> Mathf.clamp(entity.power.graph.getLastPowerStored() / entity.power.graph.getLastCapacity())));
     }
 
     @Override
@@ -122,35 +134,29 @@ public class PowerNode extends PowerBlock{
         Drawf.circles(x * tilesize + offset, y * tilesize + offset, laserRange * tilesize);
 
         getPotentialLinks(tile, other -> {
-            Drawf.square(other.x, other.y, other.block().size * tilesize / 2f + 2f, Pal.place);
+            Drawf.square(other.x, other.y, other.block.size * tilesize / 2f + 2f, Pal.place);
 
             insulators(tile.x, tile.y, other.tileX(), other.tileY(), cause -> {
-                Drawf.square(cause.x, cause.y, cause.block().size * tilesize / 2f + 2f, Pal.plastanium);
+                Drawf.square(cause.x, cause.y, cause.block.size * tilesize / 2f + 2f, Pal.plastanium);
             });
         });
 
         Draw.reset();
     }
 
-    protected void drawLaser(Team team, float x1, float y1, float x2, float y2, float satisfaction, int size1, int size2){
-        float opacity = Core.settings.getInt("lasersopacity") / 100f;
-        if(Mathf.zero(opacity)) return;
-
-        float angle1 = Angles.angle(x1, y1, x2, y2);
-        t1.trns(angle1, size1 * tilesize / 2f - 1.5f);
-        t2.trns(angle1 + 180f, size2 * tilesize / 2f - 1.5f);
-
-        x1 += t1.x;
-        y1 += t1.y;
-        x2 += t2.x;
-        y2 += t2.y;
-
+    protected void setupColor(float satisfaction){
         float fract = 1f - satisfaction;
 
-        Draw.color(Color.white, Pal.powerLight, fract * 0.86f + Mathf.absin(3f, 0.1f));
-        Draw.alpha(opacity);
-        Drawf.laser(team, laser, laserEnd, x1, y1, x2, y2, 0.25f);
-        Draw.color();
+        Draw.color(laserColor1, laserColor2, fract * 0.86f + Mathf.absin(3f, 0.1f));
+        Draw.alpha(renderer.laserOpacity);
+    }
+
+    protected void drawLaser(Team team, float x1, float y1, float x2, float y2, int size1, int size2){
+        float angle1 = Angles.angle(x1, y1, x2, y2);
+        float vx = Mathf.cosDeg(angle1), vy = Mathf.sinDeg(angle1);
+        float len1 = size1 * tilesize / 2f - 1.5f, len2 = size2 * tilesize / 2f - 1.5f;
+
+        Drawf.laser(team, laser, laserEnd, x1 + vx*len1, y1 + vy*len1, x2 - vx*len2, y2 - vy*len2, 0.25f);
     }
 
     protected boolean overlaps(float srcx, float srcy, Tile other, float range){
@@ -171,10 +177,10 @@ public class PowerNode extends PowerBlock{
     }
 
     protected void getPotentialLinks(Tile tile, Cons<Building> others){
-        Boolf<Building> valid = other -> other != null && other.tile() != tile && other.power() != null &&
-            ((!other.block().outputsPower && other.block().consumesPower) || (other.block().outputsPower && !other.block().consumesPower) || other.block() instanceof PowerNode) &&
-            overlaps(tile.x * tilesize + offset, tile.y * tilesize + offset, other.tile(), laserRange * tilesize) && other.team() == player.team()
-            && !other.proximity().contains(e -> e.tile() == tile) && !graphs.contains(other.power().graph);
+        Boolf<Building> valid = other -> other != null && other.tile() != tile && other.power != null &&
+            ((!other.block.outputsPower && other.block.consumesPower) || (other.block.outputsPower && !other.block.consumesPower) || other.block instanceof PowerNode) &&
+            overlaps(tile.x * tilesize + offset, tile.y * tilesize + offset, other.tile(), laserRange * tilesize) && other.team == player.team()
+            && !other.proximity.contains(e -> e.tile == tile) && !graphs.contains(other.power.graph);
 
         tempTileEnts.clear();
         graphs.clear();
@@ -190,13 +196,13 @@ public class PowerNode extends PowerBlock{
         });
 
         tempTileEnts.sort((a, b) -> {
-            int type = -Boolean.compare(a.block() instanceof PowerNode, b.block() instanceof PowerNode);
+            int type = -Boolean.compare(a.block instanceof PowerNode, b.block instanceof PowerNode);
             if(type != 0) return type;
             return Float.compare(a.dst2(tile), b.dst2(tile));
         });
 
         tempTileEnts.each(valid, t -> {
-            graphs.add(t.power().graph);
+            graphs.add(t.power.graph);
             others.get(t);
         });
     }
@@ -204,6 +210,7 @@ public class PowerNode extends PowerBlock{
     @Override
     public void drawRequestConfigTop(BuildPlan req, Eachable<BuildPlan> list){
         if(req.config instanceof Point2[]){
+            setupColor(1f);
             for(Point2 point : (Point2[])req.config){
                 otherReq = null;
                 list.each(other -> {
@@ -214,8 +221,9 @@ public class PowerNode extends PowerBlock{
 
                 if(otherReq == null || otherReq.block == null) return;
 
-                drawLaser(player.team(), req.drawx(), req.drawy(), otherReq.drawx(), otherReq.drawy(), 1f, size, otherReq.block.size);
+                drawLaser(player.team(), req.drawx(), req.drawy(), otherReq.drawx(), otherReq.drawy(), size, otherReq.block.size);
             }
+            Draw.color();
         }
     }
 
@@ -224,11 +232,11 @@ public class PowerNode extends PowerBlock{
     }
 
     public boolean linkValid(Building tile, Building link, boolean checkMaxNodes){
-        if(tile == link || link == null || !link.block().hasPower || tile.team() != link.team()) return false;
+        if(tile == link || link == null || !link.block.hasPower || tile.team != link.team) return false;
 
-        if(overlaps(tile, link, laserRange * tilesize) || (link.block() instanceof PowerNode && overlaps(link, tile, ((PowerNode)link.block()).laserRange * tilesize))){
-            if(checkMaxNodes && link.block() instanceof PowerNode){
-                return link.power().links.size < ((PowerNode)link.block()).maxNodes || link.power().links.contains(tile.pos());
+        if(overlaps(tile, link, laserRange * tilesize) || (link.block instanceof PowerNode && overlaps(link, tile, ((PowerNode)link.block).laserRange * tilesize))){
+            if(checkMaxNodes && link.block instanceof PowerNode){
+                return link.power.links.size < ((PowerNode)link.block).maxNodes || link.power.links.contains(tile.pos());
             }
             return true;
         }
@@ -253,7 +261,7 @@ public class PowerNode extends PowerBlock{
         world.raycastEach(x, y, x2, y2, (wx, wy) -> {
 
             Building tile = world.build(wx, wy);
-            if(tile != null && tile.block().insulated){
+            if(tile != null && tile.block.insulated){
                 iterator.get(tile);
             }
 
@@ -261,15 +269,15 @@ public class PowerNode extends PowerBlock{
         });
     }
 
-    public class PowerNodeEntity extends Building{
+    public class PowerNodeBuild extends Building{
 
         @Override
         public void placed(){
             if(net.client()) return;
 
-            Boolf<Building> valid = other -> other != null && other != this && ((!other.block().outputsPower && other.block().consumesPower) ||
-                (other.block().outputsPower && !other.block().consumesPower) || other.block() instanceof PowerNode) && linkValid(this, other)
-                && !other.proximity().contains(this) && other.power().graph != power.graph;
+            Boolf<Building> valid = other -> other != null && other != this && ((!other.block.outputsPower && other.block.consumesPower) ||
+                (other.block.outputsPower && !other.block.consumesPower) || other.block instanceof PowerNode) && linkValid(this, other)
+                && !other.proximity().contains(this) && other.power.graph != power.graph;
 
             tempTileEnts.clear();
             Geometry.circle(tile.x, tile.y, (int)(laserRange + 2), (x, y) -> {
@@ -282,7 +290,7 @@ public class PowerNode extends PowerBlock{
             });
 
             tempTileEnts.sort((a, b) -> {
-                int type = -Boolean.compare(a.block() instanceof PowerNode, b.block() instanceof PowerNode);
+                int type = -Boolean.compare(a.block instanceof PowerNode, b.block instanceof PowerNode);
                 if(type != 0) return type;
                 return Float.compare(a.dst2(tile), b.dst2(tile));
             });
@@ -295,6 +303,14 @@ public class PowerNode extends PowerBlock{
             super.placed();
         }
 
+        @Override
+        public void dropped(){
+            power.links.clear();
+            //create new power graph to manually unlink (this may be redundant)
+            power.graph = new PowerGraph();
+            power.graph.add(this);
+        }
+
         @Override
         public void updateTile(){
             power.graph.update();
@@ -308,7 +324,7 @@ public class PowerNode extends PowerBlock{
             }
 
             if(this == other){
-                if(other.power().links.size == 0){
+                if(other.power.links.size == 0){
                     int[] total = {0};
                     getPotentialLinks(tile, link -> {
                         if(!insulated(this, link) && total[0]++ < maxNodes){
@@ -352,7 +368,7 @@ public class PowerNode extends PowerBlock{
                         boolean linked = linked(link);
 
                         if(linked){
-                            Drawf.square(link.x, link.y, link.block().size * tilesize / 2f + 1f, Pal.place);
+                            Drawf.square(link.x, link.y, link.block.size * tilesize / 2f + 1f, Pal.place);
                         }
                     }
                 }
@@ -365,18 +381,19 @@ public class PowerNode extends PowerBlock{
         public void draw(){
             super.draw();
 
-            if(Core.settings.getInt("lasersopacity") == 0) return;
+            if(Mathf.zero(renderer.laserOpacity)) return;
 
             Draw.z(Layer.power);
+            setupColor(power.graph.getSatisfaction());
 
             for(int i = 0; i < power.links.size; i++){
                 Building link = world.build(power.links.get(i));
 
                 if(!linkValid(this, link)) continue;
 
-                if(link.block() instanceof PowerNode && !(link.pos() < tile.pos())) continue;
+                if(link.block instanceof PowerNode && link.id >= id) continue;
 
-                drawLaserTo(link);
+                drawLaser(team, x, y, link.x, link.y, size, link.block.size);
             }
 
             Draw.reset();
@@ -386,10 +403,6 @@ public class PowerNode extends PowerBlock{
             return power.links.contains(other.pos());
         }
 
-        protected void drawLaserTo(Building target){
-            drawLaser(team, x, y, target.x, target.y, power.graph.getSatisfaction(), size, target.block().size);
-        }
-
         @Override
         public Point2[] config(){
             Point2[] out = new Point2[power.links.size];
diff --git a/core/src/mindustry/world/blocks/power/SolarGenerator.java b/core/src/mindustry/world/blocks/power/SolarGenerator.java
index 2c79557e5d..d5f37329ae 100644
--- a/core/src/mindustry/world/blocks/power/SolarGenerator.java
+++ b/core/src/mindustry/world/blocks/power/SolarGenerator.java
@@ -1,9 +1,10 @@
 package mindustry.world.blocks.power;
 
+import arc.math.*;
 import arc.struct.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.state;
+import static mindustry.Vars.*;
 
 public class SolarGenerator extends PowerGenerator{
 
@@ -20,10 +21,15 @@ public class SolarGenerator extends PowerGenerator{
         stats.add(generationType, powerProduction * 60.0f, StatUnit.powerSecond);
     }
 
-    public class SolarGeneratorEntity extends GeneratorEntity{
+    public class SolarGeneratorBuild extends GeneratorBuild{
         @Override
         public void updateTile(){
-            productionEfficiency = state.rules.solarPowerMultiplier < 0 ? (state.rules.lighting ? 1f - state.rules.ambientLight.a : 1f) : state.rules.solarPowerMultiplier;
+            productionEfficiency = enabled ?
+                Mathf.maxZero(Attribute.light.env() +
+                    (state.rules.lighting ?
+                        1f - state.rules.ambientLight.a :
+                        1f
+                    )) : 0f;
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/mindustry/world/blocks/power/ThermalGenerator.java
index 83d2212eb5..e29b7a6bdb 100644
--- a/core/src/mindustry/world/blocks/power/ThermalGenerator.java
+++ b/core/src/mindustry/world/blocks/power/ThermalGenerator.java
@@ -22,7 +22,7 @@ public class ThermalGenerator extends PowerGenerator{
     public void setStats(){
         super.setStats();
 
-        stats.add(BlockStat.tiles, attribute);
+        stats.add(BlockStat.tiles, attribute, floating);
     }
 
     @Override
@@ -36,9 +36,13 @@ public class ThermalGenerator extends PowerGenerator{
         return tile.getLinkedTilesAs(this, tempTiles).sumf(other -> other.floor().attributes.get(attribute)) > 0.01f;
     }
 
-    public class ThermalGeneratorEntity extends GeneratorEntity{
+    public class ThermalGeneratorBuild extends GeneratorBuild{
+        public float sum;
+
         @Override
         public void updateTile(){
+            productionEfficiency = sum + attribute.env();
+
             if(productionEfficiency > 0.1f && Mathf.chance(0.05 * delta())){
                 generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f));
             }
@@ -53,14 +57,7 @@ public class ThermalGenerator extends PowerGenerator{
         public void onProximityAdded(){
             super.onProximityAdded();
 
-            productionEfficiency = sumAttribute(attribute, tile.x, tile.y);
-        }
-
-        @Override
-        public float getPowerProduction(){
-            //in this case, productionEfficiency means 'total heat'
-            //thus, it may be greater than 1.0
-            return powerProduction * productionEfficiency;
+            sum = sumAttribute(attribute, tile.x, tile.y);
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/production/AttributeSmelter.java b/core/src/mindustry/world/blocks/production/AttributeSmelter.java
index fe44c8652b..987b14e63b 100644
--- a/core/src/mindustry/world/blocks/production/AttributeSmelter.java
+++ b/core/src/mindustry/world/blocks/production/AttributeSmelter.java
@@ -40,7 +40,7 @@ public class AttributeSmelter extends GenericSmelter{
         stats.add(BlockStat.affinities, attribute, boostScale);
     }
 
-    public class AttributeSmelterEntity extends SmelterEntity{
+    public class AttributeSmelterBuild extends SmelterBuild{
         public float attrsum;
 
         @Override
@@ -49,10 +49,10 @@ public class AttributeSmelter extends GenericSmelter{
         }
 
         @Override
-        public void placed(){
-            super.placed();
+        public void onProximityUpdate(){
+            super.onProximityUpdate();
 
             attrsum = sumAttribute(attribute, tile.x, tile.y);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/mindustry/world/blocks/production/Cultivator.java b/core/src/mindustry/world/blocks/production/Cultivator.java
index f4587a4a82..2dc97d82f6 100644
--- a/core/src/mindustry/world/blocks/production/Cultivator.java
+++ b/core/src/mindustry/world/blocks/production/Cultivator.java
@@ -31,9 +31,9 @@ public class Cultivator extends GenericCrafter{
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("multiplier", (CultivatorEntity entity) -> new Bar(() ->
+        bars.add("multiplier", (CultivatorBuild entity) -> new Bar(() ->
         Core.bundle.formatFloat("bar.efficiency",
-        ((entity.boost + 1f) * entity.warmup) * 100f, 1),
+        ((entity.boost + 1f + attribute.env()) * entity.warmup) * 100f, 1),
         () -> Pal.ammo,
         () -> entity.warmup));
     }
@@ -55,7 +55,7 @@ public class Cultivator extends GenericCrafter{
         return new TextureRegion[]{region, topRegion};
     }
 
-    public class CultivatorEntity extends GenericCrafterEntity{
+    public class CultivatorBuild extends GenericCrafterBuild{
         public float warmup;
         public float boost;
 
@@ -70,9 +70,7 @@ public class Cultivator extends GenericCrafter{
         public void draw(){
             Draw.rect(region, x, y);
 
-            Draw.color(plantColor);
-            Draw.alpha(warmup);
-            Draw.rect(middleRegion, x, y);
+            Drawf.liquid(middleRegion, x, y, warmup, plantColor);
 
             Draw.color(bottomColor, plantColorLight, warmup);
 
@@ -101,7 +99,7 @@ public class Cultivator extends GenericCrafter{
 
         @Override
         public float getProgressIncrease(float baseTime){
-            return super.getProgressIncrease(baseTime) * (1f + boost);
+            return super.getProgressIncrease(baseTime) * (1f + boost + attribute.env());
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java
index a893041396..7b86f1d1f5 100644
--- a/core/src/mindustry/world/blocks/production/Drill.java
+++ b/core/src/mindustry/world/blocks/production/Drill.java
@@ -86,7 +86,7 @@ public class Drill extends Block{
     public void setBars(){
         super.setBars();
 
-        bars.add("drillspeed", (DrillEntity e) ->
+        bars.add("drillspeed", (DrillBuild e) ->
              new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60 * e.timeScale(), 2)), () -> Pal.ammo, () -> e.warmup));
     }
 
@@ -205,7 +205,7 @@ public class Drill extends Block{
         return drops != null && drops.hardness <= tier;
     }
 
-    public class DrillEntity extends Building{
+    public class DrillBuild extends Building{
         public float progress;
         public int index;
         public float warmup;
@@ -217,7 +217,7 @@ public class Drill extends Block{
 
         @Override
         public boolean shouldConsume(){
-            return items.total() < itemCapacity;
+            return items.total() < itemCapacity && enabled;
         }
 
         @Override
@@ -259,7 +259,7 @@ public class Drill extends Block{
 
                 float speed = 1f;
 
-                if(cons().optionalValid()){
+                if(cons.optionalValid()){
                     speed = liquidBoostIntensity;
                 }
 
diff --git a/core/src/mindustry/world/blocks/production/Fracker.java b/core/src/mindustry/world/blocks/production/Fracker.java
index 12649b8f06..f1389f1cbe 100644
--- a/core/src/mindustry/world/blocks/production/Fracker.java
+++ b/core/src/mindustry/world/blocks/production/Fracker.java
@@ -1,6 +1,7 @@
 package mindustry.world.blocks.production;
 
 import arc.graphics.g2d.*;
+import mindustry.graphics.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.world.meta.*;
 
@@ -33,26 +34,18 @@ public class Fracker extends SolidPump{
         return new TextureRegion[]{region, rotatorRegion, topRegion};
     }
 
-    public class FrackerEntity extends SolidPumpEntity{
+    public class FrackerBuild extends SolidPumpBuild{
         public float accumulator;
 
         @Override
         public void drawCracks(){}
 
-        @Override
-        public boolean shouldConsume(){
-            return liquids.get(result) < liquidCapacity - 0.01f;
-        }
-
         @Override
         public void draw(){
             Draw.rect(region, x, y);
             super.drawCracks();
 
-            Draw.color(result.color);
-            Draw.alpha(liquids.get(result) / liquidCapacity);
-            Draw.rect(liquidRegion, x, y);
-            Draw.color();
+            Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, result.color);
 
             Draw.rect(rotatorRegion, x, y, pumpTime);
             Draw.rect(topRegion, x, y);
diff --git a/core/src/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java
index 33665e3a81..434c9f4b65 100644
--- a/core/src/mindustry/world/blocks/production/GenericCrafter.java
+++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java
@@ -31,7 +31,6 @@ public class GenericCrafter extends Block{
         update = true;
         solid = true;
         hasItems = true;
-        health = 60;
         idleSound = Sounds.machine;
         sync = true;
         idleSoundVolume = 0.03f;
@@ -79,7 +78,7 @@ public class GenericCrafter extends Block{
         return outputItem != null;
     }
 
-    public class GenericCrafterEntity extends Building{
+    public class GenericCrafterBuild extends Building{
         public float progress;
         public float totalProgress;
         public float warmup;
@@ -94,7 +93,7 @@ public class GenericCrafter extends Block{
             if(outputItem != null && items.get(outputItem.item) >= itemCapacity){
                 return false;
             }
-            return outputLiquid == null || !(liquids.get(outputLiquid.liquid) >= liquidCapacity - 0.001f);
+            return (outputLiquid == null || !(liquids.get(outputLiquid.liquid) >= liquidCapacity - 0.001f)) && enabled;
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/production/GenericSmelter.java b/core/src/mindustry/world/blocks/production/GenericSmelter.java
index bb1260d3c7..eb04cb43c7 100644
--- a/core/src/mindustry/world/blocks/production/GenericSmelter.java
+++ b/core/src/mindustry/world/blocks/production/GenericSmelter.java
@@ -16,7 +16,7 @@ public class GenericSmelter extends GenericCrafter{
         super(name);
     }
 
-    public class SmelterEntity extends GenericCrafterEntity{
+    public class SmelterBuild extends GenericCrafterBuild{
         @Override
         public void draw(){
             super.draw();
diff --git a/core/src/mindustry/world/blocks/production/Incinerator.java b/core/src/mindustry/world/blocks/production/Incinerator.java
index 8fc5e660a7..1e16aa4faa 100644
--- a/core/src/mindustry/world/blocks/production/Incinerator.java
+++ b/core/src/mindustry/world/blocks/production/Incinerator.java
@@ -22,7 +22,7 @@ public class Incinerator extends Block{
         solid = true;
     }
 
-    public class IncineratorEntity extends Building{
+    public class IncineratorBuild extends Building{
         public float heat;
 
         @Override
diff --git a/core/src/mindustry/world/blocks/production/LiquidConverter.java b/core/src/mindustry/world/blocks/production/LiquidConverter.java
index d722d00211..84868d9b61 100644
--- a/core/src/mindustry/world/blocks/production/LiquidConverter.java
+++ b/core/src/mindustry/world/blocks/production/LiquidConverter.java
@@ -30,7 +30,7 @@ public class LiquidConverter extends GenericCrafter{
         stats.add(BlockStat.output, outputLiquid.liquid, outputLiquid.amount * craftTime, false);
     }
 
-    public class LiquidConverterEntity extends GenericCrafterEntity{
+    public class LiquidConverterBuild extends GenericCrafterBuild{
         @Override
         public void drawLight(){
             if(hasLiquids && drawLiquidLight && outputLiquid.liquid.lightColor.a > 0.001f){
diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
index e48985ebe8..e7456f0287 100644
--- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
+++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
@@ -16,37 +16,38 @@ import static mindustry.Vars.tilesize;
 public class PayloadAcceptor extends Block{
     public float payloadSpeed = 0.5f;
 
-    public @Load(value = "@-top", fallback = "factory-top-$size") TextureRegion topRegion;
-    public @Load(value = "@-out", fallback = "factory-out-$size") TextureRegion outRegion;
-    public @Load(value = "@-in", fallback = "factory-in-$size") TextureRegion inRegion;
+    public @Load(value = "@-top", fallback = "factory-top-@size") TextureRegion topRegion;
+    public @Load(value = "@-out", fallback = "factory-out-@size") TextureRegion outRegion;
+    public @Load(value = "@-in", fallback = "factory-in-@size") TextureRegion inRegion;
 
     public PayloadAcceptor(String name){
         super(name);
 
         update = true;
+        sync = true;
     }
 
     public static boolean blends(Building tile, int direction){
-        int size = tile.block().size;
+        int size = tile.block.size;
         Building accept = tile.nearby(Geometry.d4(direction).x * size, Geometry.d4(direction).y * size);
         return accept != null &&
-            accept.block().outputsPayload &&
+            accept.block.outputsPayload &&
 
             //if size is the same, block must either be facing this one, or not be rotating
-            ((accept.block().size == size &&
-            ((accept.tileX() + Geometry.d4(accept.rotation()).x * size == tile.tileX() && accept.tileY() + Geometry.d4(accept.rotation()).y * size == tile.tileY())
-            || !accept.block().rotate  || (accept.block().rotate && !accept.block().outputFacing))) ||
+            ((accept.block.size == size &&
+            ((accept.tileX() + Geometry.d4(accept.rotation).x * size == tile.tileX() && accept.tileY() + Geometry.d4(accept.rotation).y * size == tile.tileY())
+            || !accept.block.rotate  || (accept.block.rotate && !accept.block.outputFacing))) ||
 
             //if the other block is smaller, check alignment
-            (accept.block().size < size &&
-            (accept.rotation() % 2 == 0 ? //check orientation; make sure it's aligned properly with this block.
-                Math.abs(accept.y - tile.y) <= (size * tilesize - accept.block().size * tilesize)/2f : //check Y alignment
-                Math.abs(accept.x - tile.x) <= (size * tilesize - accept.block().size * tilesize)/2f   //check X alignment
-                )) && (!accept.block().rotate || accept.front() == tile || !accept.block().outputFacing) //make sure it's facing this block
+            (accept.block.size < size &&
+            (accept.rotation % 2 == 0 ? //check orientation; make sure it's aligned properly with this block.
+                Math.abs(accept.y - tile.y) <= (size * tilesize - accept.block.size * tilesize)/2f : //check Y alignment
+                Math.abs(accept.x - tile.x) <= (size * tilesize - accept.block.size * tilesize)/2f   //check X alignment
+                )) && (!accept.block.rotate || accept.front() == tile || !accept.block.outputFacing) //make sure it's facing this block
             );
     }
 
-    public class PayloadAcceptorEntity<T extends Payload> extends Building{
+    public class PayloadAcceptorBuild<T extends Payload> extends Building{
         public @Nullable T payload;
         public Vec2 payVector = new Vec2();
         public float payRotation;
@@ -59,7 +60,7 @@ public class PayloadAcceptor extends Block{
         @Override
         public void handlePayload(Building source, Payload payload){
             this.payload = (T)payload;
-            this.payVector.set(source).sub(this).clamp(-size * tilesize / 2f, size * tilesize / 2f, -size * tilesize / 2f, size * tilesize / 2f);
+            this.payVector.set(source).sub(this).clamp(-size * tilesize / 2f, -size * tilesize / 2f, size * tilesize / 2f, size * tilesize / 2f);
             this.payRotation = source.angleTo(this);
 
             updatePayload();
@@ -108,10 +109,10 @@ public class PayloadAcceptor extends Block{
             payRotation = rotdeg();
 
             if(payVector.len() >= size * tilesize/2f){
-                payVector.clamp(-size * tilesize / 2f, size * tilesize / 2f, -size * tilesize / 2f, size * tilesize / 2f);
+                payVector.clamp(-size * tilesize / 2f, -size * tilesize / 2f, size * tilesize / 2f, size * tilesize / 2f);
 
                 Building front = front();
-                if(front != null && front.block().outputsPayload){
+                if(front != null && front.block.outputsPayload){
                     if(movePayload(payload)){
                         payload = null;
                     }
diff --git a/core/src/mindustry/world/blocks/production/Pump.java b/core/src/mindustry/world/blocks/production/Pump.java
index ae77c42690..b94acd34fb 100644
--- a/core/src/mindustry/world/blocks/production/Pump.java
+++ b/core/src/mindustry/world/blocks/production/Pump.java
@@ -5,6 +5,7 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import mindustry.game.*;
 import mindustry.type.*;
+import mindustry.graphics.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.liquid.*;
@@ -33,18 +34,18 @@ public class Pump extends LiquidBlock{
         Tile tile = world.tile(x, y);
         if(tile == null) return;
 
-        float tiles = 0f;
+        float amount = 0f;
         Liquid liquidDrop = null;
 
         for(Tile other : tile.getLinkedTilesAs(this, tempTiles)){
             if(canPump(other)){
                 liquidDrop = other.floor().liquidDrop;
-                tiles++;
+                amount += other.floor().liquidMultiplier;
             }
         }
 
         if(liquidDrop != null){
-            float width = drawPlaceText(Core.bundle.formatFloat("bar.pumpspeed", tiles * pumpAmount * 60f, 0), x, y, valid);
+            float width = drawPlaceText(Core.bundle.formatFloat("bar.pumpspeed", amount * pumpAmount * 60f, 0), x, y, valid);
             float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5;
             Draw.mixcol(Color.darkGray, 1f);
             Draw.rect(liquidDrop.icon(Cicon.small), dx, dy - 1);
@@ -63,10 +64,8 @@ public class Pump extends LiquidBlock{
         if(isMultiblock()){
             Liquid last = null;
             for(Tile other : tile.getLinkedTilesAs(this, tempTiles)){
-                if(other.floor().liquidDrop == null)
-                    continue;
-                if(other.floor().liquidDrop != last && last != null)
-                    return false;
+                if(other.floor().liquidDrop == null) continue;
+                if(other.floor().liquidDrop != last && last != null) return false;
                 last = other.floor().liquidDrop;
             }
             return last != null;
@@ -79,44 +78,41 @@ public class Pump extends LiquidBlock{
         return tile != null && tile.floor().liquidDrop != null;
     }
 
-    public class PumpEntity extends LiquidBlockEntity{
-        float tiles = 0f;
-        Liquid liquidDrop = null;
+    public class PumpBuild extends LiquidBuild{
+        public float amount = 0f;
+        public Liquid liquidDrop = null;
 
         @Override
         public void draw(){
             Draw.rect(name, x, y);
 
-            Draw.color(liquids.current().color);
-            Draw.alpha(liquids.total() / liquidCapacity);
-            Draw.rect(liquidRegion, x, y);
-            Draw.color();
+            Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
         }
 
         @Override
         public void onProximityUpdate(){
             super.onProximityUpdate();
 
-            tiles = 0f;
+            amount = 0f;
             liquidDrop = null;
 
-            if(isMultiblock()){
-                for(Tile other : tile.getLinkedTiles(tempTiles)){
-                    if(canPump(other)){
-                        liquidDrop = other.floor().liquidDrop;
-                        tiles++;
-                    }
+            for(Tile other : tile.getLinkedTiles(tempTiles)){
+                if(canPump(other)){
+                    liquidDrop = other.floor().liquidDrop;
+                    amount += other.floor().liquidMultiplier;
                 }
-            }else{
-                tiles = 1f;
-                liquidDrop = tile.floor().liquidDrop;
             }
         }
 
+        @Override
+        public boolean shouldConsume(){
+            return liquidDrop != null && liquids.get(liquidDrop) < liquidCapacity - 0.01f && enabled;
+        }
+
         @Override
         public void updateTile(){
             if(consValid() && liquidDrop != null){
-                float maxPump = Math.min(liquidCapacity - liquids.total(), tiles * pumpAmount * edelta());
+                float maxPump = Math.min(liquidCapacity - liquids.total(), amount * pumpAmount * edelta());
                 liquids.add(liquidDrop, maxPump);
             }
 
diff --git a/core/src/mindustry/world/blocks/production/Separator.java b/core/src/mindustry/world/blocks/production/Separator.java
index 9af39e8685..bcf66984e3 100644
--- a/core/src/mindustry/world/blocks/production/Separator.java
+++ b/core/src/mindustry/world/blocks/production/Separator.java
@@ -3,10 +3,10 @@ package mindustry.world.blocks.production;
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.consumers.*;
@@ -17,7 +17,7 @@ import mindustry.world.meta.values.*;
  * Extracts a random list of items from an input item and an input liquid.
  */
 public class Separator extends Block{
-    public @NonNull ItemStack[] results;
+    public ItemStack[] results;
     public float craftTime;
 
     public @Load("@-liquid") TextureRegion liquidRegion;
@@ -51,7 +51,7 @@ public class Separator extends Block{
         stats.add(BlockStat.productionTime, craftTime / 60f, StatUnit.seconds);
     }
 
-    public class SeparatorEntity extends Building{
+    public class SeparatorBuild extends Building{
         public float progress;
         public float totalProgress;
         public float warmup;
@@ -71,18 +71,15 @@ public class Separator extends Block{
                     total -= items.get(stack.item);
                 }
             }
-            return total < itemCapacity;
+            return total < itemCapacity && enabled;
         }
 
         @Override
         public void draw(){
             super.draw();
 
-            Draw.color(liquids.current().color);
-            Draw.alpha(liquids.total() / liquidCapacity);
-            Draw.rect(liquidRegion, x, y);
+            Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
 
-            Draw.reset();
             if(Core.atlas.isFound(spinnerRegion)){
                 Draw.rect(spinnerRegion, x, y, totalProgress * spinnerSpeed);
             }
@@ -108,7 +105,7 @@ public class Separator extends Block{
                 int count = 0;
                 Item item = null;
 
-                //TODO guaranteed desync since items are random
+                //guaranteed desync since items are random - won't be fixed and probably isn't too important
                 for(ItemStack stack : results){
                     if(i >= count && i < count + stack.amount){
                         item = stack.item;
diff --git a/core/src/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java
index 5c83b4fcec..e5cc0861e0 100644
--- a/core/src/mindustry/world/blocks/production/SolidPump.java
+++ b/core/src/mindustry/world/blocks/production/SolidPump.java
@@ -23,6 +23,7 @@ public class SolidPump extends Pump{
     public Effect updateEffect = Fx.none;
     public float updateEffectChance = 0.02f;
     public float rotateSpeed = 1f;
+    public float baseEfficiency = 1f;
     /** Attribute that is checked when calculating output. */
     public @Nullable Attribute attribute;
 
@@ -36,14 +37,14 @@ public class SolidPump extends Pump{
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
         if(attribute != null){
-            drawPlaceText(Core.bundle.formatFloat("bar.efficiency", Math.max(sumAttribute(attribute, x, y) + 1f, 0f) * 100 * percentSolid(x, y), 1), x, y, valid);
+            drawPlaceText(Core.bundle.formatFloat("bar.efficiency", Math.max(sumAttribute(attribute, x, y) / size / size + baseEfficiency, 0f) * 100 * percentSolid(x, y), 1), x, y, valid);
         }
     }
 
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("efficiency", (SolidPumpEntity entity) -> new Bar(() -> Core.bundle.formatFloat("bar.pumpspeed",
+        bars.add("efficiency", (SolidPumpBuild entity) -> new Bar(() -> Core.bundle.formatFloat("bar.pumpspeed",
         entity.lastPump / Time.delta * 60, 1),
         () -> Pal.ammo,
         () -> entity.warmup));
@@ -56,22 +57,14 @@ public class SolidPump extends Pump{
         stats.remove(BlockStat.output);
         stats.add(BlockStat.output, result, 60f * pumpAmount, true);
         if(attribute != null){
-            stats.add(BlockStat.affinities, attribute);
+            stats.add(baseEfficiency > 0.0001f ? BlockStat.affinities : BlockStat.tiles, attribute);
         }
     }
 
     @Override
     public boolean canPlaceOn(Tile tile, Team team){
-        if(isMultiblock()){
-            for(Tile other : tile.getLinkedTilesAs(this, tempTiles)){
-                if(canPump(other)){
-                    return true;
-                }
-            }
-            return false;
-        }else{
-            return canPump(tile);
-        }
+        float sum = tile.getLinkedTilesAs(this, tempTiles).sumf(t -> canPump(t) ? baseEfficiency + (attribute != null ? t.floor().attributes.get(attribute) : 0f) : 0f);
+        return sum > 0.00001f;
     }
 
     @Override
@@ -84,39 +77,29 @@ public class SolidPump extends Pump{
         return new TextureRegion[]{region, rotatorRegion, topRegion};
     }
 
-    public class SolidPumpEntity extends PumpEntity{
+    public class SolidPumpBuild extends PumpBuild{
         public float warmup;
         public float pumpTime;
         public float boost;
+        public float validTiles;
         public float lastPump;
 
         @Override
         public void draw(){
             Draw.rect(region, x, y);
-            Draw.color(liquids.current().color);
-            Draw.alpha(liquids.total() / liquidCapacity);
-            Draw.rect(liquidRegion, x, y);
-            Draw.color();
+            Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color);
             Draw.rect(rotatorRegion, x, y, pumpTime * rotateSpeed);
             Draw.rect(topRegion, x, y);
         }
 
+        @Override
+        public boolean shouldConsume(){
+            return liquids.get(result) < liquidCapacity - 0.01f && enabled;
+        }
+
         @Override
         public void updateTile(){
-            float fraction = 0f;
-
-            if(isMultiblock()){
-                for(Tile other : tile.getLinkedTiles(tempTiles)){
-                    if(canPump(other)){
-                        fraction += 1f / (size * size);
-                    }
-                }
-            }else{
-                if(canPump(tile)) fraction = 1f;
-            }
-
-            fraction += boost;
-            fraction = Math.max(fraction, 0);
+            float fraction = Math.max(validTiles + boost + (attribute == null ? 0 : attribute.env()), 0);
 
             if(cons.valid() && typeLiquid() < liquidCapacity - 0.001f){
                 float maxPump = Math.min(liquidCapacity - typeLiquid(), pumpAmount * delta() * fraction * efficiency());
@@ -139,8 +122,12 @@ public class SolidPump extends Pump{
         public void onProximityUpdate(){
             super.onProximityAdded();
 
-            if(attribute != null){
-                boost = sumAttribute(attribute, tile.x, tile.y);
+            boost = sumAttribute(attribute, tile.x, tile.y) / size / size;
+            validTiles = 0f;
+            for(Tile other : tile.getLinkedTiles(tempTiles)){
+                if(canPump(other)){
+                    validTiles += baseEfficiency / (size * size);
+                }
             }
         }
 
diff --git a/core/src/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/mindustry/world/blocks/sandbox/ItemSource.java
index 96951cdb0b..fb28247758 100644
--- a/core/src/mindustry/world/blocks/sandbox/ItemSource.java
+++ b/core/src/mindustry/world/blocks/sandbox/ItemSource.java
@@ -23,9 +23,10 @@ public class ItemSource extends Block{
         group = BlockGroup.transportation;
         configurable = true;
         saveConfig = true;
+        noUpdateDisabled = true;
 
-        config(Item.class, (ItemSourceEntity tile, Item item) -> tile.outputItem = item);
-        configClear((ItemSourceEntity tile) -> tile.outputItem = null);
+        config(Item.class, (ItemSourceBuild tile, Item item) -> tile.outputItem = item);
+        configClear((ItemSourceBuild tile) -> tile.outputItem = null);
     }
 
     @Override
@@ -44,18 +45,20 @@ public class ItemSource extends Block{
         return true;
     }
 
-    public class ItemSourceEntity extends Building{
+    public class ItemSourceBuild extends Building{
         Item outputItem;
 
         @Override
         public void draw(){
             super.draw();
 
-            if(outputItem == null) return;
-
-            Draw.color(outputItem.color);
-            Draw.rect("center", x, y);
-            Draw.color();
+            if(outputItem == null){
+                Draw.rect("cross", x, y);
+            }else{
+                Draw.color(outputItem.color);
+                Draw.rect("center", x, y);
+                Draw.color();
+            }
         }
 
         @Override
@@ -69,7 +72,7 @@ public class ItemSource extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> outputItem, item -> configure(item));
+            ItemSelection.buildTable(table, content.items(), () -> outputItem, this::configure);
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/sandbox/ItemVoid.java b/core/src/mindustry/world/blocks/sandbox/ItemVoid.java
index 8c8bbc75b3..6ba1c9c5a6 100644
--- a/core/src/mindustry/world/blocks/sandbox/ItemVoid.java
+++ b/core/src/mindustry/world/blocks/sandbox/ItemVoid.java
@@ -11,13 +11,13 @@ public class ItemVoid extends Block{
         update = solid = acceptsItems = true;
     }
 
-    public class ItemVoidEntity extends Building{
+    public class ItemVoidBuild extends Building{
         @Override
         public void handleItem(Building source, Item item){}
 
         @Override
         public boolean acceptItem(Building source, Item item){
-            return true;
+            return enabled;
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java
index 2d46d68da4..f2e57156f6 100644
--- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java
+++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java
@@ -24,9 +24,11 @@ public class LiquidSource extends Block{
         configurable = true;
         outputsLiquid = true;
         saveConfig = true;
+        noUpdateDisabled = true;
+        displayFlow = false;
 
-        config(Liquid.class, (LiquidSourceEntity tile, Liquid l) -> tile.source = l);
-        configClear((LiquidSourceEntity tile) -> tile.source = null);
+        config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l);
+        configClear((LiquidSourceBuild tile) -> tile.source = null);
     }
 
     @Override
@@ -41,7 +43,7 @@ public class LiquidSource extends Block{
         drawRequestConfigCenter(req, req.config, "center");
     }
 
-    public class LiquidSourceEntity extends Building{
+    public class LiquidSourceBuild extends Building{
         public @Nullable Liquid source = null;
 
         @Override
@@ -58,7 +60,9 @@ public class LiquidSource extends Block{
         public void draw(){
             super.draw();
 
-            if(source != null){
+            if(source == null){
+                Draw.rect("cross", x, y);
+            }else{
                 Draw.color(source.color);
                 Draw.rect("center", x, y);
                 Draw.color();
@@ -67,7 +71,7 @@ public class LiquidSource extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.liquids(), () -> source, liquid -> configure(liquid));
+            ItemSelection.buildTable(table, content.liquids(), () -> source, this::configure);
         }
 
         @Override
@@ -86,16 +90,21 @@ public class LiquidSource extends Block{
             return source;
         }
 
+        @Override
+        public byte version(){
+            return 1;
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
-            write.b(source == null ? -1 : source.id);
+            write.s(source == null ? -1 : source.id);
         }
 
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
-            byte id = read.b();
+            int id = revision == 1 ? read.s() : read.b();
             source = id == -1 ? null : content.liquid(id);
         }
     }
diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
index 2da9b3b7a0..0f49ffd3a7 100644
--- a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
+++ b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
@@ -19,10 +19,10 @@ public class LiquidVoid extends Block{
         bars.remove("liquid");
     }
 
-    public class LiquidVoidEntity extends Building{
+    public class LiquidVoidBuild extends Building{
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid, float amount){
-            return true;
+            return enabled;
         }
 
         @Override
diff --git a/core/src/mindustry/world/blocks/sandbox/PowerSource.java b/core/src/mindustry/world/blocks/sandbox/PowerSource.java
index 789814828c..fbc24f5ea7 100644
--- a/core/src/mindustry/world/blocks/sandbox/PowerSource.java
+++ b/core/src/mindustry/world/blocks/sandbox/PowerSource.java
@@ -11,10 +11,10 @@ public class PowerSource extends PowerNode{
         consumesPower = false;
     }
 
-    public class PowerSourceEntity extends PowerNodeEntity{
+    public class PowerSourceBuild extends PowerNodeBuild{
         @Override
         public float getPowerProduction(){
-            return 10000f;
+            return enabled ? 10000f : 0f;
         }
     }
 
diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index 80902f9636..3f4aeddde8 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -9,6 +9,7 @@ import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.core.*;
 import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -56,7 +57,7 @@ public class CoreBlock extends StorageBlock{
     public static void playerSpawn(Tile tile, Player player){
         if(player == null || tile == null) return;
 
-        CoreEntity entity = tile.bc();
+        CoreBuild entity = tile.bc();
         CoreBlock block = (CoreBlock)tile.block();
         Fx.spawn.at(entity);
 
@@ -75,12 +76,12 @@ public class CoreBlock extends StorageBlock{
     public void setStats(){
         super.setStats();
 
-        bars.add("capacity", (CoreEntity e) ->
+        bars.add("capacity", (CoreBuild e) ->
             new Bar(
-                () -> Core.bundle.format("bar.capacity", ui.formatAmount(e.storageCapacity)),
+                () -> Core.bundle.format("bar.capacity", UI.formatAmount(e.storageCapacity)),
                 () -> Pal.items,
             () -> e.items.total() / ((float)e.storageCapacity * content.items().count(i -> i.unlockedNow()))
-            ));
+        ));
     }
 
     @Override
@@ -96,10 +97,11 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public boolean canPlaceOn(Tile tile, Team team){
-        CoreEntity core = team.core();
+        if(tile == null) return false;
+        CoreBuild core = team.core();
         //must have all requirements
         if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements))) return false;
-        return canReplace(tile.block());
+        return tile.block() instanceof CoreBlock && size > tile.block().size;
     }
 
     @Override
@@ -124,7 +126,7 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public void beforePlaceBegan(Tile tile, Block previous){
-        if(tile.build instanceof CoreEntity){
+        if(tile.build instanceof CoreBuild){
             //right before placing, create a "destination" item array which is all the previous items minus core requirements
             ItemModule items = tile.build.items.copy();
             if(!state.rules.infiniteResources){
@@ -137,9 +139,11 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
-        if(!canPlaceOn(world.tile(x, y),player.team())){
+        if(world.tile(x, y) == null) return;
 
-            drawPlaceText(Core.bundle.get((player.team().core() != null && player.team().core().items.has(requirements) && !state.rules.infiniteResources) ?
+        if(!canPlaceOn(world.tile(x, y), player.team())){
+
+            drawPlaceText(Core.bundle.get((player.team().core() != null && player.team().core().items.has(requirements)) || state.rules.infiniteResources ?
                 "bar.corereq" :
                 "bar.noresources"
             ), x, y, valid);
@@ -147,10 +151,10 @@ public class CoreBlock extends StorageBlock{
         }
     }
 
-    public class CoreEntity extends Building implements ControlBlock{
+    public class CoreBuild extends Building implements ControlBlock{
         public int storageCapacity;
         //note that this unit is never actually used for control; the possession handler makes the player respawn when this unit is controlled
-        public @NonNull BlockUnitc unit = Nulls.blockUnit;
+        public BlockUnitc unit = Nulls.blockUnit;
 
         @Override
         public void created(){
@@ -176,6 +180,12 @@ public class CoreBlock extends StorageBlock{
             }
         }
 
+        @Override
+        public boolean canPickup(){
+            //cores can never be picked up
+            return false;
+        }
+
         @Override
         public void drawLight(){
             Drawf.light(team, x, y, 30f * size, Pal.accent, 0.5f + Mathf.absin(20f, 0.1f));
@@ -200,15 +210,15 @@ public class CoreBlock extends StorageBlock{
             }
             state.teams.registerCore(this);
 
-            storageCapacity = itemCapacity + proximity().sum(e -> isContainer(e) && owns(e) ? e.block().itemCapacity : 0);
+            storageCapacity = itemCapacity + proximity().sum(e -> isContainer(e) && owns(e) ? e.block.itemCapacity : 0);
             proximity.each(e -> isContainer(e) && owns(e), t -> {
                 t.items = items;
-                ((StorageBlockEntity)t).linkedCore = this;
+                ((StorageBuild)t).linkedCore = this;
             });
 
             for(Building other : state.teams.cores(team)){
                 if(other.tile() == tile) continue;
-                storageCapacity += other.block().itemCapacity + other.proximity().sum(e -> isContainer(e) && owns(other, e) ? e.block().itemCapacity : 0);
+                storageCapacity += other.block.itemCapacity + other.proximity().sum(e -> isContainer(e) && owns(other, e) ? e.block.itemCapacity : 0);
             }
 
             if(!world.isGenerating()){
@@ -217,7 +227,7 @@ public class CoreBlock extends StorageBlock{
                 }
             }
 
-            for(CoreEntity other : state.teams.cores(team)){
+            for(CoreBuild other : state.teams.cores(team)){
                 other.storageCapacity = storageCapacity;
             }
         }
@@ -228,7 +238,7 @@ public class CoreBlock extends StorageBlock{
             Cons<Building> outline = t -> {
                 for(int i = 0; i < 4; i++){
                     Point2 p = Geometry.d8edge[i];
-                    float offset = -Math.max(t.block().size - 1, 0) / 2f * tilesize;
+                    float offset = -Math.max(t.block.size - 1, 0) / 2f * tilesize;
                     Draw.rect("block-select", t.x + offset * p.x, t.y + offset * p.y, i * 90);
                 }
             };
@@ -241,15 +251,15 @@ public class CoreBlock extends StorageBlock{
 
 
         public boolean isContainer(Building tile){
-            return tile instanceof StorageBlockEntity && (((StorageBlockEntity)tile).linkedCore == this || ((StorageBlockEntity)tile).linkedCore == null);
+            return tile instanceof StorageBuild && (((StorageBuild)tile).linkedCore == this || ((StorageBuild)tile).linkedCore == null);
         }
 
         public boolean owns(Building tile){
-            return tile instanceof StorageBlockEntity && (((StorageBlockEntity)tile).linkedCore == this || ((StorageBlockEntity)tile).linkedCore == null);
+            return tile instanceof StorageBuild && (((StorageBuild)tile).linkedCore == this || ((StorageBuild)tile).linkedCore == null);
         }
 
         public boolean owns(Building core, Building tile){
-            return tile instanceof StorageBlockEntity && (((StorageBlockEntity)tile).linkedCore == core || ((StorageBlockEntity)tile).linkedCore == null);
+            return tile instanceof StorageBuild && (((StorageBuild)tile).linkedCore == core || ((StorageBuild)tile).linkedCore == null);
         }
 
         @Override
@@ -266,7 +276,7 @@ public class CoreBlock extends StorageBlock{
             float fract = 1f / total / state.teams.cores(team).size;
 
             proximity.each(e -> isContainer(e) && e.items == items && owns(e), t -> {
-                StorageBlockEntity ent = (StorageBlockEntity)t;
+                StorageBuild ent = (StorageBuild)t;
                 ent.linkedCore = null;
                 ent.items = new ItemModule();
                 for(Item item : content.items()){
@@ -281,7 +291,7 @@ public class CoreBlock extends StorageBlock{
                 items.set(item, Math.min(items.get(item), max));
             }
 
-            for(CoreEntity other : state.teams.cores(team)){
+            for(CoreBuild other : state.teams.cores(team)){
                 other.onProximityUpdate();
             }
         }
diff --git a/core/src/mindustry/world/blocks/storage/StorageBlock.java b/core/src/mindustry/world/blocks/storage/StorageBlock.java
index 81f9e47f79..29059a25c7 100644
--- a/core/src/mindustry/world/blocks/storage/StorageBlock.java
+++ b/core/src/mindustry/world/blocks/storage/StorageBlock.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.storage;
 
+import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -20,7 +21,7 @@ public abstract class StorageBlock extends Block{
         return false;
     }
 
-    public class StorageBlockEntity extends Building{
+    public class StorageBuild extends Building{
         protected @Nullable Building linkedCore;
 
         @Override
@@ -39,5 +40,22 @@ public abstract class StorageBlock extends Block{
                 linkedCore.drawSelect();
             }
         }
+
+        @Override
+        public void overwrote(Seq<Building> previous){
+            for(Building other : previous){
+                if(other.items != null){
+                    items.addAll(other.items);
+                }
+            }
+
+            //ensure item counts are not too high
+            items.each((i, a) -> items.set(i, Math.min(a, itemCapacity)));
+        }
+
+        @Override
+        public boolean canPickup(){
+            return linkedCore == null;
+        }
     }
 }
diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java
index 7111283d36..86ce15956e 100644
--- a/core/src/mindustry/world/blocks/storage/Unloader.java
+++ b/core/src/mindustry/world/blocks/storage/Unloader.java
@@ -26,9 +26,10 @@ public class Unloader extends Block{
         configurable = true;
         saveConfig = true;
         itemCapacity = 0;
+        noUpdateDisabled = true;
 
-        config(Item.class, (UnloaderEntity tile, Item item) -> tile.sortItem = item);
-        configClear((UnloaderEntity tile) -> tile.sortItem = null);
+        config(Item.class, (UnloaderBuild tile, Item item) -> tile.sortItem = item);
+        configClear((UnloaderBuild tile) -> tile.sortItem = null);
     }
 
     @Override
@@ -42,7 +43,7 @@ public class Unloader extends Block{
         bars.remove("items");
     }
 
-    public class UnloaderEntity extends Building{
+    public class UnloaderBuild extends Building{
         public Item sortItem = null;
         public Building dumpingTo;
 
@@ -50,7 +51,7 @@ public class Unloader extends Block{
         public void updateTile(){
             if(timer(timerUnload, speed / timeScale())){
                 for(Building other : proximity){
-                    if(other.interactable(team) && other.block().unloadable && other.block().hasItems
+                    if(other.interactable(team) && other.block.unloadable && other.block.hasItems
                         && ((sortItem == null && other.items.total() > 0) || (sortItem != null && other.items.has(sortItem)))){
                         //make sure the item can't be dumped back into this block
                         dumpingTo = other;
@@ -82,7 +83,7 @@ public class Unloader extends Block{
 
         @Override
         public void buildConfiguration(Table table){
-            ItemSelection.buildTable(table, content.items(), () -> tile.<UnloaderEntity>bc().sortItem, item -> configure(item));
+            ItemSelection.buildTable(table, content.items(), () -> sortItem, this::configure);
         }
 
         @Override
@@ -98,7 +99,7 @@ public class Unloader extends Block{
 
         @Override
         public boolean canDump(Building to, Item item){
-            return !(to.block() instanceof StorageBlock) && to != dumpingTo;
+            return !(to.block instanceof StorageBlock) && to != dumpingTo;
         }
 
         @Override
@@ -106,16 +107,21 @@ public class Unloader extends Block{
             return sortItem;
         }
 
+        @Override
+        public byte version(){
+            return 1;
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
-            write.b(sortItem == null ? -1 : sortItem.id);
+            write.s(sortItem == null ? -1 : sortItem.id);
         }
 
         @Override
         public void read(Reads read, byte revision){
             super.read(read, revision);
-            byte id = read.b();
+            int id = revision == 1 ? read.s() : read.b();
             sortItem = id == -1 ? null : content.items().get(id);
         }
     }
diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java
new file mode 100644
index 0000000000..a8ffa3c3e9
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/CommandCenter.java
@@ -0,0 +1,97 @@
+package mindustry.world.blocks.units;
+
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.scene.style.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.ui.*;
+import mindustry.world.*;
+import mindustry.world.meta.*;
+
+public class CommandCenter extends Block{
+    public TextureRegionDrawable[] commandRegions = new TextureRegionDrawable[UnitCommand.all.length];
+    public Color topColor = null, bottomColor = Color.valueOf("5e5e5e");
+    public Effect effect = Fx.commandSend;
+
+    public CommandCenter(String name){
+        super(name);
+
+        flags = EnumSet.of(BlockFlag.rally);
+        destructible = true;
+        solid = true;
+        configurable = true;
+
+        config(UnitCommand.class, (CommandBuild build, UnitCommand command) -> {
+            build.team.data().command = command;
+            effect.at(build);
+        });
+    }
+
+    @Override
+    public void load(){
+        super.load();
+
+        if(Vars.ui != null){
+            for(UnitCommand cmd : UnitCommand.all){
+                commandRegions[cmd.ordinal()] = Vars.ui.getIcon("command" + Strings.capitalize(cmd.name()), "cancel");
+            }
+        }
+    }
+
+    public class CommandBuild extends Building{
+
+        @Override
+        public Object config(){
+            return team.data().command;
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            float size = 6f;
+
+            Draw.color(bottomColor);
+            Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy() - 1, size, size);
+            Draw.color(topColor == null ? team.color : topColor);
+            Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy(), size, size);
+            Draw.color();
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            ButtonGroup<ImageButton> group = new ButtonGroup<>();
+            Table buttons = new Table();
+
+            for(UnitCommand cmd : UnitCommand.all){
+                buttons.button(commandRegions[cmd.ordinal()], Styles.clearToggleTransi, () -> {
+                    if(team.data().command != cmd) configure(cmd);
+                }).size(44).group(group).update(b -> b.setChecked(team.data().command == cmd));
+            }
+            table.add(buttons);
+            table.row();
+            table.label(() -> team.data().command.localized()).style(Styles.outlineLabel).center().growX().get().setAlignment(Align.center);
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.b(team.data().command.ordinal());
+        }
+
+        @Override
+        public void read(Reads read, byte version){
+            super.read(read, version);
+            team.data().command = UnitCommand.all[read.b()];
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/mindustry/world/blocks/units/ControlCenter.java b/core/src/mindustry/world/blocks/units/ControlCenter.java
new file mode 100644
index 0000000000..ab99470b93
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/ControlCenter.java
@@ -0,0 +1,16 @@
+package mindustry.world.blocks.units;
+
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class ControlCenter extends Block{
+
+    public ControlCenter(String name){
+        super(name);
+        update = true;
+    }
+
+    public class ControlCenterBuild extends Building{
+
+    }
+}
diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java
index 38e02628d3..fa2783f30f 100644
--- a/core/src/mindustry/world/blocks/units/Reconstructor.java
+++ b/core/src/mindustry/world/blocks/units/Reconstructor.java
@@ -1,8 +1,10 @@
 package mindustry.world.blocks.units;
 
+import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
+import arc.util.io.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.entities.*;
@@ -41,7 +43,19 @@ public class Reconstructor extends UnitBlock{
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("progress", (ReconstructorEntity entity) -> new Bar("bar.progress", Pal.ammo, entity::fraction));
+
+        bars.add("progress", (ReconstructorBuild entity) -> new Bar("bar.progress", Pal.ammo, entity::fraction));
+        bars.add("units", (ReconstructorBuild e) ->
+        new Bar(
+            () -> e.unit() == null ? "[lightgray]" + Iconc.cancel :
+                Core.bundle.format("bar.unitcap",
+                Fonts.getUnicodeStr(e.unit().name),
+                teamIndex.countType(e.team, e.unit()),
+                Units.getCap(e.team)
+            ),
+            () -> Pal.power,
+            () -> e.unit() == null ? 0f : (float)teamIndex.countType(e.team, e.unit()) / Units.getCap(e.team)
+        ));
     }
 
     @Override
@@ -64,7 +78,7 @@ public class Reconstructor extends UnitBlock{
         super.init();
     }
 
-    public class ReconstructorEntity extends UnitBlockEntity{
+    public class ReconstructorBuild extends UnitBuild{
 
         public float fraction(){
             return progress / constructTime;
@@ -73,7 +87,7 @@ public class Reconstructor extends UnitBlock{
         @Override
         public boolean acceptPayload(Building source, Payload payload){
             return this.payload == null
-                && relativeTo(source) != rotation()
+                && relativeTo(source) != rotation
                 && payload instanceof UnitPayload
                 && hasUpgrade(((UnitPayload)payload).unit.type());
         }
@@ -89,7 +103,7 @@ public class Reconstructor extends UnitBlock{
 
             //draw input
             for(int i = 0; i < 4; i++){
-                if(blends(i) && i != rotation()){
+                if(blends(i) && i != rotation){
                     Draw.rect(inRegion, x, y, i * 90);
                 }
             }
@@ -126,14 +140,14 @@ public class Reconstructor extends UnitBlock{
                     if(moveInPayload()){
                         if(consValid()){
                             valid = true;
-                            progress += edelta();
+                            progress += edelta() * state.rules.unitBuildSpeedMultiplier;
                         }
 
                         //upgrade the unit
                         if(progress >= constructTime){
                             payload.unit = upgrade(payload.unit.type()).create(payload.unit.team());
                             progress = 0;
-                            Effects.shake(2f, 3f, this);
+                            Effect.shake(2f, 3f, this);
                             Fx.producesmoke.at(this);
                             consume();
                         }
@@ -145,17 +159,53 @@ public class Reconstructor extends UnitBlock{
             time += edelta() * speedScl * state.rules.unitBuildSpeedMultiplier;
         }
 
+        @Override
+        public boolean shouldConsume(){
+            return constructing();
+        }
+
+        public UnitType unit(){
+            if(payload == null) return null;
+
+            UnitType t = upgrade(payload.unit.type());
+            return t != null && t.unlockedNow() ? t : null;
+        }
+
         public boolean constructing(){
             return payload != null && hasUpgrade(payload.unit.type());
         }
 
         public boolean hasUpgrade(UnitType type){
-            return upgrade(type) != null;
+            UnitType t = upgrade(type);
+            return t != null && t.unlockedNow();
         }
 
         public UnitType upgrade(UnitType type){
             UnitType[] r =  Structs.find(upgrades, arr -> arr[0] == type);
             return r == null ? null : r[1];
         }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.f(progress);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            if(revision == 1){
+                progress = read.f();
+            }
+
+        }
+
     }
 }
diff --git a/core/src/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java
index a5a5646dc6..abcc4bf738 100644
--- a/core/src/mindustry/world/blocks/units/RepairPoint.java
+++ b/core/src/mindustry/world/blocks/units/RepairPoint.java
@@ -16,7 +16,7 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class RepairPoint extends Block{
-    private static final Rect rect = new Rect();
+    static final Rect rect = new Rect();
 
     public int timerTarget = timers++;
 
@@ -47,7 +47,7 @@ public class RepairPoint extends Block{
 
     @Override
     public void init(){
-        consumes.powerCond(powerUse, entity -> ((RepairPointEntity)entity).target != null);
+        consumes.powerCond(powerUse, entity -> ((RepairPointBuild)entity).target != null);
         super.init();
     }
 
@@ -61,7 +61,7 @@ public class RepairPoint extends Block{
         return new TextureRegion[]{baseRegion, region};
     }
 
-    public class RepairPointEntity extends Building{
+    public class RepairPointBuild extends Building{
         public Unit target;
         public float strength, rotation = 90;
 
@@ -70,10 +70,11 @@ public class RepairPoint extends Block{
             Draw.rect(baseRegion, x, y);
 
             Draw.z(Layer.turret);
+            Drawf.shadow(region, x - (size / 2f), y - (size / 2f), rotation - 90);
             Draw.rect(region, x, y, rotation - 90);
 
             if(target != null && Angles.angleDist(angleTo(target), rotation) < 30f){
-                Draw.z(Layer.power);
+                Draw.z(Layer.flyingUnit + 1); //above all units
                 float ang = angleTo(target);
                 float len = 5f;
 
@@ -115,7 +116,7 @@ public class RepairPoint extends Block{
 
         @Override
         public boolean shouldConsume(){
-            return target != null;
+            return target != null && enabled;
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/units/ResupplyPoint.java b/core/src/mindustry/world/blocks/units/ResupplyPoint.java
index 5baa7f5f3b..c6d5e0aa18 100644
--- a/core/src/mindustry/world/blocks/units/ResupplyPoint.java
+++ b/core/src/mindustry/world/blocks/units/ResupplyPoint.java
@@ -1,10 +1,13 @@
 package mindustry.world.blocks.units;
 
+import arc.func.*;
 import arc.graphics.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.type.AmmoTypes.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
@@ -33,7 +36,7 @@ public class ResupplyPoint extends Block{
         Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, Pal.placing);
     }
 
-    public class ResupplyPointEntity extends Building{
+    public class ResupplyPointBuild extends Building{
 
         @Override
         public void drawSelect(){
@@ -50,13 +53,19 @@ public class ResupplyPoint extends Block{
 
     /** Tries to resupply nearby units.
      * @return whether resupplying was successful. If unit ammo is disabled, always returns false. */
-    public static boolean resupply(Building tile, float range, int ammoAmount, Color ammoColor){
+    public static boolean resupply(Building tile, float range, float ammoAmount, Color ammoColor){
+        return resupply(tile.team, tile.x, tile.y, range, ammoAmount, ammoColor, u -> true);
+    }
+
+    /** Tries to resupply nearby units.
+     * @return whether resupplying was successful. If unit ammo is disabled, always returns false. */
+    public static boolean resupply(Team team, float x, float y, float range, float ammoAmount, Color ammoColor, Boolf<Unit> valid){
         if(!state.rules.unitAmmo) return false;
 
-        Unit unit = Units.closest(tile.team, tile.x, tile.y, range, u -> u.ammo() <= u.type().ammoCapacity - ammoAmount);
+        Unit unit = Units.closest(team, x, y, range, u -> u.type().ammoType instanceof ItemAmmoType && u.ammo <= u.type().ammoCapacity - ammoAmount && valid.get(u));
         if(unit != null){
-            Fx.itemTransfer.at(tile.x, tile.y, ammoAmount / 2f, ammoColor, unit);
-            unit.ammo(Math.min(unit.ammo() + ammoAmount, unit.type().ammoCapacity));
+            Fx.itemTransfer.at(x, y, ammoAmount / 2f, ammoColor, unit);
+            unit.ammo = Math.min(unit.ammo + ammoAmount, unit.type().ammoCapacity);
             return true;
         }
 
diff --git a/core/src/mindustry/world/blocks/units/UnitBlock.java b/core/src/mindustry/world/blocks/units/UnitBlock.java
index e8cf5b0903..d1bce06795 100644
--- a/core/src/mindustry/world/blocks/units/UnitBlock.java
+++ b/core/src/mindustry/world/blocks/units/UnitBlock.java
@@ -26,11 +26,11 @@ public class UnitBlock extends PayloadAcceptor{
 
     @Remote(called = Loc.server)
     public static void unitBlockSpawn(Tile tile){
-        if(!(tile.build instanceof UnitBlockEntity)) return;
-        tile.<UnitBlockEntity>bc().spawned();
+        if(!(tile.build instanceof UnitBuild)) return;
+        tile.<UnitBuild>bc().spawned();
     }
 
-    public class UnitBlockEntity extends PayloadAcceptorEntity<UnitPayload>{
+    public class UnitBuild extends PayloadAcceptorBuild<UnitPayload>{
         public float progress, time, speedScl;
 
         public void spawned(){
@@ -55,7 +55,9 @@ public class UnitBlock extends PayloadAcceptor{
 
         @Override
         public void dumpPayload(){
-            Call.unitBlockSpawn(tile);
+            if(payload.dump()){
+                Call.unitBlockSpawn(tile);
+            }
         }
     }
 }
diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java
index f2804359b4..1e71caa8cb 100644
--- a/core/src/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/mindustry/world/blocks/units/UnitFactory.java
@@ -41,12 +41,12 @@ public class UnitFactory extends UnitBlock{
         outputsPayload = true;
         rotate = true;
 
-        config(Integer.class, (UnitFactoryEntity tile, Integer i) -> {
+        config(Integer.class, (UnitFactoryBuild tile, Integer i) -> {
             tile.currentPlan = i < 0 || i >= plans.length ? -1 : i;
             tile.progress = 0;
         });
 
-        consumes.add(new ConsumeItemDynamic((UnitFactoryEntity e) -> e.currentPlan != -1 ? plans[e.currentPlan].requirements : ItemStack.empty));
+        consumes.add(new ConsumeItemDynamic((UnitFactoryBuild e) -> e.currentPlan != -1 ? plans[e.currentPlan].requirements : ItemStack.empty));
     }
 
     @Override
@@ -65,9 +65,9 @@ public class UnitFactory extends UnitBlock{
     @Override
     public void setBars(){
         super.setBars();
-        bars.add("progress", (UnitFactoryEntity e) -> new Bar("bar.progress", Pal.ammo, e::fraction));
+        bars.add("progress", (UnitFactoryBuild e) -> new Bar("bar.progress", Pal.ammo, e::fraction));
 
-        bars.add("units", (UnitFactoryEntity e) ->
+        bars.add("units", (UnitFactoryBuild e) ->
         new Bar(
             () -> e.unit() == null ? "[lightgray]" + Iconc.cancel :
                 Core.bundle.format("bar.unitcap",
@@ -118,7 +118,7 @@ public class UnitFactory extends UnitBlock{
         UnitPlan(){}
     }
 
-    public class UnitFactoryEntity extends UnitBlockEntity{
+    public class UnitFactoryBuild extends UnitBuild{
         public int currentPlan = -1;
 
         public float fraction(){
@@ -127,9 +127,13 @@ public class UnitFactory extends UnitBlock{
 
         @Override
         public void buildConfiguration(Table table){
-            Seq<UnitType> units = Seq.with(plans).map(u -> u.unit);
+            Seq<UnitType> units = Seq.with(plans).map(u -> u.unit).filter(u -> u.unlockedNow());
 
-            ItemSelection.buildTable(table, units, () -> currentPlan == -1 ? null : plans[currentPlan].unit, unit -> configure(units.indexOf(unit)));
+            if(units.any()){
+                ItemSelection.buildTable(table, units, () -> currentPlan == -1 ? null : plans[currentPlan].unit, unit -> configure(Structs.indexOf(plans, u -> u.unit == unit)));
+            }else{
+                table.table(Styles.black3, t -> t.add("@none").color(Color.lightGray));
+            }
         }
 
         @Override
@@ -151,7 +155,7 @@ public class UnitFactory extends UnitBlock{
                     i.setScaling(Scaling.fit);
                     i.setColor(currentPlan == -1 ? Color.lightGray : Color.white);
                 }).size(32).padBottom(-4).padRight(2);
-                t.label(() -> currentPlan == -1 ? "$none" : plans[currentPlan].unit.localizedName).color(Color.lightGray);
+                t.label(() -> currentPlan == -1 ? "@none" : plans[currentPlan].unit.localizedName).color(Color.lightGray);
             }).left();
         }
 
@@ -215,11 +219,8 @@ public class UnitFactory extends UnitBlock{
 
         @Override
         public boolean shouldConsume(){
-            //do not consume when cap reached
-            if(currentPlan != -1 && !Units.canCreate(team, plans[currentPlan].unit)){
-                return false;
-            }
-            return super.shouldConsume();
+            if(currentPlan == -1) return false;
+            return enabled && payload == null;
         }
 
         @Override
diff --git a/core/src/mindustry/world/consumers/ConsumeItemDynamic.java b/core/src/mindustry/world/consumers/ConsumeItemDynamic.java
index cc68185fd3..a2dd079c20 100644
--- a/core/src/mindustry/world/consumers/ConsumeItemDynamic.java
+++ b/core/src/mindustry/world/consumers/ConsumeItemDynamic.java
@@ -1,17 +1,15 @@
 package mindustry.world.consumers;
 
 import arc.func.*;
-import arc.math.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.meta.*;
 
 public class ConsumeItemDynamic extends Consume{
-    public final @NonNull Func<Building, ItemStack[]> items;
+    public final Func<Building, ItemStack[]> items;
 
     public <T extends Building> ConsumeItemDynamic(Func<T, ItemStack[]> items){
         this.items = (Func<Building, ItemStack[]>)items;
@@ -31,20 +29,24 @@ public class ConsumeItemDynamic extends Consume{
     public void build(Building tile, Table table){
         ItemStack[][] current = {items.get(tile)};
 
-        table.update(() -> {
-            if(current[0] != items.get(tile)){
-                rebuild(tile, table);
-                current[0] = items.get(tile);
-            }
-        });
+        table.table(cont -> {
+            table.update(() -> {
+                if(current[0] != items.get(tile)){
+                    rebuild(tile, cont);
+                    current[0] = items.get(tile);
+                }
+            });
 
-        rebuild(tile, table);
+            rebuild(tile, cont);
+        });
     }
 
     private void rebuild(Building tile, Table table){
+        table.clear();
+
         for(ItemStack stack : items.get(tile)){
             table.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount),
-            () -> tile.items != null && tile.items.has(stack.item, stack.amount))).size(8 * 4).padRight(6 * Mathf.digits(stack.amount));
+            () -> tile.items != null && tile.items.has(stack.item, stack.amount))).padRight(8);
         }
     }
 
diff --git a/core/src/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/mindustry/world/consumers/ConsumeItemFilter.java
index a8b3cf1292..e9e98041c4 100644
--- a/core/src/mindustry/world/consumers/ConsumeItemFilter.java
+++ b/core/src/mindustry/world/consumers/ConsumeItemFilter.java
@@ -1,9 +1,8 @@
 package mindustry.world.consumers;
 
-import arc.struct.*;
 import arc.func.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
+import arc.struct.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
@@ -13,8 +12,7 @@ import mindustry.world.meta.values.*;
 import static mindustry.Vars.*;
 
 public class ConsumeItemFilter extends Consume{
-    public final @NonNull
-    Boolf<Item> filter;
+    public final Boolf<Item> filter;
 
     public ConsumeItemFilter(Boolf<Item> item){
         this.filter = item;
diff --git a/core/src/mindustry/world/consumers/ConsumeItems.java b/core/src/mindustry/world/consumers/ConsumeItems.java
index 53eb92ebae..01909e2a14 100644
--- a/core/src/mindustry/world/consumers/ConsumeItems.java
+++ b/core/src/mindustry/world/consumers/ConsumeItems.java
@@ -1,9 +1,7 @@
 package mindustry.world.consumers;
 
-import arc.math.*;
-import arc.struct.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
+import arc.struct.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
@@ -11,7 +9,7 @@ import mindustry.world.meta.*;
 import mindustry.world.meta.values.*;
 
 public class ConsumeItems extends Consume{
-    public final @NonNull ItemStack[] items;
+    public final ItemStack[] items;
 
     public ConsumeItems(ItemStack[] items){
         this.items = items;
@@ -38,7 +36,7 @@ public class ConsumeItems extends Consume{
     public void build(Building tile, Table table){
         for(ItemStack stack : items){
             table.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount),
-                () -> tile.items != null && tile.items.has(stack.item, stack.amount))).size(8 * 4).padRight(Mathf.digits(stack.amount) * 6);
+                () -> tile.items != null && tile.items.has(stack.item, stack.amount))).padRight(8);
         }
     }
 
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquid.java b/core/src/mindustry/world/consumers/ConsumeLiquid.java
index ae9998db12..90f3bf0687 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquid.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquid.java
@@ -1,15 +1,14 @@
 package mindustry.world.consumers;
 
-import arc.struct.*;
 import arc.scene.ui.layout.*;
-import arc.util.ArcAnnotate.*;
+import arc.struct.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.meta.*;
 
 public class ConsumeLiquid extends ConsumeLiquidBase{
-    public final @NonNull Liquid liquid;
+    public final Liquid liquid;
 
     public ConsumeLiquid(Liquid liquid, float amount){
         super(amount);
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidBase.java b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
index 323a2897ac..f2cae7676e 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
@@ -23,6 +23,6 @@ public abstract class ConsumeLiquidBase extends Consume{
     }
 
     protected float use(Building entity){
-        return Math.min(amount * entity.delta(), entity.block().liquidCapacity);
+        return Math.min(amount * entity.delta(), entity.block.liquidCapacity);
     }
 }
diff --git a/core/src/mindustry/world/consumers/Consumers.java b/core/src/mindustry/world/consumers/Consumers.java
index febf111f53..8683c6d158 100644
--- a/core/src/mindustry/world/consumers/Consumers.java
+++ b/core/src/mindustry/world/consumers/Consumers.java
@@ -34,6 +34,10 @@ public class Consumers{
         return get(ConsumeType.power);
     }
 
+    public ConsumeItems getItem(){
+        return get(ConsumeType.item);
+    }
+
     public boolean hasPower(){
         return has(ConsumeType.power);
     }
@@ -52,8 +56,8 @@ public class Consumers{
     }
 
     /** Creates a consumer which only consumes power when the condition is met. */
-    public ConsumePower powerCond(float usage, Boolf<Building> cons){
-        return add(new ConditionalConsumePower(usage, cons));
+    public <T extends Building> ConsumePower powerCond(float usage, Boolf<T> cons){
+        return add(new ConditionalConsumePower(usage, (Boolf<Building>)cons));
     }
 
     /**
diff --git a/core/src/mindustry/world/draw/DrawAnimation.java b/core/src/mindustry/world/draw/DrawAnimation.java
index 1187cdf498..1bb9d92982 100644
--- a/core/src/mindustry/world/draw/DrawAnimation.java
+++ b/core/src/mindustry/world/draw/DrawAnimation.java
@@ -15,7 +15,7 @@ public class DrawAnimation extends DrawBlock{
     public TextureRegion liquid, top;
 
     @Override
-    public void draw(GenericCrafterEntity entity){
+    public void draw(GenericCrafterBuild entity){
         Draw.rect(entity.block.region, entity.x, entity.y);
         Draw.rect(
             sine ?
diff --git a/core/src/mindustry/world/draw/DrawBlock.java b/core/src/mindustry/world/draw/DrawBlock.java
index 0752c66602..d40d8fe583 100644
--- a/core/src/mindustry/world/draw/DrawBlock.java
+++ b/core/src/mindustry/world/draw/DrawBlock.java
@@ -9,7 +9,7 @@ import mindustry.world.blocks.production.GenericCrafter.*;
 public class DrawBlock{
 
     /** Draws the block. */
-    public void draw(GenericCrafterEntity entity){
+    public void draw(GenericCrafterBuild entity){
         Draw.rect(entity.block.region, entity.x, entity.y, entity.block.rotate ? entity.rotdeg() : 0);
     }
 
diff --git a/core/src/mindustry/world/draw/DrawGlow.java b/core/src/mindustry/world/draw/DrawGlow.java
index 27ae1233da..d15d477b61 100644
--- a/core/src/mindustry/world/draw/DrawGlow.java
+++ b/core/src/mindustry/world/draw/DrawGlow.java
@@ -11,7 +11,7 @@ public class DrawGlow extends DrawBlock{
     public TextureRegion top;
 
     @Override
-    public void draw(GenericCrafterEntity entity){
+    public void draw(GenericCrafterBuild entity){
         Draw.rect(entity.block.region, entity.x, entity.y);
         Draw.alpha(Mathf.absin(entity.totalProgress, glowScale, glowAmount) * entity.warmup);
         Draw.rect(top, entity.x, entity.y);
diff --git a/core/src/mindustry/world/draw/DrawMixer.java b/core/src/mindustry/world/draw/DrawMixer.java
index 50ad9e011d..bb785e01f0 100644
--- a/core/src/mindustry/world/draw/DrawMixer.java
+++ b/core/src/mindustry/world/draw/DrawMixer.java
@@ -10,7 +10,7 @@ public class DrawMixer extends DrawBlock{
     public TextureRegion liquid, top, bottom;
 
     @Override
-    public void draw(GenericCrafterEntity entity){
+    public void draw(GenericCrafterBuild entity){
         float rotation = entity.block.rotate ? entity.rotdeg() : 0;
 
         Draw.rect(bottom, entity.x, entity.y, rotation);
diff --git a/core/src/mindustry/world/draw/DrawRotator.java b/core/src/mindustry/world/draw/DrawRotator.java
index ef326f4e32..ca92aaf351 100644
--- a/core/src/mindustry/world/draw/DrawRotator.java
+++ b/core/src/mindustry/world/draw/DrawRotator.java
@@ -9,7 +9,7 @@ public class DrawRotator extends DrawBlock{
     public TextureRegion rotator;
 
     @Override
-    public void draw(GenericCrafterEntity entity){
+    public void draw(GenericCrafterBuild entity){
         Draw.rect(entity.block.region, entity.x, entity.y);
         Draw.rect(rotator, entity.x, entity.y, entity.totalProgress * 2f);
     }
diff --git a/core/src/mindustry/world/draw/DrawWeave.java b/core/src/mindustry/world/draw/DrawWeave.java
index bec6dee354..5ccd476b5f 100644
--- a/core/src/mindustry/world/draw/DrawWeave.java
+++ b/core/src/mindustry/world/draw/DrawWeave.java
@@ -12,7 +12,7 @@ public class DrawWeave extends DrawBlock{
     public TextureRegion weave, bottom;
 
     @Override
-    public void draw(GenericCrafterEntity entity){
+    public void draw(GenericCrafterBuild entity){
         Draw.rect(bottom, entity.x, entity.y);
         Draw.rect(weave, entity.x, entity.y, entity.totalProgress);
 
diff --git a/core/src/mindustry/world/meta/Attribute.java b/core/src/mindustry/world/meta/Attribute.java
index 815f471c9d..07699ba6b3 100644
--- a/core/src/mindustry/world/meta/Attribute.java
+++ b/core/src/mindustry/world/meta/Attribute.java
@@ -1,5 +1,7 @@
 package mindustry.world.meta;
 
+import mindustry.*;
+
 public enum Attribute{
     /** Heat of this block. Used for calculating output of thermal generators. */
     heat,
@@ -8,5 +10,15 @@ public enum Attribute{
     /** Water content of this block. Used for increasing water extractor yield. */
     water,
     /** Oil content of this block. Used for increasing oil extractor yield. */
-    oil
+    oil,
+    /** Light coverage. Negative values decrease solar panel efficiency. */
+    light;
+
+    public static final Attribute[] all = values();
+
+    /** @return the envrionmental value for this attribute. */
+    public float env(){
+        if(Vars.state == null) return 0;
+        return Vars.state.envAttrs.get(this);
+    }
 }
diff --git a/core/src/mindustry/world/meta/BlockFlag.java b/core/src/mindustry/world/meta/BlockFlag.java
index 2308448e45..c818ba642a 100644
--- a/core/src/mindustry/world/meta/BlockFlag.java
+++ b/core/src/mindustry/world/meta/BlockFlag.java
@@ -10,8 +10,10 @@ public enum BlockFlag{
     turret,
     /** Repair point. */
     repair,
-    /** Rally point. TODO remove*/
+    /** Rally point. */
     rally,
+    /** Block that stored power for resupply. */
+    powerResupply,
     /** Any block that boosts unit capacity. */
     unitModifier;
 
diff --git a/core/src/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java
index 24e8166990..2b3434ccfb 100644
--- a/core/src/mindustry/world/meta/BlockGroup.java
+++ b/core/src/mindustry/world/meta/BlockGroup.java
@@ -1,5 +1,5 @@
 package mindustry.world.meta;
 
 public enum BlockGroup{
-    none, walls, turrets, transportation, power, liquids, drills
+    none, walls, turrets, transportation, power, liquids, drills, storage
 }
diff --git a/core/src/mindustry/world/meta/BlockStat.java b/core/src/mindustry/world/meta/BlockStat.java
index 089ad53e45..720f4c3d8e 100644
--- a/core/src/mindustry/world/meta/BlockStat.java
+++ b/core/src/mindustry/world/meta/BlockStat.java
@@ -8,12 +8,15 @@ import java.util.Locale;
 public enum BlockStat{
     health(StatCategory.general),
     size(StatCategory.general),
+    displaySize(StatCategory.general),
     buildTime(StatCategory.general),
     buildCost(StatCategory.general),
+    memoryCapacity(StatCategory.general),
 
     itemCapacity(StatCategory.items),
     itemsMoved(StatCategory.items),
     launchTime(StatCategory.items),
+    maxConsecutive(StatCategory.items),
 
     liquidCapacity(StatCategory.liquids),
 
@@ -31,6 +34,8 @@ public enum BlockStat{
     drillTier(StatCategory.crafting),
     drillSpeed(StatCategory.crafting),
     maxUnits(StatCategory.crafting),
+    linkRange(StatCategory.crafting),
+    instructions(StatCategory.crafting),
 
     speedIncrease(StatCategory.shooting),
     repairTime(StatCategory.shooting),
@@ -44,6 +49,8 @@ public enum BlockStat{
     targetsGround(StatCategory.shooting),
     damage(StatCategory.shooting),
     ammo(StatCategory.shooting),
+    shieldHealth(StatCategory.shooting),
+    cooldownTime(StatCategory.shooting),
 
     booster(StatCategory.optional),
     boostEffect(StatCategory.optional),
diff --git a/core/src/mindustry/world/meta/BlockStats.java b/core/src/mindustry/world/meta/BlockStats.java
index 2917a92aa3..e119ff8a74 100644
--- a/core/src/mindustry/world/meta/BlockStats.java
+++ b/core/src/mindustry/world/meta/BlockStats.java
@@ -38,12 +38,20 @@ public class BlockStats{
     }
 
     public void add(BlockStat stat, Attribute attr){
-        add(stat, attr, 1f);
+        add(stat, attr, false, 1f);
     }
 
     public void add(BlockStat stat, Attribute attr, float scale){
+        add(stat, attr, false, scale);
+    }
+
+    public void add(BlockStat stat, Attribute attr, boolean floating){
+        add(stat, attr, floating, 1f);
+    }
+
+    public void add(BlockStat stat, Attribute attr, boolean floating, float scale){
         for(Block block : Vars.content.blocks()){
-            if(!block.isFloor() || block.asFloor().attributes.get(attr) == 0) continue;
+            if(!block.isFloor() || block.asFloor().attributes.get(attr) == 0 || (block.asFloor().isLiquid && !floating)) continue;
             add(stat, new FloorEfficiencyValue(block.asFloor(), block.asFloor().attributes.get(attr) * scale));
         }
     }
diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java
index 5136280e8a..0466b4f139 100644
--- a/core/src/mindustry/world/meta/StatUnit.java
+++ b/core/src/mindustry/world/meta/StatUnit.java
@@ -16,9 +16,12 @@ public enum StatUnit{
     powerUnits,
     degrees,
     seconds,
+    minutes,
     perSecond,
+    perMinute,
     timesSpeed(false),
     percent(false),
+    shieldHealth,
     none,
     items;
 
diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java
index 0e9588dfbd..1f16f36a08 100644
--- a/core/src/mindustry/world/meta/values/AmmoListValue.java
+++ b/core/src/mindustry/world/meta/values/AmmoListValue.java
@@ -33,7 +33,7 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
             table.table(Tex.underline, bt -> {
                 bt.left().defaults().padRight(3).left();
 
-                if(type.damage > 0 && type.collides){
+                if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){
                     bt.add(Core.bundle.format("bullet.damage", type.damage));
                 }
 
@@ -51,27 +51,27 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
                 }
 
                 if((type.status == StatusEffects.burning || type.status == StatusEffects.melting) || type.incendAmount > 0){
-                    sep(bt, "$bullet.incendiary");
+                    sep(bt, "@bullet.incendiary");
                 }
 
                 if(type.status == StatusEffects.freezing){
-                    sep(bt, "$bullet.freezing");
+                    sep(bt, "@bullet.freezing");
                 }
 
                 if(type.status == StatusEffects.tarred){
-                    sep(bt, "$bullet.tarred");
+                    sep(bt, "@bullet.tarred");
                 }
 
                 if(type.homingPower > 0.01f){
-                    sep(bt, "$bullet.homing");
+                    sep(bt, "@bullet.homing");
                 }
 
                 if(type.lightning > 0){
-                    sep(bt, "$bullet.shock");
+                    sep(bt, "@bullet.shock");
                 }
 
                 if(type.fragBullet != null){
-                    sep(bt, "$bullet.frag");
+                    sep(bt, "@bullet.frag");
                 }
             }).left().padTop(-9);
             table.row();
diff --git a/core/src/mindustry/world/meta/values/BooleanValue.java b/core/src/mindustry/world/meta/values/BooleanValue.java
index 7f399ca702..d0fe3518ce 100644
--- a/core/src/mindustry/world/meta/values/BooleanValue.java
+++ b/core/src/mindustry/world/meta/values/BooleanValue.java
@@ -12,6 +12,6 @@ public class BooleanValue implements StatValue{
 
     @Override
     public void display(Table table){
-        table.add(!value ? "$no" : "$yes");
+        table.add(!value ? "@no" : "@yes");
     }
 }
diff --git a/core/src/mindustry/world/modules/BlockModule.java b/core/src/mindustry/world/modules/BlockModule.java
index 974f43656f..fc61966a46 100644
--- a/core/src/mindustry/world/modules/BlockModule.java
+++ b/core/src/mindustry/world/modules/BlockModule.java
@@ -5,5 +5,12 @@ import arc.util.io.*;
 /** A class that represents compartmentalized tile entity state. */
 public abstract class BlockModule{
     public abstract void write(Writes write);
-    public abstract void read(Reads read);
+
+    public void read(Reads read, boolean legacy){
+        read(read);
+    }
+
+    public void read(Reads read){
+        read(read, false);
+    }
 }
diff --git a/core/src/mindustry/world/modules/ConsumeModule.java b/core/src/mindustry/world/modules/ConsumeModule.java
index 4d4fc6e522..431fa3fd1f 100644
--- a/core/src/mindustry/world/modules/ConsumeModule.java
+++ b/core/src/mindustry/world/modules/ConsumeModule.java
@@ -37,7 +37,7 @@ public class ConsumeModule extends BlockModule{
         optionalValid = true;
         boolean docons = entity.shouldConsume() && entity.productionValid();
 
-        for(Consume cons : entity.block().consumes.all()){
+        for(Consume cons : entity.block.consumes.all()){
             if(cons.isOptional()) continue;
 
             if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){
@@ -47,7 +47,7 @@ public class ConsumeModule extends BlockModule{
             valid &= cons.valid(entity);
         }
 
-        for(Consume cons : entity.block().consumes.optionals()){
+        for(Consume cons : entity.block.consumes.optionals()){
             if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){
                 cons.update(entity);
             }
@@ -57,17 +57,17 @@ public class ConsumeModule extends BlockModule{
     }
 
     public void trigger(){
-        for(Consume cons : entity.block().consumes.all()){
+        for(Consume cons : entity.block.consumes.all()){
             cons.trigger(entity);
         }
     }
 
     public boolean valid(){
-        return valid && entity.shouldConsume();
+        return valid && entity.shouldConsume() && entity.enabled;
     }
 
     public boolean optionalValid(){
-        return valid() && optionalValid;
+        return valid() && optionalValid && entity.enabled;
     }
 
     @Override
diff --git a/core/src/mindustry/world/modules/ItemModule.java b/core/src/mindustry/world/modules/ItemModule.java
index 09824a112b..a293942592 100644
--- a/core/src/mindustry/world/modules/ItemModule.java
+++ b/core/src/mindustry/world/modules/ItemModule.java
@@ -14,12 +14,13 @@ import static mindustry.Vars.content;
 public class ItemModule extends BlockModule{
     public static final ItemModule empty = new ItemModule();
 
-    private static final int windowSize = 60 * 4;
+    private static final int windowSize = 6;
     private static WindowedMean[] cacheFlow;
     private static float[] cacheSums;
     private static float[] displayFlow;
-    private static Bits cacheBits = new Bits();
-    private static Interval flowTimer = new Interval(1);
+    private static final Bits cacheBits = new Bits();
+    private static final Interval flowTimer = new Interval(2);
+    private static final float pollScl = 20f;
 
     protected int[] items = new int[content.items().size];
     protected int total;
@@ -41,38 +42,42 @@ public class ItemModule extends BlockModule{
 
     public void update(boolean showFlow){
         if(showFlow){
-            if(flow == null){
-                if(cacheFlow == null || cacheFlow.length != items.length){
-                    cacheFlow = new WindowedMean[items.length];
-                    for(int i = 0; i < items.length; i++){
-                        cacheFlow[i] = new WindowedMean(windowSize);
+            //update the flow at 30fps at most
+            if(flowTimer.get(1, pollScl)){
+
+                if(flow == null){
+                    if(cacheFlow == null || cacheFlow.length != items.length){
+                        cacheFlow = new WindowedMean[items.length];
+                        for(int i = 0; i < items.length; i++){
+                            cacheFlow[i] = new WindowedMean(windowSize);
+                        }
+                        cacheSums = new float[items.length];
+                        displayFlow = new float[items.length];
+                    }else{
+                        for(int i = 0; i < items.length; i++){
+                            cacheFlow[i].reset();
+                        }
+                        Arrays.fill(cacheSums, 0);
+                        cacheBits.clear();
                     }
-                    cacheSums = new float[items.length];
-                    displayFlow = new float[items.length];
-                }else{
-                    for(int i = 0; i < items.length; i++){
-                        cacheFlow[i].reset();
-                    }
-                    Arrays.fill(cacheSums, 0);
-                    cacheBits.clear();
+
+                    Arrays.fill(displayFlow, -1);
+
+                    flow = cacheFlow;
                 }
 
-                Arrays.fill(displayFlow, -1);
+                boolean updateFlow = flowTimer.get(30);
 
-                flow = cacheFlow;
-            }
+                for(int i = 0; i < items.length; i++){
+                    flow[i].add(cacheSums[i]);
+                    if(cacheSums[i] > 0){
+                        cacheBits.set(i);
+                    }
+                    cacheSums[i] = 0;
 
-            boolean updateFlow = flowTimer.get(30);
-
-            for(int i = 0; i < items.length; i++){
-                flow[i].add(cacheSums[i]);
-                if(cacheSums[i] > 0){
-                    cacheBits.set(i);
-                }
-                cacheSums[i] = 0;
-
-                if(updateFlow){
-                    displayFlow[i] = flow[i].hasEnoughData() ? flow[i].mean() / Time.delta : -1;
+                    if(updateFlow){
+                        displayFlow[i] = flow[i].hasEnoughData() ? flow[i].mean() / pollScl : -1;
+                    }
                 }
             }
         }else{
@@ -130,6 +135,15 @@ public class ItemModule extends BlockModule{
         return true;
     }
 
+    public boolean has(ItemSeq items){
+        for(Item item : content.items()){
+            if(!has(item, items.get(item))){
+                return false;
+            }
+        }
+        return true;
+    }
+
     public boolean has(Iterable<ItemStack> stacks){
         for(ItemStack stack : stacks){
             if(!has(stack.item, stack.amount)) return false;
@@ -166,6 +180,7 @@ public class ItemModule extends BlockModule{
         return total > 0;
     }
 
+    @Nullable
     public Item first(){
         for(int i = 0; i < items.length; i++){
             if(items[i] > 0){
@@ -175,6 +190,7 @@ public class ItemModule extends BlockModule{
         return null;
     }
 
+    @Nullable
     public Item take(){
         for(int i = 0; i < items.length; i++){
             int index = (i + takeRotation);
@@ -190,6 +206,7 @@ public class ItemModule extends BlockModule{
     }
 
     /** Begins a speculative take operation. This returns the item that would be returned by #take(), but does not change state. */
+    @Nullable
     public Item beginTake(){
         for(int i = 0; i < items.length; i++){
             int index = (i + takeRotation);
@@ -239,6 +256,12 @@ public class ItemModule extends BlockModule{
         }
     }
 
+    public void undoFlow(Item item){
+        if(flow != null){
+            cacheSums[item.id] -= 1;
+        }
+    }
+
     public void addAll(ItemModule items){
         for(int i = 0; i < items.items.length; i++){
             add(i, items.items[i]);
@@ -256,6 +279,10 @@ public class ItemModule extends BlockModule{
         for(ItemStack stack : stacks) remove(stack.item, stack.amount);
     }
 
+    public void remove(ItemSeq stacks){
+        stacks.each(this::remove);
+    }
+
     public void remove(Iterable<ItemStack> stacks){
         for(ItemStack stack : stacks) remove(stack.item, stack.amount);
     }
@@ -271,30 +298,30 @@ public class ItemModule extends BlockModule{
 
     @Override
     public void write(Writes write){
-        byte amount = 0;
+        int amount = 0;
         for(int item : items){
             if(item > 0) amount++;
         }
 
-        write.b(amount); //amount of items
+        write.s(amount); //amount of items
 
         for(int i = 0; i < items.length; i++){
             if(items[i] > 0){
-                write.b(i); //item ID
+                write.s(i); //item ID
                 write.i(items[i]); //item amount
             }
         }
     }
 
     @Override
-    public void read(Reads read){
+    public void read(Reads read, boolean legacy){
         //just in case, reset items
         Arrays.fill(items, 0);
-        byte count = read.b();
+        int count = legacy ? read.ub() : read.s();
         total = 0;
 
         for(int j = 0; j < count; j++){
-            int itemid = read.b();
+            int itemid = legacy ? read.ub() : read.s();
             int itemamount = read.i();
             items[content.item(itemid).id] = itemamount;
             total += itemamount;
diff --git a/core/src/mindustry/world/modules/LiquidModule.java b/core/src/mindustry/world/modules/LiquidModule.java
index 8725f78fa4..95dfc2f621 100644
--- a/core/src/mindustry/world/modules/LiquidModule.java
+++ b/core/src/mindustry/world/modules/LiquidModule.java
@@ -11,29 +11,37 @@ import java.util.*;
 import static mindustry.Vars.content;
 
 public class LiquidModule extends BlockModule{
-    private static final int windowSize = 60, updateInterval = 60;
-    private static Interval flowTimer = new Interval(1);
+    private static final int windowSize = 3, updateInterval = 60;
+    private static final Interval flowTimer = new Interval(2);
+    private static final float pollScl = 20f;
 
     private float[] liquids = new float[content.liquids().size];
     private float total;
     private Liquid current = content.liquid(0);
     private float smoothLiquid;
 
+    private boolean hadFlow;
     private @Nullable WindowedMean flow;
     private float lastAdded, currentFlowRate;
 
     public void update(boolean showFlow){
         smoothLiquid = Mathf.lerpDelta(smoothLiquid, currentAmount(), 0.1f);
         if(showFlow){
-            if(flow == null) flow = new WindowedMean(windowSize);
-            flow.add(lastAdded);
-            lastAdded = 0;
-            if(currentFlowRate < 0 || flowTimer.get(updateInterval)){
-                currentFlowRate = flow.hasEnoughData() ? flow.mean() / Time.delta : -1f;
+            if(flowTimer.get(1, pollScl)){
+
+                if(flow == null) flow = new WindowedMean(windowSize);
+                if(lastAdded > 0.0001f) hadFlow = true;
+
+                flow.add(lastAdded);
+                lastAdded = 0;
+                if(currentFlowRate < 0 || flowTimer.get(updateInterval)){
+                    currentFlowRate = flow.hasEnoughData() ? flow.mean() / pollScl : -1f;
+                }
             }
         }else{
             currentFlowRate = -1f;
             flow = null;
+            hadFlow = false;
         }
     }
 
@@ -42,6 +50,10 @@ public class LiquidModule extends BlockModule{
         return currentFlowRate * 60;
     }
 
+    public boolean hadFlow(){
+        return hadFlow;
+    }
+
     public float smoothAmount(){
         return smoothLiquid;
     }
@@ -110,29 +122,29 @@ public class LiquidModule extends BlockModule{
 
     @Override
     public void write(Writes write){
-        byte amount = 0;
+        int amount = 0;
         for(float liquid : liquids){
             if(liquid > 0) amount++;
         }
 
-        write.b(amount); //amount of liquids
+        write.s(amount); //amount of liquids
 
         for(int i = 0; i < liquids.length; i++){
             if(liquids[i] > 0){
-                write.b(i); //liquid ID
-                write.f(liquids[i]); //item amount
+                write.s(i); //liquid ID
+                write.f(liquids[i]); //liquid amount
             }
         }
     }
 
     @Override
-    public void read(Reads read){
+    public void read(Reads read, boolean legacy){
         Arrays.fill(liquids, 0);
         total = 0f;
-        byte count = read.b();
+        int count = legacy ? read.ub() : read.s();
 
         for(int j = 0; j < count; j++){
-            int liquidid = read.b();
+            int liquidid = legacy ? read.ub() : read.s();
             float amount = read.f();
             liquids[liquidid] = amount;
             if(amount > 0){
diff --git a/core/src/mindustry/world/producers/Produce.java b/core/src/mindustry/world/producers/Produce.java
deleted file mode 100644
index 478e9f35d9..0000000000
--- a/core/src/mindustry/world/producers/Produce.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package mindustry.world.producers;
-
-public class Produce{
-}
diff --git a/core/src/mindustry/world/producers/ProduceItem.java b/core/src/mindustry/world/producers/ProduceItem.java
deleted file mode 100644
index 8f0b5129fb..0000000000
--- a/core/src/mindustry/world/producers/ProduceItem.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package mindustry.world.producers;
-
-public class ProduceItem{
-}
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 3955380145..6b383b958d 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -11,7 +11,7 @@ project.ext.assetsDir = new File("../core/assets")
 
 def enableTemplates = true
 def JDK_DIR = "$System.env.JDK_DIR"
-def ICON_DIR = new File("core/assets/icons/icon.icns")
+def ICON_DIR = new File("$rootDir/core/assets/icons/icon.icns")
 def spriteHashFile = new File(project.rootDir, "build/spritehash")
 
 def hashDirectory = {
@@ -45,6 +45,8 @@ task run(dependsOn: classes, type: JavaExec){
         jvmArgs("-XstartOnFirstThread", "-Djava.awt.headless=true")
     }
 
+    jvmArgs += "-XX:+ShowCodeDetailsInExceptionMessages"
+
     /*spriteHashFile.parentFile.mkdirs()
     String spriteHash = hashDirectory()
     if(spriteHashFile.exists() && spriteHashFile.text != spriteHash){
@@ -127,13 +129,13 @@ PackrConfig.Platform.values().each{ platform ->
                     verbose = true
                     bundleIdentifier = getPackage() + ".mac"
                     iconResource = ICON_DIR
-                    outDir = file("build/packr/output")
+                    outDir = file("$rootDir/desktop/build/packr/output")
                     mainClass = project.ext.mainClassName
-                    classpath = ["desktop/build/packr/desktop.jar"]
-                    removePlatformLibs = ["desktop/build/packr/desktop.jar"]
+                    classpath = ["$rootDir/desktop/build/packr/desktop.jar".toString()]
+                    removePlatformLibs = ["$rootDir/desktop/build/packr/desktop.jar".toString()]
 
                     vmArgs = []
-                    minimizeJre = "desktop/packr_minimize.json"
+                    minimizeJre = "$rootDir/desktop/packr_minimize.json".toString()
                     jdk = JDK_DIR + "jdk-${platform.toString().toLowerCase()}.zip"
 
                     if(platform == PackrConfig.Platform.MacOS){
diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java
index cb0a3a9b84..bd9ec3e81b 100644
--- a/desktop/src/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/mindustry/desktop/DesktopLauncher.java
@@ -16,14 +16,12 @@ import mindustry.*;
 import mindustry.core.*;
 import mindustry.desktop.steam.*;
 import mindustry.game.EventType.*;
+import mindustry.gen.*;
 import mindustry.net.*;
 import mindustry.net.Net.*;
 import mindustry.type.*;
-import mindustry.gen.*;
 
 import java.io.*;
-import java.net.*;
-import java.util.*;
 
 import static mindustry.Vars.*;
 
@@ -172,11 +170,11 @@ public class DesktopLauncher extends ClientLauncher{
         String finalMessage = Strings.getFinalMesage(e);
         String total = Strings.getCauses(e).toString();
 
-        if(total.contains("Couldn't create window") || total.contains("OpenGL 2.0 or higher") || total.toLowerCase().contains("pixel format") || total.contains("GLEW")){
+        if(total.contains("Couldn't create window") || total.contains("OpenGL 2.0 or higher") || total.toLowerCase().contains("pixel format") || total.contains("GLEW")|| total.contains("unsupported combination of formats")){
 
             dialog.get(() -> message(
                 total.contains("Couldn't create window") ? "A graphics initialization error has occured! Try to update your graphics drivers:\n" + finalMessage :
-                            "Your graphics card does not support OpenGL 2.0 with the framebuffer_object extension!\n" +
+                            "Your graphics card does not support the right OpenGL features.\n" +
                                     "Try to update your graphics drivers. If this doesn't work, your computer may not support Mindustry.\n\n" +
                                     "Full message: " + finalMessage));
             badGPU = true;
@@ -307,23 +305,7 @@ public class DesktopLauncher extends ClientLauncher{
             }
         }
 
-        try{
-            Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
-            NetworkInterface out;
-            for(out = e.nextElement(); (out.getHardwareAddress() == null || out.isVirtual() || !validAddress(out.getHardwareAddress())) && e.hasMoreElements(); out = e.nextElement());
-
-            byte[] bytes = out.getHardwareAddress();
-            byte[] result = new byte[8];
-            System.arraycopy(bytes, 0, result, 0, bytes.length);
-
-            String str = new String(Base64Coder.encode(result));
-
-            if(str.equals("AAAAAAAAAOA=") || str.equals("AAAAAAAAAAA=")) throw new RuntimeException("Bad UUID.");
-
-            return str;
-        }catch(Exception e){
-            return super.getUUID();
-        }
+        return super.getUUID();
     }
 
     private static void message(String message){
diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java
index ab12f0718e..5d603067f3 100644
--- a/desktop/src/mindustry/desktop/steam/SNet.java
+++ b/desktop/src/mindustry/desktop/steam/SNet.java
@@ -79,10 +79,14 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                                 Log.err(e);
                             }
                         }else if(currentServer != null && fromID == currentServer.getAccountID()){
-                            net.handleClientReceived(output);
+                            try{
+                                net.handleClientReceived(output);
+                            }catch(Throwable t){
+                                net.handleException(t);
+                            }
                         }
                     }catch(SteamException e){
-                        e.printStackTrace();
+                        Log.err(e);
                     }
                 }
             }
@@ -233,7 +237,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
 
     @Override
     public void onLobbyEnter(SteamID steamIDLobby, int chatPermissions, boolean blocked, ChatRoomEnterResponse response){
-        Log.info("enter lobby @ @", steamIDLobby.getAccountID(), response);
+        Log.info("onLobbyEnter @ @", steamIDLobby.getAccountID(), response);
 
         if(response != ChatRoomEnterResponse.Success){
             ui.loadfrag.hide();
@@ -241,6 +245,17 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
             return;
         }
 
+        int version = Strings.parseInt(smat.getLobbyData(steamIDLobby, "version"), -1);
+
+        //check version
+        if(version != Version.build){
+            ui.loadfrag.hide();
+            ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" +
+                Core.bundle.format("server.versions", Version.build, version));
+            smat.leaveLobby(steamIDLobby);
+            return;
+        }
+
         logic.reset();
         net.reset();
 
@@ -305,6 +320,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                 try{
                     SteamID lobby = smat.getLobbyByIndex(i);
                     Host out = new Host(
+                        -1, //invalid ping
                         smat.getLobbyData(lobby, "name"),
                         "steam:" + lobby.handle(),
                         smat.getLobbyData(lobby, "mapname"),
@@ -314,7 +330,8 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                         smat.getLobbyData(lobby, "versionType"),
                         Gamemode.valueOf(smat.getLobbyData(lobby, "gamemode")),
                         smat.getLobbyMemberLimit(lobby),
-                        ""
+                        "",
+                        null
                     );
                     hosts.add(out);
                 }catch(Exception e){
diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java
index 60b85912b0..7e7c9ecef3 100644
--- a/desktop/src/mindustry/desktop/steam/SStats.java
+++ b/desktop/src/mindustry/desktop/steam/SStats.java
@@ -51,7 +51,7 @@ public class SStats implements SteamUserStatsCallback{
         this.updated = true;
     }
 
-    private void checkUpdate(){
+    void checkUpdate(){
         if(campaign()){
             SStat.maxUnitActive.max(Groups.unit.count(t -> t.team() == player.team()));
 
@@ -65,7 +65,7 @@ public class SStats implements SteamUserStatsCallback{
             }
 
             for(Building entity : player.team().cores()){
-                if(!content.items().contains(i -> entity.items.get(i) < entity.block().itemCapacity)){
+                if(!content.items().contains(i -> entity.items.get(i) < entity.block.itemCapacity)){
                     fillCoreAllCampaign.complete();
                     break;
                 }
@@ -86,13 +86,14 @@ public class SStats implements SteamUserStatsCallback{
             }
         });
 
-        Events.on(ZoneConfigureCompleteEvent.class, e -> {
-            if(!content.sectors().contains(z -> !z.canConfigure())){
-                configAllZones.complete();
-            }
-        });
+        //TODO achievement invalid
+        //Events.on(ZoneConfigureCompleteEvent.class, e -> {
+            //if(!content.sectors().contains(z -> !z.canConfigure())){
+            //    configAllZones.complete();
+            //}
+        //});
 
-        Events.on(Trigger.newGame, () -> Core.app.post(() -> {
+        Events.run(Trigger.newGame, () -> Core.app.post(() -> {
             if(campaign() && player.core() != null && player.core().items.total() >= 10 * 1000){
                 drop10kitems.complete();
             }
@@ -108,7 +109,7 @@ public class SStats implements SteamUserStatsCallback{
             if(campaign() && e.unit != null && e.unit.isLocal() && !e.breaking){
                 SStat.blocksBuilt.add();
 
-                if(e.tile.block() == Blocks.router && e.tile.build.proximity().contains(t -> t.block() == Blocks.router)){
+                if(e.tile.block() == Blocks.router && e.tile.build.proximity().contains(t -> t.block == Blocks.router)){
                     chainRouters.complete();
                 }
 
@@ -152,11 +153,11 @@ public class SStats implements SteamUserStatsCallback{
             }
         });
 
-        Events.on(Trigger.openWiki, openWiki::complete);
+        Events.run(Trigger.openWiki, openWiki::complete);
 
-        Events.on(Trigger.exclusionDeath, dieExclusion::complete);
+        Events.run(Trigger.exclusionDeath, dieExclusion::complete);
 
-        Events.on(Trigger.drown, drown::complete);
+        Events.run(Trigger.drown, drown::complete);
 
         trigger(Trigger.impactPower, powerupImpactReactor);
 
@@ -166,9 +167,9 @@ public class SStats implements SteamUserStatsCallback{
 
         trigger(Trigger.suicideBomb, suicideBomb);
 
-        Events.on(Trigger.enablePixelation, enablePixelation::complete);
+        Events.run(Trigger.enablePixelation, enablePixelation::complete);
 
-        Events.on(Trigger.thoriumReactorOverheat, () -> {
+        Events.run(Trigger.thoriumReactorOverheat, () -> {
             if(campaign()){
                 SStat.reactorsOverheated.add();
             }
@@ -195,13 +196,14 @@ public class SStats implements SteamUserStatsCallback{
             }
         });
 
-        Events.on(LaunchEvent.class, e -> {
-            if(state.rules.tutorial){
-                completeTutorial.complete();
-            }
-
-            SStat.timesLaunched.add();
-        });
+        //TODO
+        //Events.on(LaunchEvent.class, e -> {
+        //    if(state.rules.tutorial){
+        //        completeTutorial.complete();
+        //    }
+//
+        //    SStat.timesLaunched.add();
+        //});
 
         Events.on(LaunchItemEvent.class, e -> {
             SStat.itemsLaunched.add(e.stack.amount);
@@ -241,7 +243,7 @@ public class SStats implements SteamUserStatsCallback{
                     SStat.attacksWon.add();
                 }
 
-                RankResult result = state.stats.calculateRank(state.getSector(), state.launched);
+                RankResult result = state.stats.calculateRank(state.getSector(), true);
                 if(result.rank == Rank.S) earnSRank.complete();
                 if(result.rank == Rank.SS) earnSSRank.complete();
             }
@@ -263,7 +265,7 @@ public class SStats implements SteamUserStatsCallback{
     }
 
     private void trigger(Trigger trigger, SAchievement ach){
-        Events.on(trigger, () -> {
+        Events.run(trigger, () -> {
             if(campaign()){
                 ach.complete();
             }
diff --git a/desktop/src/mindustry/desktop/steam/SWorkshop.java b/desktop/src/mindustry/desktop/steam/SWorkshop.java
index 8475d8d720..ac6e5f5060 100644
--- a/desktop/src/mindustry/desktop/steam/SWorkshop.java
+++ b/desktop/src/mindustry/desktop/steam/SWorkshop.java
@@ -96,36 +96,36 @@ public class SWorkshop implements SteamUGCCallback{
                 if(details.getResult() == SteamResult.OK){
                     if(details.getOwnerID().equals(SVars.user.user.getSteamID())){
 
-                        BaseDialog dialog = new BaseDialog("$workshop.info");
+                        BaseDialog dialog = new BaseDialog("@workshop.info");
                         dialog.setFillParent(false);
-                        dialog.cont.add("$workshop.menu").pad(20f);
+                        dialog.cont.add("@workshop.menu").pad(20f);
                         dialog.addCloseButton();
 
-                        dialog.buttons.button("$view.workshop", Icon.link, () -> {
+                        dialog.buttons.button("@view.workshop", Icon.link, () -> {
                             viewListingID(id);
                             dialog.hide();
                         }).size(210f, 64f);
 
-                        dialog.buttons.button("$workshop.update", Icon.up, () -> {
-                            new BaseDialog("$workshop.update"){{
+                        dialog.buttons.button("@workshop.update", Icon.up, () -> {
+                            new BaseDialog("@workshop.update"){{
                                 setFillParent(false);
-                                cont.margin(10).add("$changelog").padRight(6f);
+                                cont.margin(10).add("@changelog").padRight(6f);
                                 cont.row();
                                 TextArea field = cont.area("", t -> {}).size(500f, 160f).get();
                                 field.setMaxLength(400);
                                 buttons.defaults().size(120, 54).pad(4);
-                                buttons.button("$ok", () -> {
+                                buttons.button("@ok", () -> {
                                     if(!p.prePublish()){
                                         Log.info("Rejecting due to pre-publish.");
                                         return;
                                     }
 
-                                    ui.loadfrag.show("$publishing");
+                                    ui.loadfrag.show("@publishing");
                                     updateItem(p, field.getText().replace("\r", "\n"));
                                     dialog.hide();
                                     hide();
                                 });
-                                buttons.button("$cancel", this::hide);
+                                buttons.button("@cancel", this::hide);
                             }}.show();
 
                         }).size(210f, 64f);
@@ -135,7 +135,7 @@ public class SWorkshop implements SteamUGCCallback{
                     }
                 }else if(details.getResult() == SteamResult.FileNotFound){
                     p.removeSteamID();
-                    ui.showErrorMessage("$missing");
+                    ui.showErrorMessage("@missing");
                 }else{
                     ui.showErrorMessage(Core.bundle.format("workshop.error", details.getResult().name()));
                 }
@@ -177,19 +177,19 @@ public class SWorkshop implements SteamUGCCallback{
     }
 
     void showPublish(Cons<SteamPublishedFileID> published){
-        BaseDialog dialog = new BaseDialog("$confirm");
+        BaseDialog dialog = new BaseDialog("@confirm");
         dialog.setFillParent(false);
-        dialog.cont.add("$publish.confirm").width(600f).wrap();
+        dialog.cont.add("@publish.confirm").width(600f).wrap();
         dialog.addCloseButton();
-        dialog.buttons.button("$eula", Icon.link,
+        dialog.buttons.button("@eula", Icon.link,
             () -> SVars.net.friends.activateGameOverlayToWebPage("https://steamcommunity.com/sharedfiles/workshoplegalagreement"))
             .size(210f, 64f);
 
-        dialog.buttons.button("$ok", Icon.ok, () -> {
+        dialog.buttons.button("@ok", Icon.ok, () -> {
             Log.info("Accepted, publishing item...");
             itemHandlers.add(published);
             ugc.createItem(SVars.steamID, WorkshopFileType.Community);
-            ui.loadfrag.show("$publishing");
+            ui.loadfrag.show("@publishing");
             dialog.hide();
         }).size(170f, 64f);
         dialog.show();
@@ -213,9 +213,9 @@ public class SWorkshop implements SteamUGCCallback{
 
             ui.loadfrag.setProgress(() -> {
                 ItemUpdateStatus status = ugc.getItemUpdateProgress(h, info);
-                ui.loadfrag.setText("$" + status.name().toLowerCase());
+                ui.loadfrag.setText("@" + status.name().toLowerCase());
                 if(status == ItemUpdateStatus.Invalid){
-                    ui.loadfrag.setText("$done");
+                    ui.loadfrag.setText("@done");
                     return 1f;
                 }
                 return (float)status.ordinal() / (float)ItemUpdateStatus.values().length;
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29659.txt b/fastlane/metadata/android/cs-CZ/changelogs/29659.txt
new file mode 100644
index 0000000000..db918ffffb
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/29659.txt
@@ -0,0 +1,10 @@
+Toto je první alfa uvolnění verze 6.0 a obrovským přídavkem obsahu a kampaně.
+I když bylo toto sestavení testováno ve hře více hráčů, stále může mít četné chyby. Jako obvykle, hlaste prosím problémy na Githubu.
+
+Přehled změn je příliš velký, ale mezi nejzajímavější patří:
+
+- Nový systém výroby jednotek, s přírůstkovými vylepšeními
+- Přímé velení jednotkám a věžím
+- Jednotky byly překresleny a přejmenovány
+- Nové jednotky a bloky ve hře
+- Námořní a hmyzu podobné jednotky
diff --git a/fastlane/metadata/android/en-US/changelogs/29659.txt b/fastlane/metadata/android/en-US/changelogs/29659.txt
new file mode 100644
index 0000000000..77646b10bd
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/29659.txt
@@ -0,0 +1,10 @@
+This is the first alpha release of 6.0, a massive campaign and content update. 
+While this build has been tested in multiplayer, it still may have numerous issues. As usual, report problems on Github.
+
+There are too many changes to list here, but the important bits include:
+
+- A new unit production system, with incremental upgrades
+- Direct unit and turret control
+- Renamed and re-sprited units
+- New blocks and units
+- Naval and insect-like units
diff --git a/fastlane/metadata/android/en-US/changelogs/29661.txt b/fastlane/metadata/android/en-US/changelogs/29661.txt
new file mode 100644
index 0000000000..076169ca4d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/29661.txt
@@ -0,0 +1,9 @@
+- Fixed some bugs
+- Didn't fix some other bugs
+- Added 6 new units to fill in missing T4/5 upgrades
+- Added unit outlines for visual clarity, may remove later
+- Added mud floor (Contributed by ThePlayerA)
+- Added research costs to units in tech tree
+- Added ability to replace small walls with bigger ones directly
+- Added launch pad destination selection (barely tested)
+- Added team colors for storage blocks (Contributed by Voz-Duh)
diff --git a/fastlane/metadata/android/en-US/changelogs/29664.txt b/fastlane/metadata/android/en-US/changelogs/29664.txt
new file mode 100644
index 0000000000..cd151c8499
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/29664.txt
@@ -0,0 +1,9 @@
+This is a small update. Not much new content, mostly bugfixes.
+The next planned update will focus on the campaign, and will likely take much longer.
+
+- Bugfixes
+- Added team color for command center (Contributed by Voz-Duh)
+- Cleaned up certain sprites to match V6 style (Partially contributed by Voz-Duh)
+- Added support for Java-based mods on Android (mostly undocumented for now)
+- Added 2x2 high capacity memory bank for logic processors
+- Balancing
diff --git a/fastlane/metadata/android/hi-IN/full_description.txt b/fastlane/metadata/android/hi-IN/full_description.txt
new file mode 100644
index 0000000000..5f41ca22c8
--- /dev/null
+++ b/fastlane/metadata/android/hi-IN/full_description.txt
@@ -0,0 +1,15 @@
+बारूद को अपने बुर्ज में खिलाने के लिए कन्वेयर बेल्ट की विस्तृत आपूर्ति श्रृंखला बनाएं, निर्माण के लिए उपयोग करने के लिए सामग्री का उत्पादन करें, और दुश्मनों की लहरों से अपनी संरचनाओं का बचाव करें। क्रॉस-प्लेटफ़ॉर्म मल्टीप्लेयर सह-ऑप गेम्स में अपने दोस्तों के साथ खेलें, या टीम-आधारित PvP मैचों में उन्हें चुनौती दें।
+
+इसमें शामिल है:
+
+- 24 निर्मित नक्शे
+- एक अभियान, एक टेक ट्री और अनलॉक करने योग्य क्षेत्रों के साथ पूरा
+- 4 शक्तिशाली लहर मालिकों को हराने के लिए
+- ऊर्जा, तरल और आइटम परिवहन प्रणाली
+- 19 विभिन्न प्रकार के ड्रोन, मेच और जहाज
+- मास्टर करने के लिए 120+ प्रौद्योगिकी ब्लॉक
+- 75+ विभिन्न पर्यावरण ब्लॉक
+- स्थानीय नेटवर्क या समर्पित सर्वरस के माध्यम से क्रॉस-प्लेटफॉर्म मल्टीप्लेयर
+- कस्टम खेल के नियम: ब्लॉक की लागत, दुश्मन के आँकड़े, शुरू आइटम, लहर समय और अधिक बदलें
+- एक शक्तिशाली संपादक, यादृच्छिक रूप से अयस्कों, इलाकों, सजावट को बनाने और मानचित्रों के लिए समरूपता को लागू करने के लिए उपकरण के साथ
+- अनुकूलन योग्य मानचित्र तरंग लेआउट
\ No newline at end of file
diff --git a/fastlane/metadata/android/hi-IN/short_description.txt b/fastlane/metadata/android/hi-IN/short_description.txt
new file mode 100644
index 0000000000..5a7eaf7783
--- /dev/null
+++ b/fastlane/metadata/android/hi-IN/short_description.txt
@@ -0,0 +1 @@
+एक कारखाने आधारित सैंडबॉक्स टॉवर रक्षा खेल।
\ No newline at end of file
diff --git a/fastlane/metadata/android/hi-IN/summary.txt b/fastlane/metadata/android/hi-IN/summary.txt
new file mode 100644
index 0000000000..5a7eaf7783
--- /dev/null
+++ b/fastlane/metadata/android/hi-IN/summary.txt
@@ -0,0 +1 @@
+एक कारखाने आधारित सैंडबॉक्स टॉवर रक्षा खेल।
\ No newline at end of file
diff --git a/fastlane/metadata/android/hi-IN/title.txt b/fastlane/metadata/android/hi-IN/title.txt
new file mode 100644
index 0000000000..36df84b3d7
--- /dev/null
+++ b/fastlane/metadata/android/hi-IN/title.txt
@@ -0,0 +1 @@
+मिन्दुस्त्र्यि (Mindustry)
\ No newline at end of file
diff --git a/fastlane/metadata/steam/korean/achievements.vdf b/fastlane/metadata/steam/korean/achievements.vdf
index 4d274ee96b..14aba2fd5e 100644
--- a/fastlane/metadata/steam/korean/achievements.vdf
+++ b/fastlane/metadata/steam/korean/achievements.vdf
@@ -14,11 +14,11 @@
 		"NEW_ACHIEVEMENT_20_5_NAME"	"무한의 배달부"
 		"NEW_ACHIEVEMENT_20_5_DESC"	"자원을 총 1,000,000개 출격시키세요."
 		"NEW_ACHIEVEMENT_20_6_NAME"	"정복자"
-		"NEW_ACHIEVEMENT_20_6_DESC"	"캠페인의 미션:적 코어 파괴인 지역에서 10번 승리하세요."
+		"NEW_ACHIEVEMENT_20_6_DESC"	"적 코어 파괴인 지역에서 10번 승리하세요."
 		"NEW_ACHIEVEMENT_20_7_NAME"	"챔피언"
 		"NEW_ACHIEVEMENT_20_7_DESC"	"멀티플레이어 PvP 매치에서 10번 승리하세요."
 		"NEW_ACHIEVEMENT_20_8_NAME"	"진격!"
-		"NEW_ACHIEVEMENT_20_8_DESC"	"캠페인의 미션:적 코어 파괴인 지역에서 5단계 이상일 때 적의 코어를 파괴하세요."
+		"NEW_ACHIEVEMENT_20_8_DESC"	"적 코어 파괴인 지역에서 5단계 이하일 때 적의 코어를 파괴하세요."
 		"NEW_ACHIEVEMENT_20_9_NAME"	"하늘에서 코어의 비가 쏟아진다!"
 		"NEW_ACHIEVEMENT_20_9_DESC"	"캠페인 지역에 30번 도전하세요."
 		"NEW_ACHIEVEMENT_20_10_NAME"	"끈질긴"
@@ -36,9 +36,9 @@
 		"NEW_ACHIEVEMENT_20_17_NAME"	"한 중대한 실수"
 		"NEW_ACHIEVEMENT_20_17_DESC"	"분배기를 연구하세요."
 		"NEW_ACHIEVEMENT_20_18_NAME"	"창조"
-		"NEW_ACHIEVEMENT_20_18_DESC"	"블럭 10,000를 설치하세요."
+		"NEW_ACHIEVEMENT_20_18_DESC"	"블록 10,000를 설치하세요."
 		"NEW_ACHIEVEMENT_20_19_NAME"	"잿더미"
-		"NEW_ACHIEVEMENT_20_19_DESC"	"적 블럭을 1,000개 파괴하세요."
+		"NEW_ACHIEVEMENT_20_19_DESC"	"적 블록을 1,000개 파괴하세요."
 		"NEW_ACHIEVEMENT_20_20_NAME"	"폭발은 예술이다!"
 		"NEW_ACHIEVEMENT_20_20_DESC"	"토륨 원자로를 폭발시키세요."
 		"NEW_ACHIEVEMENT_20_21_NAME"	"맵퍼"
@@ -88,11 +88,11 @@
 		"NEW_ACHIEVEMENT_21_14_NAME"	"출격!"
 		"NEW_ACHIEVEMENT_21_14_DESC"	"발사대를 사용하세요."
 		"NEW_ACHIEVEMENT_21_15_NAME"	"성급한"
-		"NEW_ACHIEVEMENT_21_15_DESC"	"2단계 이상을 스킵하고, 당신의 코어를 적에게 파괴당하세요."
+		"NEW_ACHIEVEMENT_21_15_DESC"	"2번 이상의 출격 기회를 스킵하고, 당신의 코어를 적에게 파괴당하세요."
 		"NEW_ACHIEVEMENT_21_16_NAME"	"2단"
 		"NEW_ACHIEVEMENT_21_16_DESC"	"분배기를 2개 붙여서 건설하세요."
 		"NEW_ACHIEVEMENT_21_17_NAME"	"고독한 수호자"
-		"NEW_ACHIEVEMENT_21_17_DESC"	"캠페인 지역에서 10단계 이상을 아무 블럭도 설치하지 않고 생존하세요."
+		"NEW_ACHIEVEMENT_21_17_DESC"	"캠페인 지역에서 10단계 이상을 아무 블록도 설치하지 않고 생존하세요."
 		"NEW_ACHIEVEMENT_21_18_NAME"	"인화성"
 		"NEW_ACHIEVEMENT_21_18_DESC"	"포탑에 파이라타이트를 사용하세요."
 		"NEW_ACHIEVEMENT_21_19_NAME"	"효율성"
diff --git a/fastlane/metadata/steam/korean/description.txt b/fastlane/metadata/steam/korean/description.txt
index 129c98613b..f08e59b4e7 100644
--- a/fastlane/metadata/steam/korean/description.txt
+++ b/fastlane/metadata/steam/korean/description.txt
@@ -17,11 +17,11 @@
 [list]
 [*] 재도전 가능한 12개의 지역을 무작위 시작 위치에서 도전해보세요.
 [*] 자원들을 출격시켜서 모으세요.
-[*] 고급 연료의 사용을 위해 새로운 블럭을 연구하세요.
+[*] 고급 연료의 사용을 위해 새로운 블록을 연구하세요.
 [*] 캠페인 지역에서 일정 조건을 달성시 각 지역의 시작자원을 편집할 수 있습니다.
 [*] 다양한 지역 임무가 준비되어 있습니다.
 [*] 친구를 초대해 지역을 같이 클리어할 수 있습니다.
-[*] 120개가 넘는 블럭들을 연구해보세요.
+[*] 120개가 넘는 블록들을 연구해보세요.
 [*] 19가지 종류의 드론, 유닛, 기체들이 준비되어 있습니다.
 [*] 50개가 넘는 도전과제들을 달성해보세요.
 [/list]
@@ -31,7 +31,7 @@
 [*] [b]생존[/b]: 포탑을 건설하고, 적의 공격을 방어하는 기본적인 타워디펜스 모드입니다. 더욱 길게 생존하여 연구하기 위한 자원을 모으고 출격하는 것도 가능합니다. 공중 보스의 기습 공격에 대비하세요.
 [*] [b]공격[/b]: 공장을 건설하여 적의 코어를 파괴하기 위한 유닛들을 생산하고, 동시에 적의 유닛을 방어하기 위한 방어건물도 건설하세요. 당신의 목표를 돕기 위한 다양한 유닛들을 생산하세요.
 [*] [b]PvP[/b]: 당신을 빼고 총 4개의 팀과의 경쟁이 가능합니다. 다른 팀의 코어를 부숴 승리를 거머쥐세요. 유닛을 생성하고, 당신의 기체를 활용해 적의 기지를 공격하세요.
-[*] [b]샌드박스[/b]: 무한한 자원을 사용하여 자유롭게 건설이 가능합니다. 무한 자원, 전기, 액체와 같은 샌드박스 모드 전용의 블럭들이 준비되어 있으며, 적들은 당신이 요구하기 전까지 출현하지 않습니다. 궁금한 것들을 마음껏 실험해보세요.
+[*] [b]샌드박스[/b]: 무한한 자원을 사용하여 자유롭게 건설이 가능합니다. 무한 자원, 전기, 액체와 같은 샌드박스 모드 전용의 블록들이 준비되어 있으며, 적들은 당신이 요구하기 전까지 출현하지 않습니다. 궁금한 것들을 마음껏 실험해보세요.
 [/list]
 
 [h2]사용자 정의 게임 & 크로스플랫폼 멀티플레이어[/h2]
@@ -40,7 +40,7 @@
 [*] 캠페인에 더하여 12개의 추가적인 맵들이 준비되어 있습니다.
 [*] 생존, PvP, 샌드박스 등을 플레이해보세요!
 [*] 유저들이 운영하는 공개되어있는 공용서버에 접속하거나, 당신만의 비공개서버를 만들고 친구들을 초대해보세요.
-[*] 자유로운 게임 규칙: 블럭의 재료 요구량 변경, 적의 능력 수치변경, 시작자원 변경, 단계 대기시간 변경 등 많은 것을 직접 설정할 수 있습니다.
+[*] 자유로운 게임 규칙: 블록의 재료 요구량 변경, 적의 능력 수치변경, 시작자원 변경, 단계 대기시간 변경 등 많은 것을 직접 설정할 수 있습니다.
 [*] 게임모드 혼합!: PvP와 PvE를 합쳐 새로운 컨텐츠를 만들어보세요.
 [/list]
 
@@ -56,5 +56,5 @@
 [*] 소환되는 적들도 에디터 내의 맵 규칙에서 편집이 가능합니다!
 [*] 맵을 제작한 뒤에는 맵을 추출하여 파일로 공유하거나 워크샵에도 올릴 수 있습니다.
 [*] 맵의 규칙을 내 마음대로 바꿔보세요.
-[*] 75개가 넘는 지형 타일, 블럭이 준비되어있습니다.
+[*] 75개가 넘는 지형 타일, 블록이 준비되어있습니다.
 [/list]
diff --git a/fastlane/metadata/steam/russian/achievements.vdf b/fastlane/metadata/steam/russian/achievements.vdf
index 1289b5db58..628e39b9a5 100644
--- a/fastlane/metadata/steam/russian/achievements.vdf
+++ b/fastlane/metadata/steam/russian/achievements.vdf
@@ -68,7 +68,7 @@
 		"NEW_ACHIEVEMENT_21_4_NAME"	"Стая"
 		"NEW_ACHIEVEMENT_21_4_DESC"	"Имейте одновременно 10 активных дронов «Фантом»."
 		"NEW_ACHIEVEMENT_21_5_NAME"	"Взрывная армия"
-		"NEW_ACHIEVEMENT_21_5_DESC"	"Имейте одновременно 50 активных гусеничных ботов «Камикадзе»."
+		"NEW_ACHIEVEMENT_21_5_DESC"	"Имейте одновременно 50 активных ботов «Ползун»."
 		"NEW_ACHIEVEMENT_21_6_NAME"	"Легионы"
 		"NEW_ACHIEVEMENT_21_6_DESC"	"Постройте в целом 1000 единиц."
 		"NEW_ACHIEVEMENT_21_7_NAME"	"Super"
diff --git a/gradle.properties b/gradle.properties
index ceb565fae3..34baa3a963 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=d1a629e5f26a038828d72d15c7c9acc01f84e77c
+archash=8278e148026dab6b5f74ded2ed2be76a22418c76
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 622ab64a3c..6c9a224775 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java
index b241e6f901..d46c5b016c 100644
--- a/ios/src/mindustry/ios/IOSLauncher.java
+++ b/ios/src/mindustry/ios/IOSLauncher.java
@@ -236,10 +236,10 @@ public class IOSLauncher extends IOSApplication.Delegate{
                             ui.load.runLoadSave(slot);
                         }
                     }catch(IOException e){
-                        ui.showException("$save.import.fail", e);
+                        ui.showException("@save.import.fail", e);
                     }
                 }else{
-                    ui.showErrorMessage("$save.import.invalid");
+                    ui.showErrorMessage("@save.import.invalid");
                 }
 
             }
diff --git a/server/server_template/run_server.bat b/server/server_template/run_server.bat
index 8084a7149f..b470f31189 100644
--- a/server/server_template/run_server.bat
+++ b/server/server_template/run_server.bat
@@ -1 +1,2 @@
+@echo off
 java -jar server.jar
diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java
index 6e9050291a..b123d7e694 100644
--- a/server/src/mindustry/server/ServerControl.java
+++ b/server/src/mindustry/server/ServerControl.java
@@ -48,7 +48,7 @@ public class ServerControl implements ApplicationListener{
     private Fi currentLogFile;
     private boolean inExtraRound;
     private Task lastTask;
-    private Gamemode lastMode = Gamemode.survival;
+    private Gamemode lastMode;
     private @Nullable Map nextMapOverride;
     private Interval autosaveCount = new Interval();
 
@@ -58,13 +58,21 @@ public class ServerControl implements ApplicationListener{
 
     public ServerControl(String[] args){
         Core.settings.defaults(
-            "shufflemode", "normal",
             "bans", "",
             "admins", "",
             "shufflemode", "custom",
             "globalrules", "{reactorExplosions: false}"
         );
 
+        //update log level
+        Config.debug.set(Config.debug.bool());
+
+        try{
+            lastMode = Gamemode.valueOf(Core.settings.getString("lastServerMode", "survival"));
+        }catch(Exception e){ //handle enum parse exception
+            lastMode = Gamemode.survival;
+        }
+
         Log.setLogger((level, text) -> {
             String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(tags[level.ordinal()] + " " + text + "&fr");
             System.out.println(result);
@@ -87,6 +95,21 @@ public class ServerControl implements ApplicationListener{
         registerCommands();
 
         Core.app.post(() -> {
+            //try to load auto-update save if possible
+            if(Config.autoUpdate.bool()){
+                Fi fi = saveDirectory.child("autosavebe." + saveExtension);
+                if(fi.exists()){
+                    try{
+                        SaveIO.load(fi);
+                        info("Auto-save loaded.");
+                        state.set(State.playing);
+                        netServer.openServer();
+                    }catch(Throwable e){
+                        Log.err(e);
+                    }
+                }
+            }
+
             Seq<String> commands = new Seq<>();
 
             if(args.length > 0){
@@ -140,11 +163,14 @@ public class ServerControl implements ApplicationListener{
             nextMapOverride = null;
             if(map != null){
                 Call.infoMessage((state.rules.pvp
-                ? "[yellow]The " + event.winner.name + " team is victorious![]" : "[scarlet]Game over![]")
+                ? "[accent]The " + event.winner.name + " team is victorious![]\n" : "[scarlet]Game over![]\n")
                 + "\nNext selected map:[accent] " + map.name() + "[]"
                 + (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[white]" : "") + "." +
                 "\nNew game begins in " + roundExtraTime + " seconds.");
 
+                state.gameOver = true;
+                Call.updateGameOver(event.winner);
+
                 info("Selected next map to be @.", map.name());
 
                 play(true, () -> world.loadMap(map, map.applyRules(lastMode)));
@@ -161,7 +187,7 @@ public class ServerControl implements ApplicationListener{
         });
 
         //autosave periodically
-        Events.on(Trigger.update, () -> {
+        Events.run(Trigger.update, () -> {
             if(state.isPlaying() && Config.autosave.bool()){
                 if(autosaveCount.get(Config.autosaveSpacing.num() * 60)){
                     int max = Config.autosaveAmount.num();
@@ -194,7 +220,7 @@ public class ServerControl implements ApplicationListener{
             }
         });
 
-        Events.on(Trigger.socketConfigChanged, () -> {
+        Events.run(Trigger.socketConfigChanged, () -> {
             toggleSocket(false);
             toggleSocket(Config.socketInput.bool());
         });
@@ -209,6 +235,10 @@ public class ServerControl implements ApplicationListener{
             }
         });
 
+        //autosave settings once a minute
+        float saveInterval = 60;
+        Timer.schedule(() -> Core.settings.forceSave(), saveInterval, saveInterval);
+
         if(!mods.list().isEmpty()){
             info("&lc@ mods loaded.", mods.list().size);
         }
@@ -280,6 +310,7 @@ public class ServerControl implements ApplicationListener{
 
             logic.reset();
             lastMode = preset;
+            Core.settings.put("lastServerMode", lastMode.name());
             try{
                 world.loadMap(result, result.applyRules(lastMode));
                 state.rules = result.applyRules(preset);
@@ -460,7 +491,7 @@ public class ServerControl implements ApplicationListener{
             }
 
             for(Item item : content.items()){
-                state.teams.cores(team).first().items.set(item, state.teams.cores(team).first().block().itemCapacity);
+                state.teams.cores(team).first().items.set(item, state.teams.cores(team).first().block.itemCapacity);
             }
 
             info("Core filled.");
@@ -517,6 +548,7 @@ public class ServerControl implements ApplicationListener{
                     }
 
                     Log.info("&lc@&lg set to &lc@.", c.name(), c.get());
+                    Core.settings.forceSave();
                 }
             }catch(IllegalArgumentException e){
                 err("Unknown config: '@'. Run the command with no arguments to get a list of valid configs.", arg[0]);
@@ -717,7 +749,7 @@ public class ServerControl implements ApplicationListener{
             boolean add = arg[0].equals("add");
 
             PlayerInfo target;
-            Player playert = Groups.player.find(p -> p.name().equalsIgnoreCase(arg[1]));
+            Player playert = Groups.player.find(p -> p.name.equalsIgnoreCase(arg[1]));
             if(playert != null){
                 target = playert.getInfo();
             }else{
@@ -731,7 +763,7 @@ public class ServerControl implements ApplicationListener{
                 }else{
                     netServer.admins.unAdminPlayer(target.id);
                 }
-                if(playert != null) playert.admin(add);
+                if(playert != null) playert.admin = add;
                 info("Changed admin status of player: &ly@", target.lastName);
             }else{
                 err("Nobody with that name or ID could be found. If adding an admin by name, make sure they're online; otherwise, use their UUID.");
@@ -924,7 +956,7 @@ public class ServerControl implements ApplicationListener{
                 players.add(p);
                 p.clearUnit();
             }
-            
+
             logic.reset();
 
             Call.worldDataBegin();
@@ -935,7 +967,9 @@ public class ServerControl implements ApplicationListener{
             for(Player p : players){
                 if(p.con == null) continue;
 
+                boolean wasAdmin = p.admin;
                 p.reset();
+                p.admin = wasAdmin;
                 if(state.rules.pvp){
                     p.team(netServer.assignTeam(p, new SeqIterable<>(players)));
                 }
diff --git a/servers.json b/servers.json
index 8067712c2b..c0b3bae268 100644
--- a/servers.json
+++ b/servers.json
@@ -1,7 +1,4 @@
 [
-  {
-    "address": "mindustry.us.to"
-  },
   {
     "address": "mindustry.indielm.com:1101"
   },
@@ -11,15 +8,6 @@
   {
     "address": "mindustry.nydus.app:1337"
   },
-  {
-    "address": "mindustry.ecansol.com:6597"
-  },
-  {
-    "address": "mindustry.ecansol.com:6499"
-  },
-  {
-    "address": "mindustry.ecansol.com:6599"
-  },
   {
     "address": "mindustry.ru"
   },
@@ -44,6 +32,9 @@
   {
     "address": "aamindustry.play.ai"
   },
+  {
+    "address": "aamindustry.play.ai:6568"
+  },
   {
     "address": "mindustry.atannergaming.com"
   },
@@ -65,6 +56,9 @@
   {
     "address": "twsmindustry.24x7.hk"
   },
+  {
+    "address": "twsmindustry.24x7.hk:6568"
+  },
   {
     "address": "Chaotic-Neutral.ddns.net:1111"
   },
diff --git a/servers_be.json b/servers_be.json
index b011612cb8..5ebfae37df 100644
--- a/servers_be.json
+++ b/servers_be.json
@@ -1,8 +1,11 @@
 [
   {
-    "address": "mindustry.us.to:6568"
+    "address": "mindustry.us.to"
   },
   {
-    "address": "mindustry.nydus.app:6060"
+    "address": "nydustry.nydus.app:6060"
+  },
+  {
+    "address": "md.surrealment.com"
   }
 ]
diff --git a/servers_v6.json b/servers_v6.json
new file mode 100644
index 0000000000..85f4c11b19
--- /dev/null
+++ b/servers_v6.json
@@ -0,0 +1,26 @@
+[
+  {
+    "address": "mindustry.pl:6000"
+  },
+  {
+    "address": "mindustry.pl:6666"
+  },
+  {
+    "address": "routerchain.ddns.net"
+  },
+  {
+    "address": "mindustry.atannergaming.com:13000"
+  },
+  {
+    "address": "pandorum.su:8000"
+  },
+  {
+    "address": "mindustry.ecansol.com:6597"
+  },
+  {
+    "address": "mindustry.ecansol.com:6499"
+  },
+  {
+    "address": "mindustry.ecansol.com:6599"
+  }
+]
diff --git a/settings.gradle b/settings.gradle
index 6883be3f0d..52b0980311 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,7 @@
+if(JavaVersion.current().ordinal() < JavaVersion.VERSION_14.ordinal()){
+    throw new GradleException("!!! YOU MUST USE JAVA 14 OR ABOVE TO COMPILE AND RUN MINDUSTRY !!! Read the README. Your version: ${System.properties["java.version"]}")
+}
+
 include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'
 
 def use = { ... names ->
@@ -20,7 +24,7 @@ if(System.getenv("JITPACK") == "true") hasSdk = false
 if(hasSdk){
 	include 'android'
 }else{
-    println("No local.properties found. Not loading Android module.")
+    println("No Android SDK found. Skipping Android module.")
 }
 
 if(!hasProperty("release")){
@@ -33,7 +37,6 @@ if(!hasProperty("release")){
         ':Arc:extensions:recorder',
         ':Arc:extensions:arcnet',
         ':Arc:extensions:packer',
-        ':Arc:extensions:box2d',
         ':Arc:extensions:g3d',
         ':Arc:extensions:fx',
         ':Arc:natives',
@@ -43,9 +46,6 @@ if(!hasProperty("release")){
         ':Arc:natives:natives-freetype-desktop',
         ':Arc:natives:natives-freetype-android',
         ':Arc:natives:natives-freetype-ios',
-        ':Arc:natives:natives-box2d-desktop',
-        ':Arc:natives:natives-box2d-android',
-        ':Arc:natives:natives-box2d-ios',
         ':Arc:backends',
         ':Arc:backends:backend-sdl',
         ':Arc:backends:backend-android',
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 3f8862a410..d689dbd5df 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -110,7 +110,6 @@ public class ApplicationTests{
         Time.setDeltaProvider(() -> 1000f);
         Time.update();
         Time.update();
-        Time.setDeltaProvider(() -> 1f);
         Groups.unit.update();
         assertFalse(Groups.unit.isEmpty(), "No enemies spawned.");
     }
@@ -289,7 +288,6 @@ public class ApplicationTests{
         state.set(State.playing);
 
         world.tile(0, 0).setBlock(Blocks.conveyor);
-        world.tile(0, 0).rotation(0);
         world.tile(0, 0).build.acceptStack(Items.copper, 1000, null);
     }
 
@@ -372,15 +370,14 @@ public class ApplicationTests{
         Seq<Building> entities = Seq.with(world.tile(0, 0).build);
 
         for(int i = 0; i < length; i++){
-            world.tile(i + 1, 0).setBlock(Blocks.conveyor);
-            world.tile(i + 1, 0).rotation(0);
+            world.tile(i + 1, 0).setBlock(Blocks.conveyor, Team.derelict, 0);
             entities.add(world.tile(i + 1, 0).build);
         }
 
         world.tile(length + 1, 0).setBlock(new Block("___"){{
             hasItems = true;
             destructible = true;
-            entityType = () -> new Building(){
+            buildType = () -> new Building(){
                 @Override
                 public void handleItem(Building source, Item item){
                     itemsa[0] ++;
@@ -526,6 +523,9 @@ public class ApplicationTests{
 
         Time.setDeltaProvider(() -> 9999f);
 
+        //prevents range issues
+        state.rules.infiniteResources = true;
+
         d1.update();
 
         assertEquals(Blocks.copperWallLarge, world.tile(0, 0).block());
@@ -533,7 +533,10 @@ public class ApplicationTests{
 
         d2.clearBuilding();
         d2.addBuild(new BuildPlan(1, 1));
-        d2.update();
+
+        for(int i = 0; i < 3; i++){
+            d2.update();
+        }
 
         assertEquals(Blocks.air, world.tile(0, 0).block());
         assertEquals(Blocks.air, world.tile(2, 2).block());
@@ -571,7 +574,7 @@ public class ApplicationTests{
                     }catch(Throwable t){
                         fail("Failed to update block '" + tile.block() + "'.", t);
                     }
-                    assertEquals(tile.block(), tile.build.block());
+                    assertEquals(tile.block(), tile.build.block);
                     assertEquals(tile.block().health, tile.build.health());
                 }
             }
diff --git a/tests/src/test/java/SectorTests.java b/tests/src/test/java/SectorTests.java
index 1cad120b64..4110670eed 100644
--- a/tests/src/test/java/SectorTests.java
+++ b/tests/src/test/java/SectorTests.java
@@ -88,9 +88,13 @@ public class SectorTests{
                     }
 
                     assertNotEquals(0, total, "Sector " + zone + " has no spawned enemies at wave " + i);
-                    assertTrue(total < 75, "Sector spawns too many enemies at wave " + i + " (" + total + ")");
+                    //TODO this is flawed and needs to be changed later
+                    //assertTrue(total < 75, "Sector spawns too many enemies at wave " + i + " (" + total + ")");
                 }
 
+                assertEquals(1, Team.sharded.cores().size, "Sector must have one core: " + zone);
+                assertTrue(Team.sharded.core().items.total() < 1000, "Sector must not have starting resources: " + zone);
+
                 assertTrue(hasSpawnPoint, "Sector \"" + zone.name + "\" has no spawn points.");
                 assertTrue(spawner.countSpawns() > 0 || (state.rules.attackMode && state.teams.get(state.rules.waveTeam).hasCore()), "Sector \"" + zone.name + "\" has no enemy spawn points: " + spawner.countSpawns());
             }));
diff --git a/tests/src/test/java/power/ItemLiquidGeneratorTests.java b/tests/src/test/java/power/ItemLiquidGeneratorTests.java
index 89765f2e00..08f636c566 100644
--- a/tests/src/test/java/power/ItemLiquidGeneratorTests.java
+++ b/tests/src/test/java/power/ItemLiquidGeneratorTests.java
@@ -8,6 +8,7 @@ import mindustry.game.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.power.*;
+import mindustry.world.blocks.power.ItemLiquidGenerator.*;
 import org.junit.jupiter.api.*;
 
 import java.util.*;
@@ -26,7 +27,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
 
     private ItemLiquidGenerator generator;
     private Tile tile;
-    private ItemLiquidGenerator.ItemLiquidGeneratorEntity entity;
+    private ItemLiquidGeneratorBuild entity;
     private final float fakeItemDuration = 60f; //ticks
     private final float maximumLiquidUsage = 0.5f;
 
@@ -38,7 +39,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
                 powerProduction = 0.1f;
                 itemDuration = fakeItemDuration;
                 maxLiquidGenerate = maximumLiquidUsage;
-                entityType = ItemLiquidGeneratorEntity::new;
+                buildType = ItemLiquidGeneratorBuild::new;
             }
 
             @Override
@@ -89,7 +90,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
         assertTrue(entity.acceptLiquid(null, liquid, availableLiquidAmount), inputType + " | " + parameterDescription + ": Liquids which will be declined by the generator don't need to be tested - The code won't be called for those cases.");
 
         entity.liquids.add(liquid, availableLiquidAmount);
-        entity.cons().update();
+        entity.cons.update();
 
         // Perform an update on the generator once - This should use up any resource up to the maximum liquid usage
         entity.updateTile();
@@ -133,7 +134,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
         if(amount > 0){
             entity.items.add(item, amount);
         }
-        entity.cons().update();
+        entity.cons.update();
 
         // Perform an update on the generator once - This should use up one or zero items - dependent on if the item is accepted and available or not.
         try{
@@ -164,7 +165,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
 
         // Burn a single coal and test for the duration
         entity.items.add(Items.coal, 1);
-        entity.cons().update();
+        entity.cons.update();
         entity.updateTile();
 
         float expectedEfficiency = entity.productionEfficiency;
diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java
index 87177440c0..994130a596 100644
--- a/tests/src/test/java/power/PowerTestFixture.java
+++ b/tests/src/test/java/power/PowerTestFixture.java
@@ -43,21 +43,21 @@ public class PowerTestFixture{
 
     protected static PowerGenerator createFakeProducerBlock(float producedPower){
         return new PowerGenerator("fakegen"){{
-            entityType = () -> new GeneratorEntity();
+            buildType = () -> new GeneratorBuild();
             powerProduction = producedPower;
         }};
     }
 
     protected static Battery createFakeBattery(float capacity){
         return new Battery("fakebattery"){{
-            entityType = () -> new BatteryEntity();
+            buildType = () -> new BatteryBuild();
             consumes.powerBuffered(capacity);
         }};
     }
 
     protected static Block createFakeDirectConsumer(float powerPerTick){
         return new PowerBlock("fakedirectconsumer"){{
-            entityType = Building::create;
+            buildType = Building::create;
             consumes.power(powerPerTick);
         }};
     }
@@ -86,7 +86,7 @@ public class PowerTestFixture{
             Reflect.set(Tile.class, tile, "floor", Blocks.sand);
 
             // Simulate the "changed" method. Calling it through reflections would require half the game to be initialized.
-            tile.build = block.newEntity().init(tile, Team.sharded, false);
+            tile.build = block.newBuilding().init(tile, Team.sharded, false, 0);
             if(block.hasPower){
                 tile.build.power.graph = new PowerGraph(){
                     //assume there's always something consuming power
diff --git a/tests/src/test/java/power/PowerTests.java b/tests/src/test/java/power/PowerTests.java
index bbe37653e3..43c2567d27 100644
--- a/tests/src/test/java/power/PowerTests.java
+++ b/tests/src/test/java/power/PowerTests.java
@@ -7,6 +7,7 @@ import mindustry.*;
 import mindustry.core.*;
 import mindustry.world.*;
 import mindustry.world.blocks.power.*;
+import mindustry.world.blocks.power.PowerGenerator.*;
 import mindustry.world.consumers.*;
 import org.junit.jupiter.api.*;
 
@@ -54,7 +55,7 @@ public class PowerTests extends PowerTestFixture{
 
         void simulateDirectConsumption(float producedPower, float requiredPower, float expectedSatisfaction, String parameterDescription){
             Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower));
-            producerTile.<PowerGenerator.GeneratorEntity>bc().productionEfficiency = 1f;
+            producerTile.<GeneratorBuild>bc().productionEfficiency = 1f;
             Tile directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requiredPower));
 
             PowerGraph powerGraph = new PowerGraph();
@@ -64,7 +65,7 @@ public class PowerTests extends PowerTestFixture{
             assertEquals(producedPower * Time.delta, powerGraph.getPowerProduced(), Mathf.FLOAT_ROUNDING_ERROR);
             assertEquals(requiredPower * Time.delta, powerGraph.getPowerNeeded(), Mathf.FLOAT_ROUNDING_ERROR);
 
-            // Update and check for the expected power status of the consumer
+            //Update and check for the expected power status of the consumer
             powerGraph.update();
             assertEquals(expectedSatisfaction, directConsumerTile.build.power.status, Mathf.FLOAT_ROUNDING_ERROR, parameterDescription + ": Satisfaction of direct consumer did not match");
         }
@@ -94,7 +95,7 @@ public class PowerTests extends PowerTestFixture{
 
             if(producedPower > 0.0f){
                 Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower));
-                producerTile.<PowerGenerator.GeneratorEntity>bc().productionEfficiency = 1f;
+                producerTile.<GeneratorBuild>bc().productionEfficiency = 1f;
                 powerGraph.add(producerTile.build);
             }
             Tile directConsumerTile = null;
@@ -119,7 +120,7 @@ public class PowerTests extends PowerTestFixture{
         @Test
         void directConsumptionStopsWithNoPower(){
             Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(10.0f));
-            producerTile.<PowerGenerator.GeneratorEntity>bc().productionEfficiency = 1.0f;
+            producerTile.<GeneratorBuild>bc().productionEfficiency = 1.0f;
             Tile consumerTile = createFakeTile(0, 1, createFakeDirectConsumer(5.0f));
 
             PowerGraph powerGraph = new PowerGraph();
diff --git a/tools/build.gradle b/tools/build.gradle
index 1b45dd95c0..3266834485 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -409,16 +409,6 @@ task genSprites(dependsOn: classes, type: JavaExec){
     workingDir = genFolder
 }
 
-task genSectorData(dependsOn: classes, type: JavaExec){
-    main = "mindustry.tools.SectorDataGenerator"
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    workingDir = "../core/assets/"
-}
-
-task updateCache(dependsOn: [genSectorData]){
-}
-
 task updateBundles(dependsOn: classes, type: JavaExec){
     file(genFolder).mkdirs()
 
diff --git a/tools/src/mindustry/tools/FontGenerator.java b/tools/src/mindustry/tools/FontGenerator.java
index f38766f37d..05f2715d29 100644
--- a/tools/src/mindustry/tools/FontGenerator.java
+++ b/tools/src/mindustry/tools/FontGenerator.java
@@ -40,7 +40,7 @@ public class FontGenerator{
         Log.info("Icon font...");
 
         ZipFi zip = new ZipFi(folder.child("font.zip"));
-        Fi dest = folder.child("font.ttf");
+        Fi dest = folder.child("font.woff");
         zip.list()[0].child("font").child("fontello.ttf").copyTo(dest);
         dest.copyTo(Fi.get("core/assets/fonts/icon.ttf"));
 
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index 391f24c57f..2bc7fd4eac 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -2,6 +2,7 @@ package mindustry.tools;
 
 import arc.*;
 import arc.files.*;
+import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -126,7 +127,7 @@ public class Generators{
             Image colors = new Image(content.blocks().size, 1);
 
             for(Block block : content.blocks()){
-                if(block.isAir() || block instanceof BuildBlock || block instanceof OreBlock || block instanceof LegacyBlock) continue;
+                if(block.isAir() || block instanceof ConstructBlock || block instanceof OreBlock || block instanceof LegacyBlock) continue;
 
                 block.load();
 
@@ -172,7 +173,7 @@ public class Generators{
                         int radius = 4;
                         GenRegion region = (GenRegion)regions[regions.length - 1];
                         Image base = ImagePacker.get(region);
-                        Image out = last = new Image(region.getWidth(), region.getHeight());
+                        Image out = last = new Image(region.width, region.height);
                         for(int x = 0; x < out.width; x++){
                             for(int y = 0; y < out.height; y++){
 
@@ -232,18 +233,22 @@ public class Generators{
 
                     boolean hasEmpty = false;
                     Color average = new Color();
+                    float asum = 0f;
                     for(int x = 0; x < image.width; x++){
                         for(int y = 0; y < image.height; y++){
                             Color color = image.getColor(x, y);
-                            average.r += color.r;
-                            average.g += color.g;
-                            average.b += color.b;
+                            average.r += color.r*color.a;
+                            average.g += color.g*color.a;
+                            average.b += color.b*color.a;
+                            asum += color.a;
                             if(color.a < 0.9f){
                                 hasEmpty = true;
                             }
                         }
                     }
-                    average.mul(1f / (image.width * image.height));
+
+                    average.mul(1f / asum);
+
                     if(block instanceof Floor){
                         average.mul(0.8f);
                     }else{
@@ -302,18 +307,37 @@ public class Generators{
         ImagePacker.generate("unit-icons", () -> content.units().each(type -> {
             if(type.isHidden()) return; //hidden units don't generate
 
+            ObjectSet<String> outlined = new ObjectSet<>();
+
             try{
                 type.load();
                 type.init();
 
-                Image image = ImagePacker.get(type.parts > 0 ? type.partRegions[0] : type.region);
-                for(int i = 1; i < type.parts; i++){
-                    image.draw(ImagePacker.get(type.partRegions[i]));
-                }
-                if(type.parts > 0){
-                    image.save(type.name);
+                Color outc = Pal.darkerMetal;
+                Func<Image, Image> outline = i -> i.outline(3, outc);
+                Cons<TextureRegion> outliner = t -> {
+                    if(t != null && t.found()){
+                        ImagePacker.replace(t, outline.get(ImagePacker.get(t)));
+                    }
+                };
+
+                for(Weapon weapon : type.weapons){
+                    if(outlined.add(weapon.name) && ImagePacker.has(weapon.name)){
+                        outline.get(ImagePacker.get(weapon.name)).save(weapon.name + "-outline");
+                    }
                 }
 
+                outliner.get(type.jointRegion);
+                outliner.get(type.footRegion);
+                outliner.get(type.legBaseRegion);
+                outliner.get(type.baseJointRegion);
+                if(type.constructor.get() instanceof Legsc) outliner.get(type.legRegion);
+
+                Image image = outline.get(ImagePacker.get(type.region));
+
+                image.save(type.name + "-outline");
+
+                //draw mech parts
                 if(type.constructor.get() instanceof Mechc){
                     image.drawCenter(type.baseRegion);
                     image.drawCenter(type.legRegion);
@@ -321,16 +345,21 @@ public class Generators{
                     image.draw(type.region);
                 }
 
-                Image baseCell = ImagePacker.get(type.parts > 0 ? type.partCellRegions[0] : type.cellRegion);
-                for(int i = 1; i < type.parts; i++){
-                    baseCell.draw(ImagePacker.get(type.partCellRegions[i]));
+                //draw outlines
+                for(Weapon weapon : type.weapons){
+                    weapon.load();
+
+                    image.draw(outline.get(ImagePacker.get(weapon.region)),
+                    (int)(weapon.x / Draw.scl + image.width / 2f - weapon.region.width / 2f),
+                    (int)(-weapon.y / Draw.scl + image.height / 2f - weapon.region.height / 2f),
+                    weapon.flipSprite, false);
                 }
 
-                if(type.parts > 0){
-                    image.save(type.name + "-cell");
-                }
+                //draw base region on top to mask weapons
+                image.draw(type.region);
 
-                Image cell = new Image(type.cellRegion.getWidth(), type.cellRegion.getHeight());
+                Image baseCell = ImagePacker.get(type.cellRegion);
+                Image cell = new Image(type.cellRegion.width, type.cellRegion.height);
                 cell.each((x, y) -> cell.draw(x, y, baseCell.getColor(x, y).mul(Color.valueOf("ffa665"))));
 
                 image.draw(cell, image.width / 2 - cell.width / 2, image.height / 2 - cell.height / 2);
@@ -338,9 +367,9 @@ public class Generators{
                 for(Weapon weapon : type.weapons){
                     weapon.load();
 
-                    image.draw(weapon.region,
-                    (int)(weapon.x / Draw.scl + image.width / 2f - weapon.region.getWidth() / 2f),
-                    (int)(-weapon.y / Draw.scl + image.height / 2f - weapon.region.getHeight() / 2f),
+                    image.draw(weapon.top ? outline.get(ImagePacker.get(weapon.region)) : ImagePacker.get(weapon.region),
+                    (int)(weapon.x / Draw.scl + image.width / 2f - weapon.region.width / 2f),
+                    (int)(-weapon.y / Draw.scl + image.height / 2f - weapon.region.height / 2f),
                     weapon.flipSprite, false);
                 }
 
@@ -382,7 +411,9 @@ public class Generators{
                 }
 
                 for(Cicon icon : Cicon.scaled){
-                    Image scaled = new Image(icon.size, icon.size);
+                    Vec2 size = Scaling.fit.apply(image.width, image.height, icon.size, icon.size);
+                    Image scaled = new Image((int)size.x, (int)size.y);
+
                     scaled.drawScaled(image);
                     scaled.save("../ui/unit-" + type.name + "-" + icon.name());
                 }
diff --git a/tools/src/mindustry/tools/Image.java b/tools/src/mindustry/tools/Image.java
index 9f7e5e5eee..83594f22be 100644
--- a/tools/src/mindustry/tools/Image.java
+++ b/tools/src/mindustry/tools/Image.java
@@ -3,6 +3,8 @@ package mindustry.tools;
 import arc.func.*;
 import arc.graphics.Color;
 import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.tools.ImagePacker.*;
@@ -60,6 +62,76 @@ class Image{
         return color;
     }
 
+    Image outline(int radius, Color outlineColor){
+        Image out = copy();
+        for(int x = 0; x < out.width; x++){
+            for(int y = 0; y < out.height; y++){
+
+                Color color = getColor(x, y);
+                out.draw(x, y, color);
+                if(color.a < 1f){
+                    boolean found = false;
+                    outer:
+                    for(int rx = -radius; rx <= radius; rx++){
+                        for(int ry = -radius; ry <= radius; ry++){
+                            if(Mathf.dst(rx, ry) <= radius && getColor(rx + x, ry + y).a > 0.01f){
+                                found = true;
+                                break outer;
+                            }
+                        }
+                    }
+                    if(found){
+                        out.draw(x, y, outlineColor);
+                    }
+                }
+            }
+        }
+        return out;
+    }
+
+    Image shadow(float alpha, int rad){
+        Image out = silhouette(new Color(0f, 0f, 0f, alpha)).blur(rad);
+        out.draw(this);
+        return out;
+    }
+
+    Image silhouette(Color color){
+        Image out = copy();
+
+        each((x, y) -> out.draw(x, y, getColor(x, y).set(color.r, color.g, color.b, this.color.a * color.a)));
+
+        return out;
+    }
+
+    Image blur(int radius){
+        Image out = copy();
+        Color c = new Color();
+        int[] sum = {0};
+
+        for(int x = 0; x < out.width; x++){
+            for(int y = 0; y < out.height; y++){
+                sum[0] = 0;
+
+                Geometry.circle(x, y, radius, (cx, cy) -> {
+                    int rx = Mathf.clamp(cx, 0, out.width - 1), ry = Mathf.clamp(cy, 0, out.height - 1);
+
+                    Color other = getColor(rx, ry);
+                    c.r += other.r;
+                    c.g += other.g;
+                    c.b += other.b;
+                    c.a += other.a;
+                    sum[0] ++;
+                });
+
+                c.mula(1f / sum[0]);
+
+                out.draw(x, y, c);
+            }
+        }
+
+        return out;
+    }
+
     void each(Intc2 cons){
         for(int x = 0; x < width; x++){
             for(int y = 0; y < height; y++){
@@ -81,12 +153,12 @@ class Image{
 
     /** Draws a region at the center. */
     void drawCenter(TextureRegion region){
-        draw(region, (width - region.getWidth()) / 2, (height - region.getHeight()) / 2, false, false);
+        draw(region, (width - region.width) / 2, (height - region.height) / 2, false, false);
     }
 
     /** Draws a region at the center. */
     void drawCenter(TextureRegion region, boolean flipx, boolean flipy){
-        draw(region, (width - region.getWidth()) / 2, (height - region.getHeight()) / 2, flipx, flipy);
+        draw(region, (width - region.width) / 2, (height - region.height) / 2, flipx, flipy);
     }
 
     void drawScaled(Image image){
@@ -110,16 +182,21 @@ class Image{
     void draw(TextureRegion region, int x, int y, boolean flipx, boolean flipy){
         GenRegion.validate(region);
 
+        draw(ImagePacker.get(region), x, y, flipx, flipy);
+    }
+
+    void draw(Image region, int x, int y, boolean flipx, boolean flipy){
+
         int ofx = 0, ofy = 0;
 
-        graphics.drawImage(ImagePacker.get(region).image,
+        graphics.drawImage(region.image,
         x, y,
-        x + region.getWidth(),
-        y + region.getHeight(),
-        (flipx ? region.getWidth() : 0) + ofx,
-        (flipy ? region.getHeight() : 0) + ofy,
-        (flipx ? 0 : region.getWidth()) + ofx,
-        (flipy ? 0 : region.getHeight()) + ofy,
+        x + region.width,
+        y + region.height,
+        (flipx ? region.width : 0) + ofx,
+        (flipy ? region.height : 0) + ofy,
+        (flipx ? 0 : region.width) + ofx,
+        (flipy ? 0 : region.height) + ofy,
         null);
     }
 
diff --git a/tools/src/mindustry/tools/ImagePacker.java b/tools/src/mindustry/tools/ImagePacker.java
index 9f359dd30a..2533f99af9 100644
--- a/tools/src/mindustry/tools/ImagePacker.java
+++ b/tools/src/mindustry/tools/ImagePacker.java
@@ -42,28 +42,12 @@ public class ImagePacker{
                 BufferedImage image = ImageIO.read(path.file());
 
                 if(image == null) throw new IOException("image " + path.absolutePath() + " is null for terrible reasons");
-                GenRegion region = new GenRegion(fname, path){
-
-                    @Override
-                    public int getX(){
-                        return 0;
-                    }
-
-                    @Override
-                    public int getY(){
-                        return 0;
-                    }
-
-                    @Override
-                    public int getWidth(){
-                        return image.getWidth();
-                    }
-
-                    @Override
-                    public int getHeight(){
-                        return image.getHeight();
-                    }
-                };
+                GenRegion region = new GenRegion(fname, path){{
+                    width = image.getWidth();
+                    height = image.getHeight();
+                    u2 = v2 = 1f;
+                    u = v = 0f;
+                }};
 
                 regionCache.put(fname, region);
                 imageCache.put(fname, image);
@@ -105,7 +89,7 @@ public class ImagePacker{
             }
         };
 
-        Draw.scl = 1f / Core.atlas.find("scale_marker").getWidth();
+        Draw.scl = 1f / Core.atlas.find("scale_marker").width;
 
         Time.mark();
         Generators.generate();
@@ -123,7 +107,7 @@ public class ImagePacker{
         map.each((key, val) -> content2id.put(val.split("\\|")[0], key));
 
         Seq<UnlockableContent> cont = Seq.withArrays(Vars.content.blocks(), Vars.content.items(), Vars.content.liquids(), Vars.content.units());
-        cont.removeAll(u -> u instanceof BuildBlock || u == Blocks.air);
+        cont.removeAll(u -> u instanceof ConstructBlock || u == Blocks.air);
 
         int minid = 0xF8FF;
         for(String key : map.keys()){
@@ -179,6 +163,15 @@ public class ImagePacker{
         return new Image(imageCache.get(((AtlasRegion)region).name));
     }
 
+    static void replace(String name, Image image){
+        image.save(name);
+        ((GenRegion)Core.atlas.find(name)).path.delete();
+    }
+
+    static void replace(TextureRegion region, Image image){
+        replace(((GenRegion)region).name, image);
+    }
+
     static void err(String message, Object... args){
         throw new IllegalArgumentException(Strings.format(message, args));
     }
diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java
new file mode 100644
index 0000000000..e15335e91a
--- /dev/null
+++ b/tools/src/mindustry/tools/ScriptMainGenerator.java
@@ -0,0 +1,99 @@
+package mindustry.tools;
+
+import arc.*;
+import arc.files.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.graphics.g2d.TextureAtlas.*;
+import arc.graphics.gl.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.io.*;
+import mindustry.net.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.net.*;
+import java.util.*;
+
+public class ScriptMainGenerator{
+
+    public static void main(String[] args) throws Exception{
+        String base = "mindustry";
+        Seq<String> blacklist = Seq.with("plugin", "mod", "net", "io", "tools");
+        Seq<String> nameBlacklist = Seq.with("ClassAccess");
+        Seq<Class<?>> whitelist = Seq.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class,
+        AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class, Shader.class,
+        Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class,
+        DataInputStream.class, DataOutputStream.class, Integer.class, Float.class, Double.class, Long.class, Boolean.class, Short.class, Byte.class, Character.class);
+        Seq<String> nopackage = Seq.with("java.lang", "java");
+
+        Seq<Class<?>> classes = Seq.withArrays(
+            getClasses("mindustry"),
+            getClasses("arc.func"),
+            getClasses("arc.struct"),
+            getClasses("arc.scene"),
+            getClasses("arc.math")
+        );
+        classes.addAll(whitelist);
+        classes.sort(Structs.comparing(Class::getName));
+
+        classes.removeAll(type -> type.isSynthetic() || type.isAnonymousClass() || type.getCanonicalName() == null || Modifier.isPrivate(type.getModifiers())
+        || blacklist.contains(s -> type.getName().startsWith(base + "." + s + ".")) || nameBlacklist.contains(type.getSimpleName()));
+        classes.add(NetConnection.class, SaveIO.class);
+
+        classes.distinct();
+        classes.sortComparing(Class::getName);
+        ObjectSet<String> used = ObjectSet.with();
+
+        StringBuilder result = new StringBuilder("//Generated class. Do not modify.\n");
+        result.append("\n").append(new Fi("core/assets/scripts/base.js").readString()).append("\n");
+        for(Class type : classes){
+            if(used.contains(type.getPackage().getName()) || nopackage.contains(s -> type.getName().startsWith(s))) continue;
+            result.append("importPackage(Packages.").append(type.getPackage().getName()).append(")\n");
+            used.add(type.getPackage().getName());
+        }
+
+        Log.info("Imported @ packages.", used.size);
+
+        for(Class type : EventType.class.getClasses()){
+            result.append("const ").append(type.getSimpleName()).append(" = ").append("Packages.").append(type.getName().replace('$', '.')).append("\n");
+        }
+
+        new Fi("core/assets/scripts/global.js").writeString(result.toString());
+    }
+
+
+    private static Seq<Class> getClasses(String packageName) throws Exception{
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        Seq<File> dirs = new Seq<>();
+
+        for(URL resource : Collections.list(classLoader.getResources(packageName.replace('.', '/')))){
+            dirs.add(new File(resource.getFile()));
+        }
+
+        Seq<Class> classes = new Seq<>();
+        for(File directory : dirs){
+            classes.addAll(findClasses(directory, packageName));
+        }
+        return classes;
+    }
+
+    private static Seq<Class> findClasses(File directory, String packageName) throws Exception{
+        Seq<Class> classes = new Seq<>();
+        if(!directory.exists()) return classes;
+
+        File[] files = directory.listFiles();
+        for(File file : files){
+            if(file.isDirectory()){
+                classes.addAll(findClasses(file, packageName + "." + file.getName()));
+            }else if(file.getName().endsWith(".class")){
+                classes.add(Class.forName(packageName + '.' + file.getName().substring(0, file.getName().length() - 6), false, Thread.currentThread().getContextClassLoader()));
+            }
+        }
+        return classes;
+    }
+}
diff --git a/tools/src/mindustry/tools/ScriptStubGenerator.java b/tools/src/mindustry/tools/ScriptStubGenerator.java
deleted file mode 100644
index 560047b112..0000000000
--- a/tools/src/mindustry/tools/ScriptStubGenerator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package mindustry.tools;
-
-import arc.*;
-import arc.struct.Seq;
-import arc.struct.*;
-import arc.files.*;
-import arc.graphics.*;
-import arc.graphics.g2d.*;
-import arc.graphics.g2d.TextureAtlas.*;
-import arc.math.*;
-import arc.util.*;
-import mindustry.game.*;
-import mindustry.gen.*;
-import org.reflections.*;
-import org.reflections.scanners.*;
-import org.reflections.util.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-public class ScriptStubGenerator{
-
-    public static void main(String[] args) throws Exception{
-        String base = "mindustry";
-        Seq<String> blacklist = Seq.with("plugin", "mod", "net", "io", "tools");
-        Seq<String> nameBlacklist = Seq.with("ClassAccess");
-        Seq<Class<?>> whitelist = Seq.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class,
-            AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class,
-            Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class,
-            DataInputStream.class, DataOutputStream.class, Integer.class, Float.class, Double.class, Long.class, Boolean.class, Short.class, Byte.class, Character.class);
-        Seq<String> nopackage = Seq.with("java.lang", "java");
-
-        List<ClassLoader> classLoadersList = new LinkedList<>();
-        classLoadersList.add(ClasspathHelper.contextClassLoader());
-        classLoadersList.add(ClasspathHelper.staticClassLoader());
-
-        Reflections reflections = new Reflections(new ConfigurationBuilder()
-        .setScanners(new SubTypesScanner(false), new ResourcesScanner())
-        .setUrls(ClasspathHelper.forClassLoader(classLoadersList.toArray(new ClassLoader[0])))
-        .filterInputsBy(new FilterBuilder()
-        .include(FilterBuilder.prefix("mindustry"))
-        .include(FilterBuilder.prefix("arc.func"))
-        .include(FilterBuilder.prefix("arc.struct"))
-        .include(FilterBuilder.prefix("arc.scene"))
-        .include(FilterBuilder.prefix("arc.math"))
-        ));
-
-        Seq<Class<?>> classes = Seq.with(reflections.getSubTypesOf(Object.class));
-        classes.addAll(reflections.getSubTypesOf(Enum.class));
-        classes.addAll(whitelist);
-        classes.sort(Structs.comparing(Class::getName));
-
-        classes.removeAll(type -> type.isSynthetic() || type.isAnonymousClass() || type.getCanonicalName() == null || Modifier.isPrivate(type.getModifiers())
-        || blacklist.contains(s -> type.getName().startsWith(base + "." + s + ".")) || nameBlacklist.contains(type.getSimpleName()));
-        classes.distinct();
-        ObjectSet<String> used = ObjectSet.with();
-
-        StringBuilder result = new StringBuilder("//Generated class. Do not modify.\n");
-        result.append("\n").append(new Fi("core/assets/scripts/base.js").readString()).append("\n");
-        for(Class type : classes){
-            if(used.contains(type.getPackage().getName()) || nopackage.contains(s -> type.getName().startsWith(s))) continue;
-            result.append("importPackage(Packages.").append(type.getPackage().getName()).append(")\n");
-            used.add(type.getPackage().getName());
-        }
-
-        for(Class type : EventType.class.getClasses()){
-            result.append("const ").append(type.getSimpleName()).append(" = ").append("Packages.").append(type.getName().replace('$', '.')).append("\n");
-        }
-
-        //Log.info(result);
-
-        new Fi("core/assets/scripts/global.js").writeString(result.toString());
-    }
-}
diff --git a/tools/src/mindustry/tools/SectorDataGenerator.java b/tools/src/mindustry/tools/SectorDataGenerator.java
deleted file mode 100644
index e0c4828280..0000000000
--- a/tools/src/mindustry/tools/SectorDataGenerator.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package mindustry.tools;
-
-import arc.*;
-import arc.backend.headless.mock.*;
-import arc.files.*;
-import arc.mock.*;
-import arc.struct.*;
-import arc.struct.ObjectIntMap.*;
-import arc.util.*;
-import arc.util.io.*;
-import mindustry.*;
-import mindustry.content.*;
-import mindustry.core.*;
-import mindustry.ctype.*;
-import mindustry.game.*;
-import mindustry.net.Net;
-import mindustry.type.*;
-import mindustry.type.Sector.*;
-import mindustry.world.*;
-import mindustry.world.blocks.storage.CoreBlock.*;
-
-import static mindustry.Vars.*;
-
-public class SectorDataGenerator{
-
-    public static void main(String[] args){
-        ArcNativesLoader.load();
-        Core.files = new MockFiles();
-        Core.app = new MockApplication();
-        Core.settings = new MockSettings();
-        Core.graphics = new MockGraphics();
-
-        headless = true;
-        net = new Net(null);
-        tree = new FileTree();
-        Vars.init();
-        content.createBaseContent();
-
-        logic = new Logic();
-        netServer = new NetServer();
-        world = new World();
-
-        content.init();
-
-        for(Planet planet : content.<Planet>getBy(ContentType.planet)){
-            int[] count = {0};
-            if(planet.grid == null) continue;
-
-            Fi fi = Fi.get("planets").child(planet.name + ".dat");
-
-            Seq<SectorData> list = planet.sectors.map(sector -> {
-                SectorData data = new SectorData();
-
-                ObjectIntMap<Block> floors = new ObjectIntMap<>();
-                ObjectSet<Content> content = new ObjectSet<>();
-
-                logic.reset();
-                world.loadSector(sector);
-                float waterFloors = 0, totalFloors = 0;
-                state.rules.sector = sector;
-
-                for(Tile tile : world.tiles){
-                    if(world.getDarkness(tile.x, tile.y) >= 3){
-                        continue;
-                    }
-
-                    Liquid liquid = tile.floor().liquidDrop;
-                    if(tile.floor().itemDrop != null) content.add(tile.floor().itemDrop);
-                    if(tile.overlay().itemDrop != null) content.add(tile.overlay().itemDrop);
-                    if(liquid != null) content.add(liquid);
-
-                    if(!tile.block().isStatic()){
-                        totalFloors ++;
-                        if(liquid == Liquids.water){
-                            waterFloors += tile.floor().isDeep() ? 1f : 0.7f;
-                        }
-                        floors.increment(tile.floor());
-                        if(tile.overlay() != Blocks.air){
-                            floors.increment(tile.overlay());
-                        }
-                    }
-                }
-
-                CoreEntity entity = Team.sharded.core();
-                int cx = entity.tileX(), cy = entity.tileY();
-
-                int nearTiles = 0;
-                int waterCheckRad = 5;
-
-                //check for water presence
-                for(int rx = -waterCheckRad; rx <= waterCheckRad; rx++){
-                    for(int ry = -waterCheckRad; ry <= waterCheckRad; ry++){
-                        Tile tile = world.tile(cx + rx, cy + ry);
-                        if(tile == null || tile.floor().liquidDrop != null){
-                            nearTiles ++;
-                        }
-                    }
-                }
-
-                if(waterFloors / totalFloors >= 0.6f){
-                    Log.debug("Sector @ has @/@ water -> naval", sector.id, waterFloors, totalFloors);
-                }
-
-                //naval sector guaranteed
-                if(nearTiles > 4){
-                    Log.debug("Sector @ has @ water tiles at @ @ -> naval", sector.id, nearTiles, cx, cy);
-                    waterFloors = totalFloors;
-                }
-
-                //sort counts in descending order
-                Seq<Entry<Block>> entries = floors.entries().toArray();
-                entries.sort(e -> -e.value);
-                //remove all blocks occuring < 30 times - unimportant
-                entries.removeAll(e -> e.value < 30);
-
-                data.floors = new Block[entries.size];
-                data.floorCounts = new int[entries.size];
-                for(int i = 0; i < entries.size; i++){
-                    data.floorCounts[i] = entries.get(i).value;
-                    data.floors[i] = entries.get(i).key;
-                }
-
-                //TODO bad code
-                boolean hasSnow = data.floors[0].name.contains("ice") || data.floors[0].name.contains("snow");
-                boolean hasRain = !hasSnow && data.floors[0].name.contains("water");
-                boolean hasDesert = !hasSnow && !hasRain && data.floors[0].name.contains("sand");
-
-                if(hasSnow){
-                    data.attributes |= (1 << SectorAttribute.snowy.ordinal());
-                }
-
-                if(hasRain){
-                    data.attributes |= (1 << SectorAttribute.rainy.ordinal());
-                }
-
-                if(hasDesert){
-                    data.attributes |= (1 << SectorAttribute.desert.ordinal());
-                }
-
-                data.resources = content.asArray().sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id))).toArray(UnlockableContent.class);
-
-                //50% water -> naval attribute
-                if(waterFloors / totalFloors >= 0.6f){
-                    data.attributes |= (1 << SectorAttribute.naval.ordinal());
-                }
-
-                if(count[0]++ % 10 == 0){
-                    Log.info("&lyDone with sector &lm@/@", count[0], planet.sectors.size);
-                }
-
-                return data;
-            });
-
-            //write data
-            try(Writes write = fi.writes()){
-                write.s(list.size);
-                list.each(s -> s.write(write));
-            }
-        }
-    }
-}